summaryrefslogtreecommitdiffstats
path: root/sbe
diff options
context:
space:
mode:
authorPrasad Bg Ranganath <prasadbgr@in.ibm.com>2016-06-29 13:23:19 -0500
committerJennifer A. Stofer <stofer@us.ibm.com>2016-06-29 14:42:38 -0400
commitd3070c76371243a4c5c54fc5e3adbfa9e242752c (patch)
tree82b53d34b7420f1a81dbf56893403c2b8b6237d5 /sbe
parent8bd4d78ccbe225f99b6f61f63757b9b30837b3c5 (diff)
downloadtalos-sbe-d3070c76371243a4c5c54fc5e3adbfa9e242752c.tar.gz
talos-sbe-d3070c76371243a4c5c54fc5e3adbfa9e242752c.zip
Fix putRing code merge issue
Change-Id: Ide73d18db6058ae81bdea2c48e875533b9973652 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26423 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Gregory S. Still <stillgs@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Diffstat (limited to 'sbe')
-rw-r--r--sbe/hwpf/src/plat_ring_traverse.C8
1 files changed, 7 insertions, 1 deletions
diff --git a/sbe/hwpf/src/plat_ring_traverse.C b/sbe/hwpf/src/plat_ring_traverse.C
index e6a70efa..c201b2ed 100644
--- a/sbe/hwpf/src/plat_ring_traverse.C
+++ b/sbe/hwpf/src/plat_ring_traverse.C
@@ -69,6 +69,13 @@ fapi2::ReturnCode findRS4InImageAndApply(
// Get the address of the Section-TOR
P9XipHeader *l_hdr = getXipHdr();
P9XipSection *l_section = &(l_hdr->iv_section[P9_XIP_SECTION_SBE_RINGS]);
+
+ if (!(l_section->iv_offset))
+ {
+ SBE_TRACE("No ring data in .RING section");
+ break;
+ }
+
SectionTOR *l_sectionTOR = (SectionTOR *)(g_seepromAddr +
l_section->iv_offset);
@@ -377,7 +384,6 @@ fapi2::ReturnCode findRS4InImageAndApply(
}
else
{
- l_rc = fapi2::FAPI2_RC_PLAT_RING_ID_NOT_FOUND_IN_RS4_IMAGE;
SBE_TRACE("Ring image is not found for this is ringId %u",i_ringID);
}
}while(0);
OpenPOWER on IntegriCloud