From cd8df2a4b0330bf0f5457463d503f132cb649ca3 Mon Sep 17 00:00:00 2001 From: Marty Gloff Date: Thu, 24 May 2018 10:18:00 -0500 Subject: Clear Block Spec Deconfig Attribute when Gard is removed In the Resource Recovery redesign, the Block Spec Deconfig attribute gets set when a check for minimal hardware fails to find enough hardware, and it gets cleared when there is a hardware change. Now, the Block Spec Deconfig attribute will also be cleared when a target that had gard applied no longer has any gard records. Change-Id: I8f93ca4821b1360638a94855c0aadb3dda365046 CQ: SW429890 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/59325 Tested-by: Jenkins Server Reviewed-by: Brian E. Bakke Tested-by: Jenkins OP Build CI Reviewed-by: Thi N. Tran Tested-by: FSP CI Jenkins Tested-by: Jenkins OP HW Reviewed-by: William G. Hoffa --- src/include/usr/hwas/common/deconfigGard.H | 12 ++ src/usr/hwas/common/deconfigGard.C | 81 +++++++++++++ .../targeting/common/xmltohb/attribute_types.xml | 4 + .../common/xmltohb/simics_CUMULUS.system.xml | 134 ++++++++++----------- .../common/xmltohb/simics_CUMULUS_CDIMM.system.xml | 134 ++++++++++----------- src/usr/targeting/common/xmltohb/target_types.xml | 42 +++---- 6 files changed, 252 insertions(+), 155 deletions(-) diff --git a/src/include/usr/hwas/common/deconfigGard.H b/src/include/usr/hwas/common/deconfigGard.H index 90aa61822..cf98cedb9 100644 --- a/src/include/usr/hwas/common/deconfigGard.H +++ b/src/include/usr/hwas/common/deconfigGard.H @@ -523,6 +523,18 @@ public: */ uint8_t clearBlockSpecDeconfigForReplacedTargets(); + /** + * @brief Clears attribute which blocks speculative deconfiguration + * (ATTR_BLOCK_SPEC_DECONFIG) so that resource recovery is allowed to + * apply speculative deconfigurations / predictive gards. Attribute + * is cleared only if a target had gard applied but no longer does. + * + * @param[in/out] io_blockAttr ATTR_BLOCK_SPEC_DECONFIG value. + * + * @return errlHndl_t. Error log handle. + */ + errlHndl_t clearBlockSpecDeconfigForUngardedTargets(uint8_t &io_blockAttr); + protected: /** diff --git a/src/usr/hwas/common/deconfigGard.C b/src/usr/hwas/common/deconfigGard.C index a1ab9bfc2..89d2e5791 100644 --- a/src/usr/hwas/common/deconfigGard.C +++ b/src/usr/hwas/common/deconfigGard.C @@ -187,6 +187,7 @@ errlHndl_t DeconfigGard::applyGardRecord(Target *i_pTarget, break; } + update_hwas_changed_mask(i_pTarget, HWAS_CHANGED_BIT_GARD_APPLIED); l_pErr = platLogEvent(i_pTarget, GARD_APPLIED); if (l_pErr) { @@ -587,6 +588,15 @@ errlHndl_t DeconfigGard::deconfigureTargetsFromGardRecordsForIpl( TARGETING::ATTR_BLOCK_SPEC_DECONFIG_type l_block_spec_deconfig = DeconfigGard::clearBlockSpecDeconfigForReplacedTargets(); + l_pErr = + clearBlockSpecDeconfigForUngardedTargets(l_block_spec_deconfig); + if (l_pErr) + { + HWAS_ERR("clearBlockSpecDeconfigForUngardedTargets returned an " + "error"); + break; + } + if(l_block_spec_deconfig != 0) { #if (!defined(CONFIG_CONSOLE_OUTPUT_TRACE) && defined(CONFIG_CONSOLE)) @@ -3027,5 +3037,76 @@ uint8_t DeconfigGard::clearBlockSpecDeconfigForReplacedTargets() return l_block_spec_deconfig; } // clearBlockSpecDeconfigForReplacedTargets +//****************************************************************************** +errlHndl_t + DeconfigGard::clearBlockSpecDeconfigForUngardedTargets(uint8_t &io_blockAttr) +{ + HWAS_INF("Clear Block Spec Deconfig for ungarded Targets"); + + errlHndl_t l_pErr = NULL; + GardRecords_t l_records; + + // Get system target + Target *pSys; + targetService().getTopLevelTarget(pSys); + + do + { + // Check Block Spec Deconfig value + if(io_blockAttr == 0) + { + // Block Spec Deconfig is already cleared + HWAS_INF("Block Spec Deconfig already cleared"); + } + + // Create the predicate with HWAS changed state and our GARD_APPLIED bit + PredicateHwasChanged l_predicateHwasChanged; + l_predicateHwasChanged.changedBit(HWAS_CHANGED_BIT_GARD_APPLIED, true); + + // Go through all targets + for (TargetIterator t_iter = targetService().begin(); + t_iter != targetService().end(); + ++t_iter) + { + Target* l_pTarget = *t_iter; + + // Check if target has gard applied + if (l_predicateHwasChanged(l_pTarget)) + { + // Get gard records for the target + l_pErr = platGetGardRecords(l_pTarget, l_records); + if (l_pErr) + { + break; + } + + // If there are gard records, continue to next target + if (l_records.size() > 0) + { + continue; + } + + // Check if Block Spec Deconfig is set + if(io_blockAttr == 1) + { + io_blockAttr = 0; + pSys->setAttr(io_blockAttr); + HWAS_INF("Block Spec Deconfig cleared due to no gard " + "records for 0x%.8x", + get_huid(l_pTarget)); + } + + // Clear GARD_APPLIED bit in HWAS changed flags for the target + HWAS_INF("HWAS_CHANGED_BIT_GARD_APPLIED cleared for 0x%.8x", + get_huid(l_pTarget)); + clear_hwas_changed_bit(l_pTarget, + HWAS_CHANGED_BIT_GARD_APPLIED); + } + } // for + } while (0); + + return l_pErr; +} // clearBlockSpecDeconfigForUngardedTargets + } // namespace HWAS diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index e57a081fb..5d158c124 100755 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -5116,6 +5116,10 @@ RESRC_RECOV 0x00000010 + + GARD_APPLIED + 0x00000020 + HWAS_CHANGED_BIT diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml index cd468970c..eaa1fb348 100644 --- a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml @@ -678,7 +678,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000019 + 0x00000039 @@ -959,7 +959,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -1341,7 +1341,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -1424,7 +1424,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -1507,7 +1507,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -1590,7 +1590,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -1673,7 +1673,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -1756,7 +1756,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -1839,7 +1839,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -1922,7 +1922,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2005,7 +2005,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2088,7 +2088,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2171,7 +2171,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2254,7 +2254,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2337,7 +2337,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2420,7 +2420,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2503,7 +2503,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2586,7 +2586,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2669,7 +2669,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2752,7 +2752,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2835,7 +2835,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2918,7 +2918,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -3001,7 +3001,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -3084,7 +3084,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -3167,7 +3167,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -3250,7 +3250,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -3984,7 +3984,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4065,7 +4065,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4144,7 +4144,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4223,7 +4223,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4302,7 +4302,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4381,7 +4381,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4460,7 +4460,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4538,7 +4538,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4616,7 +4616,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4694,7 +4694,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4772,7 +4772,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4850,7 +4850,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4928,7 +4928,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -5006,7 +5006,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -5084,7 +5084,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -5162,7 +5162,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -5240,7 +5240,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -5318,7 +5318,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -5517,7 +5517,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000013 + 0x00000033 I2C_BUS_SPEED_ARRAY @@ -5908,7 +5908,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000013 + 0x00000033 I2C_BUS_SPEED_ARRAY @@ -6928,7 +6928,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7011,7 +7011,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7094,7 +7094,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7177,7 +7177,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7260,7 +7260,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7343,7 +7343,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7426,7 +7426,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7509,7 +7509,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7592,7 +7592,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7675,7 +7675,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7758,7 +7758,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7841,7 +7841,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -11319,7 +11319,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -11410,7 +11410,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -11501,7 +11501,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -11592,7 +11592,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -11683,7 +11683,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -11774,7 +11774,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -13405,7 +13405,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -13499,7 +13499,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -13593,7 +13593,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml index a35956813..43750df7d 100644 --- a/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml +++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS_CDIMM.system.xml @@ -691,7 +691,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000019 + 0x00000039 @@ -972,7 +972,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -1354,7 +1354,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -1437,7 +1437,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -1520,7 +1520,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -1603,7 +1603,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -1686,7 +1686,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -1769,7 +1769,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -1852,7 +1852,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -1935,7 +1935,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2018,7 +2018,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2101,7 +2101,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2184,7 +2184,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2267,7 +2267,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2350,7 +2350,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2433,7 +2433,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2516,7 +2516,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2599,7 +2599,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2682,7 +2682,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2765,7 +2765,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2848,7 +2848,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -2931,7 +2931,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -3014,7 +3014,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -3097,7 +3097,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -3180,7 +3180,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -3263,7 +3263,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -3979,7 +3979,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4060,7 +4060,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4139,7 +4139,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4218,7 +4218,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4297,7 +4297,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4376,7 +4376,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4455,7 +4455,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4533,7 +4533,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4611,7 +4611,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4689,7 +4689,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4767,7 +4767,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4845,7 +4845,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -4923,7 +4923,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -5001,7 +5001,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -5079,7 +5079,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -5157,7 +5157,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -5235,7 +5235,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -5313,7 +5313,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -5510,7 +5510,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000013 + 0x00000033 I2C_BUS_SPEED_ARRAY @@ -5901,7 +5901,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000013 + 0x00000033 I2C_BUS_SPEED_ARRAY @@ -6921,7 +6921,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7004,7 +7004,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7087,7 +7087,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7170,7 +7170,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7253,7 +7253,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7336,7 +7336,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7419,7 +7419,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7502,7 +7502,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7585,7 +7585,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7668,7 +7668,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7751,7 +7751,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -7834,7 +7834,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -11312,7 +11312,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -11403,7 +11403,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -11494,7 +11494,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -11585,7 +11585,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -11676,7 +11676,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -11767,7 +11767,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -13398,7 +13398,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -13488,7 +13488,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 @@ -13578,7 +13578,7 @@ HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000011 + 0x00000031 diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml index b03c87409..106126ac6 100644 --- a/src/usr/targeting/common/xmltohb/target_types.xml +++ b/src/usr/targeting/common/xmltohb/target_types.xml @@ -166,7 +166,7 @@ DECONFIG_GARDABLE - 0x00000011 + 0x00000031 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -359,7 +359,7 @@ DECONFIG_GARDABLE - 0x00000013 + 0x00000033 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -497,7 +497,7 @@ DECONFIG_GARDABLE - 0x00000013 + 0x00000033 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -998,7 +998,7 @@ DECONFIG_GARDABLE - 0x00000019 + 0x00000039 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -1268,7 +1268,7 @@ DECONFIG_GARDABLE - 0x00000011 + 0x00000031 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -1295,7 +1295,7 @@ DECONFIG_GARDABLE - 0x00000011 + 0x00000031 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -1318,7 +1318,7 @@ DECONFIG_GARDABLE - 0x00000011 + 0x00000031 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -1346,7 +1346,7 @@ DECONFIG_GARDABLE - 0x00000013 + 0x00000033 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -1394,7 +1394,7 @@ DECONFIG_GARDABLE - 0x00000013 + 0x00000033 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -1431,7 +1431,7 @@ DECONFIG_GARDABLE - 0x00000013 + 0x00000033 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -1503,7 +1503,7 @@ DECONFIG_GARDABLE1 - 0x00000013 + 0x00000033 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK PARENT_PERVASIVE @@ -1537,7 +1537,7 @@ DECONFIG_GARDABLE - 0x00000013 + 0x00000033 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -1573,7 +1573,7 @@ DECONFIG_GARDABLE - 0x00000013 + 0x00000033 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -1636,7 +1636,7 @@ DECONFIG_GARDABLE - 0x00000011 + 0x00000031 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -1681,7 +1681,7 @@ DECONFIG_GARDABLE - 0x00000011 + 0x00000031 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -1746,7 +1746,7 @@ CDM_DOMAIN - 0x00000011 + 0x00000031 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -1945,7 +1945,7 @@ DECONFIG_GARDABLE - 0x00000011 + 0x00000031 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -1997,7 +1997,7 @@ DECONFIG_GARDABLE - 0x00000011 + 0x00000031 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK @@ -2131,7 +2131,7 @@ DECONFIG_GARDABLE HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000013 + 0x00000033 @@ -2158,7 +2158,7 @@ DECONFIG_GARDABLE1 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK - 0x00000013 + 0x00000033 CDM_DOMAIN @@ -2178,7 +2178,7 @@ DECONFIG_GARDABLE - 0x00000011 + 0x00000031 HWAS_STATE_CHANGED_SUBSCRIPTION_MASK -- cgit v1.2.1