HWP: Update HWPs with latest good versions

The selection of HWPs to pull into Hostboot was due to either:
1/ Thi needed to pull into Hostboot build for VPO to match Cronus level.
2/ Mike saw that latest code in eKB is a trivial update to current reviewed
version (usually just adding the cvs version number)
These changes have all passed the "HWP Review"

RTC: 46573
Change-Id: I50031a19e5b4f7ad0531cd58df9ec24034207664
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1499
Tested-by: Jenkins Server
Reviewed-by: Van H. Lee <vanlee@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 22 insertions, 21 deletions

diff --git a/src/usr/hwpf/hwp/dram_initialization/mss_extent_setup/mss_extent_setup.C b/src/usr/hwpf/hwp/dram_initialization/mss_extent_setup/mss_extent_setup.C
index 08c817a92..30cc399b8 100644
--- a/src/usr/hwpf/hwp/dram_initialization/mss_extent_setup/mss_extent_setup.C
+++ b/src/usr/hwpf/hwp/dram_initialization/mss_extent_setup/mss_extent_setup.C
@@ -21,6 +21,7 @@
  *
  *  IBM_PROLOG_END_TAG
  */
+// $Id: mss_extent_setup.C,v 1.8 2012/07/17 13:24:10 bellows Exp $
 //------------------------------------------------------------------------------
 // Don't forget to create CVS comments when you check in your changes!
 //------------------------------------------------------------------------------
@@ -31,6 +32,7 @@
 //------------------------------------------------------------------------------
 // Version:|  Author: |  Date:  | Comment:
 //---------|----------|---------|-----------------------------------------------
+//  1.8    | bellows  |16-Jul-12| added in Id tag
 //  1.7    | bellows  |15-Jun-12| Updated for Firmware
 //  1.3    | gpaulraj |11-Nov-11| modified according HWPF format
 //  1.2    | gpaulraj |02-oct-11| supported for MCS loop - SIM model. compiled in the ecmd & FAPI calls included.
diff --git a/src/usr/hwpf/hwp/dram_initialization/mss_extent_setup/mss_extent_setup.H b/src/usr/hwpf/hwp/dram_initialization/mss_extent_setup/mss_extent_setup.H
index a2a131174..be03117f0 100755
--- a/src/usr/hwpf/hwp/dram_initialization/mss_extent_setup/mss_extent_setup.H
+++ b/src/usr/hwpf/hwp/dram_initialization/mss_extent_setup/mss_extent_setup.H
@@ -21,6 +21,7 @@
  *
  *  IBM_PROLOG_END_TAG
  */
+// $Id: mss_extent_setup.H,v 1.8 2012/07/17 13:22:51 bellows Exp $
 //------------------------------------------------------------------------------
 // *! (C) Copyright International Business Machines Corp. 2011
 // *! All Rights Reserved -- Property of IBM
@@ -41,6 +42,7 @@
 //------------------------------------------------------------------------------
 // Version:|  Author: |  Date:  | Comment:
 //---------|----------|---------|-----------------------------------------------
+//  1.8    | bellows  |16-Jul-12| added in Id tag
 //  1.7    | bellows  |15-Jun-12| Updated for Firmware
 //   1.2   |          |         |
 //   1.1   | gpaulraj |11-NOV-11| First Draft.
@@ -54,6 +56,7 @@ typedef fapi::ReturnCode (*mss_extent_setup_FP_t)();
 
 extern "C"
 {
+
 /**
  * @brief extent setup  procedure -- currently an open shell until extent functions are found t obe needed 
  *
diff --git a/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.C b/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.C
index e64236331..8e3db1748 100644
--- a/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.C
+++ b/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.C
@@ -21,7 +21,7 @@
  *
  *  IBM_PROLOG_END_TAG
  */
-// $Id: proc_setup_bars.C,v 1.3 2012/06/12 02:44:04 jmcgill Exp $
+// $Id: proc_setup_bars.C,v 1.5 2012/07/23 17:47:05 jmcgill Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_setup_bars.C,v $
 //------------------------------------------------------------------------------
 // *|
@@ -75,6 +75,7 @@ extern "C" {
 // Function definitions
 //------------------------------------------------------------------------------
 
+
 //------------------------------------------------------------------------------
 // function: utility function to display address range/BAR information and
 //           check properties
@@ -154,9 +155,9 @@ bool proc_setup_bars_common_do_ranges_overlap(
     // check that ranges are non-overlapping
     if (i_ranges.size() > 1)
     {
-        for (uint8_t r = 0; (r < i_ranges.size()-1) && !overlap; r++)
+        for (size_t r = 0; (r < i_ranges.size()-1) && !overlap; r++)
         {
-            for (uint8_t x = r+1; x < i_ranges.size(); x++)
+            for (size_t x = r+1; x < i_ranges.size(); x++)
             {
                 if (i_ranges[r]->overlaps(*(i_ranges[x])))
                 {
diff --git a/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.H b/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.H
index 439bfe21d..df3acb937 100644
--- a/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.H
+++ b/src/usr/hwpf/hwp/dram_initialization/proc_setup_bars/proc_setup_bars.H
@@ -21,7 +21,7 @@
  *
  *  IBM_PROLOG_END_TAG
  */
-// $Id: proc_setup_bars.H,v 1.2 2012/06/12 02:44:02 jmcgill Exp $
+// $Id: proc_setup_bars.H,v 1.3 2012/07/23 17:47:41 jmcgill Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/chips/p8/working/procedures/ipl/fapi/proc_setup_bars.H,v $
 //------------------------------------------------------------------------------
 // *|
@@ -211,19 +211,14 @@ struct proc_setup_bars_addr_range
     // round region size to next largest power of 2
     void round_next_power_of_2()
     {
-        uint64_t size_round;
-        // if size is zero/one, leave as is
-        if ((size != 0) && (size != 1))
-        {
-            // shift until new size is greater than or
-            // equal to existing size
-            for (size_round = 0x1ULL;
-                 size_round < size;
-                 size_round = (size_round << 1))
-            {
-            }
-            size = size_round;
-        }
+        size = size - 1;
+        size = size | (size >> 1);
+        size = size | (size >> 2);
+        size = size | (size >> 4);
+        size = size | (size >> 8);
+        size = size | (size >> 16);
+        size = size | (size >> 32);
+        size = size + 1;
     }
 
     // return ending address of range
@@ -236,10 +231,10 @@ struct proc_setup_bars_addr_range
     bool overlaps(const proc_setup_bars_addr_range& range_compare) const
     {
         // if either range is disabled, consider them non-overlapping
-        return(!(!enabled ||
-                 !range_compare.enabled ||
-                 ((end_addr() < range_compare.base_addr) ||
-                  (base_addr > range_compare.end_addr()))));
+        return(enabled &&
+               range_compare.enabled &&
+               (base_addr <= range_compare.end_addr()) &&
+               (end_addr() >= range_compare.base_addr));
     }
 
     // merge two ranges (span breadth of both ranges)