BMC: VPD Caching in PNOR

For MVPD CVPD SPD, during presence detect VPD part number and
serial number are compared between PNOR and SEEPROM.  Mismatch
triggers copy of VPD from SEEPROM to PNOR.

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

3 files changed, 19 insertions, 12 deletions

diff --git a/src/usr/vpd/test/cvpdtest.H b/src/usr/vpd/test/cvpdtest.H
index 136e1fd9a..46975c88e 100755
--- a/src/usr/vpd/test/cvpdtest.H
+++ b/src/usr/vpd/test/cvpdtest.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013,2014              */
+/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* [+] 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.       */
@@ -51,8 +53,8 @@ using namespace TARGETING;
  */
 struct cvpdTestData
 {
-    IpVpdFacade::ipVpdRecord record;
-    IpVpdFacade::ipVpdRecord keyword;
+    VPD::vpdRecord record;
+    VPD::vpdRecord keyword;
 };
 
 /**
@@ -708,8 +710,8 @@ class CVPDTest: public CxxTest::TestSuite
         void testCvpdCheckStructOrder ( void )
         {
             uint64_t fails = 0x0;
-            IpVpdFacade::ipVpdRecord prevRecord = CVPD::CVPD_FIRST_RECORD;
-            IpVpdFacade::ipVpdKeyword prevKeyword = CVPD::CVPD_FIRST_KEYWORD;
+            VPD::vpdRecord prevRecord = CVPD::CVPD_FIRST_RECORD;
+            VPD::vpdKeyword prevKeyword = CVPD::CVPD_FIRST_KEYWORD;
 
             TRACFCOMP( g_trac_vpd,
                        ENTER_MRK"testCvpdCheckStructOrder()" );
diff --git a/src/usr/vpd/test/mvpdtest.H b/src/usr/vpd/test/mvpdtest.H
index 28c683817..b89bc3637 100755
--- a/src/usr/vpd/test/mvpdtest.H
+++ b/src/usr/vpd/test/mvpdtest.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* [+] 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.       */
@@ -51,8 +53,8 @@ using namespace TARGETING;
  */
 struct mvpdTestData
 {
-    IpVpdFacade::ipVpdRecord record;
-    IpVpdFacade::ipVpdRecord keyword;
+    VPD::vpdRecord record;
+    VPD::vpdRecord keyword;
 };
 
 /**
@@ -859,8 +861,8 @@ class MVPDTest: public CxxTest::TestSuite
         void testMvpdCheckStructOrder ( void )
         {
             uint64_t fails = 0x0;
-            IpVpdFacade::ipVpdRecord prevRecord = MVPD::MVPD_FIRST_RECORD;
-            IpVpdFacade::ipVpdKeyword prevKeyword = MVPD::MVPD_FIRST_KEYWORD;
+            VPD::vpdRecord prevRecord = MVPD::MVPD_FIRST_RECORD;
+            VPD::vpdKeyword prevKeyword = MVPD::MVPD_FIRST_KEYWORD;
 
             TRACFCOMP( g_trac_vpd,
                        ENTER_MRK"testMvpdCheckStructOrder()" );
diff --git a/src/usr/vpd/test/spdtest.H b/src/usr/vpd/test/spdtest.H
index 7a3739760..83de74c7f 100755
--- a/src/usr/vpd/test/spdtest.H
+++ b/src/usr/vpd/test/spdtest.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* [+] 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.       */
@@ -937,7 +939,8 @@ class SPDTest: public CxxTest::TestSuite
                                "valid for all types of modules.  IGNORE!!" );
                     err = checkModSpecificKeyword( kwdData,
                                                    memType,
-                                                   theTarget );
+                                                   theTarget,
+                                                   VPD::AUTOSELECT );
                     if( err )
                     {
                         // This keyword isn't supported with this module type