control:p10bmc: Rename PCIe temp sensors: phase 1
The IBM PCIe card temp sensors are in the process of being renamed to
have stable names based on the location of of the slot they're in. In
order to prevent a coreq between the fan control config files and the
entity-manager JSON that contains the name, support both the old and the
new names until everything is merged, and then the old ones can be
removed.
Notes:
* On Rainier systems, there can be up to two NVMe JBOF cards, in any of
slots C8, C10, C11.
* On the Rainier 2U/4U, the system documentation states:
"Technically, Bear Lake/River cards could be in slots C0, C2, C3, C4,
C7, C9, C10, C11."
* On the Rainier 1S4U, the DCM0 slots are C7-C11, though the
documentation states only 1 of those cards may be plugged at the same
time.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: If3bcec31fff6e42955cb28c110cb3862bab3028b
diff --git a/control/config_files/p10bmc/ibm,everest/groups.json b/control/config_files/p10bmc/ibm,everest/groups.json
index 2084097..1a888e7 100644
--- a/control/config_files/p10bmc/ibm,everest/groups.json
+++ b/control/config_files/p10bmc/ibm,everest/groups.json
@@ -921,7 +921,18 @@
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_5_Temp",
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_6_Temp",
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_7_Temp",
- "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_8_Temp"
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_8_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C1_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C2_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C3_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C4_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C5_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C6_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C7_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C8_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C9_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp"
]
},
{
diff --git a/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json b/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
index cb91efb..18ed0cb 100644
--- a/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-1s4u/groups.json
@@ -320,7 +320,10 @@
"service": "xyz.openbmc_project.HwmonTempSensor",
"members": [
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_1_Temp",
- "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_2_Temp"
+ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_2_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp"
]
},
{
@@ -328,7 +331,11 @@
"name": "pcie cable card temps",
"service": "xyz.openbmc_project.HwmonTempSensor",
"members": [
- "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_1_Temp"
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_1_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C7_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C9_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp"
]
},
{
diff --git a/control/config_files/p10bmc/ibm,rainier-2u/groups.json b/control/config_files/p10bmc/ibm,rainier-2u/groups.json
index f585f34..588e1b8 100644
--- a/control/config_files/p10bmc/ibm,rainier-2u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-2u/groups.json
@@ -524,7 +524,10 @@
"service": "xyz.openbmc_project.HwmonTempSensor",
"members": [
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_1_Temp",
- "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_2_Temp"
+ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_2_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp"
]
},
{
@@ -535,7 +538,15 @@
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_1_Temp",
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_2_Temp",
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_3_Temp",
- "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_4_Temp"
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_4_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C0_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C2_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C3_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C4_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C7_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C9_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp"
]
},
{
diff --git a/control/config_files/p10bmc/ibm,rainier-4u/groups.json b/control/config_files/p10bmc/ibm,rainier-4u/groups.json
index 7afa0fe..c8cdaa0 100644
--- a/control/config_files/p10bmc/ibm,rainier-4u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-4u/groups.json
@@ -536,7 +536,10 @@
"service": "xyz.openbmc_project.HwmonTempSensor",
"members": [
"/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_1_Temp",
- "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_2_Temp"
+ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_2_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C8_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C10_Temp",
+ "/xyz/openbmc_project/sensors/temperature/NVMe_JBOF_Card_C11_Temp"
]
},
{
@@ -547,7 +550,15 @@
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_1_Temp",
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_2_Temp",
"/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_3_Temp",
- "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_4_Temp"
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_4_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C0_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C2_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C3_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C4_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C7_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C9_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C10_Temp",
+ "/xyz/openbmc_project/sensors/temperature/PCIe_Cable_Card_C11_Temp"
]
},
{