VBU IPL -- update sim PLL configuration

  Adjust refclock/PLL configuration to drive all mesh clocks from PLLs
    non-IO/wafer configuration (nest PLL bucket #1) -- default for sc/sq/fc
    IO/system model configuration (nest PLL bucket #2) -- default for mc

  Regression framework updates
    Remove dependence on sim-only varosc/refclock HWPs
    Scan from HW image (ultimately need to move to SEEPROM)
    Add memory attribute HWPs missing from flow
    Handle real/broadside scan options

  HWP updates
    Scan PLL configuration from image
    Preserve clock mux attribute programming
    First crack at removing unneeded PLL buckets from images/TOR
    Add boot support for warm IPL

Change-Id: I05d4e243149e6d55d92668195a17107a1e3c3d78
Original-Change-Id: Ic7f27ab3dfdf258471d91618adc8eae4cadb2e42
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26938
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/30250
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

1 files changed, 13 insertions, 33 deletions

diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.C b/src/import/chips/p9/utils/imageProcs/p9_ringId.C
index f749ac1d..7456ac1c 100644
--- a/src/import/chips/p9/utils/imageProcs/p9_ringId.C
+++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.C
@@ -160,12 +160,8 @@ const GenRingIdList RING_ID_LIST_COMMON[] =
     {"xb_io2_gptr"               , 0x0a, 0x06, 0x06, "xb_io2_gptr_ring"          , NON_VPD_RING, 0,  0x0110000000002000},
     {"xb_io2_time"               , 0x0b, 0x06, 0x06, "xb_io2_time_ring"          , NON_VPD_RING, 0,  0x0110000000000100},
     {"xb_pll_gptr"               , 0x0c, 0x06, 0x06, "xb_pll_gptr_ring"          , NON_VPD_RING, 0,  0x0002000000002000},
-    {"xb_pll_bndy_bucket_1"      , 0x0d, 0x06, 0x06, "xb_pll_bndy_bucket_1_ring" , NON_VPD_PLL_RING, 5,  0x0002000000000080},
-    {"xb_pll_bndy_bucket_2"      , 0x0e, 0x06, 0x06, "xb_pll_bndy_bucket_2_ring" , NON_VPD_PLL_RING, 5,  0x0002000000000080},
-    {"xb_pll_bndy_bucket_3"      , 0x0f, 0x06, 0x06, "xb_pll_bndy_bucket_3_ring" , NON_VPD_PLL_RING, 5,  0x0002000000000080},
-    {"xb_pll_bndy_bucket_4"      , 0x10, 0x06, 0x06, "xb_pll_bndy_bucket_4_ring" , NON_VPD_PLL_RING, 5,  0x0002000000000080},
-    {"xb_pll_bndy_bucket_5"      , 0x11, 0x06, 0x06, "xb_pll_bndy_bucket_5_ring" , NON_VPD_PLL_RING, 5,  0x0002000000000080},
-    {"xb_pll_func"               , 0x12, 0x06, 0x06, "xb_pll_func_ring"          , NON_VPD_RING, 0,  0x0002000000008000},
+    {"xb_pll_bndy"               , 0x0d, 0x06, 0x06, "xb_pll_bndy_ring"          , NON_VPD_RING, 0,  0x0002000000000080},
+    {"xb_pll_func"               , 0x0e, 0x06, 0x06, "xb_pll_func_ring"          , NON_VPD_RING, 0,  0x0002000000008000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
@@ -211,12 +207,8 @@ const GenRingIdList RING_ID_LIST_COMMON[] =
     {"ob0_gptr"                   , 0x01, 0x09, 0x09, "ob0_gptr_ring"              , NON_VPD_RING, 0,  0x0E00000000002000},
     {"ob0_time"                   , 0x02, 0x09, 0x09, "ob0_time_ring"              , NON_VPD_RING, 0,  0x0E00000000000100},
     {"ob0_pll_gptr"               , 0x03, 0x09, 0x09, "ob0_pll_gptr_ring"          , NON_VPD_RING, 0,  0x0002000000002000},
-    {"ob0_pll_bndy_bucket_1"      , 0x04, 0x09, 0x09, "ob0_pll_bndy_bucket_1_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"ob0_pll_bndy_bucket_2"      , 0x05, 0x09, 0x09, "ob0_pll_bndy_bucket_2_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"ob0_pll_bndy_bucket_3"      , 0x06, 0x09, 0x09, "ob0_pll_bndy_bucket_3_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"ob0_pll_bndy_bucket_4"      , 0x07, 0x09, 0x09, "ob0_pll_bndy_bucket_4_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"ob0_pll_bndy_bucket_5"      , 0x08, 0x09, 0x09, "ob0_pll_bndy_bucket_5_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"ob0_pll_func"               , 0x09, 0x09, 0x09, "ob0_pll_func_ring"          , NON_VPD_RING, 0,  0x0002000000008000},
+    {"ob0_pll_bndy"               , 0x04, 0x09, 0x09, "ob0_pll_bndy_ring"          , NON_VPD_RING, 0,  0x0002000000000080},
+    {"ob0_pll_func"               , 0x05, 0x09, 0x09, "ob0_pll_func_ring"          , NON_VPD_RING, 0,  0x0002000000008000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
@@ -231,12 +223,8 @@ const GenRingIdList RING_ID_LIST_COMMON[] =
     {"ob1_gptr"                   , 0x01, 0x0a, 0x0a, "ob1_gptr_ring"              , NON_VPD_RING, 0,  0x0E00000000002000},
     {"ob1_time"                   , 0x02, 0x0a, 0x0a, "ob1_time_ring"              , NON_VPD_RING, 0,  0x0E00000000000100},
     {"ob1_pll_gptr"               , 0x03, 0x0a, 0x0a, "ob1_pll_gptr_ring"          , NON_VPD_RING, 0,  0x0002000000002000},
-    {"ob1_pll_bndy_bucket_1"      , 0x04, 0x0a, 0x0a, "ob1_pll_bndy_bucket_1_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"ob1_pll_bndy_bucket_2"      , 0x05, 0x0a, 0x0a, "ob1_pll_bndy_bucket_2_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"ob1_pll_bndy_bucket_3"      , 0x06, 0x0a, 0x0a, "ob1_pll_bndy_bucket_3_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"ob1_pll_bndy_bucket_4"      , 0x07, 0x0a, 0x0a, "ob1_pll_bndy_bucket_4_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"ob1_pll_bndy_bucket_5"      , 0x08, 0x0a, 0x0a, "ob1_pll_bndy_bucket_5_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"ob1_pll_func"               , 0x09, 0x0a, 0x0a, "ob1_pll_func_ring"          , NON_VPD_RING, 0,  0x0002000000008000},
+    {"ob1_pll_bndy"               , 0x04, 0x0a, 0x0a, "ob1_pll_bndy_ring"          , NON_VPD_RING, 0,  0x0002000000000080},
+    {"ob1_pll_func"               , 0x05, 0x0a, 0x0a, "ob1_pll_func_ring"          , NON_VPD_RING, 0,  0x0002000000008000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
@@ -251,12 +239,8 @@ const GenRingIdList RING_ID_LIST_COMMON[] =
     {"ob2_gptr"                   , 0x01, 0x0b, 0x0b, "ob2_gptr_ring"              , NON_VPD_RING, 0,  0x0E00000000002000},
     {"ob2_time"                   , 0x02, 0x0b, 0x0b, "ob2_time_ring"              , NON_VPD_RING, 0,  0x0E00000000000100},
     {"ob2_pll_gptr"               , 0x03, 0x0b, 0x0b, "ob2_pll_gptr_ring"          , NON_VPD_RING, 0,  0x0002000000002000},
-    {"ob2_pll_bndy_bucket_1"      , 0x04, 0x0b, 0x0b, "ob2_pll_bndy_bucket_1_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"ob2_pll_bndy_bucket_2"      , 0x05, 0x0b, 0x0b, "ob2_pll_bndy_bucket_2_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"ob2_pll_bndy_bucket_3"      , 0x06, 0x0b, 0x0b, "ob2_pll_bndy_bucket_3_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"ob2_pll_bndy_bucket_4"      , 0x07, 0x0b, 0x0b, "ob2_pll_bndy_bucket_4_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"ob2_pll_bndy_bucket_5"      , 0x08, 0x0b, 0x0b, "ob2_pll_bndy_bucket_5_ring" , NON_VPD_PLL_RING, 0,  0x0002000000000080},
-    {"ob2_pll_func"               , 0x09, 0x0b, 0x0b, "ob2_pll_func_ring"          , NON_VPD_RING, 0,  0x0002000000008000},
+    {"ob2_pll_bndy"               , 0x04, 0x0b, 0x0b, "ob2_pll_bndy_ring"          , NON_VPD_RING, 0,  0x0002000000000080},
+    {"ob2_pll_func"               , 0x05, 0x0b, 0x0b, "ob2_pll_func_ring"          , NON_VPD_RING, 0,  0x0002000000008000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
@@ -271,12 +255,8 @@ const GenRingIdList RING_ID_LIST_COMMON[] =
     {"ob3_gptr"                   , 0x01, 0x0c, 0x0c, "ob3_gptr_ring"              , NON_VPD_RING, 0,  0x0E00000000002000},
     {"ob3_time"                   , 0x02, 0x0c, 0x0c, "ob3_time_ring"              , NON_VPD_RING, 0,  0x0E00000000000100},
     {"ob3_pll_gptr"               , 0x03, 0x0c, 0x0c, "ob3_pll_gptr_ring"          , NON_VPD_RING, 0,  0x0002000000002000},
-    {"ob3_pll_bndy_bucket_1"      , 0x04, 0x0c, 0x0c, "ob3_pll_bndy_bucket_1_ring" , NON_VPD_PLL_RING, 0,  0x0002000000008000},
-    {"ob3_pll_bndy_bucket_2"      , 0x05, 0x0c, 0x0c, "ob3_pll_bndy_bucket_2_ring" , NON_VPD_PLL_RING, 0,  0x0002000000008000},
-    {"ob3_pll_bndy_bucket_3"      , 0x06, 0x0c, 0x0c, "ob3_pll_bndy_bucket_3_ring" , NON_VPD_PLL_RING, 0,  0x0002000000008000},
-    {"ob3_pll_bndy_bucket_4"      , 0x07, 0x0c, 0x0c, "ob3_pll_bndy_bucket_4_ring" , NON_VPD_PLL_RING, 0,  0x0002000000008000},
-    {"ob3_pll_bndy_bucket_5"      , 0x08, 0x0c, 0x0c, "ob3_pll_bndy_bucket_5_ring" , NON_VPD_PLL_RING, 0,  0x0002000000008000},
-    {"ob3_pll_func"               , 0x09, 0x0c, 0x0c, "ob3_pll_func_ring"          , NON_VPD_RING, 0,  0x0002000000008000},
+    {"ob3_pll_bndy"               , 0x04, 0x0c, 0x0c, "ob3_pll_bndy_ring"          , NON_VPD_RING, 0,  0x0002000000000080},
+    {"ob3_pll_func"               , 0x05, 0x0c, 0x0c, "ob3_pll_func_ring"          , NON_VPD_RING, 0,  0x0002000000008000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
 {
@@ -290,7 +270,7 @@ const GenRingIdList RING_ID_LIST_COMMON[] =
     {"pci0_fure"            , 0x00, 0x0d, 0x0d, "pci0_fure_ring"        , NON_VPD_RING, 0,  0x0E00000000009000},
     {"pci0_gptr"            , 0x01, 0x0d, 0x0d, "pci0_gptr_ring"        , NON_VPD_RING, 0,  0x0E00000000002000},
     {"pci0_time"            , 0x02, 0x0d, 0x0d, "pci0_time_ring"        , NON_VPD_RING, 0,  0x0E00000000000100},
-    {"pci0_pll_func"        , 0x03, 0x0d, 0x0d, "pci0_pll_func_ring"    , NON_VPD_RING, 0,  0x0002000000008000},
+    {"pci0_pll_bndy"        , 0x03, 0x0d, 0x0d, "pci0_pll_bndy_ring"    , NON_VPD_RING, 0,  0x0002000000000080},
     {"pci0_pll_gptr"        , 0x04, 0x0d, 0x0d, "pci0_pll_gptr_ring"    , NON_VPD_RING, 0,  0x0002000000002000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
@@ -305,7 +285,7 @@ const GenRingIdList RING_ID_LIST_COMMON[] =
     {"pci1_fure"            , 0x00, 0x0e, 0x0e, "pci1_fure_ring"        , NON_VPD_RING, 0,  0x0F00000000009000},
     {"pci1_gptr"            , 0x01, 0x0e, 0x0e, "pci1_gptr_ring"        , NON_VPD_RING, 0,  0x0F00000000002000},
     {"pci1_time"            , 0x02, 0x0e, 0x0e, "pci1_time_ring"        , NON_VPD_RING, 0,  0x0F00000000000100},
-    {"pci1_pll_func"        , 0x03, 0x0e, 0x0e, "pci1_pll_func_ring"    , NON_VPD_RING, 0,  0x0002000000008000},
+    {"pci1_pll_bndy"        , 0x03, 0x0e, 0x0e, "pci1_pll_bndy_ring"    , NON_VPD_RING, 0,  0x0002000000000080},
     {"pci1_pll_gptr"        , 0x04, 0x0e, 0x0e, "pci1_pll_gptr_ring"    , NON_VPD_RING, 0,  0x0002000000002000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =
@@ -320,7 +300,7 @@ const GenRingIdList RING_ID_LIST_COMMON[] =
     {"pci2_fure"            , 0x00, 0x0f, 0x0f, "pci2_fure_ring"        , NON_VPD_RING, 0,  0x0F80000000009000},
     {"pci2_gptr"            , 0x01, 0x0f, 0x0f, "pci2_gptr_ring"        , NON_VPD_RING, 0,  0x0F80000000002000},
     {"pci2_time"            , 0x02, 0x0f, 0x0f, "pci2_time_ring"        , NON_VPD_RING, 0,  0x0F80000000000100},
-    {"pci2_pll_func"        , 0x03, 0x0f, 0x0f, "pci2_pll_func_ring"    , NON_VPD_RING, 0,  0x0002000000008000},
+    {"pci2_pll_bndy"        , 0x03, 0x0f, 0x0f, "pci2_pll_bndy_ring"    , NON_VPD_RING, 0,  0x0002000000000080},
     {"pci2_pll_gptr"        , 0x04, 0x0f, 0x0f, "pci2_pll_gptr_ring"    , NON_VPD_RING, 0,  0x0002000000002000},
 };
 const GenRingIdList RING_ID_LIST_INSTANCE[] =