Remove override flag for ATTR_MSS_MRW_ALLOW_UNSUPPORTED_RCW, deconfig…

… update Change-Id: I7682d9e12c0f47ea6527649250864d16d9344010 RTC: 187573 CQ: SW416637 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53638 Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com> Reviewed-by: Louis Stermole <stermole@us.ibm.com> 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: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53666 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>
open-power · Mar 7, 2018 · d9cde73 · d9cde73
1 parent 4eaf644
commit d9cde73
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_factory.C b/src/import/chips/p9/procedures/hwp/memory/lib/spd/spd_factory.C
@@ -1096,6 +1096,7 @@ fapi2::ReturnCode find_raw_card_helper( const fapi2::Target<TARGET_TYPE_DIMM>& i
                                         rcw_settings& o_raw_card)
 {
     fapi2::ReturnCode l_rc(fapi2::FAPI2_RC_SUCCESS);
+    const auto l_mca = mss::find_target<fapi2::TARGET_TYPE_MCA>(i_target);
 
     FAPI_INF("Unsupported raw cards %s allowed for %s",
              i_mrw_supported_rc ? "are" : "are NOT",
@@ -1105,11 +1106,12 @@ fapi2::ReturnCode find_raw_card_helper( const fapi2::Target<TARGET_TYPE_DIMM>& i
                 fapi2::MSS_INVALID_RAW_CARD(fapi2::FAPI2_ERRL_SEV_RECOVERED, l_rc)
                 .set_DIMM_TYPE(i_dimm_type)
                 .set_RAW_CARD_REV(i_ref_raw_card_rev)
-                .set_DIMM_TARGET(i_target),
+                .set_DIMM_TARGET(i_target)
+                .set_MCA_TARGET(l_mca),
                 "Invalid reference raw card received for %s: %d for %s",
                 (i_dimm_type == fapi2::ENUM_ATTR_EFF_DIMM_TYPE_RDIMM) ? "RDIMM" : "LRDIMM",
                 i_ref_raw_card_rev,
-                mss::c_str(i_target) );
+                mss::c_str(i_target));
 
     return fapi2::FAPI2_RC_SUCCESS;
 

diff --git a/src/import/chips/p9/procedures/xml/attribute_info/memory_mrw_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/memory_mrw_attributes.xml
@@ -662,7 +662,6 @@
     <valueType>uint8</valueType>
     <platInit/>
     <default> 1  </default>
-    <overrideOnly/>
     <enum> DISABLE = 0, ENABLE = 1 </enum>
     <mssAccessorName>mrw_allow_unsupported_rcw</mssAccessorName>
   </attribute>

diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_spd_decode.xml b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_spd_decode.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER HostBoot Project                                             -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2015,2017                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2018                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -105,7 +105,7 @@
       <priority>LOW</priority>
     </callout>
     <deconfigure>
-      <target>DIMM_TARGET</target>
+      <target>MCA_TARGET</target>
     </deconfigure>
   </hwpError>
 </hwpErrors>
diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -456,6 +456,16 @@
     push @systemAttr, ['DPLL_VDM_RESPONSE', 0 ];
 }
 
+if ( exists $reqPol->{'mss_mrw_allow_unsupported_rcw'} )
+{
+    push @systemAttr, ['MSS_MRW_ALLOW_UNSUPPORTED_RCW',
+        $reqPol->{'mss_mrw_allow_unsupported_rcw'}];
+}
+else
+{
+    push @systemAttr, ['MSS_MRW_ALLOW_UNSUPPORTED_RCW', 0 ];
+}
+
 my $xBusWidth = $reqPol->{'proc_x_bus_width'};
 if( $xBusWidth == 1 )
 {