diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_cd_hp_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_cd_hp_scom.C
index da50a77436c..2106a650819 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_cd_hp_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_cd_hp_scom.C
@@ -53,8 +53,6 @@ constexpr uint64_t literal_110 = 110;
 constexpr uint64_t literal_105 = 105;
 constexpr uint64_t literal_0b01011 = 0b01011;
 constexpr uint64_t literal_125 = 125;
-constexpr uint64_t literal_130 = 130;
-constexpr uint64_t literal_135 = 135;
 constexpr uint64_t literal_0b01111 = 0b01111;
 constexpr uint64_t literal_0b10001 = 0b10001;
 constexpr uint64_t literal_0b10011 = 0b10011;
@@ -89,8 +87,8 @@ constexpr uint64_t literal_0b1 = 0b1;
 constexpr uint64_t literal_0b10 = 0b10;
 constexpr uint64_t literal_0x400 = 0x400;
 constexpr uint64_t literal_0b010 = 0b010;
-constexpr uint64_t literal_0b00010000 = 0b00010000;
-constexpr uint64_t literal_0x10 = 0x10;
+constexpr uint64_t literal_0b00001100 = 0b00001100;
+constexpr uint64_t literal_0x0C = 0x0C;
 constexpr uint64_t literal_0x141 = 0x141;
 constexpr uint64_t literal_0x21B = 0x21B;
 constexpr uint64_t literal_0x30D = 0x30D;
@@ -132,8 +130,6 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
         uint64_t l_def_X_RATIO_100_115 = ((literal_115 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_100 * l_TGT1_ATTR_FREQ_PB_MHZ));
         uint64_t l_def_X_RATIO_100_120 = ((literal_120 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_100 * l_TGT1_ATTR_FREQ_PB_MHZ));
         uint64_t l_def_X_RATIO_100_125 = ((literal_125 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_100 * l_TGT1_ATTR_FREQ_PB_MHZ));
-        uint64_t l_def_X_RATIO_100_130 = ((literal_130 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_100 * l_TGT1_ATTR_FREQ_PB_MHZ));
-        uint64_t l_def_X_RATIO_100_135 = ((literal_135 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_100 * l_TGT1_ATTR_FREQ_PB_MHZ));
         fapi2::ATTR_PROC_FABRIC_SMP_OPTICS_MODE_Type l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE;
         FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_SMP_OPTICS_MODE, TGT1, l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE));
         uint64_t l_def_SMP_OPTICS_MODE = (l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE ==
@@ -240,14 +236,6 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
                 {
                     l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b01100 );
                 }
-                else if ((((l_def_NUM_A_LINKS_CFG == literal_0) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_130))
-                {
-                    l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b01100 );
-                }
-                else if ((((l_def_NUM_A_LINKS_CFG == literal_0) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_135))
-                {
-                    l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b01100 );
-                }
                 else if ((((l_def_NUM_A_LINKS_CFG == literal_1) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_120_100))
                 {
                     l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b01110 );
@@ -288,14 +276,6 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
                 {
                     l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b10011 );
                 }
-                else if ((((l_def_NUM_A_LINKS_CFG == literal_1) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_130))
-                {
-                    l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b10011 );
-                }
-                else if ((((l_def_NUM_A_LINKS_CFG == literal_1) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_135))
-                {
-                    l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b10100 );
-                }
                 else if ((((l_def_NUM_A_LINKS_CFG == literal_2) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_120_100))
                 {
                     l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b10011 );
@@ -336,14 +316,6 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
                 {
                     l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11010 );
                 }
-                else if ((((l_def_NUM_A_LINKS_CFG == literal_2) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_130))
-                {
-                    l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11011 );
-                }
-                else if ((((l_def_NUM_A_LINKS_CFG == literal_2) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_135))
-                {
-                    l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11100 );
-                }
                 else if ((((l_def_NUM_A_LINKS_CFG == literal_3) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_120_100))
                 {
                     l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11000 );
@@ -384,14 +356,6 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
                 {
                     l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11111 );
                 }
-                else if ((((l_def_NUM_A_LINKS_CFG == literal_3) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_130))
-                {
-                    l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11111 );
-                }
-                else if ((((l_def_NUM_A_LINKS_CFG == literal_3) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_135))
-                {
-                    l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11111 );
-                }
                 else if (((l_def_NUM_A_LINKS_CFG == literal_0) && (l_def_NUM_X_LINKS_CFG == literal_4)))
                 {
                     l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b01110 );
@@ -428,6 +392,19 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             {
                 l_scom_buffer.flush<0> ();
 
+                if (l_def_SMP_OPTICS_MODE)
+                {
+                    constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_012 = 0xe;
+                    l_scom_buffer.insert<45, 4, 60, uint64_t>
+                    (l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_012 );
+                }
+                else if (( ! l_def_SMP_OPTICS_MODE))
+                {
+                    constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_01 = 0xc;
+                    l_scom_buffer.insert<45, 4, 60, uint64_t>
+                    (l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_01 );
+                }
+
                 if (l_def_SMP_OPTICS_MODE)
                 {
                     constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_VCINIT_NEXT_DOFF_32_32 = 0x4;
@@ -481,6 +458,19 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             {
                 l_scom_buffer.flush<0> ();
 
+                if (l_def_SMP_OPTICS_MODE)
+                {
+                    constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_012 = 0xe;
+                    l_scom_buffer.insert<45, 4, 60, uint64_t>
+                    (l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_012 );
+                }
+                else if (( ! l_def_SMP_OPTICS_MODE))
+                {
+                    constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_01 = 0xc;
+                    l_scom_buffer.insert<45, 4, 60, uint64_t>
+                    (l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_01 );
+                }
+
                 if (l_def_SMP_OPTICS_MODE)
                 {
                     constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_VCINIT_NEXT_DOFF_32_32 = 0x4;
@@ -533,17 +523,8 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             if (((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
             {
                 l_scom_buffer.flush<0> ();
-
-                if ((l_def_TRUE == literal_1))
-                {
-                    l_scom_buffer.insert<41, 2, 62, uint64_t>(literal_0b01 );
-                }
-
-                if ((l_def_TRUE == literal_1))
-                {
-                    l_scom_buffer.insert<43, 2, 62, uint64_t>(literal_0b11 );
-                }
-
+                l_scom_buffer.insert<41, 2, 62, uint64_t>(literal_0b01 );
+                l_scom_buffer.insert<43, 2, 62, uint64_t>(literal_0b11 );
                 FAPI_TRY(fapi2::putScom(TGT0, 0x90000d6805011c11ull, l_scom_buffer));
             }
         }
@@ -551,17 +532,8 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
             {
                 l_scom_buffer.flush<0> ();
-
-                if ((l_def_TRUE == literal_1))
-                {
-                    l_scom_buffer.insert<41, 2, 62, uint64_t>(literal_0b01 );
-                }
-
-                if ((l_def_TRUE == literal_1))
-                {
-                    l_scom_buffer.insert<43, 2, 62, uint64_t>(literal_0b11 );
-                }
-
+                l_scom_buffer.insert<41, 2, 62, uint64_t>(literal_0b01 );
+                l_scom_buffer.insert<43, 2, 62, uint64_t>(literal_0b11 );
                 FAPI_TRY(fapi2::putScom(TGT0, 0x90000d7805011c11ull, l_scom_buffer));
             }
         }
@@ -791,15 +763,12 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
             {
-                if ((l_def_TRUE == literal_1))
-                {
-                    l_scom_buffer.insert<20, 8, 56, uint64_t>(literal_0b00010000 );
-                }
+                l_scom_buffer.insert<20, 8, 56, uint64_t>(literal_0b00001100 );
             }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                l_scom_buffer.insert<20, 8, 56, uint64_t>(literal_0x10 );
+                l_scom_buffer.insert<20, 8, 56, uint64_t>(literal_0x0C );
             }
 
             FAPI_TRY(fapi2::putScom(TGT0, 0x90000ec705011c11ull, l_scom_buffer));
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_tl_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_tl_scom.C
index 528038c0cc6..03cd59b9148 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_tl_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_tl_scom.C
@@ -324,7 +324,7 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x5013411ull, l_scom_buffer ));
 
-            if ((l_def_X0_ENABLED && l_def_OPTICS_IS_A_BUS))
+            if ((l_def_X1_ENABLED && l_def_OPTICS_IS_A_BUS))
             {
                 l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x10 );
             }
@@ -361,7 +361,7 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x5013412ull, l_scom_buffer ));
 
-            if ((l_def_X0_ENABLED && l_def_OPTICS_IS_A_BUS))
+            if ((l_def_X2_ENABLED && l_def_OPTICS_IS_A_BUS))
             {
                 l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x10 );
             }
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C
index 3e7dc222ce6..f3d600c65cf 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C
@@ -44,31 +44,22 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS
         FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT1, l_chip_ec));
         fapi2::ATTR_OPTICS_CONFIG_MODE_Type l_TGT0_ATTR_OPTICS_CONFIG_MODE;
         FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_OPTICS_CONFIG_MODE, TGT0, l_TGT0_ATTR_OPTICS_CONFIG_MODE));
-        uint64_t l_def_OBUS_FBC_ENABLED = (l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP);
         uint64_t l_def_OBUS_NV_ENABLED = (l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_NV);
+        uint64_t l_def_OBUS_FBC_ENABLED = (l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP);
         fapi2::buffer<uint64_t> l_scom_buffer;
         {
             FAPI_TRY(fapi2::getScom( TGT0, 0x901080aull, l_scom_buffer ));
 
-            if (l_def_OBUS_FBC_ENABLED)
-            {
-                constexpr auto l_PB_IOO_LL0_CONFIG_LINK_PAIR_ON = 0x1;
-                l_scom_buffer.insert<0, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_LINK_PAIR_ON );
-            }
+            constexpr auto l_PB_IOO_LL0_CONFIG_LINK_PAIR_ON = 0x1;
+            l_scom_buffer.insert<0, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_LINK_PAIR_ON );
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
-                if (l_def_OBUS_FBC_ENABLED)
-                {
-                    l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0x0B );
-                }
+                l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0x0B );
             }
             else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
             {
-                if (l_def_OBUS_FBC_ENABLED)
-                {
-                    l_scom_buffer.insert<11, 5, 59, uint64_t>(literal_0x0B );
-                }
+                l_scom_buffer.insert<11, 5, 59, uint64_t>(literal_0x0B );
             }
 
             l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0x0 );
@@ -157,6 +148,21 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS
 
             constexpr auto l_PB_IOO_LL0_CONFIG_REPLAY_BUFFER_SIZE_REPLAY_255 = 0x2;
             l_scom_buffer.insert<56, 2, 62, uint64_t>(l_PB_IOO_LL0_CONFIG_REPLAY_BUFFER_SIZE_REPLAY_255 );
+            constexpr auto l_PB_IOO_LL0_LINK1_ELEVEN_LANE_SHIFT_ON = 0x1;
+            l_scom_buffer.insert<39, 1, 63, uint64_t>(l_PB_IOO_LL0_LINK1_ELEVEN_LANE_SHIFT_ON );
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
+            {
+                constexpr auto l_PB_IOO_LL0_LINK1_RX_LANE_SWAP_ON = 0x1;
+                l_scom_buffer.insert<42, 1, 63, uint64_t>(l_PB_IOO_LL0_LINK1_RX_LANE_SWAP_ON );
+            }
+
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
+            {
+                constexpr auto l_PB_IOO_LL0_LINK1_TX_LANE_SWAP_ON = 0x1;
+                l_scom_buffer.insert<43, 1, 63, uint64_t>(l_PB_IOO_LL0_LINK1_TX_LANE_SWAP_ON );
+            }
+
             FAPI_TRY(fapi2::putScom(TGT0, 0x901080full, l_scom_buffer));
         }
 
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C
index 1e11570caa5..f93da83b0e8 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_tl_scom.C
@@ -81,25 +81,18 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                                             || (l_TGT0_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG[literal_1] != literal_0));
         uint64_t l_def_OBUS0_FBC_ENABLED = ((l_TGT0_ATTR_PROC_FABRIC_X_ATTACHED_CHIP_CNFG[literal_3] != literal_0)
                                             || (l_TGT0_ATTR_PROC_FABRIC_A_ATTACHED_CHIP_CNFG[literal_0] != literal_0));
-        fapi2::ATTR_FREQ_O_MHZ_Type l_TGT0_ATTR_FREQ_O_MHZ;
-        FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_FREQ_O_MHZ, TGT0, l_TGT0_ATTR_FREQ_O_MHZ));
+        fapi2::ATTR_FREQ_A_MHZ_Type l_TGT1_ATTR_FREQ_A_MHZ;
+        FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_FREQ_A_MHZ, TGT1, l_TGT1_ATTR_FREQ_A_MHZ));
         fapi2::ATTR_FREQ_PB_MHZ_Type l_TGT1_ATTR_FREQ_PB_MHZ;
         FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_FREQ_PB_MHZ, TGT1, l_TGT1_ATTR_FREQ_PB_MHZ));
-        uint64_t l_def_OBUS0_LO_LIMIT_R = ((l_TGT1_ATTR_FREQ_PB_MHZ * literal_10) > (l_TGT0_ATTR_FREQ_O_MHZ[literal_0] *
-                                           literal_12));
-        uint64_t l_def_OBUS0_LO_LIMIT_D = (l_TGT0_ATTR_FREQ_O_MHZ[literal_0] * literal_10);
+        uint64_t l_def_LO_LIMIT_R = ((l_TGT1_ATTR_FREQ_PB_MHZ * literal_10) > (l_TGT1_ATTR_FREQ_A_MHZ * literal_12));
+        uint64_t l_def_OBUS0_LO_LIMIT_D = (l_TGT1_ATTR_FREQ_A_MHZ * literal_10);
         uint64_t l_def_OBUS0_LO_LIMIT_N = (l_TGT1_ATTR_FREQ_PB_MHZ * literal_154);
-        uint64_t l_def_OBUS1_LO_LIMIT_R = ((l_TGT1_ATTR_FREQ_PB_MHZ * literal_10) > (l_TGT0_ATTR_FREQ_O_MHZ[literal_1] *
-                                           literal_12));
-        uint64_t l_def_OBUS1_LO_LIMIT_D = l_TGT0_ATTR_FREQ_O_MHZ[literal_1];
+        uint64_t l_def_OBUS1_LO_LIMIT_D = l_TGT1_ATTR_FREQ_A_MHZ;
         uint64_t l_def_OBUS1_LO_LIMIT_N = (l_TGT1_ATTR_FREQ_PB_MHZ * literal_12);
-        uint64_t l_def_OBUS2_LO_LIMIT_R = ((l_TGT1_ATTR_FREQ_PB_MHZ * literal_10) > (l_TGT0_ATTR_FREQ_O_MHZ[literal_2] *
-                                           literal_12));
-        uint64_t l_def_OBUS2_LO_LIMIT_D = (l_TGT0_ATTR_FREQ_O_MHZ[literal_2] * literal_10);
+        uint64_t l_def_OBUS2_LO_LIMIT_D = (l_TGT1_ATTR_FREQ_A_MHZ * literal_10);
         uint64_t l_def_OBUS2_LO_LIMIT_N = (l_TGT1_ATTR_FREQ_PB_MHZ * literal_74);
-        uint64_t l_def_OBUS3_LO_LIMIT_R = ((l_TGT1_ATTR_FREQ_PB_MHZ * literal_10) > (l_TGT0_ATTR_FREQ_O_MHZ[literal_3] *
-                                           literal_12));
-        uint64_t l_def_OBUS3_LO_LIMIT_D = (l_TGT0_ATTR_FREQ_O_MHZ[literal_3] * literal_10);
+        uint64_t l_def_OBUS3_LO_LIMIT_D = (l_TGT1_ATTR_FREQ_A_MHZ * literal_10);
         uint64_t l_def_OBUS3_LO_LIMIT_N = (l_TGT1_ATTR_FREQ_PB_MHZ * literal_95);
         fapi2::ATTR_PROC_FABRIC_SMP_OPTICS_MODE_Type l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE;
         FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_SMP_OPTICS_MODE, TGT1, l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE));
@@ -136,7 +129,7 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                 l_scom_buffer.insert<12, 8, 56, uint64_t>(literal_0x40 );
             }
 
-            if ((l_def_OBUS0_FBC_ENABLED && (l_def_OBUS0_LO_LIMIT_R == literal_1)))
+            if ((l_def_OBUS0_FBC_ENABLED && (l_def_LO_LIMIT_R == literal_1)))
             {
                 l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x36 - (l_def_OBUS0_LO_LIMIT_N / l_def_OBUS0_LO_LIMIT_D)) );
             }
@@ -150,7 +143,7 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                 l_scom_buffer.insert<44, 8, 56, uint64_t>(literal_0x40 );
             }
 
-            if ((l_def_OBUS0_FBC_ENABLED && (l_def_OBUS0_LO_LIMIT_R == literal_1)))
+            if ((l_def_OBUS0_FBC_ENABLED && (l_def_LO_LIMIT_R == literal_1)))
             {
                 l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x36 - (l_def_OBUS0_LO_LIMIT_N / l_def_OBUS0_LO_LIMIT_D)) );
             }
@@ -174,7 +167,7 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                 l_scom_buffer.insert<12, 8, 56, uint64_t>(literal_0x40 );
             }
 
-            if ((l_def_OBUS1_FBC_ENABLED && (l_def_OBUS1_LO_LIMIT_R == literal_1)))
+            if ((l_def_OBUS1_FBC_ENABLED && (l_def_LO_LIMIT_R == literal_1)))
             {
                 l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x2A - (l_def_OBUS1_LO_LIMIT_N / l_def_OBUS1_LO_LIMIT_D)) );
             }
@@ -188,7 +181,7 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                 l_scom_buffer.insert<44, 8, 56, uint64_t>(literal_0x40 );
             }
 
-            if ((l_def_OBUS1_FBC_ENABLED && (l_def_OBUS1_LO_LIMIT_R == literal_1)))
+            if ((l_def_OBUS1_FBC_ENABLED && (l_def_LO_LIMIT_R == literal_1)))
             {
                 l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x2A - (l_def_OBUS1_LO_LIMIT_N / l_def_OBUS1_LO_LIMIT_D)) );
             }
@@ -212,7 +205,7 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                 l_scom_buffer.insert<12, 8, 56, uint64_t>(literal_0x40 );
             }
 
-            if ((l_def_OBUS2_FBC_ENABLED && (l_def_OBUS2_LO_LIMIT_R == literal_1)))
+            if ((l_def_OBUS2_FBC_ENABLED && (l_def_LO_LIMIT_R == literal_1)))
             {
                 l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x1B - (l_def_OBUS2_LO_LIMIT_N / l_def_OBUS2_LO_LIMIT_D)) );
             }
@@ -226,7 +219,7 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                 l_scom_buffer.insert<44, 8, 56, uint64_t>(literal_0x40 );
             }
 
-            if ((l_def_OBUS2_FBC_ENABLED && (l_def_OBUS2_LO_LIMIT_R == literal_1)))
+            if ((l_def_OBUS2_FBC_ENABLED && (l_def_LO_LIMIT_R == literal_1)))
             {
                 l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x1B - (l_def_OBUS2_LO_LIMIT_N / l_def_OBUS2_LO_LIMIT_D)) );
             }
@@ -250,7 +243,7 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                 l_scom_buffer.insert<12, 8, 56, uint64_t>(literal_0x40 );
             }
 
-            if ((l_def_OBUS3_FBC_ENABLED && (l_def_OBUS3_LO_LIMIT_R == literal_1)))
+            if ((l_def_OBUS3_FBC_ENABLED && (l_def_LO_LIMIT_R == literal_1)))
             {
                 l_scom_buffer.insert<4, 8, 56, uint64_t>((literal_0x22 - (l_def_OBUS3_LO_LIMIT_N / l_def_OBUS3_LO_LIMIT_D)) );
             }
@@ -264,7 +257,7 @@ fapi2::ReturnCode p9_fbc_ioo_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
                 l_scom_buffer.insert<44, 8, 56, uint64_t>(literal_0x40 );
             }
 
-            if ((l_def_OBUS3_FBC_ENABLED && (l_def_OBUS3_LO_LIMIT_R == literal_1)))
+            if ((l_def_OBUS3_FBC_ENABLED && (l_def_LO_LIMIT_R == literal_1)))
             {
                 l_scom_buffer.insert<36, 8, 56, uint64_t>((literal_0x22 - (l_def_OBUS3_LO_LIMIT_N / l_def_OBUS3_LO_LIMIT_D)) );
             }
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_no_hp_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_no_hp_scom.C
index cd52c8dae47..31f4775750d 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_no_hp_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_no_hp_scom.C
@@ -111,8 +111,7 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
-                 || ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
-                     && (l_def_NUM_X_LINKS_CFG > literal_3))))
+                 && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
                 constexpr auto l_PB_COM_PB_CFG_SP_HW_MARK_CNT_31 = 0x7cf9f;
                 l_scom_buffer.insert<16, 7, 43, uint64_t>(l_PB_COM_PB_CFG_SP_HW_MARK_CNT_31 );
@@ -124,8 +123,7 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
-                 || ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
-                     && (l_def_NUM_X_LINKS_CFG > literal_3))))
+                 && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
                 constexpr auto l_PB_COM_PB_CFG_GP_HW_MARK_CNT_32 = 0x81020;
                 l_scom_buffer.insert<23, 7, 43, uint64_t>(l_PB_COM_PB_CFG_GP_HW_MARK_CNT_32 );
@@ -155,8 +153,7 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
-                 || ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
-                     && (l_def_NUM_X_LINKS_CFG > literal_3))))
+                 && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
                 constexpr auto l_PB_COM_PB_CFG_SP_HW_MARK_CNT_31 = 0x7cf9f;
                 l_scom_buffer.insert<16, 7, 50, uint64_t>(l_PB_COM_PB_CFG_SP_HW_MARK_CNT_31 );
@@ -168,8 +165,7 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
-                 || ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
-                     && (l_def_NUM_X_LINKS_CFG > literal_3))))
+                 && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
                 constexpr auto l_PB_COM_PB_CFG_GP_HW_MARK_CNT_32 = 0x81020;
                 l_scom_buffer.insert<23, 7, 50, uint64_t>(l_PB_COM_PB_CFG_GP_HW_MARK_CNT_32 );
@@ -1701,8 +1697,7 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
-                 || ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
-                     && (l_def_NUM_X_LINKS_CFG > literal_3))))
+                 && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
                 constexpr auto l_PB_COM_PB_CFG_SP_HW_MARK_CNT_31 = 0x7cf9f;
                 l_scom_buffer.insert<16, 7, 57, uint64_t>(l_PB_COM_PB_CFG_SP_HW_MARK_CNT_31 );
@@ -1714,8 +1709,7 @@ fapi2::ReturnCode p9_fbc_no_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
             }
 
             if (((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE != fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
-                 || ((l_TGT1_ATTR_PROC_FABRIC_PUMP_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_PUMP_MODE_CHIP_IS_GROUP)
-                     && (l_def_NUM_X_LINKS_CFG > literal_3))))
+                 && (l_def_NUM_X_LINKS_CFG > literal_3)))
             {
                 constexpr auto l_PB_COM_PB_CFG_GP_HW_MARK_CNT_32 = 0x81020;
                 l_scom_buffer.insert<23, 7, 57, uint64_t>(l_PB_COM_PB_CFG_GP_HW_MARK_CNT_32 );
diff --git a/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
index e0cdeeef81c..d660ac2d526 100644
--- a/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
@@ -3686,22 +3686,6 @@
   <!-- ******************************************************************** -->
   <!-- End Memory Section                                                   -->
   <!-- ******************************************************************** -->
-  <attribute>
-    <id>ATTR_CHIP_EC_FEATURE_NOT_HW399276</id>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-      True if chip does not comtain HW399276 defect
-    </description>
-    <chipEcFeature>
-      <chip>
-        <name>ENUM_ATTR_NAME_NIMBUS</name>
-        <ec>
-          <value>0x20</value>
-          <test>LESS_THAN</test>
-        </ec>
-      </chip>
-    </chipEcFeature>
-  </attribute>
 
   <attribute>
     <id>ATTR_CHIP_EC_FEATURE_HW368644</id>
@@ -4014,6 +3998,31 @@
       </chip>
     </chipEcFeature>
   </attribute>
+
+  <attribute>
+    <id>ATTR_CHIP_EC_FEATURE_HW412371</id>
+    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+    <description>
+      Workaround for HW412371 wrong lane getting trained in 11 lane mode. fixed in p9c dd1.1
+      Cumulus EC greater than 10
+    </description>
+    <chipEcFeature>
+      <chip>
+        <name>ENUM_ATTR_NAME_NIMBUS</name>
+        <ec>
+          <value>0x10</value>
+          <test>GREATER_THAN</test>
+        </ec>
+      </chip>
+      <chip>
+        <name>ENUM_ATTR_NAME_CUMULUS</name>
+        <ec>
+          <value>0x10</value>
+          <test>LESS_THAN_OR_EQUAL</test>
+        </ec>
+      </chip>
+    </chipEcFeature>
+  </attribute>
   <!-- ******************************************************************** -->
   <attribute>
     <id>ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY</id>