Add Slot interface to all NVMe drives
Assign a slot number to all drive paths so that the entity manager
config file for IBM's drives can use that to give its objects unique
names. Previously it used its own incrementing index but sometimes got
confused and tried to put a duplicate interface on the same object path
which would crash.
This was already being done for IBM's cable card sensors.
Because the NVMe temperature sensor names are being hardcoded in other
places (fan control and HMC telemetry), the slots are being assigned to
always start at 1 and sequentially increment to keep the names the same
as before.
Tested:
Properties are on D-Bus:
```
busctl get-property xyz.openbmc_project.Inventory.Manager \
/xyz/openbmc_project/inventory/system/chassis/motherboard/disk_backplane0/nvme0/dp0_drive0 \
xyz.openbmc_project.Inventory.Decorator.Slot SlotNumber
u 1
```
Change-Id: Id83c5c4ea2aaae810bcd9c1120cef11fb0e7ba74
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/config/ibm/50001000.json b/config/ibm/50001000.json
index ebfff56..03f2ce8 100644
--- a/config/ibm/50001000.json
+++ b/config/ibm/50001000.json
@@ -2455,6 +2455,9 @@
"com.ibm.ipzvpd.Location": {
"LocationCode": "Ufcs-P1-C0"
},
+ "xyz.openbmc_project.Inventory.Decorator.Slot": {
+ "SlotNumber": 1
+ },
"xyz.openbmc_project.Inventory.Item": {
"PrettyName": "NVMe U.2 drive 0"
}
@@ -2490,6 +2493,9 @@
"com.ibm.ipzvpd.Location": {
"LocationCode": "Ufcs-P1-C1"
},
+ "xyz.openbmc_project.Inventory.Decorator.Slot": {
+ "SlotNumber": 2
+ },
"xyz.openbmc_project.Inventory.Item": {
"PrettyName": "NVMe U.2 drive 1"
}
@@ -2525,6 +2531,9 @@
"com.ibm.ipzvpd.Location": {
"LocationCode": "Ufcs-P1-C2"
},
+ "xyz.openbmc_project.Inventory.Decorator.Slot": {
+ "SlotNumber": 3
+ },
"xyz.openbmc_project.Inventory.Item": {
"PrettyName": "NVMe U.2 drive 2"
}
@@ -2560,6 +2569,9 @@
"com.ibm.ipzvpd.Location": {
"LocationCode": "Ufcs-P1-C3"
},
+ "xyz.openbmc_project.Inventory.Decorator.Slot": {
+ "SlotNumber": 4
+ },
"xyz.openbmc_project.Inventory.Item": {
"PrettyName": "NVMe U.2 drive 3"
}
@@ -2595,6 +2607,9 @@
"com.ibm.ipzvpd.Location": {
"LocationCode": "Ufcs-P1-C4"
},
+ "xyz.openbmc_project.Inventory.Decorator.Slot": {
+ "SlotNumber": 5
+ },
"xyz.openbmc_project.Inventory.Item": {
"PrettyName": "NVMe U.2 drive 4"
}
@@ -2630,6 +2645,9 @@
"com.ibm.ipzvpd.Location": {
"LocationCode": "Ufcs-P1-C5"
},
+ "xyz.openbmc_project.Inventory.Decorator.Slot": {
+ "SlotNumber": 6
+ },
"xyz.openbmc_project.Inventory.Item": {
"PrettyName": "NVMe U.2 drive 5"
}
@@ -2665,6 +2683,9 @@
"com.ibm.ipzvpd.Location": {
"LocationCode": "Ufcs-P1-C6"
},
+ "xyz.openbmc_project.Inventory.Decorator.Slot": {
+ "SlotNumber": 7
+ },
"xyz.openbmc_project.Inventory.Item": {
"PrettyName": "NVMe U.2 drive 6"
}
@@ -2700,6 +2721,9 @@
"com.ibm.ipzvpd.Location": {
"LocationCode": "Ufcs-P1-C7"
},
+ "xyz.openbmc_project.Inventory.Decorator.Slot": {
+ "SlotNumber": 8
+ },
"xyz.openbmc_project.Inventory.Item": {
"PrettyName": "NVMe U.2 drive 7"
}
@@ -2877,6 +2901,9 @@
"com.ibm.ipzvpd.Location": {
"LocationCode": "Ufcs-P2-C8"
},
+ "xyz.openbmc_project.Inventory.Decorator.Slot": {
+ "SlotNumber": 9
+ },
"xyz.openbmc_project.Inventory.Item": {
"PrettyName": "NVMe U.2 drive 8"
}
@@ -2911,6 +2938,9 @@
"com.ibm.ipzvpd.Location": {
"LocationCode": "Ufcs-P2-C9"
},
+ "xyz.openbmc_project.Inventory.Decorator.Slot": {
+ "SlotNumber": 10
+ },
"xyz.openbmc_project.Inventory.Item": {
"PrettyName": "NVMe U.2 drive 9"
}
@@ -2945,6 +2975,9 @@
"com.ibm.ipzvpd.Location": {
"LocationCode": "Ufcs-P2-C10"
},
+ "xyz.openbmc_project.Inventory.Decorator.Slot": {
+ "SlotNumber": 11
+ },
"xyz.openbmc_project.Inventory.Item": {
"PrettyName": "NVMe U.2 drive 10"
}
@@ -2979,6 +3012,9 @@
"com.ibm.ipzvpd.Location": {
"LocationCode": "Ufcs-P2-C11"
},
+ "xyz.openbmc_project.Inventory.Decorator.Slot": {
+ "SlotNumber": 12
+ },
"xyz.openbmc_project.Inventory.Item": {
"PrettyName": "NVMe U.2 drive 11"
}
@@ -3013,6 +3049,9 @@
"com.ibm.ipzvpd.Location": {
"LocationCode": "Ufcs-P2-C12"
},
+ "xyz.openbmc_project.Inventory.Decorator.Slot": {
+ "SlotNumber": 13
+ },
"xyz.openbmc_project.Inventory.Item": {
"PrettyName": "NVMe U.2 drive 12"
}
@@ -3047,6 +3086,9 @@
"com.ibm.ipzvpd.Location": {
"LocationCode": "Ufcs-P2-C13"
},
+ "xyz.openbmc_project.Inventory.Decorator.Slot": {
+ "SlotNumber": 14
+ },
"xyz.openbmc_project.Inventory.Item": {
"PrettyName": "NVMe U.2 drive 13"
}
@@ -3081,6 +3123,9 @@
"com.ibm.ipzvpd.Location": {
"LocationCode": "Ufcs-P2-C14"
},
+ "xyz.openbmc_project.Inventory.Decorator.Slot": {
+ "SlotNumber": 15
+ },
"xyz.openbmc_project.Inventory.Item": {
"PrettyName": "NVMe U.2 drive 14"
}
@@ -3115,6 +3160,9 @@
"com.ibm.ipzvpd.Location": {
"LocationCode": "Ufcs-P2-C15"
},
+ "xyz.openbmc_project.Inventory.Decorator.Slot": {
+ "SlotNumber": 16
+ },
"xyz.openbmc_project.Inventory.Item": {
"PrettyName": "NVMe U.2 drive 15"
}