control:p10bmc:everest - 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: I3fc755685da63547067dd41d8213b56ab487fe3f
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/control/config_files/p10bmc/ibm,everest/groups.json b/control/config_files/p10bmc/ibm,everest/groups.json
index d5b9e40..2084097 100644
--- a/control/config_files/p10bmc/ibm,everest/groups.json
+++ b/control/config_files/p10bmc/ibm,everest/groups.json
@@ -52,6 +52,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",
@@ -89,6 +90,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",
@@ -126,6 +128,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",
@@ -163,6 +166,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",
@@ -200,6 +204,7 @@
},
{
"name": "proc4 core temps",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc4_core0_0_temp",
"/xyz/openbmc_project/sensors/temperature/proc4_core0_1_temp",
@@ -237,6 +242,7 @@
},
{
"name": "proc5 core temps",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc5_core0_0_temp",
"/xyz/openbmc_project/sensors/temperature/proc5_core0_1_temp",
@@ -274,6 +280,7 @@
},
{
"name": "proc6 core temps",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc6_core0_0_temp",
"/xyz/openbmc_project/sensors/temperature/proc6_core0_1_temp",
@@ -311,6 +318,7 @@
},
{
"name": "proc7 core temps",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc7_core0_0_temp",
"/xyz/openbmc_project/sensors/temperature/proc7_core0_1_temp",
@@ -348,54 +356,63 @@
},
{
"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": "proc4 ioring temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc4_ioring_temp"
]
},
{
"name": "proc5 ioring temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc5_ioring_temp"
]
},
{
"name": "proc6 ioring temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc6_ioring_temp"
]
},
{
"name": "proc7 ioring temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc7_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",
@@ -465,6 +482,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",
@@ -534,6 +552,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",
@@ -603,6 +622,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",
@@ -672,6 +692,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",
@@ -741,6 +762,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",
@@ -754,96 +776,112 @@
},
{
"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 4 core dvfs temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc4_core_dvfs_temp"
]
},
{
"name": "proc 5 core dvfs temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc5_core_dvfs_temp"
]
},
{
"name": "proc 6 core dvfs temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc6_core_dvfs_temp"
]
},
{
"name": "proc 7 core dvfs temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc7_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"
]
},
{
"name": "proc 4 ioring dvfs temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc4_ioring_dvfs_temp"
]
},
{
"name": "proc 5 ioring dvfs temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc5_ioring_dvfs_temp"
]
},
{
"name": "proc 6 ioring dvfs temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc6_ioring_dvfs_temp"
]
},
{
"name": "proc 7 ioring dvfs temp",
+ "service": "org.open_power.OCC.Control",
"members": [
"/xyz/openbmc_project/sensors/temperature/proc7_ioring_dvfs_temp"
]