Zeppelin BUP updates: Targets.pm changes

- CEN_MBA_PORT/CEN_MBA_DIMM: copy the values from MBA_PORT/MBA_DIMM
  these are duplicate attributes. Eventually, we need to remove one
  set. But, since HWPs for centaur use CEN_MBA_PORT/CEN_MBA_DIMM and
  MRW sets MBA_PORT/MBA_DIMM correctly. We just copy from MBA_PORT to
  CEN_MBA_PORT
- DMI_REFCLOCK_SWIZZLE: used to be a bus attribute, but now it is moved
  to the dmi target. So, no additional processing is needed
- SCOM_SWITCHES: Add default for membuf target similar to proc target
- EI_BUS_TX_MSBSWAP: Remove the copying from the DMI connections. This
  now directly comes from MRW, no processing required.

Change-Id: I3ba430d766c18d1756744e54c5e615dc25cdf553
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49930
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: Santosh S. Puranik <santosh.puranik@in.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 12 insertions, 20 deletions

diff --git a/src/usr/targeting/common/Targets.pm b/src/usr/targeting/common/Targets.pm
index a32105893..14db6a5c7 100644
--- a/src/usr/targeting/common/Targets.pm
+++ b/src/usr/targeting/common/Targets.pm
@@ -1329,18 +1329,22 @@ sub processMc
                         $self->setAttribute($membuf, "POSITION", $membufnum);
                         $self->setAttribute($membuf, "VPD_REC_NUM", $membufnum);
 
+                        # It's okay to hard code these here because the code fixes it as needed
+                        # This is hardcoded for proc target as well.
+                        $self->setAttributeField($membuf, "SCOM_SWITCHES", "useSbeScom","0");
+                        $self->setAttributeField($membuf, "SCOM_SWITCHES", "useFsiScom","1");
+                        $self->setAttributeField($membuf, "SCOM_SWITCHES", "reserved",   "0");
+                        $self->setAttributeField($membuf, "SCOM_SWITCHES", "useInbandScom", "0");
+                        $self->setAttributeField($membuf, "SCOM_SWITCHES", "useXscom", "0");
+
                         ## get the dmi bus
                         my $dmi_bus = $self->{data}->{TARGETS}{$dmi}{CONNECTION}{BUS}[0];
 
                         # copy DMI bus attributes to membuf
                         $self->setAttribute($dmi, "EI_BUS_TX_LANE_INVERT",
                             $dmi_bus->{bus_attribute}->{PROC_TX_LANE_INVERT}->{default});
-                        $self->setAttribute($dmi, "EI_BUS_TX_MSBSWAP",
-                            $dmi_bus->{bus_attribute}->{PROC_TX_MSBSWAP}->{default});
                         $self->setAttribute($membuf, "EI_BUS_TX_LANE_INVERT",
                             $dmi_bus->{bus_attribute}->{MEMBUF_TX_LANE_INVERT}->{default});
-                        $self->setAttribute($membuf, "EI_BUS_TX_MSBSWAP",
-                            $dmi_bus->{bus_attribute}->{MEMBUF_TX_MSBSWAP}->{default});
 
                         ## auto setup FSI assuming schematic symbol.  If FSI busses are
                         ## defined in serverwiz2, this will be overridden
@@ -1351,18 +1355,6 @@ sub processMc
                             $self->{targeting}->{SYS}[0]{NODES}[$node]{PROCS}[$proc]{KEY};
                         my $proc_path = $self->getAttribute($proc_key,"PHYS_PATH");
                         $self->setFsiAttributes($membuf,"FSICM",0,$proc_path,$fsi_port,0);
-                        $self->setAttribute($dmi, "DMI_REFCLOCK_SWIZZLE",$fsi_port);
-                        my $dmi_swizzle = "";
-                        if( $self->isBusAttributeDefined($dmi,0,"DMI_REFCLOCK_SWIZZLE"))
-                        {
-                           $dmi_swizzle =
-                             $self->getBusAttribute($dmi,0,"DMI_REFCLOCK_SWIZZLE");
-                        }
-                        if ($dmi_swizzle ne "")
-                        {
-                            $self->setAttribute($dmi, "DMI_REFCLOCK_SWIZZLE",$dmi_swizzle);
-                        }
-
                         $self->setHuid($membuf, $sys, $node);
                         $self->{targeting}
                           ->{SYS}[0]{NODES}[$node]{PROCS}[$proc]{MC}[$mc]{MI}[$mi]
@@ -1454,16 +1446,16 @@ sub processMc
                                         if (!$self->isBadAttribute($ddr, "CEN_MBA_PORT"))
                                         {
                                             $port_num = $self->getAttribute($ddr,"CEN_MBA_PORT");
-                                            $self->setAttribute($dimm,"CEN_MBA_PORT",$port_num);
-
                                         }
+
                                         if (!$self->isBadAttribute($ddr, "CEN_MBA_DIMM"))
                                         {
                                             $dimm_num = $self->getAttribute($ddr,"CEN_MBA_DIMM");
-                                            $self->setAttribute($dimm,"CEN_MBA_DIMM",$dimm_num);
-
                                         }
 
+                                        $self->setAttribute($dimm,"CEN_MBA_PORT",$port_num);
+                                        $self->setAttribute($dimm,"CEN_MBA_DIMM",$dimm_num);
+
                                         my $aff_pos = DIMMS_PER_PROC*$proc+
                                                       DIMMS_PER_DMI*$dmi_num+
                                                       DIMMS_PER_MBAPORT*$mba+