From a6eba388f066e3b31373395d67e707d6543da59d Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Thu, 3 Mar 2022 20:10:10 +0000 Subject: [PATCH] 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 Change-Id: Ia1d1dab5e47cd844d8dd2bcff8a21fa9535d85cd --- .../vpd/ibm-vpd-parser/50001000.json | 27 +++++++++++++++ .../vpd/ibm-vpd-parser/50001000_v2.json | 30 +++++++++++++++++ .../vpd/ibm-vpd-parser/50001001.json | 30 +++++++++++++++++ .../vpd/ibm-vpd-parser/50001001_v2.json | 30 +++++++++++++++++ .../vpd/ibm-vpd-parser/50001002.json | 21 ++++++++++++ .../vpd/ibm-vpd-parser/50003000.json | 33 +++++++++++++++++++ 6 files changed, 171 insertions(+) diff --git a/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50001000.json b/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50001000.json index c7e17a46d0..4dada01a11 100644 --- 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 index f348759186..e3429a138a 100644 --- 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 index 20aaef9af8..f51402acbb 100644 --- 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 index 36dd6b87d0..649d973ea0 100644 --- 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 } } }, diff --git a/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50001002.json b/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50001002.json index 831eea036c..6c9e4f01eb 100644 --- a/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50001002.json +++ b/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50001002.json @@ -979,6 +979,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 29, "Address": 80 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 10 } } }, @@ -1097,6 +1100,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 22, "Address": 82 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 2 } } } @@ -1149,6 +1155,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 26, "Address": 82 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 7 } } } @@ -1177,6 +1186,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 27, "Address": 80 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 9 } } } @@ -1205,6 +1217,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 30, "Address": 81 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 11 } } }, @@ -1289,6 +1304,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 21, "Address": 81 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 1 } } } @@ -1317,6 +1335,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/50003000.json b/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50003000.json index 3eba2960ec..667ed22878 100644 --- a/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50003000.json +++ b/meta-ibm/recipes-phosphor/vpd/ibm-vpd-parser/50003000.json @@ -2194,6 +2194,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 16, "Address": 82 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 1 } } }, @@ -2245,6 +2248,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 17, "Address": 80 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 2 } } }, @@ -2296,6 +2302,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 18, "Address": 81 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 3 } } }, @@ -2347,6 +2356,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 19, "Address": 80 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 4 } } }, @@ -2398,6 +2410,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 20, "Address": 81 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 5 } } }, @@ -2449,6 +2464,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 21, "Address": 81 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 6 } } } @@ -2478,6 +2496,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 22, "Address": 83 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 7 } } }, @@ -2529,6 +2550,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 23, "Address": 80 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 8 } } }, @@ -2580,6 +2604,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 24, "Address": 82 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 9 } } } @@ -2609,6 +2636,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 25, "Address": 83 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 10 } } }, @@ -2660,6 +2690,9 @@ "xyz.openbmc_project.Inventory.Decorator.I2CDevice": { "Bus": 26, "Address": 81 + }, + "xyz.openbmc_project.Inventory.Decorator.Slot": { + "SlotNumber": 11 } } },