HBRT Runtime VPD Updates

Enables writes to VPD and handles disabling
PNOR cache in manufacturing mode

Change-Id: I03d4246ceb91520939f8b04f3b3d2fc31c116079
RTC: 114911
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15462
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

9 files changed, 392 insertions, 131 deletions

diff --git a/src/usr/vpd/ipvpd.C b/src/usr/vpd/ipvpd.C
index 57d5a9ce8..af0055cd1 100644
--- a/src/usr/vpd/ipvpd.C
+++ b/src/usr/vpd/ipvpd.C
@@ -242,7 +242,7 @@ errlHndl_t IpVpdFacade::write ( TARGETING::Target * i_target,
             // PNOR needs to be loaded before we can write it
             TARGETING::ATTR_VPD_SWITCHES_type vpdSwitches =
                     i_target->getAttr<TARGETING::ATTR_VPD_SWITCHES>();
-            if( vpdSwitches.pnorLoaded )
+            if( vpdSwitches.pnorCacheValid )
             {
                 l_args.location = VPD::PNOR;
                 err = write( i_target,
@@ -811,8 +811,8 @@ errlHndl_t IpVpdFacade::findRecordOffset ( const char * i_record,
          * @moduleid         VPD::VPD_IPVPD_FIND_RECORD_OFFSET
          * @userdata1[0:31]  Target HUID
          * @userdata1[32:63] Requested VPD Source Location
-         * @userdata2[0:31]  CONFIG_<vpd>_READ_WRITE_CONFIG_PNOR
-         * @userdata2[32:63] CONFIG_<vpd>_READ_WRITE_CONFIG_HW
+         * @userdata2[0:31]  VPD write PNOR flag
+         * @userdata2[32:63] VPD write HW flag
          * @devdesc          Unable to resolve the VPD
          *                   source (PNOR or SEEPROM)
          */
@@ -1426,8 +1426,8 @@ errlHndl_t IpVpdFacade::fetchData ( uint64_t i_byteAddr,
          * @moduleid         VPD::VPD_IPVPD_FETCH_DATA
          * @userdata1[0:31]  Target HUID
          * @userdata1[32:63] Requested VPD Source Location
-         * @userdata2[0:31]  CONFIG_<vpd>_READ_FROM_PNOR
-         * @userdata2[32:63] CONFIG_<vpd>_READ_FROM_HW
+         * @userdata2[0:31]  VPD read PNOR flag
+         * @userdata2[32:63] VPD read HW flag
          * @devdesc          Unable to resolve the VPD
          *                   source (PNOR or SEEPROM)
          */
@@ -1903,8 +1903,8 @@ errlHndl_t IpVpdFacade::writeKeyword ( const char * i_keywordName,
              * @moduleid         VPD::VPD_IPVPD_WRITE_KEYWORD
              * @userdata1[0:31]  Target HUID
              * @userdata1[32:63] Requested VPD Destination
-             * @userdata2[0:31]  CONFIG_<vpd>_WRITE_TO_PNOR
-             * @userdata2[32:63] CONFIG_<vpd>_WRITE_TO_HW
+             * @userdata2[0:31]  VPD write PNOR flag
+             * @userdata2[32:63] VPD write HW flag
              * @devdesc          Unable to resolve the VPD
              *                   destination (PNOR or SEEPROM)
              */
@@ -2007,3 +2007,24 @@ bool IpVpdFacade::compareKeywords ( const keywordInfo e1,
     else
         return false;
 }
+
+
+// ------------------------------------------------------------------
+// IpVpdFacade::setConfigFlagsHW
+// ------------------------------------------------------------------
+void IpVpdFacade::setConfigFlagsHW ( )
+{
+    // Only change configs if in PNOR caching mode
+    if( iv_configInfo.vpdReadPNOR &&
+        iv_configInfo.vpdReadHW )
+    {
+        iv_configInfo.vpdReadPNOR = false;
+        iv_configInfo.vpdReadHW = true;
+    }
+    if( iv_configInfo.vpdWritePNOR &&
+        iv_configInfo.vpdWriteHW )
+    {
+        iv_configInfo.vpdWritePNOR = false;
+        iv_configInfo.vpdWriteHW = true;
+    }
+}
diff --git a/src/usr/vpd/ipvpd.H b/src/usr/vpd/ipvpd.H
index e80f19363..bd121dcae 100644
--- a/src/usr/vpd/ipvpd.H
+++ b/src/usr/vpd/ipvpd.H
@@ -275,6 +275,11 @@ class IpVpdFacade
      */
     errlHndl_t invalidatePnor ( TARGETING::Target * i_target );
 
+    /**
+     * @brief This function sets the config flags to use HW and not PNOR
+     */
+    void setConfigFlagsHW ( );
+
   protected:
 
     /**
diff --git a/src/usr/vpd/rtvpd_load.C b/src/usr/vpd/rtvpd_load.C
index dbe31f79f..837d9477b 100644
--- a/src/usr/vpd/rtvpd_load.C
+++ b/src/usr/vpd/rtvpd_load.C
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013,2014              */
+/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -101,46 +103,99 @@ errlHndl_t VPD::vpd_load_rt_image(uint64_t & o_vpd_addr)
 {
     errlHndl_t err = NULL;
 
-    uint64_t vpd_addr = TARGETING::get_top_mem_addr();
-
-    assert (vpd_addr != 0,
-            "bld_devtree: Top of memory was 0!");
-
-    vpd_addr -= VMM_RT_VPD_OFFSET;
+    do
+    {
+        uint64_t vpd_addr = TARGETING::get_top_mem_addr();
 
-    o_vpd_addr = vpd_addr;
+        assert (vpd_addr != 0,
+                "bld_devtree: Top of memory was 0!");
 
-    uint8_t * vpd_ptr = reinterpret_cast<uint8_t*>(vpd_addr);
+        vpd_addr -= VMM_RT_VPD_OFFSET;
 
-    void * vptr = mm_block_map(vpd_ptr, VMM_RT_VPD_SIZE);
+        o_vpd_addr = vpd_addr;
 
-    assert(vptr != NULL,"bld_devtree: Could not map VPD memory");
+        uint8_t * vpd_ptr = reinterpret_cast<uint8_t*>(vpd_addr);
 
-    vpd_ptr = static_cast<uint8_t*>(vptr);
+        void * vptr = mm_block_map(vpd_ptr, VMM_RT_VPD_SIZE);
 
-    err = bld_vpd_image(PNOR::DIMM_JEDEC_VPD,
-                             vpd_ptr,
-                             VMM_DIMM_JEDEC_VPD_SIZE);
+        assert(vptr != NULL,"bld_devtree: Could not map VPD memory");
 
-    vpd_ptr += VMM_DIMM_JEDEC_VPD_SIZE;
+        vpd_ptr = static_cast<uint8_t*>(vptr);
+        err = bld_vpd_image(PNOR::DIMM_JEDEC_VPD,
+                                 vpd_ptr,
+                                 VMM_DIMM_JEDEC_VPD_SIZE);
+        if(err)
+        {
+            break;
+        }
 
-    if(!err)
-    {
+        vpd_ptr += VMM_DIMM_JEDEC_VPD_SIZE;
         err = bld_vpd_image(PNOR::MODULE_VPD,
                                  vpd_ptr,
                                  VMM_MODULE_VPD_SIZE);
+        if(err)
+        {
+            break;
+        }
 
         vpd_ptr += VMM_MODULE_VPD_SIZE;
-    }
-
-    if(!err)
-    {
         err = bld_vpd_image(PNOR::CENTAUR_VPD,
                                  vpd_ptr,
                                  VMM_CENTAUR_VPD_SIZE);
-    }
+        if(err)
+        {
+            break;
+        }
+
+        mm_block_unmap(vptr);
+
+        // In manufacturing mode the VPD PNOR cache needs to be cleared
+        // And the VPD ATTR switch and flags need to be reset
+        // Note: this code should do nothing when not in PNOR caching mode
+        TARGETING::Target* l_pTopLevel = NULL;
+        TARGETING::targetService().getTopLevelTarget(l_pTopLevel);
+        TARGETING::ATTR_MNFG_FLAGS_type l_mnfgFlags =
+                    l_pTopLevel->getAttr<TARGETING::ATTR_MNFG_FLAGS>();
+
+        // @todo RTC 118752 Use generic mfg-mode attr when available
+        if (l_mnfgFlags & TARGETING::MNFG_FLAG_SRC_TERM)
+        {
+            // Reset the PNOR config flags to HW - MVPD/CVPD/SPD
+            // Checks for PNOR caching mode before reset
+            VPD::setVpdConfigFlagsHW();
+            if (err)
+            {
+                break;
+            }
+
+            // Find all the targets with VPD switches
+            for (TARGETING::TargetIterator target =
+                        TARGETING::targetService().begin();
+                 target != TARGETING::targetService().end();
+                 ++target)
+            {
+                TARGETING::ATTR_VPD_SWITCHES_type l_switch;
+                if(target->tryGetAttr<TARGETING::ATTR_VPD_SWITCHES>(l_switch))
+                {
+                    if (l_switch.pnorCacheValid)
+                    {
+                        // Invalidate the VPD PNOR for this target
+                        // This also clears the VPD ATTR switch
+                        err = VPD::invalidatePnorCache(*target);
+                        if (err)
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+            if (err)
+            {
+                break;
+            }
+        }
 
-    mm_block_unmap(vptr);
+    } while( 0 );
 
     return err;
 }
diff --git a/src/usr/vpd/runtime/makefile b/src/usr/vpd/runtime/makefile
index c3c3615b0..7943ffcb0 100644
--- a/src/usr/vpd/runtime/makefile
+++ b/src/usr/vpd/runtime/makefile
@@ -5,7 +5,9 @@
 #
 # OpenPOWER HostBoot Project
 #
-# COPYRIGHT International Business Machines Corp. 2013,2014
+# Contributors Listed Below - COPYRIGHT 2013,2015
+# [+] International Business Machines Corp.
+#
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,11 +31,12 @@ MODULE = vpd_rt
 include ../vpd.mk
 
 #add unique object modules
-OBJS += rt_vpd.o 
+OBJS += rt_vpd.o
 
 SUBDIRS += test.d
 
 VPATH += ..
+CFLAGS += -iquote ../
 
 include $(ROOTPATH)/config.mk
 
diff --git a/src/usr/vpd/runtime/rt_vpd.C b/src/usr/vpd/runtime/rt_vpd.C
index d907aee2e..d73b0dc1a 100644
--- a/src/usr/vpd/runtime/rt_vpd.C
+++ b/src/usr/vpd/runtime/rt_vpd.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -28,9 +28,14 @@
 #include <errl/errludtarget.H>
 #include <vpd/vpdreasoncodes.H>
 #include <initservice/initserviceif.H>
-#include "../vpd.H"
+#include <devicefw/driverif.H>
+#include <i2c/eepromif.H>
 #include <runtime/interface.h>
 #include <targeting/common/util.H>
+#include "vpd.H"
+#include "mvpd.H"
+#include "cvpd.H"
+#include "spd.H"
 
 // ----------------------------------------------
 // Trace definitions
@@ -261,29 +266,145 @@ errlHndl_t writePNOR ( uint64_t i_byteAddr,
                        mutex_t * i_mutex )
 {
     errlHndl_t err = NULL;
-    // Does VPD write ever need to be supported at runtime?
-    TRACFCOMP(g_trac_vpd, ERR_MRK
-              "RT writePNOR: VPD write not supported at runtime.");
 
-    /*@
-     * @errortype
-     * @reasoncode       VPD::VPD_RT_WRITE_NOT_SUPPORTED
-     * @severity         ERRORLOG::ERRL_SEV_UNRECOVERABLE
-     * @moduleid         VPD::VPD_RT_WRITE_PNOR
-     * @userdata1        target huid
-     * @userdata2        VPD type
-     * @devdesc          VPD write not supported at runtime
-     */
-    err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE,
-                                   VPD::VPD_RT_WRITE_PNOR,
-                                   VPD::VPD_RT_WRITE_NOT_SUPPORTED,
-                                   get_huid(i_target),
-                                   i_pnorInfo.pnorSection);
+    int64_t vpdLocation = 0;
+    uint64_t addr = 0x0;
+    const char * writeAddr = NULL;
 
-    err->addProcedureCallout(HWAS::EPUB_PRC_HB_CODE,
-                             HWAS::SRCI_PRIORITY_HIGH);
+    TRACSSCOMP( g_trac_vpd,
+                ENTER_MRK"RT writePNOR()" );
 
-    err->collectTrace( "VPD", 256);
+    do
+    {
+        if(INITSERVICE::spBaseServicesEnabled())
+        {
+            TRACFCOMP(g_trac_vpd,ERR_MRK"rt_vpd:writePNOR not supported with FSP");
+
+            /*@
+             * @errortype
+             * @reasoncode       VPD::VPD_RT_WRITE_NOT_SUPPORTED
+             * @severity         ERRORLOG::ERRL_SEV_UNRECOVERABLE
+             * @moduleid         VPD::VPD_RT_WRITE_PNOR
+             * @userdata1        Target
+             * @userdata2        0
+             * @devdesc          MBOX send not supported in HBRT
+             */
+            err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
+                                          VPD::VPD_RT_WRITE_PNOR,
+                                          VPD::VPD_RT_WRITE_NOT_SUPPORTED,
+                                          TARGETING::get_huid(i_target),
+                                          0);
+
+            err->addProcedureCallout(HWAS::EPUB_PRC_HB_CODE,
+                                     HWAS::SRCI_PRIORITY_HIGH);
+
+            err->collectTrace( "VPD", 256);
+
+            break;
+        }
+
+        //----------------------------
+        // Write memory version of VPD
+        //----------------------------
+        // Fake getPnorAddr gets memory address of VPD
+        err = getPnorAddr( i_pnorInfo,
+                           io_cachedAddr,
+                           i_mutex );
+        if(err)
+        {
+            break;
+        }
+
+        addr = io_cachedAddr;
+
+        err = getVpdLocation( vpdLocation,
+                              i_target);
+        if(err)
+        {
+            break;
+        }
+
+        // Add Offset for target vpd location
+        addr += (vpdLocation * i_pnorInfo.segmentSize);
+
+        // Add keyword offset
+        addr += i_byteAddr;
+
+        TRACUCOMP( g_trac_vpd,
+                   INFO_MRK"Address to write: 0x%08x",
+                   addr );
+
+        // Write fake VPD in main-store
+        writeAddr = reinterpret_cast<const char *>( addr );
+        memcpy( (void*)(writeAddr),
+                i_data,
+                i_numBytes );
+
+        //--------------------------------
+        // Write PNOR cache version of VPD
+        //--------------------------------
+
+        // Check if the VPD PNOR cache is loaded for this target
+        TARGETING::ATTR_VPD_SWITCHES_type vpdSwitches =
+                i_target->getAttr<TARGETING::ATTR_VPD_SWITCHES>();
+        if( vpdSwitches.pnorCacheValid )
+        {
+            PNOR::SectionInfo_t info;
+            writeAddr = NULL;
+
+            // Get SPD PNOR section info from PNOR RP
+            err = PNOR::getSectionInfo( i_pnorInfo.pnorSection,
+                                        info );
+            if( err )
+            {
+                break;
+            }
+
+            addr = info.vaddr;
+
+            // Offset cached address by vpd location multiplier
+            addr += (vpdLocation * i_pnorInfo.segmentSize);
+
+            // Now offset into that chunk of data by i_byteAddr
+            addr += i_byteAddr;
+
+            TRACUCOMP( g_trac_vpd,
+                       INFO_MRK"Address to write: 0x%08x",
+                       addr );
+
+            // Write the data
+            writeAddr = reinterpret_cast<const char*>( addr );
+            memcpy( (void*)(writeAddr),
+                    i_data,
+                    i_numBytes );
+
+            // Flush the page to make sure it gets to the PNOR
+            err = PNOR::flush( info.id );
+            if( err )
+            {
+                break;
+            }
+        }
+
+        //------------------------
+        // Write HW version of VPD
+        //------------------------
+        err = DeviceFW::deviceOp( DeviceFW::WRITE,
+                                  i_target,
+                                  i_data,
+                                  i_numBytes,
+                                  DEVICE_EEPROM_ADDRESS(
+                                      EEPROM::VPD_PRIMARY,
+                                      i_byteAddr ) );
+        if( err )
+        {
+            break;
+        }
+
+    } while(0);
+
+    TRACSSCOMP( g_trac_vpd,
+                EXIT_MRK"RT writePNOR()" );
 
     return err;
 }
@@ -375,7 +496,7 @@ bool resolveVpdSource( TARGETING::Target * i_target,
             // PNOR needs to be loaded before we can use it
             TARGETING::ATTR_VPD_SWITCHES_type vpdSwitches =
                     i_target->getAttr<TARGETING::ATTR_VPD_SWITCHES>();
-            if( vpdSwitches.pnorLoaded )
+            if( vpdSwitches.pnorCacheValid )
             {
                 o_vpdSource = VPD::PNOR;
             }
diff --git a/src/usr/vpd/spd.C b/src/usr/vpd/spd.C
index b4b6a18a9..54837a581 100644
--- a/src/usr/vpd/spd.C
+++ b/src/usr/vpd/spd.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
 /* [+] Google Inc.                                                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
@@ -87,6 +87,28 @@ uint64_t g_spdPnorAddr = 0x0;
 // substitute a binary file (dimmspd.dat) into PNOR.
 const bool g_usePNOR = true;
 
+// Define where to read/write SPD data
+#ifdef CONFIG_DJVPD_READ_FROM_PNOR
+    static bool g_spdReadPNOR = true;
+#else
+    static bool g_spdReadPNOR = false;
+#endif
+#ifdef CONFIG_DJVPD_READ_FROM_HW
+    static bool g_spdReadHW = true;
+#else
+    static bool g_spdReadHW = false;
+#endif
+#ifdef CONFIG_DJVPD_WRITE_TO_PNOR
+    static bool g_spdWritePNOR = true;
+#else
+    static bool g_spdWritePNOR = false;
+#endif
+#ifdef CONFIG_DJVPD_WRITE_TO_HW
+    static bool g_spdWriteHW = true;
+#else
+    static bool g_spdWriteHW = false;
+#endif
+
 
 /**
 * @brief Compare two values and return whether e2 is greater than
@@ -418,21 +440,12 @@ errlHndl_t spdFetchData ( uint64_t i_byteAddr,
             break;
         }
 
-        bool readFromPnorEnabled = false;
-#ifdef CONFIG_DJVPD_READ_FROM_PNOR
-        readFromPnorEnabled = true;
-#endif
-        bool readFromHwEnabled = false;
-#ifdef CONFIG_DJVPD_READ_FROM_HW
-        readFromHwEnabled = true;
-#endif
-
         // Determine the SPD source (PNOR/SEEPROM)
         VPD::vpdCmdTarget vpdSource = VPD::AUTOSELECT;
         bool configError = false;
         configError = VPD::resolveVpdSource( i_target,
-                                             readFromPnorEnabled,
-                                             readFromHwEnabled,
+                                             g_spdReadPNOR,
+                                             g_spdReadHW,
                                              i_location,
                                              vpdSource );
 
@@ -488,8 +501,8 @@ errlHndl_t spdFetchData ( uint64_t i_byteAddr,
              * @moduleid         VPD::VPD_SPD_FETCH_DATA
              * @userdata1[0:31]  Target HUID
              * @userdata1[32:63] Requested VPD Source Location
-             * @userdata2[0:31]  CONFIG_DJVPD_READ_FROM_PNOR
-             * @userdata2[32:63] CONFIG_DJVPD_READ_FROM_HW
+             * @userdata2[0:31]  SPD read PNOR flag
+             * @userdata2[32:63] SPD read HW flag
              * @devdesc          Unable to resolve the VPD
              *                   source (PNOR or SEEPROM)
              */
@@ -499,8 +512,8 @@ errlHndl_t spdFetchData ( uint64_t i_byteAddr,
                         VPD::VPD_READ_SOURCE_UNRESOLVED,
                         TWO_UINT32_TO_UINT64( TARGETING::get_huid(i_target),
                                               i_location ),
-                        TWO_UINT32_TO_UINT64( readFromHwEnabled,
-                                              readFromHwEnabled ),
+                        TWO_UINT32_TO_UINT64( g_spdReadPNOR,
+                                              g_spdReadHW ),
                         true /*Add HB SW Callout*/ );
             err->collectTrace( "VPD", 256 );
             break;
@@ -531,44 +544,46 @@ errlHndl_t spdWriteData ( uint64_t i_offset,
 
     do
     {
-#ifdef CONFIG_DJVPD_WRITE_TO_HW
-        if( i_location != VPD::PNOR )
+        if( g_spdWriteHW )
         {
-            // Write directly to target's EEPROM.
-            err = DeviceFW::deviceOp( DeviceFW::WRITE,
-                                      i_target,
-                                      i_data,
-                                      i_numBytes,
-                                      DEVICE_EEPROM_ADDRESS(
-                                          EEPROM::VPD_PRIMARY,
-                                          i_offset ) );
-            if( err )
+            if( i_location != VPD::PNOR )
             {
-                break;
+                // Write directly to target's EEPROM.
+                err = DeviceFW::deviceOp( DeviceFW::WRITE,
+                                          i_target,
+                                          i_data,
+                                          i_numBytes,
+                                          DEVICE_EEPROM_ADDRESS(
+                                              EEPROM::VPD_PRIMARY,
+                                              i_offset ) );
+                if( err )
+                {
+                    break;
+                }
             }
         }
-#endif
-#ifdef CONFIG_DJVPD_WRITE_TO_PNOR
-        if( i_location != VPD::SEEPROM )
+        if( g_spdWritePNOR )
         {
-            // Setup info needed to write from PNOR
-            VPD::pnorInformation info;
-            info.segmentSize = DIMM_SPD_SECTION_SIZE;
-            info.maxSegments = DIMM_SPD_MAX_SECTIONS;
-            info.pnorSection = PNOR::DIMM_JEDEC_VPD;
-            err = VPD::writePNOR( i_offset,
-                                  i_numBytes,
-                                  i_data,
-                                  i_target,
-                                  info,
-                                  g_spdPnorAddr,
-                                  &g_spdMutex );
-            if( err )
+            if( i_location != VPD::SEEPROM )
             {
-                break;
+                // Setup info needed to write to PNOR
+                VPD::pnorInformation info;
+                info.segmentSize = DIMM_SPD_SECTION_SIZE;
+                info.maxSegments = DIMM_SPD_MAX_SECTIONS;
+                info.pnorSection = PNOR::DIMM_JEDEC_VPD;
+                err = VPD::writePNOR( i_offset,
+                                      i_numBytes,
+                                      i_data,
+                                      i_target,
+                                      info,
+                                      g_spdPnorAddr,
+                                      &g_spdMutex );
+                if( err )
+                {
+                    break;
+                }
             }
         }
-#endif
     } while( 0 );
 
     TRACSSCOMP( g_trac_spd,
@@ -885,23 +900,24 @@ errlHndl_t spdWriteValue ( VPD::vpdKeyword i_keyword,
             break;
         }
 
-#ifndef CONFIG_DJVPD_WRITE_TO_HW
-        // Send mbox message with new data to Fsp
-        VPD::VpdWriteMsg_t msgdata;
-        msgdata.rec_num = i_target->getAttr<TARGETING::ATTR_VPD_REC_NUM>();
-        //XXXX=offset relative to whole section
-        memcpy( msgdata.record, "XXXX", sizeof(msgdata.record) );
-        msgdata.offset = entry->offset;
-        err = VPD::sendMboxWriteMsg( io_buflen,
-                                     io_buffer,
-                                     i_target,
-                                     VPD::VPD_WRITE_DIMM,
-                                     msgdata );
-        if( err )
+        if( !g_spdWriteHW )
         {
-            break;
+            // Send mbox message with new data to Fsp
+            VPD::VpdWriteMsg_t msgdata;
+            msgdata.rec_num = i_target->getAttr<TARGETING::ATTR_VPD_REC_NUM>();
+            //XXXX=offset relative to whole section
+            memcpy( msgdata.record, "XXXX", sizeof(msgdata.record) );
+            msgdata.offset = entry->offset;
+            err = VPD::sendMboxWriteMsg( io_buflen,
+                                         io_buffer,
+                                         i_target,
+                                         VPD::VPD_WRITE_DIMM,
+                                         msgdata );
+            if( err )
+            {
+                break;
+            }
         }
-#endif
     } while( 0 );
 
     TRACSSCOMP( g_trac_spd,
@@ -917,11 +933,14 @@ bool spdPresent ( TARGETING::Target * i_target )
 {
 
     TRACSSCOMP( g_trac_spd, ENTER_MRK"spdPresent()" );
-#if(defined( CONFIG_DJVPD_READ_FROM_HW ) && !defined (__HOSTBOOT_RUNTIME ) )
 
-    return EEPROM::eepromPresence( i_target );
+#ifndef __HOSTBOOT_RUNTIME
+    if( g_spdReadHW )
+    {
+        return EEPROM::eepromPresence( i_target );
+    }
+#endif
 
-#else
     errlHndl_t err = NULL;
     bool pres = false;
 
@@ -953,7 +972,6 @@ bool spdPresent ( TARGETING::Target * i_target )
     } while( 0 );
 
     return pres;
-#endif
 }
 
 
@@ -2138,13 +2156,13 @@ errlHndl_t loadPnor ( TARGETING::Target * i_target )
 
 
 // ------------------------------------------------------------------
-// /*invalidatePnorCache*/
+// invalidatePnor
 // ------------------------------------------------------------------
 errlHndl_t invalidatePnor ( TARGETING::Target * i_target )
 {
     errlHndl_t err = NULL;
 
-    TRACSSCOMP( g_trac_spd, ENTER_MRK"invalidatePnorCache()" );
+    TRACSSCOMP( g_trac_spd, ENTER_MRK"invalidatePnor()" );
 
     // Write SPD section to all Fs
     uint8_t writeData[DIMM_SPD_SECTION_SIZE];
@@ -2156,14 +2174,36 @@ errlHndl_t invalidatePnor ( TARGETING::Target * i_target )
                         VPD::PNOR );
     if( err )
     {
-        TRACFCOMP( g_trac_spd, ERR_MRK"invalidatePnorCache: "
+        TRACFCOMP( g_trac_spd, ERR_MRK"invalidatePnor: "
                    "Error invalidating the SPD in PNOR" );
     }
 
-    TRACSSCOMP( g_trac_spd, EXIT_MRK"invalidatePnorCache()" );
+    TRACSSCOMP( g_trac_spd, EXIT_MRK"invalidatePnor()" );
 
     return err;
 }
 
 
+// ------------------------------------------------------------------
+// setConfigFlagsHW
+// ------------------------------------------------------------------
+void setConfigFlagsHW ( )
+{
+    // Only change configs if in PNOR caching mode
+    // In PNOR only mode we would lose all VPD data
+    if( g_spdReadPNOR &&
+        g_spdReadHW )
+    {
+        g_spdReadPNOR  = false;
+        g_spdReadHW    = true;
+    }
+    if( g_spdWritePNOR &&
+        g_spdWriteHW )
+    {
+        g_spdWritePNOR = false;
+        g_spdWriteHW   = true;
+    }
+}
+
+
 }; // end namespace SPD
diff --git a/src/usr/vpd/spd.H b/src/usr/vpd/spd.H
index c7ad2e0cb..8cc66fcf7 100755
--- a/src/usr/vpd/spd.H
+++ b/src/usr/vpd/spd.H
@@ -452,6 +452,11 @@ errlHndl_t loadPnor ( TARGETING::Target * i_target );
  */
 errlHndl_t invalidatePnor ( TARGETING::Target * i_target );
 
+/**
+ * @brief This function sets the config flags to use HW and not PNOR
+ */
+void setConfigFlagsHW ( );
+
 
 }; // end SPD namespace
 
diff --git a/src/usr/vpd/vpd.C b/src/usr/vpd/vpd.C
index b335c81db..921e4e5da 100755
--- a/src/usr/vpd/vpd.C
+++ b/src/usr/vpd/vpd.C
@@ -396,7 +396,7 @@ bool resolveVpdSource( TARGETING::Target * i_target,
             // PNOR needs to be loaded before we can use it
             TARGETING::ATTR_VPD_SWITCHES_type vpdSwitches =
                     i_target->getAttr<TARGETING::ATTR_VPD_SWITCHES>();
-            if( vpdSwitches.pnorLoaded )
+            if( vpdSwitches.pnorCacheValid )
             {
                 o_vpdSource = VPD::PNOR;
             }
@@ -560,7 +560,7 @@ errlHndl_t ensureCacheIsInSync ( TARGETING::Target * i_target )
         // Set target attribute switch that says VPD is loaded into PNOR
         TARGETING::ATTR_VPD_SWITCHES_type vpdSwitches =
                     i_target->getAttr<TARGETING::ATTR_VPD_SWITCHES>();
-        vpdSwitches.pnorLoaded = 1;
+        vpdSwitches.pnorCacheValid = 1;
         i_target->setAttr<TARGETING::ATTR_VPD_SWITCHES>( vpdSwitches );
 
     } while(0);
@@ -598,7 +598,7 @@ errlHndl_t invalidatePnorCache ( TARGETING::Target * i_target )
     // Clear target attribute switch that says VPD is loaded into PNOR
     TARGETING::ATTR_VPD_SWITCHES_type vpdSwitches =
                 i_target->getAttr<TARGETING::ATTR_VPD_SWITCHES>();
-    vpdSwitches.pnorLoaded = 0;
+    vpdSwitches.pnorCacheValid = 0;
     i_target->setAttr<TARGETING::ATTR_VPD_SWITCHES>( vpdSwitches );
 
     TRACSSCOMP( g_trac_vpd, EXIT_MRK"invalidatePnorCache()" );
@@ -607,4 +607,15 @@ errlHndl_t invalidatePnorCache ( TARGETING::Target * i_target )
 }
 
 
+// ------------------------------------------------------------------
+// setVpdConfigFlagsHW
+// ------------------------------------------------------------------
+void setVpdConfigFlagsHW ( )
+{
+    Singleton<MvpdFacade>::instance().setConfigFlagsHW();
+    Singleton<CvpdFacade>::instance().setConfigFlagsHW();
+    SPD::setConfigFlagsHW();
+}
+
+
 }; //end VPD namespace
diff --git a/src/usr/vpd/vpd.H b/src/usr/vpd/vpd.H
index 96c42c7eb..9c39a7f3d 100644
--- a/src/usr/vpd/vpd.H
+++ b/src/usr/vpd/vpd.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -210,8 +210,7 @@ errlHndl_t sendMboxWriteMsg ( size_t i_numBytes,
  *
  * @param[out] o_source - The resolved VPD source to be accessed
  *
- * @return errHndl_t - NULL if successful, otherwise a pointer to the
- *      error log.
+ * @return bool - True if bad config detected otherwise False
  */
 bool resolveVpdSource( TARGETING::Target * i_target,
                        bool i_rwPnorEnabled,
@@ -219,6 +218,7 @@ bool resolveVpdSource( TARGETING::Target * i_target,
                        vpdCmdTarget i_vpdCmdTarget,
                        vpdCmdTarget& o_vpdSource );
 
+
 }; //end VPD namespace
 
 #endif