diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/import/chips/p9/utils/imageProcs/p9_ringId.C | 17 | ||||
-rw-r--r-- | src/import/chips/p9/utils/imageProcs/p9_tor.H | 3 |
2 files changed, 19 insertions, 1 deletions
diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.C b/src/import/chips/p9/utils/imageProcs/p9_ringId.C index 7456ac1c..51de3c11 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_ringId.C +++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.C @@ -24,6 +24,7 @@ /* IBM_PROLOG_END_TAG */ #include "p9_ringId.H" #include "p9_ring_identification.H" +#include "p9_tor.H" namespace PERV { @@ -54,6 +55,7 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = {"occ_repr" , 0x12, 0x01, 0x01, "occ_repr_ring" , NON_VPD_RING, 0, 0x0100000000000200}, {"perv_pibnet_repr" , 0x13, 0x01, 0x01, "perv_pibnet_repr_ring" , NON_VPD_RING, 0, 0x0600000000000200}, }; +const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::RL, P9_TOR::NOT_VALID}; }; namespace N0 { @@ -75,6 +77,7 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = {"n0_nx_repr" , 0x0a, 0x02, 0x02, "n0_nx_repr_ring" , NON_VPD_RING, 0, 0x0400000000000200}, {"n0_cxa0_repr" , 0x0b, 0x02, 0x02, "n0_cxa0_repr_ring" , NON_VPD_RING, 0, 0x0200000000000200}, }; +const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::RL, P9_TOR::NOT_VALID}; }; namespace N1 { @@ -100,6 +103,7 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = {"n1_ioo1_repr" , 0x0e, 0x03, 0x03, "n1_ioo1_repr_ring" , NON_VPD_RING, 0, 0x0080000000000200}, {"n1_mcs23_repr" , 0x0f, 0x03, 0x03, "n1_mcs23_repr_ring" , NON_VPD_RING, 0, 0x0040000000000200}, }; +const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::RL, P9_TOR::NOT_VALID}; }; namespace N2 { @@ -121,6 +125,7 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = {"n2_cxa1_repr" , 0x0a, 0x04, 0x04, "n2_cxa1_repr_ring" , NON_VPD_RING, 0, 0x0400000000000200}, {"n2_psi_repr" , 0x0b, 0x04, 0x04, "n2_cxa1_repr_ring" , NON_VPD_RING, 0, 0x0400000000000200}, }; +const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::RL, P9_TOR::NOT_VALID}; }; namespace N3 { @@ -142,6 +147,7 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = {"n3_mcs01_repr" , 0x0a, 0x05, 0x05, "n3_mcs01_repr_ring" , NON_VPD_RING, 0, 0x0020000000000200}, {"n3_np_repr" , 0x0b, 0x05, 0x05, "n3_np_repr_ring" , NON_VPD_RING, 0, 0x0100000000000200}, }; +const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::RL, P9_TOR::NOT_VALID}; }; namespace XB { @@ -170,6 +176,7 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = {"xb_io1_repr" , 0x15, 0x06, 0x06, "xb_io1_repr_ring" , NON_VPD_RING, 0, 0x0220000000000200}, {"xb_io2_repr" , 0x16, 0x06, 0x06, "xb_io2_repr_ring" , NON_VPD_RING, 0, 0x0110000000000200}, }; +const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::RL, P9_TOR::NOT_VALID}; }; namespace MC { @@ -198,6 +205,7 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = {"mc_iom01_repr" , 0x11, 0x07, 0x08, "mc_iom01_repr_ring" , NON_VPD_RING, 0, 0x0200000000000200}, {"mc_iom23_repr" , 0x12, 0x07, 0x08, "mc_iom23_repr_ring" , NON_VPD_RING, 0, 0x0100000000000200}, }; +const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::RL, P9_TOR::NOT_VALID}; }; namespace OB0 { @@ -214,6 +222,7 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = { {"ob0_repr" , 0x0a, 0x09, 0x09, "ob0_repr_ring" , NON_VPD_RING, 0, 0x0E00000000000200}, }; +const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::RL, P9_TOR::NOT_VALID}; }; namespace OB1 { @@ -230,6 +239,7 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = { {"ob1_repr" , 0x0a, 0x0a, 0x0a, "ob1_repr_ring" , NON_VPD_RING, 0, 0x0E00000000000200}, }; +const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::RL, P9_TOR::NOT_VALID}; }; namespace OB2 { @@ -246,6 +256,7 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = { {"ob2_repr" , 0x0a, 0x0b, 0x0b, "ob2_repr_ring" , NON_VPD_RING, 0, 0x0E00000000000200}, }; +const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::RL, P9_TOR::NOT_VALID}; }; namespace OB3 { @@ -262,6 +273,7 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = { {"ob3_repr" , 0x0a, 0x0c, 0x0c, "ob3_repr_ring" , NON_VPD_RING, 0, 0x0E00000000000200}, }; +const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::RL, P9_TOR::NOT_VALID}; }; namespace PCI0 { @@ -277,6 +289,7 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = { {"pci0_repr" , 0x05, 0x0d, 0x0d, "pci0_repr_ring" , NON_VPD_RING, 0, 0x0E00000000000200}, }; +const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::RL, P9_TOR::NOT_VALID}; }; namespace PCI1 { @@ -292,6 +305,7 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = { {"pci1_repr" , 0x05, 0x0e, 0x0e, "pci1_repr_ring" , NON_VPD_RING, 0, 0x0F00000000000200}, }; +const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::RL, P9_TOR::NOT_VALID}; }; namespace PCI2 { @@ -307,6 +321,7 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = { {"pci2_repr" , 0x05, 0x0F, 0x0F, "pci2_repr_ring" , NON_VPD_RING, 0, 0x0F80000000000200}, }; +const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::RL, P9_TOR::NOT_VALID}; }; namespace EQ { @@ -368,6 +383,7 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = {"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}, }; +const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::CC, P9_TOR::RL}; }; namespace EC { @@ -383,4 +399,5 @@ const GenRingIdList RING_ID_LIST_INSTANCE[] = { { "ec_repr" , 0x04, 0x20, 0x37, "ec_repr_ring", NON_VPD_RING, 0, 0x0E00000000000200}, }; +const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::CC, P9_TOR::RL}; }; diff --git a/src/import/chips/p9/utils/imageProcs/p9_tor.H b/src/import/chips/p9/utils/imageProcs/p9_tor.H index d9840bd7..ba37c4ca 100644 --- a/src/import/chips/p9/utils/imageProcs/p9_tor.H +++ b/src/import/chips/p9/utils/imageProcs/p9_tor.H @@ -112,7 +112,8 @@ typedef enum RingVariant // Base variables RL = 0x02, OVERRIDE = 0x03, OVERLAY = 0x04, - NUM_RING_VARIANTS = 0x05 + NUM_RING_VARIANTS = 0x05, + NOT_VALID = 0xff } RingVariant_t; |