Replace "NVBUS" with "NV" everywhere that we can

Change-Id: Ice2e298b5a7679976fbcb677c469d4d5fc27cb40
RTC: 147555
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/21870
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Elizabeth K. Liner <eliner@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

16 files changed, 72 insertions, 66 deletions

diff --git a/src/include/usr/fapi2/hwpf_fapi2_reasoncodes.H b/src/include/usr/fapi2/hwpf_fapi2_reasoncodes.H
index fdca12fea..4a8d10868 100644
--- a/src/include/usr/fapi2/hwpf_fapi2_reasoncodes.H
+++ b/src/include/usr/fapi2/hwpf_fapi2_reasoncodes.H
@@ -82,7 +82,7 @@ namespace fapi2
         RC_PEC_NO_PROC_FOUND           = FAPI2_COMP_ID | 0x1a,
         RC_XBUS_NO_PROC_FOUND          = FAPI2_COMP_ID | 0x1b,
         RC_OBUS_NO_PROC_FOUND          = FAPI2_COMP_ID | 0x1c,
-        RC_NVBUS_NO_PROC_FOUND         = FAPI2_COMP_ID | 0x1d,
+        RC_NV_NO_PROC_FOUND            = FAPI2_COMP_ID | 0x1d,
         RC_PPE_NO_PROC_FOUND           = FAPI2_COMP_ID | 0x1e,
         RC_PERV_NO_PROC_FOUND          = FAPI2_COMP_ID | 0x1f,
         RC_CAPP_NO_PROC_FOUND          = FAPI2_COMP_ID | 0x20,
diff --git a/src/include/usr/fapi2/target.H b/src/include/usr/fapi2/target.H
index e38f24585..615677c90 100644
--- a/src/include/usr/fapi2/target.H
+++ b/src/include/usr/fapi2/target.H
@@ -161,7 +161,7 @@ inline TARGETING::TYPE convertFapi2TypeToTargeting(fapi2::TargetType i_T)
             o_targetingType = TARGETING::TYPE_OBUS;
             break;
         case fapi2::TARGET_TYPE_NV:
-            o_targetingType = TARGETING::TYPE_NVBUS;
+            o_targetingType = TARGETING::TYPE_NV;
             break;
         case fapi2::TARGET_TYPE_SBE:
             o_targetingType = TARGETING::TYPE_SBE;
diff --git a/src/usr/fapi2/plat_utils.C b/src/usr/fapi2/plat_utils.C
index 152491ea9..c9f0a1d93 100644
--- a/src/usr/fapi2/plat_utils.C
+++ b/src/usr/fapi2/plat_utils.C
@@ -301,7 +301,7 @@ void xlateTargetType(const fapi2::TargetType i_targetType,
         break;
     case fapi2::TARGET_TYPE_NV:
         o_class = TARGETING::CLASS_UNIT;
-        o_type = TARGETING::TYPE_NVBUS;
+        o_type = TARGETING::TYPE_NV;
         break;
     case fapi2::TARGET_TYPE_SBE:
         o_class = TARGETING::CLASS_UNIT;
diff --git a/src/usr/fapi2/test/fapi2HwpTest.C b/src/usr/fapi2/test/fapi2HwpTest.C
index c90431ecb..d8fb23c0c 100644
--- a/src/usr/fapi2/test/fapi2HwpTest.C
+++ b/src/usr/fapi2/test/fapi2HwpTest.C
@@ -128,8 +128,8 @@ errlHndl_t fapi2HwpTest()
                 targeting_targets[MY_XBUS]);
         fapi2::Target<fapi2::TARGET_TYPE_OBUS> fapi2_obusTarget(
                 targeting_targets[MY_OBUS]);
-        fapi2::Target<fapi2::TARGET_TYPE_NV> fapi2_nvbusTarget(
-                targeting_targets[MY_NVBUS]);
+        fapi2::Target<fapi2::TARGET_TYPE_NV> fapi2_nvTarget(
+                targeting_targets[MY_NV]);
         fapi2::Target<fapi2::TARGET_TYPE_PPE> fapi2_ppeTarget(targeting_targets[MY_PPE]);
         fapi2::Target<fapi2::TARGET_TYPE_PERV> fapi2_pervTarget(
                 targeting_targets[MY_PERV]);
@@ -230,7 +230,7 @@ errlHndl_t fapi2HwpTest()
           TS_FAIL("Error occured in p9_sample_procedure_obus !!");
         }
         numTests++;
-        FAPI_INVOKE_HWP(l_errl, p9_sample_procedure_nv, fapi2_nvbusTarget, scratchWriteValue);
+        FAPI_INVOKE_HWP(l_errl, p9_sample_procedure_nv, fapi2_nvTarget, scratchWriteValue);
         if(l_errl != NULL)
         {
           l_errl = NULL;
diff --git a/src/usr/fapi2/test/fapi2TestUtils.C b/src/usr/fapi2/test/fapi2TestUtils.C
index 896a94ba8..acf25eeb3 100644
--- a/src/usr/fapi2/test/fapi2TestUtils.C
+++ b/src/usr/fapi2/test/fapi2TestUtils.C
@@ -47,7 +47,7 @@
 #define NUM_PHBS         6
 #define NUM_XBUS         1
 #define NUM_OBUS         2
-#define NUM_NVBUS        2
+#define NUM_NV           2
 #define NUM_PPES         21
 #define NUM_PERVS        55
 #define NUM_CAPPS        2
@@ -225,14 +225,14 @@ void generateTargets(TARGETING::Target* i_pMasterProcChip,
         }
     }
 
-    //Setup NVBUS
+    //Setup NV
     i_pMasterProcChip->tryGetAttr<TARGETING::ATTR_PHYS_PATH>(l_epath);
-    for(int i = 0; i < NUM_NVBUS; i++)
+    for(int i = 0; i < NUM_NV; i++)
     {
-        l_epath.addLast(TARGETING::TYPE_NVBUS, i);
+        l_epath.addLast(TARGETING::TYPE_NV, i);
         if(TARGETING::targetService().toTarget(l_epath) != NULL)
         {
-            o_targetList[MY_NVBUS] =
+            o_targetList[MY_NV] =
               TARGETING::targetService().toTarget(l_epath);
             break;
         }
diff --git a/src/usr/fapi2/test/fapi2TestUtils.H b/src/usr/fapi2/test/fapi2TestUtils.H
index fa1ad1353..0a841d6a6 100644
--- a/src/usr/fapi2/test/fapi2TestUtils.H
+++ b/src/usr/fapi2/test/fapi2TestUtils.H
@@ -55,7 +55,7 @@ enum{
     MY_PHB,
     MY_XBUS,
     MY_OBUS,
-    MY_NVBUS,
+    MY_NV,
     MY_PPE,
     MY_PERV,
     MY_CAPP,
diff --git a/src/usr/hwas/common/hwas.C b/src/usr/hwas/common/hwas.C
index 1081bb615..25a43bc47 100644
--- a/src/usr/hwas/common/hwas.C
+++ b/src/usr/hwas/common/hwas.C
@@ -856,13 +856,13 @@ bool isDescFunctional(const TARGETING::TargetHandle_t &i_desc,
         }
     }
     else
-    if (i_desc->getAttr<ATTR_TYPE>() == TYPE_NVBUS)
+    if (i_desc->getAttr<ATTR_TYPE>() == TYPE_NV)
     {
         // Check NPU bit in N3 entry
         if ((i_pgData[VPD_CP00_PG_N3_INDEX] &
              VPD_CP00_PG_N3_NPU) != 0)
         {
-            HWAS_INF("pDesc %.8X - NVBUS pgData[%d]: "
+            HWAS_INF("pDesc %.8X - NV pgData[%d]: "
                      "actual 0x%04X, expected 0x%04X - bad",
                      i_desc->getAttr<ATTR_HUID>(),
                      VPD_CP00_PG_N3_INDEX,
diff --git a/src/usr/hwas/test/hwas1test.H b/src/usr/hwas/test/hwas1test.H
index 69e81af1f..02ece0841 100644
--- a/src/usr/hwas/test/hwas1test.H
+++ b/src/usr/hwas/test/hwas1test.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2015                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2016                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -1167,9 +1167,9 @@ public:
                             (uint16_t)VPD_CP00_PG_MCxx_GOOD;
                         break;
 
-                    case TYPE_NVBUS:
+                    case TYPE_NV:
                         TS_TRACE( "testHWASisDescFunctional: "
-                                  "NVBUS is not functional");
+                                  "NV is not functional");
                         pgData[VPD_CP00_PG_N3_INDEX] |=
                             (uint16_t)VPD_CP00_PG_N3_NPU;
 
@@ -1177,7 +1177,7 @@ public:
                         {
                             TS_FAIL("testHWASisDescFunctional>"
                                     "functional = 0x%x, should be false, "
-                                    "NVBUS = 0x%04x.",
+                                    "NV = 0x%04x.",
                                     isDescFunctional(pDesc, pgData),
                                     pgData[VPD_CP00_PG_N3_INDEX]);
                         }
diff --git a/src/usr/scom/scomtrans.C b/src/usr/scom/scomtrans.C
index 54e87b06d..2fd7de7f3 100644
--- a/src/usr/scom/scomtrans.C
+++ b/src/usr/scom/scomtrans.C
@@ -132,7 +132,7 @@ DEVICE_REGISTER_ROUTE(DeviceFW::WILDCARD,
 
 DEVICE_REGISTER_ROUTE(DeviceFW::WILDCARD,
                     DeviceFW::SCOM,
-                    TARGETING::TYPE_NVBUS,
+                    TARGETING::TYPE_NV,
                     startScomProcess);
 
 DEVICE_REGISTER_ROUTE(DeviceFW::WILDCARD,
@@ -588,9 +588,9 @@ bool getChipUnit (TARGETING::TYPE i_type,
             o_chipUnit = PU_OBUS_CHIPUNIT;
             break;
         }
-        case(TARGETING::TYPE_NVBUS) :
+        case(TARGETING::TYPE_NV) :
         {
-            o_chipUnit = PU_NVBUS_CHIPUNIT;
+            o_chipUnit = PU_NV_CHIPUNIT;
             break;
         }
         case(TARGETING::TYPE_SBE) :
diff --git a/src/usr/scom/test/scomtest.H b/src/usr/scom/test/scomtest.H
index 936390b40..fe9279056 100644
--- a/src/usr/scom/test/scomtest.H
+++ b/src/usr/scom/test/scomtest.H
@@ -558,8 +558,8 @@ public:
         myPHB5,
         myOBUS0,
         myOBUS3,
-        myNVBUS0,
-        myNVBUS1,
+        myNV0,
+        myNV1,
         myPPE0,
         myPPE1,
         myOCC0,
@@ -733,18 +733,18 @@ public:
     // remove OBUS3 target
     epath.removeLast();
 
-    //add NVBUS0 target
-    epath.addLast(TARGETING::TYPE_NVBUS,0);
-    scom_targets[myNVBUS0] = TARGETING::targetService().toTarget(epath);
+    //add NV0 target
+    epath.addLast(TARGETING::TYPE_NV,0);
+    scom_targets[myNV0] = TARGETING::targetService().toTarget(epath);
 
-    // remove NVBUS0 target
+    // remove NV0 target
     epath.removeLast();
 
-    // add NVBUS1 target.
-    epath.addLast(TARGETING::TYPE_NVBUS,1);
-    scom_targets[myNVBUS1] = TARGETING::targetService().toTarget(epath);
+    // add NV1 target.
+    epath.addLast(TARGETING::TYPE_NV,1);
+    scom_targets[myNV1] = TARGETING::targetService().toTarget(epath);
 
-    // remove NVBUS1 target
+    // remove NV1 target
     epath.removeLast();
 
     //add PPE0 target
@@ -856,10 +856,10 @@ public:
     { scom_targets[myOBUS3], 0x09010C55, 0x0C010C55 ,false},
     { scom_targets[myOBUS0], 0x12012826, 0x12012826, true},
     { scom_targets[myOBUS3], 0x24030008, 0x24030008, true},
-    { scom_targets[myNVBUS0], 0x050110D4, 0x050110D4, false},
-    { scom_targets[myNVBUS1], 0x050110D4, 0x050110F4,false},
-    { scom_targets[myNVBUS0], 0x12012826, 0x12012826, true},
-    { scom_targets[myNVBUS1], 0x24030008, 0x24030008, true},
+    { scom_targets[myNV0], 0x050110D4, 0x050110D4, false},
+    { scom_targets[myNV1], 0x050110D4, 0x050110F4,false},
+    { scom_targets[myNV0], 0x12012826, 0x12012826, true},
+    { scom_targets[myNV1], 0x24030008, 0x24030008, true},
     };
 
     int numOfAddr = sizeof test_data / sizeof(test_data[0]);
diff --git a/src/usr/targeting/common/entitypath.C b/src/usr/targeting/common/entitypath.C
index 59e05dc18..ff5bb086c 100644
--- a/src/usr/targeting/common/entitypath.C
+++ b/src/usr/targeting/common/entitypath.C
@@ -413,8 +413,8 @@ const char* EntityPath::pathElementTypeAsString(
             return "DMI";
         case TYPE_OBUS:
             return "OBUS";
-        case TYPE_NVBUS:
-            return "NVBUS";
+        case TYPE_NV:
+            return "NV";
         case TYPE_SBE:
             return "SBE";
         case TYPE_PPE:
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 50aa6b93a..48e2e7da8 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -242,7 +242,7 @@
         <value>40</value>
     </enumerator>
     <enumerator>
-        <name>NVBUS</name>
+        <name>NV</name>
         <value>41</value>
     </enumerator>
     <enumerator>
diff --git a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
index 5c92ce454..53898e6c4 100644
--- a/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_NIMBUS.system.xml
@@ -42,7 +42,7 @@
      *     PEC 2 has 3 PHBs
      * Each Nimbus has 1 XBUS chiplet
      * Each Nimbus has 2 OBUS (OB0 and OB3)
-     * Each Nimbus has 2 NVBUS
+     * Each Nimbus has 2 NV
      * Each Nimbus has 21 PPE units (including the SBE):
      *    1 SBE, 1 Powerbus/Fabric PPE, 4 GPEs, 12 CMEs, and 3 IO PPEs.     *
      * Each chiplet existing in a Nimbus has 1 equivalent PERV unit
@@ -1474,18 +1474,18 @@
     </attribute>
 </targetInstance>
 
-<!-- Nimbus n0p0 NVBUS units -->
+<!-- Nimbus n0p0 NV units -->
 <targetInstance>
-    <id>sys0node0proc0nvbus0</id>
-    <type>unit-nvbus-nimbus</type>
+    <id>sys0node0proc0nv0</id>
+    <type>unit-nv-nimbus</type>
     <attribute><id>HUID</id><default>0x000E0300</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/nvbus-0</default>
+        <default>physical:sys-0/node-0/proc-0/nv-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/nvbus-0</default>
+        <default>affinity:sys-0/node-0/proc-0/nv-0</default>
     </attribute>
     <attribute>
         <id>CHIP_UNIT</id>
@@ -1494,16 +1494,16 @@
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0proc0nvbus1</id>
-    <type>unit-nvbus-nimbus</type>
+    <id>sys0node0proc0nv1</id>
+    <type>unit-nv-nimbus</type>
     <attribute><id>HUID</id><default>0x000E0301</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/nvbus-1</default>
+        <default>physical:sys-0/node-0/proc-0/nv-1</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/nvbus-1</default>
+        <default>affinity:sys-0/node-0/proc-0/nv-1</default>
     </attribute>
     <attribute>
         <id>CHIP_UNIT</id>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index beb2649c6..4f7b5b1c1 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -2433,23 +2433,23 @@
     </attribute>
 </targetType>
 
-<!-- NVBUS
+<!-- NV
      Nimbus : 2 per chip
      Cumulus: 2  -->
 <targetType>
-    <id>unit-nvbus-power9</id>
+    <id>unit-nv-power9</id>
     <parent>unit</parent>
     <attribute>
         <id>TYPE</id>
-        <default>NVBUS</default>
+        <default>NV</default>
     </attribute>
     <attribute><id>DECONFIG_GARDABLE</id><default>1</default></attribute>
     <attribute><id>SCRATCH_UINT8_1</id><default>5</default></attribute>
 </targetType>
 
 <targetType>
-    <id>unit-nvbus-nimbus</id>
-    <parent>unit-nvbus-power9</parent>
+    <id>unit-nv-nimbus</id>
+    <parent>unit-nv-power9</parent>
     <attribute>
         <id>MODEL</id>
         <default>NIMBUS</default>
@@ -2457,8 +2457,8 @@
 </targetType>
 
 <targetType>
-    <id>unit-nvbus-cumulus</id>
-    <parent>unit-nvbus-power9</parent>
+    <id>unit-nv-cumulus</id>
+    <parent>unit-nv-power9</parent>
     <attribute>
         <id>MODEL</id>
         <default>CUMULUS</default>
diff --git a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
index 9b22b5ff2..2a8afc2f3 100644
--- a/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/vbu_NIMBUS.system.xml
@@ -42,7 +42,7 @@
      *     PEC 2 has 3 PHBs
      * Each Nimbus has 1 XBUS chiplet
      * Each Nimbus has 2 OBUS (OB0 and OB3)
-     * Each Nimbus has 2 NVBUS
+     * Each Nimbus has 2 NV
      * Each Nimbus has 21 PPE units (including the SBE):
      *    1 SBE, 1 Powerbus/Fabric PPE, 4 GPEs, 12 CMEs, and 3 IO PPEs.     *
      * Each chiplet existing in a Nimbus has 1 equivalent PERV unit
@@ -1474,18 +1474,18 @@
     </attribute>
 </targetInstance>
 
-<!-- Nimbus n0p0 NVBUS units -->
+<!-- Nimbus n0p0 NV units -->
 <targetInstance>
-    <id>sys0node0proc0nvbus0</id>
-    <type>unit-nvbus-nimbus</type>
+    <id>sys0node0proc0nv0</id>
+    <type>unit-nv-nimbus</type>
     <attribute><id>HUID</id><default>0x000E0300</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/nvbus-0</default>
+        <default>physical:sys-0/node-0/proc-0/nv-0</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/nvbus-0</default>
+        <default>affinity:sys-0/node-0/proc-0/nv-0</default>
     </attribute>
     <attribute>
         <id>CHIP_UNIT</id>
@@ -1494,16 +1494,16 @@
 </targetInstance>
 
 <targetInstance>
-    <id>sys0node0proc0nvbus1</id>
-    <type>unit-nvbus-nimbus</type>
+    <id>sys0node0proc0nv1</id>
+    <type>unit-nv-nimbus</type>
     <attribute><id>HUID</id><default>0x000E0301</default></attribute>
     <attribute>
         <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/proc-0/nvbus-1</default>
+        <default>physical:sys-0/node-0/proc-0/nv-1</default>
     </attribute>
     <attribute>
         <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/nvbus-1</default>
+        <default>affinity:sys-0/node-0/proc-0/nv-1</default>
     </attribute>
     <attribute>
         <id>CHIP_UNIT</id>
diff --git a/src/usr/targeting/common/xmltohb/xmltohb.pl b/src/usr/targeting/common/xmltohb/xmltohb.pl
index b29871de0..d5a3ad99b 100755
--- a/src/usr/targeting/common/xmltohb/xmltohb.pl
+++ b/src/usr/targeting/common/xmltohb/xmltohb.pl
@@ -1789,7 +1789,13 @@ sub writeEnumFileAttrEnums {
             $enumName = $enumerationType->{id} . "_" . $enumerator->{name};
             write;
         }
-
+#@TODO RTC:149503 Remove hack that allows TYPE_NVBUS
+        if($enumerationType->{id} eq 'TYPE')
+          {
+              $enumHex = 'TYPE_NV';
+              $enumName = 'TYPE_NVBUS';
+              write;
+          }
         print $outFile "};\n\n";
     }
 }