From 7247b205d621a2b988e3816760c81cbc551f7f68 Mon Sep 17 00:00:00 2001
From: Mark Pizzutillo <Mark.Pizzutillo@ibm.com>
Date: Fri, 4 Oct 2019 17:22:24 -0400
Subject: Add SPD, ATTR, and code support for thermal sensor fields

In order to not break systems with old DDIMMs or old Explorer FW,
this commit includes a workaround to bypass the thermal field parsing
if the SPD revision is less than 0.3, as the decoder will try to
parse garbage. This can be replaced down the line if needed with
a proper API.

git-coreq:hostboot:I7400886b90b566bbfdf218bcedf11627acf1d2fd
Change-Id: I7400886b90b566bbfdf218bcedf11627acf1d2fd
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/87999
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Dev-Ready: Mark Pizzutillo <mark.pizzutillo@ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Reviewed-by: Louis Stermole <stermole@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@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://rchgit01.rchland.ibm.com/gerrit1/88583
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
---
 .../procedures/hwp/memory/lib/shared/exp_consts.H  | 34 +++++++++++++++++++++-
 .../procedures/xml/error_info/mss_exp_errors.xml   | 15 +++++++++-
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H
index 434242eb..acf3ba05 100644
--- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H
+++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H
@@ -111,9 +111,25 @@ enum class attr_eff_engine_fields
     MRAM_SUPPORT = 8,
     SPD_CL_SUPPORTED = 9,
     ADDRESS_MIRROR = 10,
+    MODULE_THERMAL_SENSORS = 11,
+
+    THERM_SENSOR_0_AVAIL = 12,
+    THERM_SENSOR_0_TYPE = 13,
+    THERM_SENSOR_0_USAGE = 14,
+    THERM_SENSOR_0_I2C_ADDR = 15,
+
+    THERM_SENSOR_1_AVAIL = 16,
+    THERM_SENSOR_1_TYPE = 17,
+    THERM_SENSOR_1_USAGE = 18,
+    THERM_SENSOR_1_I2C_ADDR = 19,
+
+    THERM_SENSOR_DIFF_AVAIL = 20,
+    THERM_SENSOR_DIFF_TYPE = 21,
+    THERM_SENSOR_DIFF_USAGE = 22,
+    THERM_SENSOR_DIFF_I2C_ADDR = 23,
 
     // Dispatcher set to last enum value
-    DISPATCHER = ADDRESS_MIRROR,
+    DISPATCHER = THERM_SENSOR_DIFF_I2C_ADDR,
 };
 
 ///
@@ -158,6 +174,22 @@ enum ffdc_codes
     SET_MRAM_SUPPORT = 0x1049,
     SET_SPD_CL_SUPPORTED = 0x1050,
     SET_SERDES_FREQ = 0x1051,
+    SET_MODULE_THERMAL_SENSORS = 0x1052,
+
+    SET_THERM_SENSOR_0_AVAIL = 0x1053,
+    SET_THERM_SENSOR_0_TYPE = 0x1054,
+    SET_THERM_SENSOR_0_USAGE = 0x1055,
+    SET_THERM_SENSOR_0_I2C_ADDR = 0x1056,
+
+    SET_THERM_SENSOR_1_AVAIL = 0x1057,
+    SET_THERM_SENSOR_1_TYPE = 0x1058,
+    SET_THERM_SENSOR_1_USAGE = 0x1059,
+    SET_THERM_SENSOR_1_I2C_ADDR = 0x105A,
+
+    SET_THERM_SENSOR_DIFF_AVAIL = 0x105B,
+    SET_THERM_SENSOR_DIFF_TYPE = 0x105C,
+    SET_THERM_SENSOR_DIFF_USAGE = 0x105D,
+    SET_THERM_SENSOR_DIFF_I2C_ADDR = 0x105E,
 };
 
 ///
diff --git a/src/import/chips/ocmb/explorer/procedures/xml/error_info/mss_exp_errors.xml b/src/import/chips/ocmb/explorer/procedures/xml/error_info/mss_exp_errors.xml
index 4b9285dd..7e4a926f 100644
--- a/src/import/chips/ocmb/explorer/procedures/xml/error_info/mss_exp_errors.xml
+++ b/src/import/chips/ocmb/explorer/procedures/xml/error_info/mss_exp_errors.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER sbe Project                                                  -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2018,2019                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2018,2020                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -768,4 +768,17 @@
     </deconfigure>
   </hwpError>
 
+  <hwpError>
+    <rc>RC_MSS_EXP_UNKNOWN_THERMAL_SENSOR</rc>
+    <description>
+      The thermal sensor type for the given port was not a known value
+    </description>
+    <ffdc>PORT_TARGET</ffdc>
+    <ffdc>VALUE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>MEDIUM</priority>
+    </callout>
+  </hwpError>
+
 </hwpErrors>
-- 
cgit v1.2.1