From 119105e94a2b07abb7daad75f79e6156570d4543 Mon Sep 17 00:00:00 2001
From: Dan Crowell <dcrowell@us.ibm.com>
Date: Wed, 28 Jun 2017 14:03:32 -0500
Subject: [PATCH] Ignore ATTR_WOF_TABLE_LID_NUMBER on OpenPOWER boxes

The lid number is only valid for FSP machines

Change-Id: I00a76082c84aef026d4371cf0c7583f7335921f1
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42565
Tested-by: Jenkins Server <pfd-jenkins+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: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
---
 src/usr/fapi2/plat_wof_access.C | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/usr/fapi2/plat_wof_access.C b/src/usr/fapi2/plat_wof_access.C
index e79779b33f6..c782a3f201c 100644
--- a/src/usr/fapi2/plat_wof_access.C
+++ b/src/usr/fapi2/plat_wof_access.C
@@ -36,6 +36,7 @@
 #include <errl/errlreasoncodes.H>
 #include <util/utillidmgr.H>
 #include <p9_pstates_common.h>
+#include <initservice/initserviceif.H>
 
 namespace fapi2
 {
@@ -151,9 +152,13 @@ fapi2::ReturnCode platParseWOFTables(uint8_t* o_wofData)
 
     do {
         // @todo RTC 172776 Make WOF table parser PNOR accesses more efficient
-        // Lid number is system dependent
-        uint32_t l_lidNumber =
-            l_sys->getAttr<TARGETING::ATTR_WOF_TABLE_LID_NUMBER>();
+        uint32_t l_lidNumber = Util::WOF_LIDID;
+        if( INITSERVICE::spBaseServicesEnabled() )
+        {
+            // Lid number is system dependent on FSP systems
+            l_lidNumber =
+              l_sys->getAttr<TARGETING::ATTR_WOF_TABLE_LID_NUMBER>();
+        }
         UtilLidMgr l_wofLidMgr(l_lidNumber);
 
         // Get the size of the full wof tables image