control:p10bmc:rainier-2u - Include OCC service on OCC groups
To provide some performance optimization ability, include the OCC
service to all the groups that are provided by the OCC service on the
BMC. This alleviates the need to lookup the service for all of the
members of these groups, regardless of interface in this case, and
correctly handle members that may not exist from the OCCs on a system.
Change-Id: I129741d4800dba7f3736047694c4630d56777eec
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/control/config_files/p10bmc/ibm,rainier-2u/groups.json b/control/config_files/p10bmc/ibm,rainier-2u/groups.json
index 591197d..f585f34 100644
--- a/control/config_files/p10bmc/ibm,rainier-2u/groups.json
+++ b/control/config_files/p10bmc/ibm,rainier-2u/groups.json
@@ -64,6 +64,7 @@
},
{
"name": "proc0 core temps",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc0_core0_0_temp",
"/xyz/openbmc_project/sensors/temperature/proc0_core0_1_temp",
@@ -101,6 +102,7 @@
},
{
"name": "proc1 core temps",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc1_core0_0_temp",
"/xyz/openbmc_project/sensors/temperature/proc1_core0_1_temp",
@@ -138,6 +140,7 @@
},
{
"name": "proc2 core temps",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc2_core0_0_temp",
"/xyz/openbmc_project/sensors/temperature/proc2_core0_1_temp",
@@ -175,6 +178,7 @@
},
{
"name": "proc3 core temps",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc3_core0_0_temp",
"/xyz/openbmc_project/sensors/temperature/proc3_core0_1_temp",
@@ -212,30 +216,35 @@
},
{
"name": "proc0 ioring temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc0_ioring_temp"
]
},
{
"name": "proc1 ioring temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc1_ioring_temp"
]
},
{
"name": "proc2 ioring temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc2_ioring_temp"
]
},
{
"name": "proc3 ioring temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc3_ioring_temp"
]
},
{
"name": "dram temps",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/dimm0_dram_temp",
"/xyz/openbmc_project/sensors/temperature/dimm1_dram_temp",
@@ -273,6 +282,7 @@
},
{
"name": "pmic temps",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/dimm0_pmic_temp",
"/xyz/openbmc_project/sensors/temperature/dimm1_pmic_temp",
@@ -310,6 +320,7 @@
},
{
"name": "internal memory buffer temps",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/dimm0_intmb_temp",
"/xyz/openbmc_project/sensors/temperature/dimm1_intmb_temp",
@@ -347,6 +358,7 @@
},
{
"name": "dram and external memory buffer temps",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/dimm0_dram_extmb_temp",
"/xyz/openbmc_project/sensors/temperature/dimm1_dram_extmb_temp",
@@ -384,6 +396,7 @@
},
{
"name": "external memory buffer temps",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/dimm0_extmb_temp",
"/xyz/openbmc_project/sensors/temperature/dimm1_extmb_temp",
@@ -421,6 +434,7 @@
},
{
"name": "vdd vrm temps",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/vrm_vdd0_temp",
"/xyz/openbmc_project/sensors/temperature/vrm_vdd1_temp",
@@ -430,48 +444,56 @@
},
{
"name": "proc 0 core dvfs temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc0_core_dvfs_temp"
]
},
{
"name": "proc 1 core dvfs temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc1_core_dvfs_temp"
]
},
{
"name": "proc 2 core dvfs temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc2_core_dvfs_temp"
]
},
{
"name": "proc 3 core dvfs temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc3_core_dvfs_temp"
]
},
{
"name": "proc 0 ioring dvfs temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc0_ioring_dvfs_temp"
]
},
{
"name": "proc 1 ioring dvfs temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc1_ioring_dvfs_temp"
]
},
{
"name": "proc 2 ioring dvfs temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc2_ioring_dvfs_temp"
]
},
{
"name": "proc 3 ioring dvfs temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc3_ioring_dvfs_temp"
]