From d3070c76371243a4c5c54fc5e3adbfa9e242752c Mon Sep 17 00:00:00 2001 From: Prasad Bg Ranganath Date: Wed, 29 Jun 2016 13:23:19 -0500 Subject: Fix putRing code merge issue Change-Id: Ide73d18db6058ae81bdea2c48e875533b9973652 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26423 Tested-by: Jenkins Server Reviewed-by: Gregory S. Still Reviewed-by: Jennifer A. Stofer --- sbe/hwpf/src/plat_ring_traverse.C | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'sbe') 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); -- cgit v1.2.1