Deprecate legacy ATTR_MBA_PORT/ATTR_MBA_DIMM

There are currently two competing sets of attributes related to
the DIMM position.
- Legacy (P8) MBA_PORT/MBA_DIMM
- New (P9) CEN_MBA_PORT/CEN_MBA_DIMM

These two sets of attributes are not currently being populated
with the same data in all of the MRW xml files.  The P9 HWPs are
using the CEN_ versions but there is a lot of code on the FSP
that is still using the old versions.  Additionally, the Nimbus
MRW XMLs are using MBA_PORT to represent the dimm position
behind the MCA (even though there is only a single port on the
MCA and MBA is erroneous).

This commit attempts to consolidate things into a new set of
more generic (and hopefully more descriptive) attributes to use
for all system types.  The MRW parsing logic has been modified
to consume whatever data it can to populate all 3 sets of data
with the same values.  Eventually we will deprecate the 2
previous attribute sets once we've cleaned all the existing files
up.

The new attributes are:
- MEM_PORT
- POS_ON_MEM_PORT

CQ: SW430317
Change-Id: If63929d78dcaacc1120709a659d6094ce576918d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/59077
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/usr/htmgt/htmgt_utility.C b/src/usr/htmgt/htmgt_utility.C
index aabe6e18e..79aa96e77 100644
--- a/src/usr/htmgt/htmgt_utility.C
+++ b/src/usr/htmgt/htmgt_utility.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2014,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -164,15 +164,15 @@ namespace HTMGT
     {
         //To make the OCC DIMM # 0 - 7: 0bABC
         //  A: MBA  ATTR_CHIP_UNIT: 0 or 1
-        //  B: DIMM ATTR_MBA_PORT:  0 or 1
-        //  C: DIMM ATTR_MBA_DIMM:  0 or 1
+        //  B: DIMM ATTR_MEM_PORT:  0 or 1
+        //  C: DIMM ATTR_POS_ON_MEM_PORT:  0 or 1
 
         //Note: No CDIMM systems in plan.  May need to revisit
         //this if there are any as OCC may not care about logical DIMMs.
 
         const uint8_t mbaUnit = i_mba->getAttr<ATTR_CHIP_UNIT>();
-        const uint8_t mbaPort = i_dimm->getAttr<ATTR_MBA_PORT>();
-        const uint8_t mbaDIMM = i_dimm->getAttr<ATTR_MBA_DIMM>();
+        const uint8_t mbaPort = i_dimm->getAttr<ATTR_MEM_PORT>();
+        const uint8_t mbaDIMM = i_dimm->getAttr<ATTR_POS_ON_MEM_PORT>();
 
         TMGT_DBG("DIMM 0x%X unit %d port %d pos %d = %d",
                  i_dimm->getAttr<ATTR_HUID>(),