summaryrefslogtreecommitdiffstats
path: root/src/import/chips/p9/procedures
diff options
context:
space:
mode:
authorClaus Michael Olsen <cmolsen@us.ibm.com>2017-04-05 05:16:51 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2017-12-10 16:02:46 -0500
commitb78b33c5a32ac5c12ca0fd980f054a86258eec00 (patch)
tree10cb7d12bd76545fa9245973ffee12f9c4b61903 /src/import/chips/p9/procedures
parentfabc7bd251908585f097d37fcc0cadd29a2ee635 (diff)
downloadtalos-hostboot-b78b33c5a32ac5c12ca0fd980f054a86258eec00.tar.gz
talos-hostboot-b78b33c5a32ac5c12ca0fd980f054a86258eec00.zip
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 <hwsv-ci+hostboot@us.ibm.com> Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Cronus HW CI <cronushw-ci+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: GIRISANKAR PAULRAJ <gpaulraj@in.ibm.com> Reviewed-by: Thi N. Tran <thi@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43251 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/import/chips/p9/procedures')
-rw-r--r--src/import/chips/p9/procedures/hwp/accessors/p9_mvpd_ring_funcs.C2
-rw-r--r--src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.C5
-rw-r--r--src/import/chips/p9/procedures/hwp/customize/p9_xip_customize.mk1
-rw-r--r--src/import/chips/p9/procedures/hwp/pm/p9_hcode_image_build.mk1
4 files changed, 4 insertions, 5 deletions
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
OpenPOWER on IntegriCloud