all scripts for hdat pnor partition

Change-Id: Ied9c154d544d65eebfe5cfb0185ccb26545ee130
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/67144
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: Jayashankar Padath <jayashankar.padath@in.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 17 insertions, 6 deletions

diff --git a/src/usr/targeting/common/Targets.pm b/src/usr/targeting/common/Targets.pm
index b5597a711..f2a80c709 100644
--- a/src/usr/targeting/common/Targets.pm
+++ b/src/usr/targeting/common/Targets.pm
@@ -1027,10 +1027,12 @@ sub iterateOverChiplets
                              }
                              else
                              {
-                                 # The dynamic bifurcation feature will make duplicate connection
-                                 # for single PEC. So just post warning message for the possible
-                                 # error in other scenario.
-                                 printf("Warning: Found a duplicate connection for PEC %s PHB %s.\n",$pec_num,$phb_num);
+                                 # This is our "bug" scenerio. We have found a
+                                 # connection, but that PHB element is already
+                                 # filled in the array. We need to kill the
+                                 # program.
+                                 printf("Found a duplicate connection for PEC %s PHB %s.\n",$pec_num,$phb_num);
+                                 die "Duplicate PHB bus connection found\n";
                              }
                         }
                     }
@@ -2179,6 +2181,7 @@ sub getAttribute
     return $target_ptr->{ATTRIBUTES}->{$attribute}->{default};
 }
 
+
 sub getAttributeGroup
 {
     my $self       = shift;
diff --git a/src/usr/targeting/common/genHDATstructures.pl b/src/usr/targeting/common/genHDATstructures.pl
index bf0b13589..5150e3a06 100755
--- a/src/usr/targeting/common/genHDATstructures.pl
+++ b/src/usr/targeting/common/genHDATstructures.pl
@@ -6,7 +6,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2015,2017
+# Contributors Listed Below - COPYRIGHT 2015,2018
 # [+] International Business Machines Corp.
 #
 #
@@ -391,7 +391,15 @@ sub processProcessor
 
     my $parent_target =
              $targetObj->getTargetParent($targetObj->getTargetParent($target));
-    my $proc_id = $targetObj->getAttribute($parent_target, "POSITION");
+    my $proc_id = 0;         
+    if (!($targetObj->isBadAttribute($parent_target, "POSITION")))
+    {
+      $proc_id = $targetObj->getAttribute($parent_target, "POSITION");
+    }
+    else
+    {
+      $targetObj->writeReport("ERROR::proc id not found for $parent_target \n");
+    }
     my $node_id = getParentNodeId($targetObj,$parent_target);
     my $hosti2centryid = ($node_id << 24) | ($proc_id << 16);