mc_pll_bucket attribute

in async mode for Cumulus. Using scratch_reg_2 bits 21:23 shift p9_xip_customize changes to a separate, dependent commit to satisfy HB CI for this commit Change-Id: I44c25c5cfb437298f1102f5275a260b4c5ccf522 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42355 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: Joseph J. McGill <jmcgill@us.ibm.com> Reviewed-by: Benjamin Gass <bgass@us.ibm.com> Reviewed-by: Matt K. Light <mklight@us.ibm.com> Reviewed-by: PARVATHI RACHAKONDA <prachako@in.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42357 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: Christian R. Geddes <crgeddes@us.ibm.com>
open-power · Jul 11, 2017 · 1802dad · 1802dad
1 parent 2d2625f
commit 1802dad
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 0 deletions.
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mss_attribute_accessors.H b/src/import/chips/p9/procedures/hwp/memory/lib/mss_attribute_accessors.H
@@ -28709,6 +28709,26 @@ fapi_try_exit:
     return fapi2::current_err;
 }
 
+///
+/// @brief ATTR_MC_PLL_BUCKET getter
+/// @param[out] uint8_t& reference to store the value
+/// @note Generated by gen_accessors.pl generateParameters (SYSTEM)
+/// @return fapi2::ReturnCode - FAPI2_RC_SUCCESS iff get is OK
+/// @note  MC pll bucket selection in async mode for
+/// Cumulus
+///
+inline fapi2::ReturnCode mc_pll_bucket(uint8_t& o_value)
+{
+
+    FAPI_TRY( FAPI_ATTR_GET(fapi2::ATTR_MC_PLL_BUCKET, fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>(), o_value) );
+    return fapi2::current_err;
+
+fapi_try_exit:
+    FAPI_ERR("failed accessing ATTR_MC_PLL_BUCKET: 0x%lx (system target)",
+             uint64_t(fapi2::current_err));
+    return fapi2::current_err;
+}
+
 
 }
 

diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_setup_sbe_config.C b/src/import/chips/p9/procedures/hwp/perv/p9_setup_sbe_config.C
@@ -58,6 +58,8 @@ enum P9_SETUP_SBE_CONFIG_Private_Constants
     ATTR_OPTICS_CONFIG_MODE_OBUS1_BIT  = 17,
     ATTR_OPTICS_CONFIG_MODE_OBUS2_BIT  = 18,
     ATTR_OPTICS_CONFIG_MODE_OBUS3_BIT  = 19,
+    ATTR_MC_PLL_BUCKET_STARTBIT      = 21,
+    ATTR_MC_PLL_BUCKET_LENGTH        = 3,
     ATTR_OB0_PLL_BUCKET_STARTBIT       = 24,
     ATTR_OB0_PLL_BUCKET_LENGTH         = 2,
     ATTR_OB1_PLL_BUCKET_STARTBIT       = 26,
@@ -207,6 +209,11 @@ fapi2::ReturnCode p9_setup_sbe_config(const
             }
         }
 
+        FAPI_DBG("Reading MC PLL buckets");
+        FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_MC_PLL_BUCKET, FAPI_SYSTEM, l_read_1));
+        l_read_scratch_reg.insertFromRight< ATTR_MC_PLL_BUCKET_STARTBIT, ATTR_MC_PLL_BUCKET_LENGTH >(l_read_1);
+
+
         FAPI_DBG("Reading OB PLL buckets");
         FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_OB0_PLL_BUCKET, i_target_chip, l_ob0_pll_bucket));
         FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_OB1_PLL_BUCKET, i_target_chip, l_ob1_pll_bucket));

diff --git a/src/import/chips/p9/procedures/xml/attribute_info/pervasive_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/pervasive_attributes.xml
@@ -767,4 +767,14 @@
   <writeable/>
 </attribute>
 
+<attribute>
+  <id>ATTR_MC_PLL_BUCKET</id>
+  <targetType>TARGET_TYPE_SYSTEM</targetType>
+  <description>MC pll bucket selection in async mode for Cumulus</description>
+  <valueType>uint8</valueType>
+  <persistRuntime/>
+  <platInit/>
+  <writeable/>
+</attribute>
+
 </attributes>
diff --git a/src/import/hwpf/fapi2/xml/attribute_info/hb_temp_defaults.xml b/src/import/hwpf/fapi2/xml/attribute_info/hb_temp_defaults.xml
@@ -333,6 +333,10 @@
         <id>ATTR_SYSTEM_CORECACHE_DCADJ_DISABLE</id>
         <default>0x0</default>
     </attribute>
+    <attribute>
+        <id>ATTR_MC_PLL_BUCKET</id>
+        <default>0x05</default>
+    </attribute>
 
 <!-- =====================================================================
      End of temporary definitions

diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -34937,4 +34937,21 @@ Measured in GB</description>
     </hwpfToHbAttrMap>
 </attribute>
 
+<attribute>
+    <id>MC_PLL_BUCKET</id>
+    <description>
+        MC pll bucket selection in async mode for Cumulus
+    </description>
+    <simpleType>
+        <uint8_t></uint8_t>
+    </simpleType>
+    <persistency>volatile-zeroed</persistency>
+    <readable/>
+    <writeable/>
+    <hwpfToHbAttrMap>
+        <id>ATTR_MC_PLL_BUCKET</id>
+        <macro>DIRECT</macro>
+    </hwpfToHbAttrMap>
+</attribute>
+
 </attributes>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -963,6 +963,7 @@
     <attribute><id>AUX_FUNC_INVOCATION_TIME_MS</id></attribute>
     <attribute><id>SYSTEM_CORECACHE_SKEWADJ_DISABLE</id></attribute>
     <attribute><id>SYSTEM_CORECACHE_DCADJ_DISABLE</id></attribute>
+    <attribute><id>MC_PLL_BUCKET</id></attribute>
 </targetType>
 
 <!-- enc-node-power9 -->