From b78b33c5a32ac5c12ca0fd980f054a86258eec00 Mon Sep 17 00:00:00 2001 From: Claus Michael Olsen Date: Wed, 5 Apr 2017 05:16:51 -0500 Subject: Code restruct: TOR API Key_Cronus_Test=XIP_REGRESS Code restructuring aiming at: - utilizing TOR magic header info - enforce a common approach for - extracting metadata for all image,chipType combinations - traversing images for all image,chipType combinations - shrinking code size by reusing common code segments - improve readability by - separating more clearly metadata extraction and image traversal - slight rearrange of certain code segments - remove leftover hardcoded assumptions about ring/TOR data and structs - variables appropriately renamed and now all using camel style Change-Id: I50ace8b2fdb340a97ce6d74ce545c5e1acd21c40 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38863 Tested-by: HWSV CI Tested-by: PPE CI Tested-by: Jenkins Server Tested-by: Cronus HW CI Tested-by: FSP CI Jenkins Tested-by: Hostboot CI Reviewed-by: GIRISANKAR PAULRAJ Reviewed-by: Thi N. Tran Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43251 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Daniel M. Crowell --- src/import/chips/p9/procedures/hwp/accessors/p9_mvpd_ring_funcs.C | 2 +- src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C | 5 +---- src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.mk | 1 + src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.mk | 1 + 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/import/chips/p9/procedures') diff --git a/src/import/chips/p9/procedures/hwp/accessors/p9_mvpd_ring_funcs.C b/src/import/chips/p9/procedures/hwp/accessors/p9_mvpd_ring_funcs.C index fccc0d4e5..3dcc9024a 100644 --- a/src/import/chips/p9/procedures/hwp/accessors/p9_mvpd_ring_funcs.C +++ b/src/import/chips/p9/procedures/hwp/accessors/p9_mvpd_ring_funcs.C @@ -534,7 +534,7 @@ extern "C" be64toh(l_pScanDataOld->iv_scanSelect) & l_evenOddMask ) ) { // look up ring in p9_ringId and retrieve scanAddr - GenRingIdList* l_ringProp = ringid_get_ring_properties(i_ringId); + GenRingIdList* l_ringProp = ringid_get_ring_list(i_ringId); FAPI_ASSERT(l_ringProp, fapi2::MVPD_RINGID_DATA_NOT_FOUND(). diff --git a/src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C b/src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C index 70ab94943..2fdb46607 100644 --- a/src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C +++ b/src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C @@ -906,7 +906,6 @@ fapi2::ReturnCode _fetch_and_insert_vpd_rings( i_ringBufSize2, // Max size. i_ring.ringId, l_PpeType, - ALLRING, // No-care BASE, // All VPD rings are Base ringVariant l_chipletTorId, // Chiplet instance TOR Index i_vpdRing ); // The VPD RS4 ring container @@ -2471,9 +2470,7 @@ ReturnCode p9_xip_customize ( l_rc = tor_get_block_of_rings( l_hwRingsSection, attrDdLevel, l_PpeType, - ALLRING, - BASE, - 0, + NOT_VALID, &io_ringSectionBuf, io_ringSectionBufSize ); diff --git a/src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.mk b/src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.mk index 103376c98..820a1f3ee 100644 --- a/src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.mk +++ b/src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.mk @@ -29,6 +29,7 @@ lib$(PROCEDURE)_DEPLIBS+=p9_scan_compression lib$(PROCEDURE)_DEPLIBS+=p9_get_mvpd_ring lib$(PROCEDURE)_DEPLIBS+=p9_mvpd_ring_funcs lib$(PROCEDURE)_DEPLIBS+=p9_tor +lib$(PROCEDURE)_DEPLIBS+=common_ringId lib$(PROCEDURE)_DEPLIBS+=p9_ringId lib$(PROCEDURE)_DEPLIBS+=cen_ringId lib$(PROCEDURE)_DEPLIBS+=p9_dd_container diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.mk b/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.mk index 277071bfd..44168b0e7 100644 --- a/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.mk +++ b/src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.mk @@ -38,6 +38,7 @@ lib$(PROCEDURE)_DEPLIBS += p9_scan_ring_util lib$(PROCEDURE)_DEPLIBS += p9_xip_image lib$(PROCEDURE)_DEPLIBS += p9_tor lib$(PROCEDURE)_DEPLIBS += p9_ring_identification +lib$(PROCEDURE)_DEPLIBS += common_ringId lib$(PROCEDURE)_DEPLIBS += p9_ringId lib$(PROCEDURE)_DEPLIBS += cen_ringId lib$(PROCEDURE)_DEPLIBS += p9_stop_util -- cgit v1.2.1