Add DLL Calibration

  Add ADRS32{0,1} register API
  Add per-procedure ipl test (phy reset)
  Fix blastah, don't return current_err unchanged

Change-Id: I4a76f74f8b7401af15ba1ae0b1823f61ad2ec050
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26306
Tested-by: Jenkins Server
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Tested-by: Hostboot CI
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26307
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 171 insertions, 0 deletions

diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_ddr_phy_reset.xml b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_ddr_phy_reset.xml
index caca92f58..930b80f0c 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_ddr_phy_reset.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_ddr_phy_reset.xml
@@ -41,6 +41,156 @@
     <scomRegister>MCA_DDRPHY_ADR_SYSCLK_CNTL_PR_P0_ADR32S1</scomRegister>
 </registerFfdc>
 
+<registerFfdc>
+  <id>REG_FFDC_DLL_REGS</id>
+  <scomRegister>MCA_DDRPHY_PC_DLL_ZCAL_CAL_STATUS_P0</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_ADR_DLL_CNTL_P0_ADR32S0</scomRegister>
+  <scomRegister>MCA_DDRPHY_ADR_DLL_CNTL_P0_ADR32S1</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_ADR_DLL_DAC_LOWER_P0_ADR32S0</scomRegister>
+  <scomRegister>MCA_DDRPHY_ADR_DLL_DAC_LOWER_P0_ADR32S1</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_ADR_DLL_DAC_UPPER_P0_ADR32S0</scomRegister>
+  <scomRegister>MCA_DDRPHY_ADR_DLL_DAC_UPPER_P0_ADR32S1</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_ADR_DLL_EXTRA_P0_ADR32S0</scomRegister>
+  <scomRegister>MCA_DDRPHY_ADR_DLL_EXTRA_P0_ADR32S1</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_ADR_DLL_SLAVE_VREG_LOWER_P0_ADR32S0</scomRegister>
+  <scomRegister>MCA_DDRPHY_ADR_DLL_SLAVE_VREG_LOWER_P0_ADR32S1</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_ADR_DLL_SLAVE_VREG_UPPER_P0_ADR32S0</scomRegister>
+  <scomRegister>MCA_DDRPHY_ADR_DLL_SLAVE_VREG_UPPER_P0_ADR32S1</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_ADR_DLL_SW_CONTROL_P0_ADR32S0</scomRegister>
+  <scomRegister>MCA_DDRPHY_ADR_DLL_SW_CONTROL_P0_ADR32S1</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_ADR_DLL_VREG_COARSE_P0_ADR32S0</scomRegister>
+  <scomRegister>MCA_DDRPHY_ADR_DLL_VREG_COARSE_P0_ADR32S1</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_ADR_DLL_VREG_CONFIG_1_P0_ADR32S0</scomRegister>
+  <scomRegister>MCA_DDRPHY_ADR_DLL_VREG_CONFIG_1_P0_ADR32S1</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_ADR_DLL_VREG_CONTROL_P0_ADR32S0</scomRegister>
+  <scomRegister>MCA_DDRPHY_ADR_DLL_VREG_CONTROL_P0_ADR32S1</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_CNTL0_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_CNTL0_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_CNTL0_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_CNTL0_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_CNTL0_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_CNTL1_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_CNTL1_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_CNTL1_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_CNTL1_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_CNTL1_P0_4</scomRegister>
+
+  <!-- No CONFIG0 it appears -->
+  <scomRegister>MCA_DDRPHY_DP16_DLL_CONFIG1_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_CONFIG1_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_CONFIG1_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_CONFIG1_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_CONFIG1_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_LOWER0_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_LOWER0_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_LOWER0_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_LOWER0_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_LOWER0_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_UPPER0_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_UPPER0_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_UPPER0_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_UPPER0_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_UPPER0_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_UPPER0_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_UPPER0_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_UPPER0_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_UPPER0_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_UPPER0_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_UPPER1_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_UPPER1_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_UPPER1_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_UPPER1_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_DAC_UPPER1_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_EXTRA0_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_EXTRA0_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_EXTRA0_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_EXTRA0_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_EXTRA0_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_EXTRA1_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_EXTRA1_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_EXTRA1_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_EXTRA1_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_EXTRA1_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_LOWER0_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_LOWER0_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_LOWER0_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_LOWER0_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_LOWER0_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_LOWER1_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_LOWER1_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_LOWER1_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_LOWER1_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_LOWER1_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_UPPER0_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_UPPER0_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_UPPER0_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_UPPER0_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_UPPER0_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_UPPER1_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_UPPER1_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_UPPER1_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_UPPER1_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SLAVE_VREG_UPPER1_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SW_CONTROL0_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SW_CONTROL0_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SW_CONTROL0_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SW_CONTROL0_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SW_CONTROL0_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SW_CONTROL1_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SW_CONTROL1_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SW_CONTROL1_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SW_CONTROL1_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_SW_CONTROL1_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_COARSE0_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_COARSE0_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_COARSE0_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_COARSE0_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_COARSE0_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_COARSE1_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_COARSE1_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_COARSE1_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_COARSE1_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_COARSE1_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_CONTROL0_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_CONTROL0_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_CONTROL0_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_CONTROL0_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_CONTROL0_P0_4</scomRegister>
+
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_CONTROL1_P0_0</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_CONTROL1_P0_1</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_CONTROL1_P0_2</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_CONTROL1_P0_3</scomRegister>
+  <scomRegister>MCA_DDRPHY_DP16_DLL_VREG_CONTROL1_P0_4</scomRegister>
+</registerFfdc>
+
 <hwpError>
   <rc>RC_MSS_DP16_PLL_FAILED_TO_LOCK</rc>
   <description>
@@ -153,4 +303,25 @@
   </gard>
 </hwpError>
 
+<hwpError>
+  <rc>RC_MSS_DLL_FAILED_TO_CALIBRATE</rc>
+  <description>
+    DLL failed to calibrate
+  </description>
+  <collectRegisterFfdc>
+    <id>REG_FFDC_DLL_REGS</id>
+    <target>MCA_IN_ERROR</target>
+  </collectRegisterFfdc>
+  <callout>
+    <target>MCA_IN_ERROR</target>
+    <priority>HIGH</priority>
+  </callout>
+  <deconfigure>
+    <target>MCA_IN_ERROR</target>
+  </deconfigure>
+  <gard>
+    <target>MCA_IN_ERROR</target>
+  </gard>
+</hwpError>
+
 </hwpErrors>