p9_tor / p9_ringId: fixing layering violation

p9_tor builds on p9_ringId, not the other way around.
Hence p9_ringId should not include p9_tor.
Resolving by moving a definition and fixing some includes.

Change-Id: Ibfe4d7c0c28838a836bf6ee5fc704ff515827c72
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27918
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>
Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com>
Reviewed-by: Claus M. Olsen <cmolsen@us.ibm.com>
Reviewed-by: GIRISANKAR PAULRAJ <gpaulraj@in.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/28059
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 28 insertions, 29 deletions

diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.C b/src/import/chips/p9/utils/imageProcs/p9_ringId.C
index 653aa31c8..e30ebd8db 100644
--- a/src/import/chips/p9/utils/imageProcs/p9_ringId.C
+++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.C
@@ -25,7 +25,6 @@
 
 #include "p9_ringId.H"
 #include "p9_ring_identification.H"
-#include "p9_tor.H"
 
 namespace PERV
 {
@@ -56,7 +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};
+const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
 namespace N0
 {
@@ -78,7 +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};
+const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
 namespace N1
 {
@@ -104,7 +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};
+const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
 namespace N2
 {
@@ -126,7 +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,  0x0040000000000200},
 };
-const RingVariantOrder RING_VARIANT_ORDER[] = { P9_TOR::BASE, P9_TOR::RL, P9_TOR::NOT_VALID};
+const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
 namespace N3
 {
@@ -148,7 +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};
+const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
 namespace XB
 {
@@ -177,7 +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};
+const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
 namespace MC
 {
@@ -206,7 +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};
+const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
 namespace OB0
 {
@@ -223,7 +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};
+const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
 namespace OB1
 {
@@ -240,7 +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};
+const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
 namespace OB2
 {
@@ -257,7 +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};
+const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
 namespace OB3
 {
@@ -274,7 +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};
+const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
 namespace PCI0
 {
@@ -290,7 +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};
+const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
 namespace PCI1
 {
@@ -306,7 +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};
+const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
 namespace PCI2
 {
@@ -322,7 +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};
+const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, RL, NOT_VALID};
 };
 namespace EQ
 {
@@ -383,7 +382,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};
+const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, CC, RL};
 };
 namespace EC
 {
@@ -399,5 +398,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};
+const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, CC, RL};
 };
diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.H b/src/import/chips/p9/utils/imageProcs/p9_ringId.H
index f33533a0d..2bf825a8f 100644
--- a/src/import/chips/p9/utils/imageProcs/p9_ringId.H
+++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.H
@@ -42,6 +42,17 @@ typedef struct
     uint64_t     scanRegionType;
 } GenRingIdList;
 
+typedef enum RingVariant   // Base variables
+{
+    BASE     = 0x00,
+    CC       = 0x01,
+    RL       = 0x02,
+    OVERRIDE = 0x03,
+    OVERLAY  = 0x04,
+    NUM_RING_VARIANTS = 0x05,
+    NOT_VALID = 0xff
+} RingVariant_t;
+
 typedef struct
 {
     uint8_t  variant[3];
diff --git a/src/import/chips/p9/utils/imageProcs/p9_tor.H b/src/import/chips/p9/utils/imageProcs/p9_tor.H
index daa860cba..be26fc984 100644
--- a/src/import/chips/p9/utils/imageProcs/p9_tor.H
+++ b/src/import/chips/p9/utils/imageProcs/p9_tor.H
@@ -26,6 +26,7 @@
 #define _P9_TOR_H_
 
 #include "p9_ring_id.h"
+#include "p9_ringId.H"
 
 namespace P9_TOR
 {
@@ -104,18 +105,6 @@ typedef enum RingType      // Different type of Rings
 
 
 
-typedef enum RingVariant   // Base variables
-{
-    BASE     = 0x00,
-    CC       = 0x01,
-    RL       = 0x02,
-    OVERRIDE = 0x03,
-    OVERLAY  = 0x04,
-    NUM_RING_VARIANTS = 0x05,
-    NOT_VALID = 0xff
-} RingVariant_t;
-
-
 //
 // PPE types
 //