From 8293d83310c151bb61bdc04932aa041ca0cd2223 Mon Sep 17 00:00:00 2001 From: Matt Derksen Date: Tue, 22 Jan 2019 14:49:20 -0600 Subject: Fix deconfigure parent rollup policy Change to specifically designate if a target is allowed to be deconfigured by child rollup and if it should rollup to its parent. Need to cover the case where there are two different types of children and only one is allowed to rollup to the parent. Also prevent the deconfigure rollup from happening to the parent. Change-Id: I514876a46e9c8180e1fc99a969e0ca4247fbf2d9 CQ:SW454562 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/70759 Reviewed-by: Christian R. Geddes Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Tested-by: Jenkins OP HW Reviewed-by: Daniel M. Crowell --- .../targeting/common/xmltohb/attribute_types.xml | 52 +- .../common/xmltohb/simics_NIMBUS.system.xml | 4 +- src/usr/targeting/common/xmltohb/target_types.xml | 804 +++++++++++++++++++-- 3 files changed, 806 insertions(+), 54 deletions(-) (limited to 'src/usr/targeting/common/xmltohb') diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index d75aaca3d..21eca1fd7 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -5091,18 +5091,52 @@ - Do not allow deconfiguration of this target to rollup to its parent - 0x00 (false) = Allow parent deconfiguration rollup (default setting) - 0x01 (true) = Do not allow parent deconfiguration rollup + Rules on how to handle a deconfigure to parent level - PARENT_DECONFIG_DISABLED + PARENT_DECONFIG_RULES non-volatile - - - 0x0 - - + + Structure which defines a target's deconfigure rules. + Structure is read-only. + + + 1 + 0 + Are the rule bits set correctly? + + valid + uint8_t + + + 1 + 0 + + 0b0: Target should NOT be deconfigured by child rollup + 0b1: Target allowed to be deconfigured by child rollup + + childRollupAllowed + uint8_t + + + 1 + 0 + + 0b0: Target should NOT rollup its deconfigure to its parent + 0b1: Target should deconfigure its parent if no more functioning + children of same type exist for its parent + + deconfigureParent + uint8_t + + + 5 + 0 + Reserved for future use + reserved + uint8_t + + diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml index ae27cbf81..981228686 100644 --- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml @@ -5383,7 +5383,7 @@ AFFINITY_PATH - physical:sys-0/node-0/proc-0/nx-0 + affinity:sys-0/node-0/proc-0/nx-0 ORDINAL_ID @@ -5736,7 +5736,7 @@ AFFINITY_PATH - physical:sys-0/node-0/proc-1/nx-0 + affinity:sys-0/node-0/proc-1/nx-0 ORDINAL_ID diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index f51a84c23..70ebfc55d 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -58,7 +58,7 @@ ORDINAL_ID - PARENT_DECONFIG_DISABLED + PARENT_DECONFIG_RULES PHYS_PATH @@ -131,10 +131,6 @@ MRU_ID - - 1 - PARENT_DECONFIG_DISABLED - POSITION @@ -192,8 +188,21 @@ MODEL - 1 - PARENT_DECONFIG_DISABLED + + + childRollupAllowed + 1 + + + deconfigureParent + 0 + + + valid + 1 + + + PARENT_DECONFIG_RULES PHYS_PATH @@ -287,6 +296,23 @@ CENTAUR MODEL + + + + childRollupAllowed + 1 + + + deconfigureParent + 1 + + + valid + 1 + + + PARENT_DECONFIG_RULES + @@ -379,6 +405,23 @@ 0x00000033 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK + + + + childRollupAllowed + 1 + + + deconfigureParent + 1 + + + valid + 1 + + + PARENT_DECONFIG_RULES + OCMB_CHIP TYPE @@ -540,6 +583,23 @@ NVDIMM_ARMED + + + + childRollupAllowed + 0 + + + deconfigureParent + 0 + + + valid + 1 + + + PARENT_DECONFIG_RULES + @@ -754,6 +814,23 @@ NEST_VIO_ID + + + + childRollupAllowed + 0 + + + deconfigureParent + 0 + + + valid + 1 + + + PARENT_DECONFIG_RULES + PCI_BASE_ADDRS_32 @@ -830,8 +907,21 @@ MODEL - 1 - PARENT_DECONFIG_DISABLED + + + childRollupAllowed + 1 + + + deconfigureParent + 0 + + + valid + 1 + + + PARENT_DECONFIG_RULES TPM_INFO @@ -922,8 +1012,21 @@ MSS_VOLT_VPP_SLOPE_EFF_CONFIG - 1 - PARENT_DECONFIG_DISABLED + + + childRollupAllowed + 0 + + + deconfigureParent + 0 + + + valid + 1 + + + PARENT_DECONFIG_RULES START_MEM_ADDRESS_FOR_PAYLOAD_TCE_TOKEN @@ -950,6 +1053,23 @@ UNIT CLASS + + + + childRollupAllowed + 0 + + + deconfigureParent + 0 + + + valid + 1 + + + PARENT_DECONFIG_RULES + ETH TYPE @@ -963,6 +1083,23 @@ UNIT CLASS + + + + childRollupAllowed + 0 + + + deconfigureParent + 0 + + + valid + 1 + + + PARENT_DECONFIG_RULES + FAN TYPE @@ -979,6 +1116,23 @@ MODEL PCA9847 + + + + childRollupAllowed + 0 + + + deconfigureParent + 0 + + + valid + 1 + + + PARENT_DECONFIG_RULES + TYPE I2C_MUX @@ -1030,6 +1184,23 @@ NV_STATUS_FLAG + + + + childRollupAllowed + 1 + + + deconfigureParent + 1 + + + valid + 1 + + + PARENT_DECONFIG_RULES + POSITION @@ -1090,6 +1261,23 @@ OCC_MASTER_CAPABLE + + + + childRollupAllowed + 0 + + + deconfigureParent + 0 + + + valid + 1 + + + PARENT_DECONFIG_RULES + OCC TYPE @@ -1099,6 +1287,23 @@ panel unit + + + + childRollupAllowed + 0 + + + deconfigureParent + 0 + + + valid + 1 + + + PARENT_DECONFIG_RULES + PANEL TYPE @@ -1112,6 +1317,23 @@ UNIT CLASS + + + + childRollupAllowed + 0 + + + deconfigureParent + 0 + + + valid + 1 + + + PARENT_DECONFIG_RULES + PS TYPE @@ -1459,6 +1681,23 @@ O_EREPAIR_THRESHOLD_MNFG + + + + childRollupAllowed + 0 + + + deconfigureParent + 0 + + + valid + 1 + + + PARENT_DECONFIG_RULES + PAYLOAD_BASE @@ -1601,6 +1840,23 @@ UNIT CLASS + + + + childRollupAllowed + 0 + + + deconfigureParent + 0 + + + valid + 1 + + + PARENT_DECONFIG_RULES + UART TYPE @@ -1676,6 +1932,23 @@ 0x00000031 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK + + + + childRollupAllowed + 0 + + + deconfigureParent + 0 + + + valid + 1 + + + PARENT_DECONFIG_RULES + PARENT_PERVASIVE @@ -1702,6 +1975,23 @@ 0x00000031 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK + + + + childRollupAllowed + 1 + + + deconfigureParent + 1 + + + valid + 1 + + + PARENT_DECONFIG_RULES + PARENT_PERVASIVE @@ -1741,6 +2031,23 @@ 0x00000033 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK + + + + childRollupAllowed + 1 + + + deconfigureParent + 1 + + + valid + 1 + + + PARENT_DECONFIG_RULES + PARENT_PERVASIVE @@ -1769,16 +2076,29 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 1 - PARENT_DECONFIG_DISABLED - - - PARENT_PERVASIVE - - - EQ - TYPE - + + + childRollupAllowed + 1 + + + deconfigureParent + 0 + + + valid + 1 + + + PARENT_DECONFIG_RULES + + + PARENT_PERVASIVE + + + EQ + TYPE +