diff options
| author | Jennifer A. Stofer <stofer@us.ibm.com> | 2017-12-08 10:41:23 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-12-11 10:49:28 -0500 |
| commit | a8ef67b96804c2d6449e92bd751e923696b7c323 (patch) | |
| tree | 269da54d377bf3a63f8a4839cc6516c283c0431e /src/import/chips/p9/procedures/hwp/initfiles/p9_vas_scom.C | |
| parent | 52c557d1409b8422c08ad67b8c03d6c8ffdabd35 (diff) | |
| download | talos-hostboot-a8ef67b96804c2d6449e92bd751e923696b7c323.tar.gz talos-hostboot-a8ef67b96804c2d6449e92bd751e923696b7c323.zip | |
Revert "Adding p9a support."
This reverts commit 41352b2d444e98639eedc06b1eb0d8da89d4adb3.
Change-Id: Ic3f2099eff3f5c942ef8fb6916e8ee78ca1a9e82
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50703
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50723
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>
Diffstat (limited to 'src/import/chips/p9/procedures/hwp/initfiles/p9_vas_scom.C')
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/initfiles/p9_vas_scom.C | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_vas_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_vas_scom.C index 08b2f2192..193d6d1bf 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_vas_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_vas_scom.C @@ -118,26 +118,21 @@ fapi2::ReturnCode p9_vas_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } { - if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((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 == 0x6) && (l_chip_ec == 0x10)) - || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) ) - { - FAPI_TRY(fapi2::getScom( TGT0, 0x301184dull, 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 == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) ) - { - l_scom_buffer.insert<0, 4, 60, uint64_t>(l_TGT1_ATTR_FABRIC_ADDR_EXTENSION_GROUP_ID ); - l_scom_buffer.insert<4, 3, 61, uint64_t>(l_TGT1_ATTR_FABRIC_ADDR_EXTENSION_CHIP_ID ); - } + FAPI_TRY(fapi2::getScom( TGT0, 0x301184dull, l_scom_buffer )); - if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) - { - l_scom_buffer.insert<19, 1, 63, uint64_t>(literal_0x1 ); - } + 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 == 0x6) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x11)) ) + { + l_scom_buffer.insert<0, 4, 60, uint64_t>(l_TGT1_ATTR_FABRIC_ADDR_EXTENSION_GROUP_ID ); + l_scom_buffer.insert<4, 3, 61, uint64_t>(l_TGT1_ATTR_FABRIC_ADDR_EXTENSION_CHIP_ID ); + } - FAPI_TRY(fapi2::putScom(TGT0, 0x301184dull, l_scom_buffer)); + if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) ) + { + l_scom_buffer.insert<19, 1, 63, uint64_t>(literal_0x1 ); } + + FAPI_TRY(fapi2::putScom(TGT0, 0x301184dull, l_scom_buffer)); } { FAPI_TRY(fapi2::getScom( TGT0, 0x301184eull, l_scom_buffer )); |
