p9_sbe_lpc_init: Fix timeout setup

Factor LPC register access out into its own utility function, with added timeout for the ADU access and proper FFDC if the ADU times out. CQ: SW418354 Change-Id: Ief05ccb022eeb1ec45d2f49f386fb58231966058 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54637 Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com> Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Reviewed-by: Prachi Gupta <pragupta@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54642 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
open-power · Mar 23, 2018 · b8da2d8 · b8da2d8
1 parent eea4b09
commit b8da2d8
Show file tree

Hide file tree

Showing 2 changed files with 110 additions and 0 deletions.
diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_lpc_utils.H b/src/import/chips/p9/procedures/hwp/perv/p9_lpc_utils.H
@@ -22,3 +22,91 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+/// @file  p9_lpc_utils.H
+///
+/// @brief Helper functions for indirect reads/writes to the LPC register space
+/// @author Joachim Fenkes <fenkes@de.ibm.com>
+#ifndef P9_LPC_UTILS_H_
+#define P9_LPC_UTILS_H_
+
+const uint32_t LPC_CMD_TIMEOUT_DELAY_NS = 1000000;
+const uint32_t LPC_CMD_TIMEOUT_COUNT = 4;
+
+static fapi2::ReturnCode lpc_rw(
+    const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip,
+    uint32_t i_addr, bool i_read_notwrite, fapi2::buffer<uint32_t>& io_data)
+{
+    const int l_bit_offset = (i_addr & 4) << 3;
+    fapi2::buffer<uint64_t> l_command;
+    l_command.writeBit<PU_LPC_CMD_REG_RNW>(i_read_notwrite)
+    .insertFromRight<PU_LPC_CMD_REG_SIZE, PU_LPC_CMD_REG_SIZE_LEN>(0x4)
+    .insertFromRight<PU_LPC_CMD_REG_ADR, PU_LPC_CMD_REG_ADR_LEN>(i_addr);
+    FAPI_TRY(fapi2::putScom(i_target_chip, PU_LPC_CMD_REG, l_command), "Error writing LPC command register");
+
+    if (!i_read_notwrite)
+    {
+        fapi2::buffer<uint64_t> l_data;
+        l_data.insert(io_data, l_bit_offset, 32);
+        FAPI_TRY(fapi2::putScom(i_target_chip, PU_LPC_DATA_REG, l_data), "Error writing LPC data");
+    }
+
+    {
+        fapi2::buffer<uint64_t> l_status;
+        int timeout = LPC_CMD_TIMEOUT_COUNT;
+
+        while (timeout--)
+        {
+            FAPI_TRY(fapi2::getScom(i_target_chip, PU_LPC_STATUS_REG, l_status), "Error reading LPC status");
+
+            if (l_status.getBit<PU_LPC_STATUS_REG_DONE>())
+            {
+                break;
+            }
+
+            fapi2::delay(LPC_CMD_TIMEOUT_DELAY_NS, LPC_CMD_TIMEOUT_DELAY_NS);
+        }
+
+        if (LPC_UTILS_TIMEOUT_FFDC)
+        {
+            FAPI_ASSERT(l_status.getBit<PU_LPC_STATUS_REG_DONE>(), fapi2::LPC_ACCESS_TIMEOUT()
+                        .set_TARGET_CHIP(i_target_chip)
+                        .set_COUNT(LPC_CMD_TIMEOUT_COUNT)
+                        .set_COMMAND(l_command)
+                        .set_DATA(io_data)
+                        .set_STATUS(l_status),
+                        "LPC access timed out");
+        }
+        else if (!l_status.getBit<PU_LPC_STATUS_REG_DONE>())
+        {
+            return fapi2::RC_LPC_ACCESS_TIMEOUT;
+        }
+    }
+
+    if (i_read_notwrite)
+    {
+        fapi2::buffer<uint64_t> l_data;
+        FAPI_TRY(fapi2::getScom(i_target_chip, PU_LPC_DATA_REG, l_data), "Error reading LPC data");
+        l_data.extract(io_data, l_bit_offset, 32);
+    }
+
+    return fapi2::FAPI2_RC_SUCCESS;
+
+fapi_try_exit:
+    return fapi2::current_err;
+}
+
+static inline fapi2::ReturnCode lpc_read(
+    const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip,
+    uint32_t i_addr, fapi2::buffer<uint32_t>& o_data)
+{
+    return lpc_rw(i_target_chip, i_addr, true, o_data);
+}
+
+static inline fapi2::ReturnCode lpc_write(
+    const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target_chip,
+    uint32_t i_addr, fapi2::buffer<uint32_t> i_data)
+{
+    return lpc_rw(i_target_chip, i_addr, false, i_data);
+}
+
+#endif /* P9_LPC_UTILS_H_ */
diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_sbe_lpc_init_errors.xml b/src/import/chips/p9/procedures/xml/error_info/p9_sbe_lpc_init_errors.xml
@@ -23,4 +23,26 @@
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
 <hwpErrors>
+  <sbeTarget>TARGET_CHIP</sbeTarget>
+  <hwpError>
+    <sbeError/>
+    <rc>RC_LPC_ACCESS_TIMEOUT</rc>
+    <description>An attempt to read/write data in the LPC address space via the Alter/Display unit timed out.</description>
+    <ffdc>COUNT</ffdc>
+    <ffdc>COMMAND</ffdc>
+    <ffdc>DATA</ffdc>
+    <ffdc>STATUS</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
+    <callout>
+      <target>TARGET_CHIP</target>
+      <targetType>TARGET_TYPE_PROC_CHIP</targetType>
+      <priority>MEDIUM</priority>
+    </callout>
+    <deconfigure>
+      <target>TARGET_CHIP</target>
+    </deconfigure>
+  </hwpError>
 </hwpErrors>