p9.npu.scom.initfile -- Nimbus DD2 updates

  mask NPU.IDIAL_SM_MASK_NLGX_0 for all ECs
  set NPU.CONFIG_DISABLE_VG_NOT_SYS for all ECs

Change-Id: Ief91a75430932f01d643cadee60f3d707e1ea048
CQ: HW413726
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42691
Reviewed-by: RYAN BLACK <rblack@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jenny Huynh <jhuynh@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42693
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
Tested-by: Dean Sanner <dsanner@us.ibm.com>

2 files changed, 194 insertions, 42 deletions

diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C
index c3e8dc399..ac561060d 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C
@@ -96,6 +96,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
             }
 
+            if (literal_1)
+            {
+                l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+            }
+
             if ((l_def_NVLINK_ACTIVE == literal_1))
             {
                 l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0x1 );
@@ -154,13 +159,10 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             FAPI_TRY(fapi2::putScom(TGT0, 0x5011008ull, l_scom_buffer));
         }
         {
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
-            {
-                FAPI_TRY(fapi2::getScom( TGT0, 0x501101bull, l_scom_buffer ));
+            FAPI_TRY(fapi2::getScom( TGT0, 0x501101bull, l_scom_buffer ));
 
-                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
-                FAPI_TRY(fapi2::putScom(TGT0, 0x501101bull, l_scom_buffer));
-            }
+            l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
+            FAPI_TRY(fapi2::putScom(TGT0, 0x501101bull, l_scom_buffer));
         }
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
@@ -174,6 +176,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
 
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
                     l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0x1 );
@@ -250,6 +257,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
 
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
                     l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0x1 );
@@ -335,6 +347,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
 
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
                     l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0x1 );
@@ -400,6 +417,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             }
         }
         {
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
+            {
+                FAPI_TRY(fapi2::getScom( TGT0, 0x501104bull, l_scom_buffer ));
+
+                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
+                FAPI_TRY(fapi2::putScom(TGT0, 0x501104bull, l_scom_buffer));
+            }
+        }
+        {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x501105bull, l_scom_buffer ));
@@ -418,6 +444,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
             }
 
+            if (literal_1)
+            {
+                l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+            }
+
             if ((l_def_NVLINK_ACTIVE == literal_1))
             {
                 l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0x1 );
@@ -476,13 +507,10 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             FAPI_TRY(fapi2::putScom(TGT0, 0x5011068ull, l_scom_buffer));
         }
         {
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
-            {
-                FAPI_TRY(fapi2::getScom( TGT0, 0x501107bull, l_scom_buffer ));
+            FAPI_TRY(fapi2::getScom( TGT0, 0x501107bull, l_scom_buffer ));
 
-                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
-                FAPI_TRY(fapi2::putScom(TGT0, 0x501107bull, l_scom_buffer));
-            }
+            l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
+            FAPI_TRY(fapi2::putScom(TGT0, 0x501107bull, l_scom_buffer));
         }
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
@@ -570,6 +598,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 {
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
+
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
             }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
@@ -647,6 +680,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
             {
+                FAPI_TRY(fapi2::getScom( TGT0, 0x50110abull, l_scom_buffer ));
+
+                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
+                FAPI_TRY(fapi2::putScom(TGT0, 0x50110abull, l_scom_buffer));
+            }
+        }
+        {
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
+            {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x50110c0ull, l_scom_buffer ));
 
                 l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 );
@@ -724,6 +766,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
 
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
                     l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0x1 );
@@ -809,6 +856,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
 
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
                     l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0x1 );
@@ -894,6 +946,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
 
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
                     l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0x1 );
@@ -979,6 +1036,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
 
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
                     l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0x1 );
@@ -1131,6 +1193,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 {
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
+
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
             }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
@@ -1139,6 +1206,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 {
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
+
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
             }
 
             if ((l_def_NVLINK_ACTIVE == literal_1))
@@ -1227,13 +1299,10 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             FAPI_TRY(fapi2::putScom(TGT0, 0x5011208ull, l_scom_buffer));
         }
         {
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
-            {
-                FAPI_TRY(fapi2::getScom( TGT0, 0x501121bull, l_scom_buffer ));
+            FAPI_TRY(fapi2::getScom( TGT0, 0x501121bull, l_scom_buffer ));
 
-                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
-                FAPI_TRY(fapi2::putScom(TGT0, 0x501121bull, l_scom_buffer));
-            }
+            l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
+            FAPI_TRY(fapi2::putScom(TGT0, 0x501121bull, l_scom_buffer));
         }
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
@@ -1247,6 +1316,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
 
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
                     l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0x1 );
@@ -1351,6 +1425,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
 
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
                     l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0x1 );
@@ -1436,6 +1515,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
 
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
                     l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0x1 );
@@ -1529,6 +1613,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             }
         }
         {
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
+            {
+                FAPI_TRY(fapi2::getScom( TGT0, 0x501124bull, l_scom_buffer ));
+
+                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
+                FAPI_TRY(fapi2::putScom(TGT0, 0x501124bull, l_scom_buffer));
+            }
+        }
+        {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
             {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x501125bull, l_scom_buffer ));
@@ -1548,6 +1641,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 {
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
+
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
             }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
@@ -1556,6 +1654,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 {
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
+
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
             }
 
             if ((l_def_NVLINK_ACTIVE == literal_1))
@@ -1644,13 +1747,10 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             FAPI_TRY(fapi2::putScom(TGT0, 0x5011268ull, l_scom_buffer));
         }
         {
-            if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
-            {
-                FAPI_TRY(fapi2::getScom( TGT0, 0x501127bull, l_scom_buffer ));
+            FAPI_TRY(fapi2::getScom( TGT0, 0x501127bull, l_scom_buffer ));
 
-                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
-                FAPI_TRY(fapi2::putScom(TGT0, 0x501127bull, l_scom_buffer));
-            }
+            l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
+            FAPI_TRY(fapi2::putScom(TGT0, 0x501127bull, l_scom_buffer));
         }
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
@@ -1738,6 +1838,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 {
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
+
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
             }
 
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
@@ -1815,6 +1920,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
             {
+                FAPI_TRY(fapi2::getScom( TGT0, 0x50112abull, l_scom_buffer ));
+
+                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
+                FAPI_TRY(fapi2::putScom(TGT0, 0x50112abull, l_scom_buffer));
+            }
+        }
+        {
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
+            {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x50112c0ull, l_scom_buffer ));
 
                 l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 );
@@ -1998,6 +2112,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
 
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
                     l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0x1 );
@@ -2140,6 +2259,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
             {
+                FAPI_TRY(fapi2::getScom( TGT0, 0x501141bull, l_scom_buffer ));
+
+                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
+                FAPI_TRY(fapi2::putScom(TGT0, 0x501141bull, l_scom_buffer));
+            }
+        }
+        {
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
+            {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x5011430ull, l_scom_buffer ));
 
                 l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 );
@@ -2149,6 +2277,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
 
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
                     l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0x1 );
@@ -2287,6 +2420,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
             {
+                FAPI_TRY(fapi2::getScom( TGT0, 0x501144bull, l_scom_buffer ));
+
+                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
+                FAPI_TRY(fapi2::putScom(TGT0, 0x501144bull, l_scom_buffer));
+            }
+        }
+        {
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
+            {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x5011460ull, l_scom_buffer ));
 
                 l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 );
@@ -2296,6 +2438,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
 
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
                     l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0x1 );
@@ -2391,6 +2538,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
             {
+                FAPI_TRY(fapi2::getScom( TGT0, 0x501147bull, l_scom_buffer ));
+
+                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
+                FAPI_TRY(fapi2::putScom(TGT0, 0x501147bull, l_scom_buffer));
+            }
+        }
+        {
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
+            {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x5011490ull, l_scom_buffer ));
 
                 l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 );
@@ -2400,6 +2556,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                     l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 );
                 }
 
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
                     l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0x1 );
@@ -2495,6 +2656,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
         {
             if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
             {
+                FAPI_TRY(fapi2::getScom( TGT0, 0x50114abull, l_scom_buffer ));
+
+                l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
+                FAPI_TRY(fapi2::putScom(TGT0, 0x50114abull, l_scom_buffer));
+            }
+        }
+        {
+            if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
+            {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x50114c0ull, l_scom_buffer ));
 
                 l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 );
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 d660ac2d5..bd5734169 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
@@ -2315,24 +2315,6 @@
   </attribute>
   <!-- ******************************************************************** -->
   <attribute>
-    <id>ATTR_CHIP_EC_FEATURE_HW363780</id>>
-    <targetType>TARGET_TYPE_PROC_CHIP</targetType>
-    <description>
-      Nimbus DD1: NPU incorrectly asserts FIR for any rcmd snoops that
-      misses its table lookup, includes commands that it does not master
-    </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_HW403465</id>>
     <targetType>TARGET_TYPE_PROC_CHIP</targetType>
     <description>