Update npu initfiles for Axone

Change-Id: Ie33a3b4dc17f4c4ebd49b6799b9032a2b3aaab09
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77847
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@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>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Reviewed-by: NICHOLAS J. OLLERICH <njolleri@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77890
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: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 212 insertions, 19 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 e36053acd..b8ee5a22d 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
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2019                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -44,6 +44,7 @@ constexpr uint64_t literal_0x200 = 0x200;
 constexpr uint64_t literal_0x300 = 0x300;
 constexpr uint64_t literal_0xFFF = 0xFFF;
 constexpr uint64_t literal_0x8 = 0x8;
+constexpr uint64_t literal_0x7E = 0x7E;
 constexpr uint64_t literal_0x0 = 0x0;
 constexpr uint64_t literal_0xE000000000000000 = 0xE000000000000000;
 constexpr uint64_t literal_0x0000740000000000 = 0x0000740000000000;
@@ -70,7 +71,6 @@ constexpr uint64_t literal_0x66 = 0x66;
 constexpr uint64_t literal_0b01 = 0b01;
 constexpr uint64_t literal_0x67 = 0x67;
 constexpr uint64_t literal_0x4B = 0x4B;
-constexpr uint64_t literal_0x7E = 0x7E;
 constexpr uint64_t literal_0x009A48180F63FFFF = 0x009A48180F63FFFF;
 constexpr uint64_t literal_0x009A48180F03FFFF = 0x009A48180F03FFFF;
 constexpr uint64_t literal_0x8005000200100000 = 0x8005000200100000;
@@ -133,6 +133,16 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
 
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
+                    l_scom_buffer.insert<26, 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<32, 1, 63, uint64_t>(literal_0x1 );
                 }
 
@@ -218,6 +228,16 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
 
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
+                    l_scom_buffer.insert<26, 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<32, 1, 63, uint64_t>(literal_0x1 );
                 }
 
@@ -303,6 +323,16 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
 
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
+                    l_scom_buffer.insert<26, 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<32, 1, 63, uint64_t>(literal_0x1 );
                 }
 
@@ -388,6 +418,16 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
 
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
+                    l_scom_buffer.insert<26, 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<32, 1, 63, uint64_t>(literal_0x1 );
                 }
 
@@ -558,6 +598,32 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
         {
             if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
             {
+                FAPI_TRY(fapi2::getScom( TGT0, 0x3011e2aull, l_scom_buffer ));
+
+                if ((l_def_NVLINK_ACTIVE == literal_1))
+                {
+                    l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x7E );
+                }
+
+                FAPI_TRY(fapi2::putScom(TGT0, 0x3011e2aull, l_scom_buffer));
+            }
+        }
+        {
+            if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                FAPI_TRY(fapi2::getScom( TGT0, 0x3011e5aull, l_scom_buffer ));
+
+                if ((l_def_NVLINK_ACTIVE == literal_1))
+                {
+                    l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x7E );
+                }
+
+                FAPI_TRY(fapi2::putScom(TGT0, 0x3011e5aull, l_scom_buffer));
+            }
+        }
+        {
+            if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x3011ef5ull, l_scom_buffer ));
 
                 if ((l_def_NVLINK_ACTIVE == literal_1))
@@ -878,6 +944,19 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             {
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
+                    l_scom_buffer.insert<26, 1, 63, uint64_t>(literal_0x1 );
+                }
+
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+            }
+
+            if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                if ((l_def_NVLINK_ACTIVE == literal_1))
+                {
                     l_scom_buffer.insert<32, 1, 63, uint64_t>(literal_0x1 );
                 }
             }
@@ -1862,6 +1941,19 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             {
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
+                    l_scom_buffer.insert<26, 1, 63, uint64_t>(literal_0x1 );
+                }
+
+                if (literal_1)
+                {
+                    l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                }
+            }
+
+            if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                if ((l_def_NVLINK_ACTIVE == literal_1))
+                {
                     l_scom_buffer.insert<32, 1, 63, uint64_t>(literal_0x1 );
                 }
             }
@@ -2590,6 +2682,19 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 {
                     if ((l_def_NVLINK_ACTIVE == literal_1))
                     {
+                        l_scom_buffer.insert<26, 1, 63, uint64_t>(literal_0x1 );
+                    }
+
+                    if (literal_1)
+                    {
+                        l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                    }
+                }
+
+                if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+                {
+                    if ((l_def_NVLINK_ACTIVE == literal_1))
+                    {
                         l_scom_buffer.insert<32, 1, 63, uint64_t>(literal_0x1 );
                     }
                 }
@@ -2955,6 +3060,19 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 {
                     if ((l_def_NVLINK_ACTIVE == literal_1))
                     {
+                        l_scom_buffer.insert<26, 1, 63, uint64_t>(literal_0x1 );
+                    }
+
+                    if (literal_1)
+                    {
+                        l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                    }
+                }
+
+                if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+                {
+                    if ((l_def_NVLINK_ACTIVE == literal_1))
+                    {
                         l_scom_buffer.insert<32, 1, 63, uint64_t>(literal_0x1 );
                     }
                 }
@@ -5526,22 +5644,22 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x501138aull, l_scom_buffer ));
 
-                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
+                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)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                    || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                            && (l_chip_ec == 0x13)) )
                 {
                     if ((l_def_NVLINK_ACTIVE == literal_1))
                     {
-                        l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x7F60B04500AC0000 );
+                        l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x7E );
                     }
                 }
 
-                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)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
-                    || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
-                            && (l_chip_ec == 0x13)) )
+                if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
                 {
                     if ((l_def_NVLINK_ACTIVE == literal_1))
                     {
-                        l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x7E );
+                        l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x7F60B04500AC0000 );
                     }
                 }
 
@@ -5670,6 +5788,19 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 {
                     if ((l_def_NVLINK_ACTIVE == literal_1))
                     {
+                        l_scom_buffer.insert<26, 1, 63, uint64_t>(literal_0x1 );
+                    }
+
+                    if (literal_1)
+                    {
+                        l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                    }
+                }
+
+                if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+                {
+                    if ((l_def_NVLINK_ACTIVE == literal_1))
+                    {
                         l_scom_buffer.insert<32, 1, 63, uint64_t>(literal_0x1 );
                     }
                 }
@@ -6378,6 +6509,19 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 {
                     if ((l_def_NVLINK_ACTIVE == literal_1))
                     {
+                        l_scom_buffer.insert<26, 1, 63, uint64_t>(literal_0x1 );
+                    }
+
+                    if (literal_1)
+                    {
+                        l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                    }
+                }
+
+                if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+                {
+                    if ((l_def_NVLINK_ACTIVE == literal_1))
+                    {
                         l_scom_buffer.insert<32, 1, 63, uint64_t>(literal_0x1 );
                     }
                 }
@@ -6970,6 +7114,19 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 {
                     if ((l_def_NVLINK_ACTIVE == literal_1))
                     {
+                        l_scom_buffer.insert<26, 1, 63, uint64_t>(literal_0x1 );
+                    }
+
+                    if (literal_1)
+                    {
+                        l_scom_buffer.insert<6, 1, 63, uint64_t>(literal_0x1 );
+                    }
+                }
+
+                if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+                {
+                    if ((l_def_NVLINK_ACTIVE == literal_1))
+                    {
                         l_scom_buffer.insert<32, 1, 63, uint64_t>(literal_0x1 );
                     }
                 }
@@ -7090,6 +7247,16 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
 
                 if ((l_def_NVLINK_ACTIVE == literal_1))
                 {
+                    l_scom_buffer.insert<26, 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<32, 1, 63, uint64_t>(literal_0x1 );
                 }
 
@@ -7230,11 +7397,14 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             {
                 FAPI_TRY(fapi2::getScom( TGT0, 0x501158aull, l_scom_buffer ));
 
-                if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+                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)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
+                    || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
+                            && (l_chip_ec == 0x13)) )
                 {
                     if ((l_def_NVLINK_ACTIVE == literal_1))
                     {
-                        l_scom_buffer.insert<1, 3, 61, uint64_t>(literal_0x4 );
+                        l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x7E );
                     }
                 }
 
@@ -7242,7 +7412,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 {
                     if ((l_def_NVLINK_ACTIVE == literal_1))
                     {
-                        l_scom_buffer.insert<4, 10, 54, uint64_t>(literal_0x100 );
+                        l_scom_buffer.insert<1, 3, 61, uint64_t>(literal_0x4 );
                     }
                 }
 
@@ -7250,7 +7420,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 {
                     if ((l_def_NVLINK_ACTIVE == literal_1))
                     {
-                        l_scom_buffer.insert<14, 10, 54, uint64_t>(literal_0x200 );
+                        l_scom_buffer.insert<4, 10, 54, uint64_t>(literal_0x100 );
                     }
                 }
 
@@ -7258,18 +7428,15 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
                 {
                     if ((l_def_NVLINK_ACTIVE == literal_1))
                     {
-                        l_scom_buffer.insert<24, 10, 54, uint64_t>(literal_0x300 );
+                        l_scom_buffer.insert<14, 10, 54, uint64_t>(literal_0x200 );
                     }
                 }
 
-                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)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
-                    || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
-                            && (l_chip_ec == 0x13)) )
+                if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
                 {
                     if ((l_def_NVLINK_ACTIVE == literal_1))
                     {
-                        l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x7E );
+                        l_scom_buffer.insert<24, 10, 54, uint64_t>(literal_0x300 );
                     }
                 }
 
@@ -7300,6 +7467,19 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             }
         }
         {
+            if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                FAPI_TRY(fapi2::getScom( TGT0, 0x501162aull, l_scom_buffer ));
+
+                if ((l_def_NVLINK_ACTIVE == literal_1))
+                {
+                    l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x7E );
+                }
+
+                FAPI_TRY(fapi2::putScom(TGT0, 0x501162aull, l_scom_buffer));
+            }
+        }
+        {
             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)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
                 || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)
@@ -7321,6 +7501,19 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             }
         }
         {
+            if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
+            {
+                FAPI_TRY(fapi2::getScom( TGT0, 0x501165aull, l_scom_buffer ));
+
+                if ((l_def_NVLINK_ACTIVE == literal_1))
+                {
+                    l_scom_buffer.insert<32, 8, 56, uint64_t>(literal_0x7E );
+                }
+
+                FAPI_TRY(fapi2::putScom(TGT0, 0x501165aull, l_scom_buffer));
+            }
+        }
+        {
             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)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
                 || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x12)) || ((l_chip_id == 0x6)