From 99fdea2ff94392456dabc41836738bcdaa2b6038 Mon Sep 17 00:00:00 2001
From: Dan Crowell <dcrowell@us.ibm.com>
Date: Mon, 28 Aug 2017 12:26:26 -0500
Subject: Remove hack to override MRW enablement of WOF on ZZ

The value of SYSTEM_WOF_DISABLE now comes from the MRW directly.

Change-Id: I5996dff3613669d53c64fee1023cf6bfa7046cba
RTC: 177909
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/45244
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Elizabeth K. Liner <eliner@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
---
 src/build/buildpnor/defaultPnorLayout.xml |  2 +-
 src/build/buildpnor/pnorLayoutFSP.xml     |  2 +-
 src/usr/targeting/common/genHwsvMrwXml.pl | 18 +-----------------
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/build/buildpnor/defaultPnorLayout.xml b/src/build/buildpnor/defaultPnorLayout.xml
index 79a972d2c..5dee3cd66 100644
--- a/src/build/buildpnor/defaultPnorLayout.xml
+++ b/src/build/buildpnor/defaultPnorLayout.xml
@@ -252,7 +252,7 @@ Layout Description
     <section>
         <description>VFRT data for WOF (12MB)</description>
         <!-- We need 266KB per module sort, going to support
-             10 sorts by default, plus ECC  -->
+             40 tables by default, plus ECC  -->
         <eyeCatch>WOFDATA</eyeCatch>
         <physicalOffset>0x2CD8000</physicalOffset>
         <physicalRegionSize>0xC00000</physicalRegionSize>
diff --git a/src/build/buildpnor/pnorLayoutFSP.xml b/src/build/buildpnor/pnorLayoutFSP.xml
index 26aecb69a..73a905e85 100644
--- a/src/build/buildpnor/pnorLayoutFSP.xml
+++ b/src/build/buildpnor/pnorLayoutFSP.xml
@@ -222,7 +222,7 @@ Layout Description - Used when building an FSP driver
     <section>
         <description>VFRT data for WOF (12MB)</description>
         <!-- We need 266KB per module sort, going to support
-             10 sorts by default, plus ECC  -->
+             40 tables by default, plus ECC  -->
         <eyeCatch>WOFDATA</eyeCatch>
         <physicalOffset>0x1766000</physicalOffset>
         <physicalRegionSize>0xC00000</physicalRegionSize>
diff --git a/src/usr/targeting/common/genHwsvMrwXml.pl b/src/usr/targeting/common/genHwsvMrwXml.pl
index 742f29da4..40a28fa2c 100755
--- a/src/usr/targeting/common/genHwsvMrwXml.pl
+++ b/src/usr/targeting/common/genHwsvMrwXml.pl
@@ -363,6 +363,7 @@ push @systemAttr,
     "IVRM_STEP_DELAY_NS", $reqPol->{'ivrm_step_delay_ns'},
     "IVRM_STABILIZATION_DELAY_NS", $reqPol->{'ivrm_stabilization_delay_ns'},
     "SBE_UPDATE_DISABLE", 0,
+    "SYSTEM_WOF_DISABLE", $reqPol->{'system_wof_disable'},
 ];
 
 if ($reqPol->{'mss_mrw_refresh_rate_request'} eq 'SINGLE')
@@ -459,23 +460,6 @@ else
     push @systemAttr, ['PROC_FABRIC_X_BUS_WIDTH', '4_BYTE'];
 }
 
-#TODO: RTC 177909 / SW397632 -- re-enable once OOM is fixed
-# on ZZ
-#if( exists $reqPol->{'system_wof_disable'} )
-#{
-#    push @systemAttr, ['SYSTEM_WOF_DISABLE',
-#        $reqPol->{'system_wof_disable'}];
-#}
-#elsif ( exists $reqPol->{'system_wof_enabled'} )
-#{
-#    push @systemAttr, ['SYSTEM_WOF_DISABLE',
-#        !($reqPol->{'system_wof_enabled'})];
-#}
-#else
-#{
-    push @systemAttr, ['SYSTEM_WOF_DISABLE', 'ON' ];
-#}
-
 # Note - if below attribute is specified with im-id, it will not get
 #  set into the output
 if( exists $reqPol->{'mss_mrw_interleave_enable'} )
-- 
cgit v1.2.3