diff options
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/fapi2/test/fapi2GetVpdTest.H | 6 | ||||
-rw-r--r-- | src/usr/isteps/istep07/call_mss_eff_config.C | 6 | ||||
-rw-r--r-- | src/usr/isteps/istep07/call_mss_freq.C | 6 | ||||
-rw-r--r-- | src/usr/isteps/istep11/call_host_prd_hwreconfig.C | 2 | ||||
-rw-r--r-- | src/usr/isteps/istep14/call_proc_exit_cache_contained.C | 4 | ||||
-rw-r--r-- | src/usr/pnor/test/pnorrptest.H | 6 | ||||
-rwxr-xr-x | src/usr/vpd/test/dvpdtest.H | 6 | ||||
-rwxr-xr-x | src/usr/vpd/vpd.C | 16 |
8 files changed, 28 insertions, 24 deletions
diff --git a/src/usr/fapi2/test/fapi2GetVpdTest.H b/src/usr/fapi2/test/fapi2GetVpdTest.H index 8a8dc0849..8f86430a0 100644 --- a/src/usr/fapi2/test/fapi2GetVpdTest.H +++ b/src/usr/fapi2/test/fapi2GetVpdTest.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2017 */ +/* Contributors Listed Below - COPYRIGHT 2016,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -46,7 +46,7 @@ public: void testGetVPD(void) { -#ifdef CONFIG_SECUREBOOT +#if (defined CONFIG_SECUREBOOT && ! defined CONFIG_AXONE) errlHndl_t pError=NULL; do { @@ -71,7 +71,7 @@ void testGetVPD(void) testGetVPD_DQ(); testGetVPD_CK(); -#ifdef CONFIG_SECUREBOOT +#if (defined CONFIG_SECUREBOOT && ! defined CONFIG_AXONE) pError = PNOR::unloadSecureSection(PNOR::MEMD); if(pError) { diff --git a/src/usr/isteps/istep07/call_mss_eff_config.C b/src/usr/isteps/istep07/call_mss_eff_config.C index 00340627f..abfe738ea 100644 --- a/src/usr/isteps/istep07/call_mss_eff_config.C +++ b/src/usr/isteps/istep07/call_mss_eff_config.C @@ -180,13 +180,13 @@ void* call_mss_eff_config( void *io_pArgs ) { IStepError l_StepError; errlHndl_t l_err = nullptr; -#ifdef CONFIG_SECUREBOOT +#if (defined CONFIG_SECUREBOOT && ! defined CONFIG_AXONE) auto memdLoaded = false; #endif do { - #ifdef CONFIG_SECUREBOOT + #if (defined CONFIG_SECUREBOOT && ! defined CONFIG_AXONE) // MEMD used by p9_mss_eff_config HWP l_err = loadSecureSection(PNOR::MEMD); if (l_err) @@ -577,7 +577,7 @@ void* call_mss_eff_config( void *io_pArgs ) } while (0); - #ifdef CONFIG_SECUREBOOT + #if (defined CONFIG_SECUREBOOT && ! defined CONFIG_AXONE) if(memdLoaded) { l_err = unloadSecureSection(PNOR::MEMD); diff --git a/src/usr/isteps/istep07/call_mss_freq.C b/src/usr/isteps/istep07/call_mss_freq.C index 9bec2f97b..af758ef20 100644 --- a/src/usr/isteps/istep07/call_mss_freq.C +++ b/src/usr/isteps/istep07/call_mss_freq.C @@ -92,7 +92,7 @@ void* call_mss_freq( void *io_pArgs ) IStepError l_StepError; errlHndl_t l_err = nullptr; - #ifdef CONFIG_SECUREBOOT + #if (defined CONFIG_SECUREBOOT && ! defined CONFIG_AXONE) bool l_isMemdLoaded = false; #endif @@ -100,7 +100,7 @@ void* call_mss_freq( void *io_pArgs ) do { - #ifdef CONFIG_SECUREBOOT + #if (defined CONFIG_SECUREBOOT && ! defined CONFIG_AXONE) // Load MEMD so that vpd_supported_freqs can use it. l_err = loadSecureSection(PNOR::MEMD); if (l_err) @@ -475,7 +475,7 @@ void* call_mss_freq( void *io_pArgs ) } while(0); - #ifdef CONFIG_SECUREBOOT + #if (defined CONFIG_SECUREBOOT && ! defined CONFIG_AXONE) if(l_isMemdLoaded) { // Should not have any uncommitted errors at this point. diff --git a/src/usr/isteps/istep11/call_host_prd_hwreconfig.C b/src/usr/isteps/istep11/call_host_prd_hwreconfig.C index e3a0a434a..509d0311c 100644 --- a/src/usr/isteps/istep11/call_host_prd_hwreconfig.C +++ b/src/usr/isteps/istep11/call_host_prd_hwreconfig.C @@ -40,7 +40,7 @@ void* call_host_prd_hwreconfig (void *io_pArgs) ISTEP_ERROR::IStepError l_StepError; //@TODO-RTC:158411 call p9_enable_reconfig.C -#ifdef CONFIG_SECUREBOOT +#if (defined CONFIG_SECUREBOOT && ! defined CONFIG_AXONE) errlHndl_t l_err = NULL; // Load the MEMD section here as the first part of step11, it // will stay loaded until the end of step14 diff --git a/src/usr/isteps/istep14/call_proc_exit_cache_contained.C b/src/usr/isteps/istep14/call_proc_exit_cache_contained.C index 897bb58ac..2307f52dc 100644 --- a/src/usr/isteps/istep14/call_proc_exit_cache_contained.C +++ b/src/usr/isteps/istep14/call_proc_exit_cache_contained.C @@ -81,7 +81,7 @@ void* call_proc_exit_cache_contained (void *io_pArgs) "call_proc_exit_cache_contained entry" ); errlHndl_t l_errl = nullptr; -#ifdef CONFIG_SECUREBOOT +#if (defined CONFIG_SECUREBOOT && ! defined CONFIG_AXONE) if(SECUREBOOT::enabled()) { SECUREBOOT::CENTAUR_SECURITY::ScomCache& centaurCache = @@ -537,7 +537,7 @@ void* call_proc_exit_cache_contained (void *io_pArgs) errlCommit( l_errl, HWPF_COMP_ID ); } -#ifdef CONFIG_SECUREBOOT +#if (defined CONFIG_SECUREBOOT && ! defined CONFIG_AXONE) // Unload the MEMD section that was loaded at the beginning of step11 l_errl = unloadSecureSection(PNOR::MEMD); if (l_errl) diff --git a/src/usr/pnor/test/pnorrptest.H b/src/usr/pnor/test/pnorrptest.H index 9d9dd95c1..1a5c40993 100644 --- a/src/usr/pnor/test/pnorrptest.H +++ b/src/usr/pnor/test/pnorrptest.H @@ -90,11 +90,13 @@ class PnorRpTest : public CxxTest::TestSuite continue; } - if(( testSections[idx] == PNOR::DIMM_JEDEC_VPD ) && + if(( testSections[idx] == PNOR::DIMM_JEDEC_VPD || + testSections[idx] == PNOR::MODULE_VPD) && ( TARGETING::MODEL_AXONE == TARGETING::targetService().getProcessorModel() )) { - TRACFCOMP(g_trac_pnor, "PnorRpTest::test_sectionInfo> Skipping non-existent DIMM_JEDEC_VPD section for Axone"); + TRACFCOMP(g_trac_pnor, "PnorRpTest::test_sectionInfo> " + "Skipping non-existent MODULE_VPD and DIMM_JEDEC_VPD section for Axone"); continue; } diff --git a/src/usr/vpd/test/dvpdtest.H b/src/usr/vpd/test/dvpdtest.H index b0d62a062..c5fe0bc97 100755 --- a/src/usr/vpd/test/dvpdtest.H +++ b/src/usr/vpd/test/dvpdtest.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2018 */ +/* Contributors Listed Below - COPYRIGHT 2013,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -732,7 +732,7 @@ class DVPDTest: public CxxTest::TestSuite DVPDTest() : CxxTest::TestSuite() { TRACFCOMP( g_trac_vpd, "Starting DVPDTest" ); -#ifdef CONFIG_SECUREBOOT +#if (defined CONFIG_SECUREBOOT && ! defined CONFIG_AXONE) #ifndef __HOSTBOOT_RUNTIME errlHndl_t l_err = loadSecureSection(PNOR::MEMD); if(l_err) @@ -746,7 +746,7 @@ class DVPDTest: public CxxTest::TestSuite ~DVPDTest() { -#ifdef CONFIG_SECUREBOOT +#if (defined CONFIG_SECUREBOOT && ! defined CONFIG_AXONE) #ifndef __HOSTBOOT_RUNTIME errlHndl_t l_err = unloadSecureSection(PNOR::MEMD); TRACFCOMP( g_trac_vpd, "Ending DVPDTest" ); diff --git a/src/usr/vpd/vpd.C b/src/usr/vpd/vpd.C index bae60f483..0ee7c9bcb 100755 --- a/src/usr/vpd/vpd.C +++ b/src/usr/vpd/vpd.C @@ -1251,14 +1251,16 @@ void getListOfOverrideSections( OverrideRsvMemMap_t& o_overrides ) delete l_elog; return; } + else + { + // Add MEMD section + OverrideSpecifier_t l_memd = { + PNOR::MEMD, + l_memd_info.size + }; - // Add MEMD section - OverrideSpecifier_t l_memd = { - PNOR::MEMD, - l_memd_info.size - }; - - o_overrides[0x4D454D44/*MEMD*/] = l_memd; + o_overrides[0x4D454D44/*MEMD*/] = l_memd; + } } }; //end VPD namespace |