Skip to content

Commit

Permalink
NMMU FIR, RAS XML updates for Nimbus DD2
Browse files Browse the repository at this point in the history 
fir_nmmufir.xml:
  bit 9: recoverable, self_th_1
  bit 10: mask

fir_nmmucqfir.xml
  bit 4 - recoverable, self_th_1
  bit 5 - masked
  bit 11 - recoverable, threshold_and_mask
  bit 15 - recoverable, threshold_and_mask
  bit 29 - masked
  bit 37 - recoverable, self_th_1
  bit 45 - masked

rebase to pick up changes for HW414700, apply for DD2.0 only

Change-Id: I1164cefddab6ba693050dd07b10ffc8e28ae586b
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42953
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: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-by: Kevin F. Reick <reick@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42957
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Dean Sanner <dsanner@us.ibm.com>
  • Loading branch information
@jjmcgill @sannerd
jjmcgill authored and sannerd committed Jul 19, 2017
1 parent 543d555 commit def5f05
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_mmu_scom.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ constexpr uint64_t literal_0 = 0;
constexpr uint64_t literal_0x04047C0000000000 = 0x04047C0000000000;
constexpr uint64_t literal_0x04247C0000000000 = 0x04247C0000000000;
constexpr uint64_t literal_0x0000000000000000 = 0x0000000000000000;
constexpr uint64_t literal_0x40B2000000000000 = 0x40B2000000000000;
constexpr uint64_t literal_0x409B000000000000 = 0x409B000000000000;
constexpr uint64_t literal_0x40FB000000000000 = 0x40FB000000000000;
constexpr uint64_t literal_0x4092000000000000 = 0x4092000000000000;
constexpr uint64_t literal_0x40DB000000000000 = 0x40DB000000000000;
constexpr uint64_t literal_0x3 = 0x3;
constexpr uint64_t literal_0x1 = 0x1;
constexpr uint64_t literal_0x0000FAF800FF = 0x0000FAF800FF;
constexpr uint64_t literal_0x0000FAFC00FB = 0x0000FAFC00FB;
constexpr uint64_t literal_0x0400FAFC00FF = 0x0400FAFC00FF;
constexpr uint64_t literal_0x000000000000 = 0x000000000000;
constexpr uint64_t literal_0x951100000F04 = 0x951100000F04;
constexpr uint64_t literal_0x910000040F00 = 0x910000040F00;
constexpr uint64_t literal_0x9D1100000F04 = 0x9D1100000F04;
constexpr uint64_t literal_0x911100000F00 = 0x911100000F00;
constexpr uint64_t literal_0x991100000F00 = 0x991100000F00;
constexpr uint64_t literal_0b11111 = 0b11111;
constexpr uint64_t literal_0x00E = 0x00E;
constexpr uint64_t literal_0x000 = 0x000;
Expand Down Expand Up @@ -91,17 +91,17 @@ fapi2::ReturnCode p9_mmu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5012c07ull, l_scom_buffer ));

if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW414700 != literal_0))
if ((l_TGT0_ATTR_CHIP_EC_FEATURE_NMMU_NDD1 != literal_0))
{
l_scom_buffer.insert<0, 22, 0, uint64_t>(literal_0x40B2000000000000 );
l_scom_buffer.insert<0, 22, 0, uint64_t>(literal_0x409B000000000000 );
}
else if ((l_TGT0_ATTR_CHIP_EC_FEATURE_NMMU_NDD1 != literal_0))
else if (((l_TGT0_ATTR_CHIP_EC_FEATURE_NMMU_NDD1 == literal_0) && (l_TGT0_ATTR_CHIP_EC_FEATURE_HW414700 != literal_0)))
{
l_scom_buffer.insert<0, 22, 0, uint64_t>(literal_0x409B000000000000 );
l_scom_buffer.insert<0, 22, 0, uint64_t>(literal_0x4092000000000000 );
}
else if ((l_TGT0_ATTR_CHIP_EC_FEATURE_NMMU_NDD1 == literal_0))
else if (((l_TGT0_ATTR_CHIP_EC_FEATURE_NMMU_NDD1 == literal_0) && (l_TGT0_ATTR_CHIP_EC_FEATURE_HW414700 == literal_0)))
{
l_scom_buffer.insert<0, 22, 0, uint64_t>(literal_0x40FB000000000000 );
l_scom_buffer.insert<0, 22, 0, uint64_t>(literal_0x40DB000000000000 );
}

FAPI_TRY(fapi2::putScom(TGT0, 0x5012c07ull, l_scom_buffer));
Expand Down Expand Up @@ -150,7 +150,7 @@ fapi2::ReturnCode p9_mmu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
}
else if ((l_TGT0_ATTR_CHIP_EC_FEATURE_NMMU_NDD1 == literal_0))
{
l_scom_buffer.insert<0, 48, 16, uint64_t>(literal_0x0000FAFC00FB );
l_scom_buffer.insert<0, 48, 16, uint64_t>(literal_0x0400FAFC00FF );
}

FAPI_TRY(fapi2::putScom(TGT0, 0x5012c43ull, l_scom_buffer));
Expand All @@ -164,17 +164,17 @@ fapi2::ReturnCode p9_mmu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5012c47ull, l_scom_buffer ));

if ((l_TGT0_ATTR_CHIP_EC_FEATURE_HW414700 != literal_0))
if ((l_TGT0_ATTR_CHIP_EC_FEATURE_NMMU_NDD1 != literal_0))
{
l_scom_buffer.insert<0, 48, 16, uint64_t>(literal_0x951100000F04 );
l_scom_buffer.insert<0, 48, 16, uint64_t>(literal_0x910000040F00 );
}
else if ((l_TGT0_ATTR_CHIP_EC_FEATURE_NMMU_NDD1 != literal_0))
else if (((l_TGT0_ATTR_CHIP_EC_FEATURE_NMMU_NDD1 == literal_0) && (l_TGT0_ATTR_CHIP_EC_FEATURE_HW414700 != literal_0)))
{
l_scom_buffer.insert<0, 48, 16, uint64_t>(literal_0x910000040F00 );
l_scom_buffer.insert<0, 48, 16, uint64_t>(literal_0x911100000F00 );
}
else if ((l_TGT0_ATTR_CHIP_EC_FEATURE_NMMU_NDD1 == literal_0))
else if (((l_TGT0_ATTR_CHIP_EC_FEATURE_NMMU_NDD1 == literal_0) && (l_TGT0_ATTR_CHIP_EC_FEATURE_HW414700 == literal_0)))
{
l_scom_buffer.insert<0, 48, 16, uint64_t>(literal_0x9D1100000F04 );
l_scom_buffer.insert<0, 48, 16, uint64_t>(literal_0x991100000F00 );
}

FAPI_TRY(fapi2::putScom(TGT0, 0x5012c47ull, l_scom_buffer));
Expand Down

0 comments on commit def5f05

Please sign in to comment.