diff options
author | Claus Michael Olsen <cmolsen@us.ibm.com> | 2016-09-29 02:44:19 -0500 |
---|---|---|
committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-09-30 01:33:23 -0400 |
commit | 57475477182adeecc322a4a3852857bd5b997993 (patch) | |
tree | 1be40d8ea8d58693f0dbd104ae277c3931fbde0a | |
parent | fbf033171a95d93a65254a54b38a0c7f6cc7d848 (diff) | |
download | talos-sbe-57475477182adeecc322a4a3852857bd5b997993.tar.gz talos-sbe-57475477182adeecc322a4a3852857bd5b997993.zip |
Support for EX VPD instance rings.
Change-Id: I43090f95b6ee2729549d962c1af6827d59b4277c
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30458
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Dev-Ready: Matt K. Light <mklight@us.ibm.com>
Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30460
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
-rw-r--r-- | src/import/chips/p9/utils/imageProcs/p9_ringId.C | 10 | ||||
-rw-r--r-- | src/import/chips/p9/utils/imageProcs/p9_tor.C | 3 |
2 files changed, 6 insertions, 7 deletions
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"); } } |