From 5e1f534a38ba19e043a2eec005d9c5f7a92d61ba Mon Sep 17 00:00:00 2001 From: Ben Gass Date: Wed, 24 Oct 2018 13:10:06 -0500 Subject: Adjust MI/MCC p9a scom translation for PB scoms Change-Id: I3680ec9a15e3e82f6cbb6e3a485ecf49e5b77ac1 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/67955 Tested-by: Jenkins Server Tested-by: HWSV CI Tested-by: Hostboot CI Reviewed-by: Brent Wieman Reviewed-by: Benjamin Gass Dev-Ready: Benjamin Gass Reviewed-by: Jennifer A. Stofer Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/67966 Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Tested-by: Jenkins OP HW Reviewed-by: Daniel M. Crowell --- src/import/chips/p9/common/scominfo/p9_scominfo.C | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/import/chips/p9/common/scominfo/p9_scominfo.C b/src/import/chips/p9/common/scominfo/p9_scominfo.C index 84295515d..a00dee19d 100644 --- a/src/import/chips/p9/common/scominfo/p9_scominfo.C +++ b/src/import/chips/p9/common/scominfo/p9_scominfo.C @@ -648,7 +648,7 @@ extern "C" uint32_t p9_scominfo_xlate_mi(bool& o_chipUnitRelated, std::vector& o_chipUnitPairing, - p9_scom_addr& i_scom, const p9ChipUnits_t mcc_dmi, const uint32_t i_mode) + p9_scom_addr& i_scom, const p9ChipUnits_t mcc_dmi, const int i_low0, const int i_low1, const uint32_t i_mode) { uint8_t l_chiplet_id = i_scom.get_chiplet_id(); uint8_t l_port = i_scom.get_port(); @@ -675,8 +675,8 @@ extern "C" //DMI5 03 02 0 0x3X (X <= 0xB) //DMI6 03 02 2 0x2X (X <= 0xB) //DMI7 03 02 2 0x3X (X <= 0xB) - if ((0x20 <= l_sat_offset && l_sat_offset <= 0x2B) || - (0x30 <= l_sat_offset && l_sat_offset <= 0x3B)) + if ((i_low0 <= l_sat_offset && l_sat_offset <= 0x2B) || + (i_low1 <= l_sat_offset && l_sat_offset <= 0x3B)) { uint8_t l_off_nib0 = (l_sat_offset >> 4); o_chipUnitRelated = true; @@ -901,7 +901,7 @@ extern "C" else if (i_mode == P9C_DD1_SI_MODE || i_mode == P9C_DD2_SI_MODE) { //==== CUMULUS MC/MI/DMI================================================================================== - rc = p9_scominfo_xlate_mi(o_chipUnitRelated, o_chipUnitPairing, l_scom, PU_DMI_CHIPUNIT, i_mode); + rc = p9_scominfo_xlate_mi(o_chipUnitRelated, o_chipUnitPairing, l_scom, PU_DMI_CHIPUNIT, 0x20, 0x30, i_mode); if (rc) { @@ -1086,7 +1086,7 @@ extern "C" else { //==== AXONE MC/MI/OMIC/OMI ============================================================================ - rc = p9_scominfo_xlate_mi(o_chipUnitRelated, o_chipUnitPairing, l_scom, PU_MCC_CHIPUNIT, i_mode); + rc = p9_scominfo_xlate_mi(o_chipUnitRelated, o_chipUnitPairing, l_scom, PU_MCC_CHIPUNIT, 0x23, 0x33, i_mode); if (rc) { -- cgit v1.2.3