From 57475477182adeecc322a4a3852857bd5b997993 Mon Sep 17 00:00:00 2001 From: Claus Michael Olsen Date: Thu, 29 Sep 2016 02:44:19 -0500 Subject: Support for EX VPD instance rings. Change-Id: I43090f95b6ee2729549d962c1af6827d59b4277c Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30458 Tested-by: Jenkins Server Tested-by: PPE CI Tested-by: Hostboot CI Dev-Ready: Matt K. Light Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA Reviewed-by: Martin Gloff Reviewed-by: Benjamin Gass Reviewed-by: Joseph J. McGill Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30460 Reviewed-by: Hostboot Team Tested-by: FSP CI Jenkins Reviewed-by: Sachin Gupta --- src/import/chips/p9/utils/imageProcs/p9_ringId.C | 10 +++++----- src/import/chips/p9/utils/imageProcs/p9_tor.C | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/import/chips/p9/utils/imageProcs') diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.C b/src/import/chips/p9/utils/imageProcs/p9_ringId.C index 0780ed59..81ac09e0 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ringId.C +++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.C @@ -376,11 +376,11 @@ const GenRingIdList RING_ID_LIST_COMMON[] = }; const GenRingIdList RING_ID_LIST_INSTANCE[] = { - {"eq_repr" , 0x2e, 0x10, 0x15, "eq_repr_ring" , NON_VPD_RING, 0, 0x0C10000000000200}, - {"ex_l3_repr" , 0x2f, 0x10, 0x15, "ex_l3_repr_ring" , NON_VPD_RING, 0, 0x0200000000000200}, - {"ex_l2_repr" , 0x30, 0x10, 0x15, "ex_l2_repr_ring" , NON_VPD_RING, 0, 0x0080000000000200}, - {"ex_l3_refr_repr" , 0x31, 0x10, 0x15, "ex_l3_refr_repr_ring" , NON_VPD_RING, 0, 0x0008000000000200}, - {"ex_l3_refr_time" , 0x32, 0x10, 0x15, "ex_l3_refr_time_ring" , NON_VPD_RING, 0, 0x0008000000000100}, + {"eq_repr" , 0x2e, 0x10, 0x1b, "eq_repr_ring" , NON_VPD_RING, 0, 0x0C10000000000200}, + {"ex_l3_repr" , 0x2f, 0x10, 0x1b, "ex_l3_repr_ring" , NON_VPD_RING, 0, 0x0200000000000200}, + {"ex_l2_repr" , 0x30, 0x10, 0x1b, "ex_l2_repr_ring" , NON_VPD_RING, 0, 0x0080000000000200}, + {"ex_l3_refr_repr" , 0x31, 0x10, 0x1b, "ex_l3_refr_repr_ring" , NON_VPD_RING, 0, 0x0008000000000200}, + {"ex_l3_refr_time" , 0x32, 0x10, 0x1b, "ex_l3_refr_time_ring" , NON_VPD_RING, 0, 0x0008000000000100}, }; const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, CC, RL}; }; diff --git a/src/import/chips/p9/utils/imageProcs/p9_tor.C b/src/import/chips/p9/utils/imageProcs/p9_tor.C index 1c68e7df..96f4cf6e 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_tor.C +++ b/src/import/chips/p9/utils/imageProcs/p9_tor.C @@ -525,7 +525,7 @@ int get_ring_from_sbe_image ( void* i_ringSection, // Image pointer } else { - MY_INF(" SBE ring instance ID %d is invalid, Valid ID is from %d to %d \n", + MY_ERR(" SBE ring instance ID %d is invalid, Valid ID is from %d to %d \n", io_instanceId, (ring_id_list_instance + 0)->instanceIdMin, (ring_id_list_instance + 0)->instanceIdMax); return IMGBUILD_INVALID_INSTANCEID; @@ -535,7 +535,6 @@ int get_ring_from_sbe_image ( void* i_ringSection, // Image pointer local++; } - //MY_INF("\n"); } } -- cgit v1.2.1