Update to ifCompiler to produce *.bitsModified Care for PLL filter rings

Key_Cronus_Test=XIP_REGRESS

Change-Id: Ifd23d6bb3a4cead763487d80678f5a0817d81c5c
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54733
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: Cronus HW CI <cronushw-ci+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54907
CI-Ready: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>

7 files changed, 386 insertions, 159 deletions

diff --git a/src/import/chips/centaur/procedures/hwp/initfiles/centaur_cleanup_pll_scan.C b/src/import/chips/centaur/procedures/hwp/initfiles/centaur_cleanup_pll_scan.C
index d060a1ae3..b46d3bca2 100644
--- a/src/import/chips/centaur/procedures/hwp/initfiles/centaur_cleanup_pll_scan.C
+++ b/src/import/chips/centaur/procedures/hwp/initfiles/centaur_cleanup_pll_scan.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -48,21 +48,25 @@ fapi2::ReturnCode centaur_cleanup_pll_scan(const fapi2::Target<fapi2::TARGET_TYP
         uint64_t l_def_IS_HW = (l_TGT1_ATTR_IS_SIMULATION == literal_0);
         bool l_DMI_RX_RXCLKCTL_CUPLL_CTL_update = false;
         fapi2::variable_buffer l_DMI_RX_RXCLKCTL_CUPLL_CTL(47);
+        fapi2::variable_buffer l_DMI_RX_RXCLKCTL_CUPLL_CTL_CARE(47);
 
         if (l_def_IS_SIM)
         {
             l_DMI_RX_RXCLKCTL_CUPLL_CTL.insertFromRight<uint64_t>(literal_0x000020000000, 0, 47);
+            l_DMI_RX_RXCLKCTL_CUPLL_CTL_CARE.insertFromRight<uint64_t>(0x7fffffffffff, 0, 47);
             l_DMI_RX_RXCLKCTL_CUPLL_CTL_update = true;
         }
         else if (l_def_IS_HW)
         {
             l_DMI_RX_RXCLKCTL_CUPLL_CTL.insertFromRight<uint64_t>(literal_0x40002208BF00, 0, 47);
+            l_DMI_RX_RXCLKCTL_CUPLL_CTL_CARE.insertFromRight<uint64_t>(0x7fffffffffff, 0, 47);
             l_DMI_RX_RXCLKCTL_CUPLL_CTL_update = true;
         }
 
         if ( l_DMI_RX_RXCLKCTL_CUPLL_CTL_update)
         {
-            FAPI_TRY(fapi2::putSpy(TGT0, "DMI.RX.RXCLKCTL.CUPLL_CTL", l_DMI_RX_RXCLKCTL_CUPLL_CTL));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "DMI.RX.RXCLKCTL.CUPLL_CTL", l_DMI_RX_RXCLKCTL_CUPLL_CTL,
+                                           l_DMI_RX_RXCLKCTL_CUPLL_CTL_CARE));
         }
 
     };
diff --git a/src/import/chips/centaur/procedures/hwp/initfiles/centaur_mba_scan.C b/src/import/chips/centaur/procedures/hwp/initfiles/centaur_mba_scan.C
index 5d69946ee..a3b85c6f3 100644
--- a/src/import/chips/centaur/procedures/hwp/initfiles/centaur_mba_scan.C
+++ b/src/import/chips/centaur/procedures/hwp/initfiles/centaur_mba_scan.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -41,43 +41,71 @@ fapi2::ReturnCode centaur_mba_scan(const fapi2::Target<fapi2::TARGET_TYPE_MEMBUF
         FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_NAME, TGT0, l_chip_id));
         FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT0, l_chip_ec));
         fapi2::variable_buffer l_MBU_MBA01_DD2_HW218537_MASTER_RANK_END_FIX_DIS(1);
+        fapi2::variable_buffer l_MBU_MBA01_DD2_HW218537_MASTER_RANK_END_FIX_DIS_CARE(1);
         constexpr auto l_MBU_MBA01_DD2_HW218537_MASTER_RANK_END_FIX_DIS_ON = 0x1;
         l_MBU_MBA01_DD2_HW218537_MASTER_RANK_END_FIX_DIS.insertFromRight<uint64_t>
         (l_MBU_MBA01_DD2_HW218537_MASTER_RANK_END_FIX_DIS_ON, 0, 1);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBA01.DD2_HW218537_MASTER_RANK_END_FIX_DIS",
-                               l_MBU_MBA01_DD2_HW218537_MASTER_RANK_END_FIX_DIS));
+        l_MBU_MBA01_DD2_HW218537_MASTER_RANK_END_FIX_DIS_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBA01.DD2_HW218537_MASTER_RANK_END_FIX_DIS",
+                                       l_MBU_MBA01_DD2_HW218537_MASTER_RANK_END_FIX_DIS, l_MBU_MBA01_DD2_HW218537_MASTER_RANK_END_FIX_DIS_CARE));
         fapi2::variable_buffer l_MBU_MBA23_DD2_HW218537_MASTER_RANK_END_FIX_DIS(1);
+        fapi2::variable_buffer l_MBU_MBA23_DD2_HW218537_MASTER_RANK_END_FIX_DIS_CARE(1);
         constexpr auto l_MBU_MBA23_DD2_HW218537_MASTER_RANK_END_FIX_DIS_ON = 0x1;
         l_MBU_MBA23_DD2_HW218537_MASTER_RANK_END_FIX_DIS.insertFromRight<uint64_t>
         (l_MBU_MBA23_DD2_HW218537_MASTER_RANK_END_FIX_DIS_ON, 0, 1);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBA23.DD2_HW218537_MASTER_RANK_END_FIX_DIS",
-                               l_MBU_MBA23_DD2_HW218537_MASTER_RANK_END_FIX_DIS));
+        l_MBU_MBA23_DD2_HW218537_MASTER_RANK_END_FIX_DIS_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBA23.DD2_HW218537_MASTER_RANK_END_FIX_DIS",
+                                       l_MBU_MBA23_DD2_HW218537_MASTER_RANK_END_FIX_DIS, l_MBU_MBA23_DD2_HW218537_MASTER_RANK_END_FIX_DIS_CARE));
         fapi2::variable_buffer l_MBU_MBA01_DD2_HW220614_SCRUB_PSAVE_DIS(1);
+        fapi2::variable_buffer l_MBU_MBA01_DD2_HW220614_SCRUB_PSAVE_DIS_CARE(1);
         constexpr auto l_MBU_MBA01_DD2_HW220614_SCRUB_PSAVE_DIS_OFF = 0x0;
         l_MBU_MBA01_DD2_HW220614_SCRUB_PSAVE_DIS.insertFromRight<uint64_t>(l_MBU_MBA01_DD2_HW220614_SCRUB_PSAVE_DIS_OFF, 0, 1);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBA01.DD2_HW220614_SCRUB_PSAVE_DIS", l_MBU_MBA01_DD2_HW220614_SCRUB_PSAVE_DIS));
+        l_MBU_MBA01_DD2_HW220614_SCRUB_PSAVE_DIS_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBA01.DD2_HW220614_SCRUB_PSAVE_DIS", l_MBU_MBA01_DD2_HW220614_SCRUB_PSAVE_DIS,
+                                       l_MBU_MBA01_DD2_HW220614_SCRUB_PSAVE_DIS_CARE));
         fapi2::variable_buffer l_MBU_MBA23_DD2_HW220614_SCRUB_PSAVE_DIS(1);
+        fapi2::variable_buffer l_MBU_MBA23_DD2_HW220614_SCRUB_PSAVE_DIS_CARE(1);
         constexpr auto l_MBU_MBA23_DD2_HW220614_SCRUB_PSAVE_DIS_OFF = 0x0;
         l_MBU_MBA23_DD2_HW220614_SCRUB_PSAVE_DIS.insertFromRight<uint64_t>(l_MBU_MBA23_DD2_HW220614_SCRUB_PSAVE_DIS_OFF, 0, 1);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBA23.DD2_HW220614_SCRUB_PSAVE_DIS", l_MBU_MBA23_DD2_HW220614_SCRUB_PSAVE_DIS));
+        l_MBU_MBA23_DD2_HW220614_SCRUB_PSAVE_DIS_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBA23.DD2_HW220614_SCRUB_PSAVE_DIS", l_MBU_MBA23_DD2_HW220614_SCRUB_PSAVE_DIS,
+                                       l_MBU_MBA23_DD2_HW220614_SCRUB_PSAVE_DIS_CARE));
         fapi2::variable_buffer l_TCM_TRA_MBA01TRA_TR_TRACE_TRDATA_CONFIG_0(64);
+        fapi2::variable_buffer l_TCM_TRA_MBA01TRA_TR_TRACE_TRDATA_CONFIG_0_CARE(64);
         l_TCM_TRA_MBA01TRA_TR_TRACE_TRDATA_CONFIG_0.insertFromRight<uint64_t>(literal_0x0000000000003FFF, 0, 64);
-        FAPI_TRY(fapi2::putSpy(TGT0, "TCM.TRA.MBA01TRA.TR.TRACE_TRDATA_CONFIG_0", l_TCM_TRA_MBA01TRA_TR_TRACE_TRDATA_CONFIG_0));
+        l_TCM_TRA_MBA01TRA_TR_TRACE_TRDATA_CONFIG_0_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "TCM.TRA.MBA01TRA.TR.TRACE_TRDATA_CONFIG_0",
+                                       l_TCM_TRA_MBA01TRA_TR_TRACE_TRDATA_CONFIG_0, l_TCM_TRA_MBA01TRA_TR_TRACE_TRDATA_CONFIG_0_CARE));
         fapi2::variable_buffer l_TCM_TRA_MBA01TRA_TR_TRACE_TRDATA_CONFIG_1(24);
+        fapi2::variable_buffer l_TCM_TRA_MBA01TRA_TR_TRACE_TRDATA_CONFIG_1_CARE(24);
         l_TCM_TRA_MBA01TRA_TR_TRACE_TRDATA_CONFIG_1.insertFromRight<uint64_t>(literal_0xFFFFFF, 0, 24);
-        FAPI_TRY(fapi2::putSpy(TGT0, "TCM.TRA.MBA01TRA.TR.TRACE_TRDATA_CONFIG_1", l_TCM_TRA_MBA01TRA_TR_TRACE_TRDATA_CONFIG_1));
+        l_TCM_TRA_MBA01TRA_TR_TRACE_TRDATA_CONFIG_1_CARE.insertFromRight<uint64_t>(0xffffff, 0, 24);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "TCM.TRA.MBA01TRA.TR.TRACE_TRDATA_CONFIG_1",
+                                       l_TCM_TRA_MBA01TRA_TR_TRACE_TRDATA_CONFIG_1, l_TCM_TRA_MBA01TRA_TR_TRACE_TRDATA_CONFIG_1_CARE));
         fapi2::variable_buffer l_TCM_TRA_MBA23TRA_TR_TRACE_TRDATA_CONFIG_0(64);
+        fapi2::variable_buffer l_TCM_TRA_MBA23TRA_TR_TRACE_TRDATA_CONFIG_0_CARE(64);
         l_TCM_TRA_MBA23TRA_TR_TRACE_TRDATA_CONFIG_0.insertFromRight<uint64_t>(literal_0x0000000000003FFF, 0, 64);
-        FAPI_TRY(fapi2::putSpy(TGT0, "TCM.TRA.MBA23TRA.TR.TRACE_TRDATA_CONFIG_0", l_TCM_TRA_MBA23TRA_TR_TRACE_TRDATA_CONFIG_0));
+        l_TCM_TRA_MBA23TRA_TR_TRACE_TRDATA_CONFIG_0_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "TCM.TRA.MBA23TRA.TR.TRACE_TRDATA_CONFIG_0",
+                                       l_TCM_TRA_MBA23TRA_TR_TRACE_TRDATA_CONFIG_0, l_TCM_TRA_MBA23TRA_TR_TRACE_TRDATA_CONFIG_0_CARE));
         fapi2::variable_buffer l_TCM_TRA_MBA23TRA_TR_TRACE_TRDATA_CONFIG_1(24);
+        fapi2::variable_buffer l_TCM_TRA_MBA23TRA_TR_TRACE_TRDATA_CONFIG_1_CARE(24);
         l_TCM_TRA_MBA23TRA_TR_TRACE_TRDATA_CONFIG_1.insertFromRight<uint64_t>(literal_0xFFFFFF, 0, 24);
-        FAPI_TRY(fapi2::putSpy(TGT0, "TCM.TRA.MBA23TRA.TR.TRACE_TRDATA_CONFIG_1", l_TCM_TRA_MBA23TRA_TR_TRACE_TRDATA_CONFIG_1));
+        l_TCM_TRA_MBA23TRA_TR_TRACE_TRDATA_CONFIG_1_CARE.insertFromRight<uint64_t>(0xffffff, 0, 24);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "TCM.TRA.MBA23TRA.TR.TRACE_TRDATA_CONFIG_1",
+                                       l_TCM_TRA_MBA23TRA_TR_TRACE_TRDATA_CONFIG_1, l_TCM_TRA_MBA23TRA_TR_TRACE_TRDATA_CONFIG_1_CARE));
         fapi2::variable_buffer l_TCM_TRA_MBA01TRA_TR_TRACE_TRCTRL_CONFIG(14);
+        fapi2::variable_buffer l_TCM_TRA_MBA01TRA_TR_TRACE_TRCTRL_CONFIG_CARE(14);
         l_TCM_TRA_MBA01TRA_TR_TRACE_TRCTRL_CONFIG.insertFromRight<uint64_t>(literal_0b00000000000011, 0, 14);
-        FAPI_TRY(fapi2::putSpy(TGT0, "TCM.TRA.MBA01TRA.TR.TRACE_TRCTRL_CONFIG", l_TCM_TRA_MBA01TRA_TR_TRACE_TRCTRL_CONFIG));
+        l_TCM_TRA_MBA01TRA_TR_TRACE_TRCTRL_CONFIG_CARE.insertFromRight<uint64_t>(0x3fff, 0, 14);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "TCM.TRA.MBA01TRA.TR.TRACE_TRCTRL_CONFIG",
+                                       l_TCM_TRA_MBA01TRA_TR_TRACE_TRCTRL_CONFIG, l_TCM_TRA_MBA01TRA_TR_TRACE_TRCTRL_CONFIG_CARE));
         fapi2::variable_buffer l_TCM_TRA_MBA23TRA_TR_TRACE_TRCTRL_CONFIG(14);
+        fapi2::variable_buffer l_TCM_TRA_MBA23TRA_TR_TRACE_TRCTRL_CONFIG_CARE(14);
         l_TCM_TRA_MBA23TRA_TR_TRACE_TRCTRL_CONFIG.insertFromRight<uint64_t>(literal_0b00000000000011, 0, 14);
-        FAPI_TRY(fapi2::putSpy(TGT0, "TCM.TRA.MBA23TRA.TR.TRACE_TRCTRL_CONFIG", l_TCM_TRA_MBA23TRA_TR_TRACE_TRCTRL_CONFIG));
+        l_TCM_TRA_MBA23TRA_TR_TRACE_TRCTRL_CONFIG_CARE.insertFromRight<uint64_t>(0x3fff, 0, 14);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "TCM.TRA.MBA23TRA.TR.TRACE_TRCTRL_CONFIG",
+                                       l_TCM_TRA_MBA23TRA_TR_TRACE_TRCTRL_CONFIG, l_TCM_TRA_MBA23TRA_TR_TRACE_TRCTRL_CONFIG_CARE));
 
     };
 fapi_try_exit:
diff --git a/src/import/chips/centaur/procedures/hwp/initfiles/centaur_mbs_scan.C b/src/import/chips/centaur/procedures/hwp/initfiles/centaur_mbs_scan.C
index 02ea79e81..79d9b4354 100644
--- a/src/import/chips/centaur/procedures/hwp/initfiles/centaur_mbs_scan.C
+++ b/src/import/chips/centaur/procedures/hwp/initfiles/centaur_mbs_scan.C
@@ -47,65 +47,111 @@ fapi2::ReturnCode centaur_mbs_scan(const fapi2::Target<fapi2::TARGET_TYPE_MEMBUF
         FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_NAME, TGT0, l_chip_id));
         FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT0, l_chip_ec));
         fapi2::variable_buffer l_MBU_MBS_CFG_MBS_FLARB_PROGRESS_WINDOW_EN(1);
+        fapi2::variable_buffer l_MBU_MBS_CFG_MBS_FLARB_PROGRESS_WINDOW_EN_CARE(1);
         constexpr auto l_MBU_MBS_CFG_MBS_FLARB_PROGRESS_WINDOW_EN_ON = 0x1;
         l_MBU_MBS_CFG_MBS_FLARB_PROGRESS_WINDOW_EN.insertFromRight<uint64_t>(l_MBU_MBS_CFG_MBS_FLARB_PROGRESS_WINDOW_EN_ON, 0,
                 1);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBS.CFG_MBS_FLARB_PROGRESS_WINDOW_EN", l_MBU_MBS_CFG_MBS_FLARB_PROGRESS_WINDOW_EN));
+        l_MBU_MBS_CFG_MBS_FLARB_PROGRESS_WINDOW_EN_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBS.CFG_MBS_FLARB_PROGRESS_WINDOW_EN",
+                                       l_MBU_MBS_CFG_MBS_FLARB_PROGRESS_WINDOW_EN, l_MBU_MBS_CFG_MBS_FLARB_PROGRESS_WINDOW_EN_CARE));
         fapi2::variable_buffer l_MBU_MBS_CFG_BLOCK_CACHE_CE_FIR_DIS(1);
+        fapi2::variable_buffer l_MBU_MBS_CFG_BLOCK_CACHE_CE_FIR_DIS_CARE(1);
         constexpr auto l_MBU_MBS_CFG_BLOCK_CACHE_CE_FIR_DIS_ON = 0x1;
         l_MBU_MBS_CFG_BLOCK_CACHE_CE_FIR_DIS.insertFromRight<uint64_t>(l_MBU_MBS_CFG_BLOCK_CACHE_CE_FIR_DIS_ON, 0, 1);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBS.CFG_BLOCK_CACHE_CE_FIR_DIS", l_MBU_MBS_CFG_BLOCK_CACHE_CE_FIR_DIS));
+        l_MBU_MBS_CFG_BLOCK_CACHE_CE_FIR_DIS_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBS.CFG_BLOCK_CACHE_CE_FIR_DIS", l_MBU_MBS_CFG_BLOCK_CACHE_CE_FIR_DIS,
+                                       l_MBU_MBS_CFG_BLOCK_CACHE_CE_FIR_DIS_CARE));
         fapi2::variable_buffer l_MBU_MBX_HW269130_MBX_RDTAG_PARITY_CHECK(4);
+        fapi2::variable_buffer l_MBU_MBX_HW269130_MBX_RDTAG_PARITY_CHECK_CARE(4);
         constexpr auto l_MBU_MBX_HW269130_MBX_RDTAG_PARITY_CHECK_MASKED = 0xf;
         l_MBU_MBX_HW269130_MBX_RDTAG_PARITY_CHECK.insertFromRight<uint64_t>(l_MBU_MBX_HW269130_MBX_RDTAG_PARITY_CHECK_MASKED, 0,
                 4);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBX.HW269130_MBX_RDTAG_PARITY_CHECK", l_MBU_MBX_HW269130_MBX_RDTAG_PARITY_CHECK));
+        l_MBU_MBX_HW269130_MBX_RDTAG_PARITY_CHECK_CARE.insertFromRight<uint64_t>(0xf, 0, 4);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBX.HW269130_MBX_RDTAG_PARITY_CHECK",
+                                       l_MBU_MBX_HW269130_MBX_RDTAG_PARITY_CHECK, l_MBU_MBX_HW269130_MBX_RDTAG_PARITY_CHECK_CARE));
         fapi2::variable_buffer l_MBU_MBS_CFG_DIR_ECC_USE_ADDPAR_DISABLE(7);
+        fapi2::variable_buffer l_MBU_MBS_CFG_DIR_ECC_USE_ADDPAR_DISABLE_CARE(7);
         constexpr auto l_MBU_MBS_CFG_DIR_ECC_USE_ADDPAR_DISABLE_OFF = 0x0;
         l_MBU_MBS_CFG_DIR_ECC_USE_ADDPAR_DISABLE.insertFromRight<uint64_t>(l_MBU_MBS_CFG_DIR_ECC_USE_ADDPAR_DISABLE_OFF, 0, 7);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBS.CFG_DIR_ECC_USE_ADDPAR_DISABLE", l_MBU_MBS_CFG_DIR_ECC_USE_ADDPAR_DISABLE));
+        l_MBU_MBS_CFG_DIR_ECC_USE_ADDPAR_DISABLE_CARE.insertFromRight<uint64_t>(0x7f, 0, 7);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBS.CFG_DIR_ECC_USE_ADDPAR_DISABLE", l_MBU_MBS_CFG_DIR_ECC_USE_ADDPAR_DISABLE,
+                                       l_MBU_MBS_CFG_DIR_ECC_USE_ADDPAR_DISABLE_CARE));
         fapi2::variable_buffer l_MBU_MBI_MBI_WAT0A_WAT_ENABLE(1);
+        fapi2::variable_buffer l_MBU_MBI_MBI_WAT0A_WAT_ENABLE_CARE(1);
         constexpr auto l_MBU_MBI_MBI_WAT0A_WAT_ENABLE_ON = 0x1;
         l_MBU_MBI_MBI_WAT0A_WAT_ENABLE.insertFromRight<uint64_t>(l_MBU_MBI_MBI_WAT0A_WAT_ENABLE_ON, 0, 1);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBI.MBI.WAT0A.WAT_ENABLE", l_MBU_MBI_MBI_WAT0A_WAT_ENABLE));
+        l_MBU_MBI_MBI_WAT0A_WAT_ENABLE_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBI.MBI.WAT0A.WAT_ENABLE", l_MBU_MBI_MBI_WAT0A_WAT_ENABLE,
+                                       l_MBU_MBI_MBI_WAT0A_WAT_ENABLE_CARE));
         fapi2::variable_buffer l_MBU_MBI_MBI_WAT0B_WAT_ENABLE(1);
+        fapi2::variable_buffer l_MBU_MBI_MBI_WAT0B_WAT_ENABLE_CARE(1);
         constexpr auto l_MBU_MBI_MBI_WAT0B_WAT_ENABLE_ON = 0x1;
         l_MBU_MBI_MBI_WAT0B_WAT_ENABLE.insertFromRight<uint64_t>(l_MBU_MBI_MBI_WAT0B_WAT_ENABLE_ON, 0, 1);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBI.MBI.WAT0B.WAT_ENABLE", l_MBU_MBI_MBI_WAT0B_WAT_ENABLE));
+        l_MBU_MBI_MBI_WAT0B_WAT_ENABLE_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBI.MBI.WAT0B.WAT_ENABLE", l_MBU_MBI_MBI_WAT0B_WAT_ENABLE,
+                                       l_MBU_MBI_MBI_WAT0B_WAT_ENABLE_CARE));
         fapi2::variable_buffer l_MBU_MBI_CFG_DBG_MUX(7);
+        fapi2::variable_buffer l_MBU_MBI_CFG_DBG_MUX_CARE(7);
         l_MBU_MBI_CFG_DBG_MUX.insertFromRight<uint64_t>(literal_0b0010000, 0, 7);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBI.CFG_DBG_MUX", l_MBU_MBI_CFG_DBG_MUX));
+        l_MBU_MBI_CFG_DBG_MUX_CARE.insertFromRight<uint64_t>(0x7f, 0, 7);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBI.CFG_DBG_MUX", l_MBU_MBI_CFG_DBG_MUX, l_MBU_MBI_CFG_DBG_MUX_CARE));
         fapi2::variable_buffer l_MBU_MBS_IBB_IBRD_CFG_LATE_OCC_UPDATE_DONE(1);
+        fapi2::variable_buffer l_MBU_MBS_IBB_IBRD_CFG_LATE_OCC_UPDATE_DONE_CARE(1);
         constexpr auto l_MBU_MBS_IBB_IBRD_CFG_LATE_OCC_UPDATE_DONE_ON = 0x1;
         l_MBU_MBS_IBB_IBRD_CFG_LATE_OCC_UPDATE_DONE.insertFromRight<uint64_t>(l_MBU_MBS_IBB_IBRD_CFG_LATE_OCC_UPDATE_DONE_ON, 0,
                 1);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBS.IBB.IBRD.CFG_LATE_OCC_UPDATE_DONE", l_MBU_MBS_IBB_IBRD_CFG_LATE_OCC_UPDATE_DONE));
+        l_MBU_MBS_IBB_IBRD_CFG_LATE_OCC_UPDATE_DONE_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBS.IBB.IBRD.CFG_LATE_OCC_UPDATE_DONE",
+                                       l_MBU_MBS_IBB_IBRD_CFG_LATE_OCC_UPDATE_DONE, l_MBU_MBS_IBB_IBRD_CFG_LATE_OCC_UPDATE_DONE_CARE));
         fapi2::variable_buffer l_MBU_MBS_CFG_HANG_COUNT(11);
+        fapi2::variable_buffer l_MBU_MBS_CFG_HANG_COUNT_CARE(11);
         l_MBU_MBS_CFG_HANG_COUNT.insertFromRight<uint64_t>(literal_0b10110111000, 0, 11);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBS.CFG_HANG_COUNT", l_MBU_MBS_CFG_HANG_COUNT));
+        l_MBU_MBS_CFG_HANG_COUNT_CARE.insertFromRight<uint64_t>(0x7ff, 0, 11);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBS.CFG_HANG_COUNT", l_MBU_MBS_CFG_HANG_COUNT,
+                                       l_MBU_MBS_CFG_HANG_COUNT_CARE));
         fapi2::variable_buffer l_MBU_MBS_MBS_CLN_DV_CGC_CNT_LWMARK(14);
+        fapi2::variable_buffer l_MBU_MBS_MBS_CLN_DV_CGC_CNT_LWMARK_CARE(14);
         l_MBU_MBS_MBS_CLN_DV_CGC_CNT_LWMARK.insertFromRight<uint64_t>(literal_0b00000000000000, 0, 14);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBS.MBS_CLN_DV_CGC_CNT_LWMARK", l_MBU_MBS_MBS_CLN_DV_CGC_CNT_LWMARK));
+        l_MBU_MBS_MBS_CLN_DV_CGC_CNT_LWMARK_CARE.insertFromRight<uint64_t>(0x3fff, 0, 14);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBS.MBS_CLN_DV_CGC_CNT_LWMARK", l_MBU_MBS_MBS_CLN_DV_CGC_CNT_LWMARK,
+                                       l_MBU_MBS_MBS_CLN_DV_CGC_CNT_LWMARK_CARE));
         fapi2::variable_buffer l_MBU_MBS_MBS_CLN_RNK_GRP_WRQ_CNT_LWMARK(6);
+        fapi2::variable_buffer l_MBU_MBS_MBS_CLN_RNK_GRP_WRQ_CNT_LWMARK_CARE(6);
         l_MBU_MBS_MBS_CLN_RNK_GRP_WRQ_CNT_LWMARK.insertFromRight<uint64_t>(literal_0b001001, 0, 6);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBS.MBS_CLN_RNK_GRP_WRQ_CNT_LWMARK", l_MBU_MBS_MBS_CLN_RNK_GRP_WRQ_CNT_LWMARK));
+        l_MBU_MBS_MBS_CLN_RNK_GRP_WRQ_CNT_LWMARK_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBS.MBS_CLN_RNK_GRP_WRQ_CNT_LWMARK", l_MBU_MBS_MBS_CLN_RNK_GRP_WRQ_CNT_LWMARK,
+                                       l_MBU_MBS_MBS_CLN_RNK_GRP_WRQ_CNT_LWMARK_CARE));
         fapi2::variable_buffer l_MBU_MBS_MBS_CLN_PAGE_MODE_HARVEST_DIS(1);
+        fapi2::variable_buffer l_MBU_MBS_MBS_CLN_PAGE_MODE_HARVEST_DIS_CARE(1);
         constexpr auto l_MBU_MBS_MBS_CLN_PAGE_MODE_HARVEST_DIS_OFF = 0x0;
         l_MBU_MBS_MBS_CLN_PAGE_MODE_HARVEST_DIS.insertFromRight<uint64_t>(l_MBU_MBS_MBS_CLN_PAGE_MODE_HARVEST_DIS_OFF, 0, 1);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBS.MBS_CLN_PAGE_MODE_HARVEST_DIS", l_MBU_MBS_MBS_CLN_PAGE_MODE_HARVEST_DIS));
+        l_MBU_MBS_MBS_CLN_PAGE_MODE_HARVEST_DIS_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBS.MBS_CLN_PAGE_MODE_HARVEST_DIS", l_MBU_MBS_MBS_CLN_PAGE_MODE_HARVEST_DIS,
+                                       l_MBU_MBS_MBS_CLN_PAGE_MODE_HARVEST_DIS_CARE));
         fapi2::variable_buffer l_MBU_MBS_MBS_CLN_PAGE_MODE_HARV_MAX_FAILS_CNT(3);
+        fapi2::variable_buffer l_MBU_MBS_MBS_CLN_PAGE_MODE_HARV_MAX_FAILS_CNT_CARE(3);
         l_MBU_MBS_MBS_CLN_PAGE_MODE_HARV_MAX_FAILS_CNT.insertFromRight<uint64_t>(literal_0b001, 0, 3);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBS.MBS_CLN_PAGE_MODE_HARV_MAX_FAILS_CNT",
-                               l_MBU_MBS_MBS_CLN_PAGE_MODE_HARV_MAX_FAILS_CNT));
+        l_MBU_MBS_MBS_CLN_PAGE_MODE_HARV_MAX_FAILS_CNT_CARE.insertFromRight<uint64_t>(0x7, 0, 3);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBS.MBS_CLN_PAGE_MODE_HARV_MAX_FAILS_CNT",
+                                       l_MBU_MBS_MBS_CLN_PAGE_MODE_HARV_MAX_FAILS_CNT, l_MBU_MBS_MBS_CLN_PAGE_MODE_HARV_MAX_FAILS_CNT_CARE));
         fapi2::variable_buffer l_MBU_MBS_MBS_CLN_PG_HARV_CONFLICT_WAIT_CNT(6);
+        fapi2::variable_buffer l_MBU_MBS_MBS_CLN_PG_HARV_CONFLICT_WAIT_CNT_CARE(6);
         l_MBU_MBS_MBS_CLN_PG_HARV_CONFLICT_WAIT_CNT.insertFromRight<uint64_t>(literal_0b000000, 0, 6);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBS.MBS_CLN_PG_HARV_CONFLICT_WAIT_CNT", l_MBU_MBS_MBS_CLN_PG_HARV_CONFLICT_WAIT_CNT));
+        l_MBU_MBS_MBS_CLN_PG_HARV_CONFLICT_WAIT_CNT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBS.MBS_CLN_PG_HARV_CONFLICT_WAIT_CNT",
+                                       l_MBU_MBS_MBS_CLN_PG_HARV_CONFLICT_WAIT_CNT, l_MBU_MBS_MBS_CLN_PG_HARV_CONFLICT_WAIT_CNT_CARE));
         fapi2::variable_buffer l_MBU_MBS_CFG_WHAP_CLEAN_THRESHOLD(5);
+        fapi2::variable_buffer l_MBU_MBS_CFG_WHAP_CLEAN_THRESHOLD_CARE(5);
         l_MBU_MBS_CFG_WHAP_CLEAN_THRESHOLD.insertFromRight<uint64_t>(literal_0b00100, 0, 5);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBS.CFG_WHAP_CLEAN_THRESHOLD", l_MBU_MBS_CFG_WHAP_CLEAN_THRESHOLD));
+        l_MBU_MBS_CFG_WHAP_CLEAN_THRESHOLD_CARE.insertFromRight<uint64_t>(0x1f, 0, 5);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBS.CFG_WHAP_CLEAN_THRESHOLD", l_MBU_MBS_CFG_WHAP_CLEAN_THRESHOLD,
+                                       l_MBU_MBS_CFG_WHAP_CLEAN_THRESHOLD_CARE));
         fapi2::variable_buffer l_MBU_MBS_CFG_WHAP_WR_START_RECNT(3);
+        fapi2::variable_buffer l_MBU_MBS_CFG_WHAP_WR_START_RECNT_CARE(3);
         l_MBU_MBS_CFG_WHAP_WR_START_RECNT.insertFromRight<uint64_t>(literal_0b011, 0, 3);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MBU.MBS.CFG_WHAP_WR_START_RECNT", l_MBU_MBS_CFG_WHAP_WR_START_RECNT));
+        l_MBU_MBS_CFG_WHAP_WR_START_RECNT_CARE.insertFromRight<uint64_t>(0x7, 0, 3);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MBU.MBS.CFG_WHAP_WR_START_RECNT", l_MBU_MBS_CFG_WHAP_WR_START_RECNT,
+                                       l_MBU_MBS_CFG_WHAP_WR_START_RECNT_CARE));
 
     };
 fapi_try_exit:
diff --git a/src/import/chips/centaur/procedures/hwp/initfiles/centaur_mem_pll_scan.C b/src/import/chips/centaur/procedures/hwp/initfiles/centaur_mem_pll_scan.C
index 93104de29..936be0c4e 100644
--- a/src/import/chips/centaur/procedures/hwp/initfiles/centaur_mem_pll_scan.C
+++ b/src/import/chips/centaur/procedures/hwp/initfiles/centaur_mem_pll_scan.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -63,89 +63,104 @@ fapi2::ReturnCode centaur_mem_pll_scan(const fapi2::Target<fapi2::TARGET_TYPE_ME
         uint64_t l_def_IS_HW = (l_TGT1_ATTR_IS_SIMULATION == literal_0);
         bool l_PLLMEM_PLL_CNTRL0_update = false;
         fapi2::variable_buffer l_PLLMEM_PLL_CNTRL0(64);
+        fapi2::variable_buffer l_PLLMEM_PLL_CNTRL0_CARE(64);
 
         if (l_def_IS_SIM)
         {
             l_PLLMEM_PLL_CNTRL0.insertFromRight<uint64_t>(literal_0x128000000A0040D5, 0, 64);
+            l_PLLMEM_PLL_CNTRL0_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
             l_PLLMEM_PLL_CNTRL0_update = true;
         }
         else if ((l_def_IS_HW && (l_def_MEMB_MEM_FREQ == literal_1066)))
         {
             l_PLLMEM_PLL_CNTRL0.insertFromRight<uint64_t>(literal_0x128000000A0030D2, 0, 64);
+            l_PLLMEM_PLL_CNTRL0_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
             l_PLLMEM_PLL_CNTRL0_update = true;
         }
         else if ((l_def_IS_HW && (l_def_MEMB_MEM_FREQ == literal_1333)))
         {
             l_PLLMEM_PLL_CNTRL0.insertFromRight<uint64_t>(literal_0x128000000A0050D1, 0, 64);
+            l_PLLMEM_PLL_CNTRL0_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
             l_PLLMEM_PLL_CNTRL0_update = true;
         }
         else if ((l_def_IS_HW && (l_def_MEMB_MEM_FREQ == literal_1600)))
         {
             l_PLLMEM_PLL_CNTRL0.insertFromRight<uint64_t>(literal_0x128000000A0030D1, 0, 64);
+            l_PLLMEM_PLL_CNTRL0_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
             l_PLLMEM_PLL_CNTRL0_update = true;
         }
         else if ((l_def_IS_HW && (l_def_MEMB_MEM_FREQ == literal_1866)))
         {
             l_PLLMEM_PLL_CNTRL0.insertFromRight<uint64_t>(literal_0x128000000A0150D5, 0, 64);
+            l_PLLMEM_PLL_CNTRL0_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
             l_PLLMEM_PLL_CNTRL0_update = true;
         }
 
         if ( l_PLLMEM_PLL_CNTRL0_update)
         {
-            FAPI_TRY(fapi2::putSpy(TGT0, "PLLMEM.PLL_CNTRL0", l_PLLMEM_PLL_CNTRL0));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "PLLMEM.PLL_CNTRL0", l_PLLMEM_PLL_CNTRL0, l_PLLMEM_PLL_CNTRL0_CARE));
         }
 
         bool l_PLLMEM_PLL_CNTRL1_update = false;
         fapi2::variable_buffer l_PLLMEM_PLL_CNTRL1(64);
+        fapi2::variable_buffer l_PLLMEM_PLL_CNTRL1_CARE(64);
 
         if (l_def_IS_SIM)
         {
             l_PLLMEM_PLL_CNTRL1.insertFromRight<uint64_t>(literal_0xB000000200040000, 0, 64);
+            l_PLLMEM_PLL_CNTRL1_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
             l_PLLMEM_PLL_CNTRL1_update = true;
         }
         else if ((l_def_IS_HW && (l_def_MEMB_MEM_FREQ == literal_1066)))
         {
             l_PLLMEM_PLL_CNTRL1.insertFromRight<uint64_t>(literal_0x5000000200040002, 0, 64);
+            l_PLLMEM_PLL_CNTRL1_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
             l_PLLMEM_PLL_CNTRL1_update = true;
         }
         else if ((l_def_IS_HW && (l_def_MEMB_MEM_FREQ == literal_1333)))
         {
             l_PLLMEM_PLL_CNTRL1.insertFromRight<uint64_t>(literal_0x3000000200040002, 0, 64);
+            l_PLLMEM_PLL_CNTRL1_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
             l_PLLMEM_PLL_CNTRL1_update = true;
         }
         else if ((l_def_IS_HW && (l_def_MEMB_MEM_FREQ == literal_1600)))
         {
             l_PLLMEM_PLL_CNTRL1.insertFromRight<uint64_t>(literal_0x3000000200040002, 0, 64);
+            l_PLLMEM_PLL_CNTRL1_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
             l_PLLMEM_PLL_CNTRL1_update = true;
         }
         else if ((l_def_IS_HW && (l_def_MEMB_MEM_FREQ == literal_1866)))
         {
             l_PLLMEM_PLL_CNTRL1.insertFromRight<uint64_t>(literal_0xB000000200040002, 0, 64);
+            l_PLLMEM_PLL_CNTRL1_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
             l_PLLMEM_PLL_CNTRL1_update = true;
         }
 
         if ( l_PLLMEM_PLL_CNTRL1_update)
         {
-            FAPI_TRY(fapi2::putSpy(TGT0, "PLLMEM.PLL_CNTRL1", l_PLLMEM_PLL_CNTRL1));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "PLLMEM.PLL_CNTRL1", l_PLLMEM_PLL_CNTRL1, l_PLLMEM_PLL_CNTRL1_CARE));
         }
 
         bool l_PLLMEM_PLL_CNTRL2_update = false;
         fapi2::variable_buffer l_PLLMEM_PLL_CNTRL2(8);
+        fapi2::variable_buffer l_PLLMEM_PLL_CNTRL2_CARE(8);
 
         if (l_def_IS_SIM)
         {
             l_PLLMEM_PLL_CNTRL2.insertFromRight<uint64_t>(literal_0x00, 0, 8);
+            l_PLLMEM_PLL_CNTRL2_CARE.insertFromRight<uint64_t>(0xff, 0, 8);
             l_PLLMEM_PLL_CNTRL2_update = true;
         }
         else if (l_def_IS_HW)
         {
             l_PLLMEM_PLL_CNTRL2.insertFromRight<uint64_t>(literal_0x00, 0, 8);
+            l_PLLMEM_PLL_CNTRL2_CARE.insertFromRight<uint64_t>(0xff, 0, 8);
             l_PLLMEM_PLL_CNTRL2_update = true;
         }
 
         if ( l_PLLMEM_PLL_CNTRL2_update)
         {
-            FAPI_TRY(fapi2::putSpy(TGT0, "PLLMEM.PLL_CNTRL2", l_PLLMEM_PLL_CNTRL2));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "PLLMEM.PLL_CNTRL2", l_PLLMEM_PLL_CNTRL2, l_PLLMEM_PLL_CNTRL2_CARE));
         }
 
     };
diff --git a/src/import/chips/centaur/procedures/hwp/initfiles/centaur_nest_pll_scan.C b/src/import/chips/centaur/procedures/hwp/initfiles/centaur_nest_pll_scan.C
index b20ecd045..ba6d68b28 100644
--- a/src/import/chips/centaur/procedures/hwp/initfiles/centaur_nest_pll_scan.C
+++ b/src/import/chips/centaur/procedures/hwp/initfiles/centaur_nest_pll_scan.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -57,74 +57,89 @@ fapi2::ReturnCode centaur_nest_pll_scan(const fapi2::Target<fapi2::TARGET_TYPE_M
         uint64_t l_def_IS_HW = (l_TGT1_ATTR_IS_SIMULATION == literal_0);
         bool l_DMI_DMIPLL_CWRAP_PLL_CNTRL0_update = false;
         fapi2::variable_buffer l_DMI_DMIPLL_CWRAP_PLL_CNTRL0(64);
+        fapi2::variable_buffer l_DMI_DMIPLL_CWRAP_PLL_CNTRL0_CARE(64);
 
         if (l_def_IS_SIM)
         {
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL0.insertFromRight<uint64_t>(literal_0x13CAB402001C0009, 0, 64);
+            l_DMI_DMIPLL_CWRAP_PLL_CNTRL0_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL0_update = true;
         }
         else if ((l_def_IS_HW && (l_def_NEST_FREQ == literal_2000)))
         {
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL0.insertFromRight<uint64_t>(literal_0x18469406001C0048, 0, 64);
+            l_DMI_DMIPLL_CWRAP_PLL_CNTRL0_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL0_update = true;
         }
         else if ((l_def_IS_HW && (l_def_NEST_FREQ == literal_2400)))
         {
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL0.insertFromRight<uint64_t>(literal_0x184B1402000C0008, 0, 64);
+            l_DMI_DMIPLL_CWRAP_PLL_CNTRL0_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL0_update = true;
         }
 
         if ( l_DMI_DMIPLL_CWRAP_PLL_CNTRL0_update)
         {
-            FAPI_TRY(fapi2::putSpy(TGT0, "DMI.DMIPLL.CWRAP.PLL_CNTRL0", l_DMI_DMIPLL_CWRAP_PLL_CNTRL0));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "DMI.DMIPLL.CWRAP.PLL_CNTRL0", l_DMI_DMIPLL_CWRAP_PLL_CNTRL0,
+                                           l_DMI_DMIPLL_CWRAP_PLL_CNTRL0_CARE));
         }
 
         bool l_DMI_DMIPLL_CWRAP_PLL_CNTRL1_update = false;
         fapi2::variable_buffer l_DMI_DMIPLL_CWRAP_PLL_CNTRL1(64);
+        fapi2::variable_buffer l_DMI_DMIPLL_CWRAP_PLL_CNTRL1_CARE(64);
 
         if (l_def_IS_SIM)
         {
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL1.insertFromRight<uint64_t>(literal_0x0000000000000000, 0, 64);
+            l_DMI_DMIPLL_CWRAP_PLL_CNTRL1_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL1_update = true;
         }
         else if ((l_def_IS_HW && (l_def_NEST_FREQ == literal_2000)))
         {
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL1.insertFromRight<uint64_t>(literal_0x0008000000000000, 0, 64);
+            l_DMI_DMIPLL_CWRAP_PLL_CNTRL1_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL1_update = true;
         }
         else if ((l_def_IS_HW && (l_def_NEST_FREQ == literal_2400)))
         {
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL1.insertFromRight<uint64_t>(literal_0x0008000000000000, 0, 64);
+            l_DMI_DMIPLL_CWRAP_PLL_CNTRL1_CARE.insertFromRight<uint64_t>(0xffffffffffffffff, 0, 64);
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL1_update = true;
         }
 
         if ( l_DMI_DMIPLL_CWRAP_PLL_CNTRL1_update)
         {
-            FAPI_TRY(fapi2::putSpy(TGT0, "DMI.DMIPLL.CWRAP.PLL_CNTRL1", l_DMI_DMIPLL_CWRAP_PLL_CNTRL1));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "DMI.DMIPLL.CWRAP.PLL_CNTRL1", l_DMI_DMIPLL_CWRAP_PLL_CNTRL1,
+                                           l_DMI_DMIPLL_CWRAP_PLL_CNTRL1_CARE));
         }
 
         bool l_DMI_DMIPLL_CWRAP_PLL_CNTRL2_update = false;
         fapi2::variable_buffer l_DMI_DMIPLL_CWRAP_PLL_CNTRL2(8);
+        fapi2::variable_buffer l_DMI_DMIPLL_CWRAP_PLL_CNTRL2_CARE(8);
 
         if (l_def_IS_SIM)
         {
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL2.insertFromRight<uint64_t>(literal_0x00, 0, 8);
+            l_DMI_DMIPLL_CWRAP_PLL_CNTRL2_CARE.insertFromRight<uint64_t>(0xff, 0, 8);
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL2_update = true;
         }
         else if ((l_def_IS_HW && (l_def_NEST_FREQ == literal_2000)))
         {
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL2.insertFromRight<uint64_t>(literal_0x00, 0, 8);
+            l_DMI_DMIPLL_CWRAP_PLL_CNTRL2_CARE.insertFromRight<uint64_t>(0xff, 0, 8);
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL2_update = true;
         }
         else if ((l_def_IS_HW && (l_def_NEST_FREQ == literal_2400)))
         {
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL2.insertFromRight<uint64_t>(literal_0x00, 0, 8);
+            l_DMI_DMIPLL_CWRAP_PLL_CNTRL2_CARE.insertFromRight<uint64_t>(0xff, 0, 8);
             l_DMI_DMIPLL_CWRAP_PLL_CNTRL2_update = true;
         }
 
         if ( l_DMI_DMIPLL_CWRAP_PLL_CNTRL2_update)
         {
-            FAPI_TRY(fapi2::putSpy(TGT0, "DMI.DMIPLL.CWRAP.PLL_CNTRL2", l_DMI_DMIPLL_CWRAP_PLL_CNTRL2));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "DMI.DMIPLL.CWRAP.PLL_CNTRL2", l_DMI_DMIPLL_CWRAP_PLL_CNTRL2,
+                                           l_DMI_DMIPLL_CWRAP_PLL_CNTRL2_CARE));
         }
 
     };
diff --git a/src/import/chips/centaur/procedures/hwp/initfiles/centaur_thermal_scan.C b/src/import/chips/centaur/procedures/hwp/initfiles/centaur_thermal_scan.C
index 1cc80cded..304229813 100644
--- a/src/import/chips/centaur/procedures/hwp/initfiles/centaur_thermal_scan.C
+++ b/src/import/chips/centaur/procedures/hwp/initfiles/centaur_thermal_scan.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -39,9 +39,12 @@ fapi2::ReturnCode centaur_thermal_scan(const fapi2::Target<fapi2::TARGET_TYPE_ME
         FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_NAME, TGT0, l_chip_id));
         FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT0, l_chip_ec));
         fapi2::variable_buffer l_TCN_EPS_THERM_OVERFLOW_ERR_MASK(1);
+        fapi2::variable_buffer l_TCN_EPS_THERM_OVERFLOW_ERR_MASK_CARE(1);
         constexpr auto l_TCN_EPS_THERM_OVERFLOW_ERR_MASK_ON = 0x1;
         l_TCN_EPS_THERM_OVERFLOW_ERR_MASK.insertFromRight<uint64_t>(l_TCN_EPS_THERM_OVERFLOW_ERR_MASK_ON, 0, 1);
-        FAPI_TRY(fapi2::putSpy(TGT0, "TCN.EPS.THERM.OVERFLOW_ERR_MASK", l_TCN_EPS_THERM_OVERFLOW_ERR_MASK));
+        l_TCN_EPS_THERM_OVERFLOW_ERR_MASK_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "TCN.EPS.THERM.OVERFLOW_ERR_MASK", l_TCN_EPS_THERM_OVERFLOW_ERR_MASK,
+                                       l_TCN_EPS_THERM_OVERFLOW_ERR_MASK_CARE));
 
     };
 fapi_try_exit:
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9n_mc_scan.C b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mc_scan.C
index a6b809352..dc97c1868 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9n_mc_scan.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9n_mc_scan.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2017                             */
+/* Contributors Listed Below - COPYRIGHT 2017,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -45,326 +45,442 @@ fapi2::ReturnCode p9n_mc_scan(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC01_PORT0_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT(6);
+            fapi2::variable_buffer l_MC01_PORT0_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE(6);
             l_MC01_PORT0_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT.insertFromRight<uint64_t>(literal_0b111111, 0, 6);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT0.ATCL.CL.CLSCOM.MCPERF0_PREFETCH_LIMIT",
-                                   l_MC01_PORT0_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT));
+            l_MC01_PORT0_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT0.ATCL.CL.CLSCOM.MCPERF0_PREFETCH_LIMIT",
+                                           l_MC01_PORT0_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT, l_MC01_PORT0_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC01_PORT1_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT(6);
+            fapi2::variable_buffer l_MC01_PORT1_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE(6);
             l_MC01_PORT1_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT.insertFromRight<uint64_t>(literal_0b111111, 0, 6);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT1.ATCL.CL.CLSCOM.MCPERF0_PREFETCH_LIMIT",
-                                   l_MC01_PORT1_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT));
+            l_MC01_PORT1_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT1.ATCL.CL.CLSCOM.MCPERF0_PREFETCH_LIMIT",
+                                           l_MC01_PORT1_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT, l_MC01_PORT1_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC01_PORT2_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT(6);
+            fapi2::variable_buffer l_MC01_PORT2_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE(6);
             l_MC01_PORT2_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT.insertFromRight<uint64_t>(literal_0b111111, 0, 6);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT2.ATCL.CL.CLSCOM.MCPERF0_PREFETCH_LIMIT",
-                                   l_MC01_PORT2_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT));
+            l_MC01_PORT2_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT2.ATCL.CL.CLSCOM.MCPERF0_PREFETCH_LIMIT",
+                                           l_MC01_PORT2_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT, l_MC01_PORT2_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC01_PORT3_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT(6);
+            fapi2::variable_buffer l_MC01_PORT3_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE(6);
             l_MC01_PORT3_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT.insertFromRight<uint64_t>(literal_0b111111, 0, 6);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT3.ATCL.CL.CLSCOM.MCPERF0_PREFETCH_LIMIT",
-                                   l_MC01_PORT3_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT));
+            l_MC01_PORT3_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT3.ATCL.CL.CLSCOM.MCPERF0_PREFETCH_LIMIT",
+                                           l_MC01_PORT3_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT, l_MC01_PORT3_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC23_PORT0_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT(6);
+            fapi2::variable_buffer l_MC23_PORT0_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE(6);
             l_MC23_PORT0_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT.insertFromRight<uint64_t>(literal_0b111111, 0, 6);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT0.ATCL.CL.CLSCOM.MCPERF0_PREFETCH_LIMIT",
-                                   l_MC23_PORT0_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT));
+            l_MC23_PORT0_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT0.ATCL.CL.CLSCOM.MCPERF0_PREFETCH_LIMIT",
+                                           l_MC23_PORT0_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT, l_MC23_PORT0_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC23_PORT1_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT(6);
+            fapi2::variable_buffer l_MC23_PORT1_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE(6);
             l_MC23_PORT1_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT.insertFromRight<uint64_t>(literal_0b111111, 0, 6);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT1.ATCL.CL.CLSCOM.MCPERF0_PREFETCH_LIMIT",
-                                   l_MC23_PORT1_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT));
+            l_MC23_PORT1_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT1.ATCL.CL.CLSCOM.MCPERF0_PREFETCH_LIMIT",
+                                           l_MC23_PORT1_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT, l_MC23_PORT1_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC23_PORT2_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT(6);
+            fapi2::variable_buffer l_MC23_PORT2_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE(6);
             l_MC23_PORT2_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT.insertFromRight<uint64_t>(literal_0b111111, 0, 6);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT2.ATCL.CL.CLSCOM.MCPERF0_PREFETCH_LIMIT",
-                                   l_MC23_PORT2_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT));
+            l_MC23_PORT2_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT2.ATCL.CL.CLSCOM.MCPERF0_PREFETCH_LIMIT",
+                                           l_MC23_PORT2_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT, l_MC23_PORT2_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC23_PORT3_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT(6);
+            fapi2::variable_buffer l_MC23_PORT3_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE(6);
             l_MC23_PORT3_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT.insertFromRight<uint64_t>(literal_0b111111, 0, 6);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT3.ATCL.CL.CLSCOM.MCPERF0_PREFETCH_LIMIT",
-                                   l_MC23_PORT3_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT));
+            l_MC23_PORT3_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT3.ATCL.CL.CLSCOM.MCPERF0_PREFETCH_LIMIT",
+                                           l_MC23_PORT3_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT, l_MC23_PORT3_ATCL_CL_CLSCOM_MCPERF0_PREFETCH_LIMIT_CARE));
         }
 
         fapi2::variable_buffer l_MC01_PORT0_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT(6);
+        fapi2::variable_buffer l_MC01_PORT0_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE(6);
         l_MC01_PORT0_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT.insertFromRight<uint64_t>(literal_8, 0, 6);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT0.ATCL.CL.CLSCOM.MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT",
-                               l_MC01_PORT0_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT));
+        l_MC01_PORT0_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT0.ATCL.CL.CLSCOM.MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT",
+                                       l_MC01_PORT0_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT,
+                                       l_MC01_PORT0_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE));
         fapi2::variable_buffer l_MC01_PORT1_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT(6);
+        fapi2::variable_buffer l_MC01_PORT1_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE(6);
         l_MC01_PORT1_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT.insertFromRight<uint64_t>(literal_8, 0, 6);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT1.ATCL.CL.CLSCOM.MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT",
-                               l_MC01_PORT1_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT));
+        l_MC01_PORT1_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT1.ATCL.CL.CLSCOM.MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT",
+                                       l_MC01_PORT1_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT,
+                                       l_MC01_PORT1_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE));
         fapi2::variable_buffer l_MC01_PORT2_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT(6);
+        fapi2::variable_buffer l_MC01_PORT2_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE(6);
         l_MC01_PORT2_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT.insertFromRight<uint64_t>(literal_8, 0, 6);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT2.ATCL.CL.CLSCOM.MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT",
-                               l_MC01_PORT2_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT));
+        l_MC01_PORT2_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT2.ATCL.CL.CLSCOM.MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT",
+                                       l_MC01_PORT2_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT,
+                                       l_MC01_PORT2_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE));
         fapi2::variable_buffer l_MC01_PORT3_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT(6);
+        fapi2::variable_buffer l_MC01_PORT3_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE(6);
         l_MC01_PORT3_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT.insertFromRight<uint64_t>(literal_8, 0, 6);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT3.ATCL.CL.CLSCOM.MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT",
-                               l_MC01_PORT3_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT));
+        l_MC01_PORT3_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT3.ATCL.CL.CLSCOM.MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT",
+                                       l_MC01_PORT3_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT,
+                                       l_MC01_PORT3_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE));
         fapi2::variable_buffer l_MC23_PORT0_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT(6);
+        fapi2::variable_buffer l_MC23_PORT0_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE(6);
         l_MC23_PORT0_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT.insertFromRight<uint64_t>(literal_8, 0, 6);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT0.ATCL.CL.CLSCOM.MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT",
-                               l_MC23_PORT0_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT));
+        l_MC23_PORT0_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT0.ATCL.CL.CLSCOM.MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT",
+                                       l_MC23_PORT0_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT,
+                                       l_MC23_PORT0_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE));
         fapi2::variable_buffer l_MC23_PORT1_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT(6);
+        fapi2::variable_buffer l_MC23_PORT1_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE(6);
         l_MC23_PORT1_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT.insertFromRight<uint64_t>(literal_8, 0, 6);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT1.ATCL.CL.CLSCOM.MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT",
-                               l_MC23_PORT1_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT));
+        l_MC23_PORT1_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT1.ATCL.CL.CLSCOM.MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT",
+                                       l_MC23_PORT1_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT,
+                                       l_MC23_PORT1_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE));
         fapi2::variable_buffer l_MC23_PORT2_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT(6);
+        fapi2::variable_buffer l_MC23_PORT2_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE(6);
         l_MC23_PORT2_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT.insertFromRight<uint64_t>(literal_8, 0, 6);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT2.ATCL.CL.CLSCOM.MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT",
-                               l_MC23_PORT2_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT));
+        l_MC23_PORT2_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT2.ATCL.CL.CLSCOM.MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT",
+                                       l_MC23_PORT2_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT,
+                                       l_MC23_PORT2_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE));
         fapi2::variable_buffer l_MC23_PORT3_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT(6);
+        fapi2::variable_buffer l_MC23_PORT3_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE(6);
         l_MC23_PORT3_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT.insertFromRight<uint64_t>(literal_8, 0, 6);
-        FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT3.ATCL.CL.CLSCOM.MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT",
-                               l_MC23_PORT3_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT));
+        l_MC23_PORT3_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE.insertFromRight<uint64_t>(0x3f, 0, 6);
+        FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT3.ATCL.CL.CLSCOM.MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT",
+                                       l_MC23_PORT3_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT,
+                                       l_MC23_PORT3_ATCL_CL_CLSCOM_MCPERF0_WR_RSVD_LOWER_OR_STATIC_LIMIT_CARE));
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC01_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE(1);
+            fapi2::variable_buffer l_MC01_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE(1);
             l_MC01_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE.insertFromRight<uint64_t>(literal_0b1, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT0.READ.RDATA_ARY0.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC01_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT0.READ.RDATA_ARY1.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC01_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT0.READ.RDATA_ARY2.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC01_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT0.READ.RDATA_ARY3.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC01_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
+            l_MC01_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT0.READ.RDATA_ARY0.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC01_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC01_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT0.READ.RDATA_ARY1.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC01_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC01_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT0.READ.RDATA_ARY2.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC01_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC01_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT0.READ.RDATA_ARY3.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC01_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC01_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC01_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE(1);
+            fapi2::variable_buffer l_MC01_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE(1);
             l_MC01_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE.insertFromRight<uint64_t>(literal_0b1, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT1.READ.RDATA_ARY0.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC01_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT1.READ.RDATA_ARY1.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC01_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT1.READ.RDATA_ARY2.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC01_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT1.READ.RDATA_ARY3.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC01_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
+            l_MC01_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT1.READ.RDATA_ARY0.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC01_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC01_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT1.READ.RDATA_ARY1.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC01_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC01_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT1.READ.RDATA_ARY2.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC01_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC01_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT1.READ.RDATA_ARY3.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC01_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC01_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC01_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE(1);
+            fapi2::variable_buffer l_MC01_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE(1);
             l_MC01_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE.insertFromRight<uint64_t>(literal_0b1, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT2.READ.RDATA_ARY0.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC01_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT2.READ.RDATA_ARY1.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC01_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT2.READ.RDATA_ARY2.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC01_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT2.READ.RDATA_ARY3.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC01_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
+            l_MC01_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT2.READ.RDATA_ARY0.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC01_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC01_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT2.READ.RDATA_ARY1.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC01_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC01_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT2.READ.RDATA_ARY2.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC01_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC01_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT2.READ.RDATA_ARY3.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC01_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC01_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC01_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE(1);
+            fapi2::variable_buffer l_MC01_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE(1);
             l_MC01_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE.insertFromRight<uint64_t>(literal_0b1, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT3.READ.RDATA_ARY0.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC01_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT3.READ.RDATA_ARY1.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC01_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT3.READ.RDATA_ARY2.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC01_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT3.READ.RDATA_ARY3.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC01_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
+            l_MC01_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT3.READ.RDATA_ARY0.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC01_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC01_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT3.READ.RDATA_ARY1.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC01_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC01_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT3.READ.RDATA_ARY2.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC01_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC01_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT3.READ.RDATA_ARY3.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC01_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC01_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC23_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE(1);
+            fapi2::variable_buffer l_MC23_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE(1);
             l_MC23_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE.insertFromRight<uint64_t>(literal_0b1, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT0.READ.RDATA_ARY0.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC23_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT0.READ.RDATA_ARY1.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC23_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT0.READ.RDATA_ARY2.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC23_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT0.READ.RDATA_ARY3.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC23_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
+            l_MC23_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT0.READ.RDATA_ARY0.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC23_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC23_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT0.READ.RDATA_ARY1.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC23_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC23_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT0.READ.RDATA_ARY2.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC23_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC23_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT0.READ.RDATA_ARY3.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC23_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC23_PORT0_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC23_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE(1);
+            fapi2::variable_buffer l_MC23_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE(1);
             l_MC23_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE.insertFromRight<uint64_t>(literal_0b1, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT1.READ.RDATA_ARY0.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC23_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT1.READ.RDATA_ARY1.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC23_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT1.READ.RDATA_ARY2.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC23_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT1.READ.RDATA_ARY3.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC23_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
+            l_MC23_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT1.READ.RDATA_ARY0.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC23_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC23_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT1.READ.RDATA_ARY1.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC23_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC23_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT1.READ.RDATA_ARY2.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC23_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC23_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT1.READ.RDATA_ARY3.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC23_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC23_PORT1_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC23_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE(1);
+            fapi2::variable_buffer l_MC23_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE(1);
             l_MC23_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE.insertFromRight<uint64_t>(literal_0b1, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT2.READ.RDATA_ARY0.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC23_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT2.READ.RDATA_ARY1.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC23_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT2.READ.RDATA_ARY2.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC23_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT2.READ.RDATA_ARY3.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC23_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
+            l_MC23_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT2.READ.RDATA_ARY0.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC23_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC23_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT2.READ.RDATA_ARY1.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC23_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC23_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT2.READ.RDATA_ARY2.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC23_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC23_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT2.READ.RDATA_ARY3.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC23_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC23_PORT2_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC23_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE(1);
+            fapi2::variable_buffer l_MC23_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE(1);
             l_MC23_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE.insertFromRight<uint64_t>(literal_0b1, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT3.READ.RDATA_ARY0.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC23_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT3.READ.RDATA_ARY1.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC23_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT3.READ.RDATA_ARY2.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC23_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT3.READ.RDATA_ARY3.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
-                                   l_MC23_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE));
+            l_MC23_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT3.READ.RDATA_ARY0.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC23_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC23_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT3.READ.RDATA_ARY1.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC23_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC23_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT3.READ.RDATA_ARY2.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC23_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC23_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT3.READ.RDATA_ARY3.SFT_MAC.SFT.LCBCNTL_BLK_RF.CLOCKGATE_DISABLE",
+                                           l_MC23_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE,
+                                           l_MC23_PORT3_READ_RDATA_ARY0_SFT_MAC_SFT_LCBCNTL_BLK_RF_CLOCKGATE_DISABLE_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC01_PBI01_LCBCNTL_BLK1_CLOCKGATE_DISABLE(1);
+            fapi2::variable_buffer l_MC01_PBI01_LCBCNTL_BLK1_CLOCKGATE_DISABLE_CARE(1);
             l_MC01_PBI01_LCBCNTL_BLK1_CLOCKGATE_DISABLE.insertFromRight<uint64_t>(literal_1, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PBI01.LCBCNTL_BLK1.CLOCKGATE_DISABLE", l_MC01_PBI01_LCBCNTL_BLK1_CLOCKGATE_DISABLE));
+            l_MC01_PBI01_LCBCNTL_BLK1_CLOCKGATE_DISABLE_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PBI01.LCBCNTL_BLK1.CLOCKGATE_DISABLE",
+                                           l_MC01_PBI01_LCBCNTL_BLK1_CLOCKGATE_DISABLE, l_MC01_PBI01_LCBCNTL_BLK1_CLOCKGATE_DISABLE_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC01_PBI23_LCBCNTL_BLK1_CLOCKGATE_DISABLE(1);
+            fapi2::variable_buffer l_MC01_PBI23_LCBCNTL_BLK1_CLOCKGATE_DISABLE_CARE(1);
             l_MC01_PBI23_LCBCNTL_BLK1_CLOCKGATE_DISABLE.insertFromRight<uint64_t>(literal_1, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PBI23.LCBCNTL_BLK1.CLOCKGATE_DISABLE", l_MC01_PBI23_LCBCNTL_BLK1_CLOCKGATE_DISABLE));
+            l_MC01_PBI23_LCBCNTL_BLK1_CLOCKGATE_DISABLE_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PBI23.LCBCNTL_BLK1.CLOCKGATE_DISABLE",
+                                           l_MC01_PBI23_LCBCNTL_BLK1_CLOCKGATE_DISABLE, l_MC01_PBI23_LCBCNTL_BLK1_CLOCKGATE_DISABLE_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC23_PBI01_LCBCNTL_BLK1_CLOCKGATE_DISABLE(1);
+            fapi2::variable_buffer l_MC23_PBI01_LCBCNTL_BLK1_CLOCKGATE_DISABLE_CARE(1);
             l_MC23_PBI01_LCBCNTL_BLK1_CLOCKGATE_DISABLE.insertFromRight<uint64_t>(literal_1, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PBI01.LCBCNTL_BLK1.CLOCKGATE_DISABLE", l_MC23_PBI01_LCBCNTL_BLK1_CLOCKGATE_DISABLE));
+            l_MC23_PBI01_LCBCNTL_BLK1_CLOCKGATE_DISABLE_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PBI01.LCBCNTL_BLK1.CLOCKGATE_DISABLE",
+                                           l_MC23_PBI01_LCBCNTL_BLK1_CLOCKGATE_DISABLE, l_MC23_PBI01_LCBCNTL_BLK1_CLOCKGATE_DISABLE_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
         {
             fapi2::variable_buffer l_MC23_PBI23_LCBCNTL_BLK1_CLOCKGATE_DISABLE(1);
+            fapi2::variable_buffer l_MC23_PBI23_LCBCNTL_BLK1_CLOCKGATE_DISABLE_CARE(1);
             l_MC23_PBI23_LCBCNTL_BLK1_CLOCKGATE_DISABLE.insertFromRight<uint64_t>(literal_1, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PBI23.LCBCNTL_BLK1.CLOCKGATE_DISABLE", l_MC23_PBI23_LCBCNTL_BLK1_CLOCKGATE_DISABLE));
+            l_MC23_PBI23_LCBCNTL_BLK1_CLOCKGATE_DISABLE_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PBI23.LCBCNTL_BLK1.CLOCKGATE_DISABLE",
+                                           l_MC23_PBI23_LCBCNTL_BLK1_CLOCKGATE_DISABLE, l_MC23_PBI23_LCBCNTL_BLK1_CLOCKGATE_DISABLE_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
                 && (l_chip_ec == 0x22)) )
         {
             fapi2::variable_buffer l_MC01_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX(1);
+            fapi2::variable_buffer l_MC01_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE(1);
             constexpr auto l_MC01_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_ON = 0x1;
             l_MC01_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX.insertFromRight<uint64_t>
             (l_MC01_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_ON, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT0.ATCL.CL.DISABLE_ERIC_DD2_10_HTM_TO_FIX",
-                                   l_MC01_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX));
+            l_MC01_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT0.ATCL.CL.DISABLE_ERIC_DD2_10_HTM_TO_FIX",
+                                           l_MC01_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX, l_MC01_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
                 && (l_chip_ec == 0x22)) )
         {
             fapi2::variable_buffer l_MC01_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX(1);
+            fapi2::variable_buffer l_MC01_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE(1);
             constexpr auto l_MC01_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_ON = 0x1;
             l_MC01_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX.insertFromRight<uint64_t>
             (l_MC01_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_ON, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT1.ATCL.CL.DISABLE_ERIC_DD2_10_HTM_TO_FIX",
-                                   l_MC01_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX));
+            l_MC01_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT1.ATCL.CL.DISABLE_ERIC_DD2_10_HTM_TO_FIX",
+                                           l_MC01_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX, l_MC01_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
                 && (l_chip_ec == 0x22)) )
         {
             fapi2::variable_buffer l_MC01_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX(1);
+            fapi2::variable_buffer l_MC01_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE(1);
             constexpr auto l_MC01_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_ON = 0x1;
             l_MC01_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX.insertFromRight<uint64_t>
             (l_MC01_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_ON, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT2.ATCL.CL.DISABLE_ERIC_DD2_10_HTM_TO_FIX",
-                                   l_MC01_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX));
+            l_MC01_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT2.ATCL.CL.DISABLE_ERIC_DD2_10_HTM_TO_FIX",
+                                           l_MC01_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX, l_MC01_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
                 && (l_chip_ec == 0x22)) )
         {
             fapi2::variable_buffer l_MC01_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX(1);
+            fapi2::variable_buffer l_MC01_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE(1);
             constexpr auto l_MC01_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_ON = 0x1;
             l_MC01_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX.insertFromRight<uint64_t>
             (l_MC01_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_ON, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC01.PORT3.ATCL.CL.DISABLE_ERIC_DD2_10_HTM_TO_FIX",
-                                   l_MC01_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX));
+            l_MC01_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC01.PORT3.ATCL.CL.DISABLE_ERIC_DD2_10_HTM_TO_FIX",
+                                           l_MC01_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX, l_MC01_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
                 && (l_chip_ec == 0x22)) )
         {
             fapi2::variable_buffer l_MC23_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX(1);
+            fapi2::variable_buffer l_MC23_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE(1);
             constexpr auto l_MC23_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_ON = 0x1;
             l_MC23_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX.insertFromRight<uint64_t>
             (l_MC23_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_ON, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT0.ATCL.CL.DISABLE_ERIC_DD2_10_HTM_TO_FIX",
-                                   l_MC23_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX));
+            l_MC23_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT0.ATCL.CL.DISABLE_ERIC_DD2_10_HTM_TO_FIX",
+                                           l_MC23_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX, l_MC23_PORT0_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
                 && (l_chip_ec == 0x22)) )
         {
             fapi2::variable_buffer l_MC23_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX(1);
+            fapi2::variable_buffer l_MC23_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE(1);
             constexpr auto l_MC23_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_ON = 0x1;
             l_MC23_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX.insertFromRight<uint64_t>
             (l_MC23_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_ON, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT1.ATCL.CL.DISABLE_ERIC_DD2_10_HTM_TO_FIX",
-                                   l_MC23_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX));
+            l_MC23_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT1.ATCL.CL.DISABLE_ERIC_DD2_10_HTM_TO_FIX",
+                                           l_MC23_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX, l_MC23_PORT1_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
                 && (l_chip_ec == 0x22)) )
         {
             fapi2::variable_buffer l_MC23_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX(1);
+            fapi2::variable_buffer l_MC23_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE(1);
             constexpr auto l_MC23_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_ON = 0x1;
             l_MC23_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX.insertFromRight<uint64_t>
             (l_MC23_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_ON, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT2.ATCL.CL.DISABLE_ERIC_DD2_10_HTM_TO_FIX",
-                                   l_MC23_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX));
+            l_MC23_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT2.ATCL.CL.DISABLE_ERIC_DD2_10_HTM_TO_FIX",
+                                           l_MC23_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX, l_MC23_PORT2_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE));
         }
 
         if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
                 && (l_chip_ec == 0x22)) )
         {
             fapi2::variable_buffer l_MC23_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX(1);
+            fapi2::variable_buffer l_MC23_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE(1);
             constexpr auto l_MC23_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_ON = 0x1;
             l_MC23_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX.insertFromRight<uint64_t>
             (l_MC23_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_ON, 0, 1);
-            FAPI_TRY(fapi2::putSpy(TGT0, "MC23.PORT3.ATCL.CL.DISABLE_ERIC_DD2_10_HTM_TO_FIX",
-                                   l_MC23_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX));
+            l_MC23_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE.insertFromRight<uint64_t>(0x1, 0, 1);
+            FAPI_TRY(fapi2::putSpyWithCare(TGT0, "MC23.PORT3.ATCL.CL.DISABLE_ERIC_DD2_10_HTM_TO_FIX",
+                                           l_MC23_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX, l_MC23_PORT3_ATCL_CL_DISABLE_ERIC_DD2_10_HTM_TO_FIX_CARE));
         }
     };
 fapi_try_exit: