commit 0e45ced1a8977f3ad29959efbf7bcf5415637645
author Matt Spinler <spinler@us.ibm.com> Mon Feb 12 14:36:07 2018 -0600
committer Matt Spinler <spinler@us.ibm.com> Mon Feb 26 14:50:12 2018 +0000
tree 24889f7aaf7399579243f4567a9f965b1de40500
parent 5e361c5cf7993c56d45e7e1c4d508a83be777018

Call out GPUs using their inventory path

The existing code was calling out GPUs in the metadata
with 'GPU=GPUn' because at the time the GPUs were not
in the inventory.

Now that the GPUs are in the inventory, they can be called
out using their inventory objects which is the correct
way to do it.

Resolves openbmc/openbmc#2869

Change-Id: Ic7b3ac465d482aade532f75ef10cc05df4928767
Signed-off-by: Matt Spinler <spinler@us.ibm.com>

power-sequencer/ucd90160_defs.cpp

diff --git a/power-sequencer/ucd90160_defs.cpp b/power-sequencer/ucd90160_defs.cpp
index 997650e..5696061 100644
--- a/power-sequencer/ucd90160_defs.cpp
+++ b/power-sequencer/ucd90160_defs.cpp
@@ -71,15 +71,22 @@
                         "/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@"
                         "1e78a000/1e78a400.i2c-bus/i2c-11/11-0060",
                         gpio::Value::low,
-                        [](auto& ucd, const auto& callout) { ucd.gpuPGOODError(callout); },
+                        [](auto& ucd, const auto& callout)
+                                { ucd.gpuPGOODError(callout); },
                         optionFlags::none,
                         GPIODefinitions{
-                            GPIODefinition{8, "GPU0"s},
-                            GPIODefinition{9, "GPU1"s},
-                            GPIODefinition{10, "GPU2"s},
-                            GPIODefinition{11, "GPU3"s},
-                            GPIODefinition{12, "GPU4"s},
-                            GPIODefinition{13, "GPU5"s}}
+                            GPIODefinition{8,
+                                "/system/chassis/motherboard/gv100card0"s},
+                            GPIODefinition{9,
+                                "/system/chassis/motherboard/gv100card1"s},
+                            GPIODefinition{10,
+                                "/system/chassis/motherboard/gv100card2"s},
+                            GPIODefinition{11,
+                                "/system/chassis/motherboard/gv100card3"s},
+                            GPIODefinition{12,
+                                "/system/chassis/motherboard/gv100card4"s},
+                            GPIODefinition{13,
+                                "/system/chassis/motherboard/gv100card5"s}}
                     }},
 
                 {extraAnalysisType::gpuOverTemp,
@@ -87,15 +94,22 @@
                         "/sys/devices/platform/ahb/ahb:apb/ahb:apb:i2c@"
                         "1e78a000/1e78a400.i2c-bus/i2c-11/11-0060",
                         gpio::Value::low,
-                        [](auto& ucd, const auto& callout) { ucd.gpuOverTempError(callout); },
+                        [](auto& ucd, const auto& callout)
+                                { ucd.gpuOverTempError(callout); },
                         optionFlags::shutdownOnFault,
                         GPIODefinitions{
-                            GPIODefinition{2, "GPU0"s},
-                            GPIODefinition{3, "GPU1"s},
-                            GPIODefinition{4, "GPU2"s},
-                            GPIODefinition{5, "GPU3"s},
-                            GPIODefinition{6, "GPU4"s},
-                            GPIODefinition{7, "GPU5"s}}
+                            GPIODefinition{2,
+                                "/system/chassis/motherboard/gv100card0"s},
+                            GPIODefinition{3,
+                                "/system/chassis/motherboard/gv100card1"s},
+                            GPIODefinition{4,
+                                "/system/chassis/motherboard/gv100card2"s},
+                            GPIODefinition{5,
+                                "/system/chassis/motherboard/gv100card3"s},
+                            GPIODefinition{6,
+                                "/system/chassis/motherboard/gv100card4"s},
+                            GPIODefinition{7,
+                                "/system/chassis/motherboard/gv100card5"s}}
                     }}
             }
         }