diff options
| author | Prachi Gupta <pragupta@us.ibm.com> | 2015-02-06 13:09:43 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-02-24 15:42:34 -0600 |
| commit | 26dbc6dcf3be4416bc4606147a0226e68df997e1 (patch) | |
| tree | 1763f5f228532823334d78b12c83695e2d05c1ee /src/usr/hwas/hwasPlatDeconfigGard.C | |
| parent | b908135a569ed584b12262a020664d0150e4d933 (diff) | |
| download | talos-hostboot-26dbc6dcf3be4416bc4606147a0226e68df997e1.tar.gz talos-hostboot-26dbc6dcf3be4416bc4606147a0226e68df997e1.zip | |
Added an interface to get PNOR side information
RTC:120061
Change-Id: I6732160b2154bcb856e01a79307ee15caf5ec6e5
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15629
Tested-by: Jenkins Server
Reviewed-by: STEPHEN M. CPREK <smcprek@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwas/hwasPlatDeconfigGard.C')
| -rw-r--r-- | src/usr/hwas/hwasPlatDeconfigGard.C | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/src/usr/hwas/hwasPlatDeconfigGard.C b/src/usr/hwas/hwasPlatDeconfigGard.C index 52eb1b04c..452a9e7aa 100644 --- a/src/usr/hwas/hwasPlatDeconfigGard.C +++ b/src/usr/hwas/hwasPlatDeconfigGard.C @@ -270,7 +270,7 @@ errlHndl_t DeconfigGard::platCreateGardRecord( } l_pErr = _GardRecordIdSetup(iv_platDeconfigGard); - if (l_pErr && iv_platDeconfigGard) + if (l_pErr || !iv_platDeconfigGard) { break; } @@ -490,16 +490,26 @@ errlHndl_t getGardSectionInfo(PNOR::SectionInfo_t& o_sectionInfo) if (l_errl) { g_GardSectionInfo.size = 0; -// @TODO RTC: 120061 - replace config flag with a pnor interface call to say if -// there is a guard section on the current (active) side -// of pnor -#ifdef CONFIG_PNOR_TWO_SIDE_SUPPORT - HWAS_INF("getGardSectionInfo: No guard section disabling guard support"); - delete l_errl; - l_errl = NULL; -#else - HWAS_ERR("getGardSectionInfo:getSectionInfo failed"); -#endif + + PNOR::SideInfo_t l_sideInfo; + errlHndl_t l_tempErr = PNOR::getSideInfo(PNOR::WORKING,l_sideInfo); + if (l_tempErr) + { + HWAS_ERR("getGardSectionInfo: getSideInfo failed"); + errlCommit (l_errl,HWAS_COMP_ID); + l_errl = l_tempErr; + } + if (!l_sideInfo.isGuardPresent) + { + HWAS_INF("getGardSectionInfo: No guard section disabling guard" + " support"); + delete l_errl; + l_errl = NULL; + } + else + { + HWAS_ERR("getGardSectionInfo:getSectionInfo failed"); + } } else { |
