meta-ibm:vpd-json: Add Slot iface to pcie cards

Entity manager needs the slot number of PCIe cards on D-Bus so it can use it when building up names for the sensors on the cards. For example, with: "Name": "NVMe JBOF Card $slotnumber Temp", There would be a sensor name of: /xyz/openbmc_project/temperature/NVMe_JBOF_Card_10_Temp for the temp sensor on the card in slot C10. Otherwise, it's just numbered in the order it's discovered which isn't stable. Signed-off-by: Matt Spinler <spinler@us.ibm.com> Change-Id: Ia1d1dab5e47cd844d8dd2bcff8a21fa9535d85cd
ibm-openbmc · Apr 29, 2022 · a6eba38 · a6eba38
1 parent af34b82
commit a6eba38
Show file tree

Hide file tree

Showing 6 changed files with 171 additions and 0 deletions.
diff --git a/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50001000.json b/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50001000.json
@@ -1482,6 +1482,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 4,
               "Address": 80
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 0
           }
         }
       },
@@ -1545,6 +1548,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 5,
               "Address": 80
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 3
           }
         }
       },
@@ -1671,6 +1677,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 11,
               "Address": 80
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 10
           }
         }
       },
@@ -1789,6 +1798,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 4,
               "Address": 82
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 2
           }
         }
       }
@@ -1841,6 +1853,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 6,
               "Address": 82
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 7
           }
         }
       }
@@ -1869,6 +1884,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 6,
               "Address": 80
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 9
           }
         }
       }
@@ -1897,6 +1915,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 11,
               "Address": 81
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 11
           }
         }
       },
@@ -1981,6 +2002,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 4,
               "Address": 81
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 1
           }
         }
       }
@@ -2009,6 +2033,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 6,
               "Address": 81
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 8
           }
         }
       },

diff --git a/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50001000_v2.json b/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50001000_v2.json
@@ -1486,6 +1486,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 20,
               "Address": 80
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 0
           }
         }
       },
@@ -1553,6 +1556,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 23,
               "Address": 80
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 3
           }
         }
       },
@@ -1620,6 +1626,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 24,
               "Address": 81
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 4
           }
         }
       },
@@ -1687,6 +1696,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 29,
               "Address": 80
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 10
           }
         }
       },
@@ -1809,6 +1821,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 22,
               "Address": 82
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 2
           }
         }
       }
@@ -1869,6 +1884,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 26,
               "Address": 82
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 7
           }
         }
       }
@@ -1901,6 +1919,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 27,
               "Address": 80
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 9
           }
         }
       }
@@ -1933,6 +1954,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 30,
               "Address": 81
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 11
           }
         }
       },
@@ -2021,6 +2045,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 21,
               "Address": 81
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 1
           }
         }
       }
@@ -2053,6 +2080,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 28,
               "Address": 81
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 8
           }
         }
       },

diff --git a/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50001001.json b/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50001001.json
@@ -1374,6 +1374,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 4,
               "Address": 80
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 0
           }
         }
       },
@@ -1437,6 +1440,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 5,
               "Address": 80
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 3
           }
         }
       },
@@ -1500,6 +1506,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 5,
               "Address": 81
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 4
           }
         }
       },
@@ -1563,6 +1572,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 11,
               "Address": 80
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 10
           }
         }
       },
@@ -1681,6 +1693,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 4,
               "Address": 82
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 2
           }
         }
       }
@@ -1733,6 +1748,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 6,
               "Address": 82
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 7
           }
         }
       }
@@ -1761,6 +1779,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 6,
               "Address": 80
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 9
           }
         }
       }
@@ -1789,6 +1810,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 11,
               "Address": 81
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 11
           }
         }
       },
@@ -1873,6 +1897,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 4,
               "Address": 81
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 1
           }
         }
       }
@@ -1901,6 +1928,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 6,
               "Address": 81
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 8
           }
         }
       },

diff --git a/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50001001_v2.json b/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50001001_v2.json
@@ -1378,6 +1378,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 20,
               "Address": 80
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 0
           }
         }
       },
@@ -1445,6 +1448,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 23,
               "Address": 80
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 3
           }
         }
       },
@@ -1512,6 +1518,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 24,
               "Address": 81
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 4
           }
         }
       },
@@ -1579,6 +1588,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 29,
               "Address": 80
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 10
           }
         }
       },
@@ -1701,6 +1713,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 22,
               "Address": 82
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 2
           }
         }
       }
@@ -1761,6 +1776,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 26,
               "Address": 82
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 7
           }
         }
       }
@@ -1793,6 +1811,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 27,
               "Address": 80
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 9
           }
         }
       }
@@ -1825,6 +1846,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 30,
               "Address": 81
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 11
           }
         }
       },
@@ -1913,6 +1937,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 21,
               "Address": 81
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 1
           }
         }
       }
@@ -1945,6 +1972,9 @@
           "xyz.openbmc_project.Inventory.Decorator.I2CDevice": {
               "Bus": 28,
               "Address": 81
+          },
+          "xyz.openbmc_project.Inventory.Decorator.Slot": {
+              "SlotNumber": 8
           }
         }
       },