Facilitate transition from using EFF attribute to reading actual C_DIMM VPD

Change ATTR_VPD_DIMM_SPARE attribute to match EFF_DIMM_SPARE attribute
in target and data type to ensure proper operation when a HWP
switches to reading real Centaur VPD.

Change-Id: I3a6f26d94c42fdb37f4063b1f3a51eb4faaec022
RTC: 84528
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/6281
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: William H. Schwartz <whs@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 21 insertions, 17 deletions

diff --git a/src/include/usr/hwpf/hwp/dimmBadDqBitmapAccessHwp.H b/src/include/usr/hwpf/hwp/dimmBadDqBitmapAccessHwp.H
index d57ab1490..3529c5d16 100644
--- a/src/include/usr/hwpf/hwp/dimmBadDqBitmapAccessHwp.H
+++ b/src/include/usr/hwpf/hwp/dimmBadDqBitmapAccessHwp.H
@@ -42,6 +42,7 @@
 
 typedef fapi::ReturnCode (*dimmBadDqBitmapAccessHwp_FP_t)(
     const fapi::Target &,
+    const fapi::Target &,
     const uint8_t (&)[DIMM_DQ_MAX_DIMM_RANKS][DIMM_DQ_RANK_BITMAP_SIZE],
     const bool);
 
@@ -62,6 +63,7 @@ extern "C"
  * if (data[1][0] == 0x40) then rank 1, Centaur DQ1 is bad
  * if (data[1][1] == 0x20) then rank 1, Centaur DQ10 is bad
  *
+ * @param[in] i_mba   Reference to MBA Target
  * @param[in] i_dimm  Reference to DIMM Target
  * @param[io] io_data Reference to bad DQ bitmap data for the DIMM.
  * @param[in] i_get   True if getting DQ Bitmap data. False if setting data.
@@ -69,6 +71,7 @@ extern "C"
  * @return ReturnCode
  */
 fapi::ReturnCode dimmBadDqBitmapAccessHwp(
+    const fapi::Target & i_mba,
     const fapi::Target & i_dimm,
     uint8_t (&io_data)[DIMM_DQ_MAX_DIMM_RANKS][DIMM_DQ_RANK_BITMAP_SIZE],
     const bool i_get);
diff --git a/src/include/usr/hwpf/hwp/mvpd_accessors/getMBvpdSpareDramData.H b/src/include/usr/hwpf/hwp/mvpd_accessors/getMBvpdSpareDramData.H
index 0692b30af..39f37e089 100644
--- a/src/include/usr/hwpf/hwp/mvpd_accessors/getMBvpdSpareDramData.H
+++ b/src/include/usr/hwpf/hwp/mvpd_accessors/getMBvpdSpareDramData.H
@@ -29,29 +29,26 @@
 
 typedef fapi::ReturnCode (*getMBvpdSpareDramData_FP_t)(
     const fapi::Target &,
-    const fapi::Target &,
-    uint8_t &);
-
+    uint8_t (&)[DIMM_DQ_MAX_MBA_PORTS][DIMM_DQ_MAX_MBAPORT_DIMMS]
+                                         [DIMM_DQ_MAX_DIMM_RANKS]);
 extern "C"
 {
 
 /**
- * @brief FW Team HWP that, for C-DIMMs, queries MBvpd to determine spare DRAM
- * availability and, for IS-DIMMS, returns NO_SPARE.
+ * @brief FW Team HWP that handles the ATTR_VPD_DIMM_SPARE attribute
+ * by querying MBvpd to determine spare DRAM availability for C-DIMMs.
  *
  * This HWP should be called through the VPD_DIMM_SPARE attribute.
  *
- * @param[in]  i_mba       Reference to MBA Target associated with the DIMM.
- * @param[in]  i_dimm      Reference to DIMM Target.
+ * @param[in]  i_mba       Reference to MBA Target.
  * @param[out] o_data      Reference to spare DRAM data.
  *
  * @return ReturnCode
  */
 fapi::ReturnCode getMBvpdSpareDramData(
     const fapi::Target & i_mba,
-    const fapi::Target & i_dimm,
-    uint8_t &o_data);
-
+    uint8_t (&o_data)[DIMM_DQ_MAX_MBA_PORTS][DIMM_DQ_MAX_MBAPORT_DIMMS]
+                                               [DIMM_DQ_MAX_DIMM_RANKS]);
 }
 
 #endif
diff --git a/src/include/usr/hwpf/hwpf_reasoncodes.H b/src/include/usr/hwpf/hwpf_reasoncodes.H
index 871297e4c..6b151a998 100644
--- a/src/include/usr/hwpf/hwpf_reasoncodes.H
+++ b/src/include/usr/hwpf/hwpf_reasoncodes.H
@@ -62,6 +62,8 @@ namespace fapi
         MOD_VDDR_SEND_MSG                          = 0x17,
         MOD_PLAT_ATTR_SVC_GET_MIRR_DATA            = 0x18,
         MOD_PLAT_ATTR_SVC_GET_SPARE_DATA           = 0x19,
+        MOD_PLAT_ATTR_SVC_GET_BADDQ_DATA           = 0x1A,
+        MOD_PLAT_ATTR_SVC_SET_BADDQ_DATA           = 0x1B,
     };
 
     /**
diff --git a/src/include/usr/hwpf/plat/fapiPlatAttributeService.H b/src/include/usr/hwpf/plat/fapiPlatAttributeService.H
index 6e5d3b0e6..5e49540dc 100644
--- a/src/include/usr/hwpf/plat/fapiPlatAttributeService.H
+++ b/src/include/usr/hwpf/plat/fapiPlatAttributeService.H
@@ -514,13 +514,13 @@ fapi::ReturnCode fapiPlatGetSlopeInterceptData (
  * the Bad DQ Bitmap attribute
  * It should not be called directly.
  *
- *  @param[in]  i_pTarget   Target pointer
+ *  @param[in]  i_pTarget   DIMM target pointer
  *  @param[out] o_data      Bad DIMM DQ Bitmap
  *  @return     ReturnCode. Zero on success, else platform specified error
  */
 fapi::ReturnCode fapiPlatDimmGetBadDqBitmap (
                                    const fapi::Target * i_pTarget,
-                                   uint8_t (&o_data)[DIMM_DQ_MAX_DIMM_RANKS]\
+                                   uint8_t (&o_data)[DIMM_DQ_MAX_DIMM_RANKS]
                                                     [DIMM_DQ_RANK_BITMAP_SIZE]);
 
 /**
@@ -528,13 +528,13 @@ fapi::ReturnCode fapiPlatDimmGetBadDqBitmap (
  * the Bad DQ Bitmap attribute
  * It should not be called directly.
  *
- *  @param[in]  i_pTarget   Target pointer
+ *  @param[in]  i_pTarget   DIMM target pointer
  *  @param[in]  i_data      Bad DIMM DQ Bitmap
  *  @return     ReturnCode. Zero on success, else platform specified error
  */
 fapi::ReturnCode fapiPlatDimmSetBadDqBitmap (
                                    const fapi::Target * i_pTarget,
-                                   uint8_t (&i_data)[DIMM_DQ_MAX_DIMM_RANKS]\
+                                   uint8_t (&i_data)[DIMM_DQ_MAX_DIMM_RANKS]
                                                     [DIMM_DQ_RANK_BITMAP_SIZE]);
 
 //------------------------------------------------------------------------------
@@ -547,13 +547,15 @@ fapi::ReturnCode fapiPlatDimmSetBadDqBitmap (
  * the VPD DIMM Spare attribute
  * It should not be called directly.
  *
- *  @param[in]  i_pTarget   Target pointer
- *  @param[out] o_data      Spare DRAM availability for DIMM
+ *  @param[in]  i_pTarget   MBA target pointer
+ *  @param[out] o_data      Spare DRAM availability for all DIMMs on MBA
  *  @return     ReturnCode. Zero on success, else platform specified error
  */
 fapi::ReturnCode fapiPlatDimmGetSpareDram (
                                     const fapi::Target * i_pTarget,
-                                    uint8_t &o_data);
+                                    uint8_t (&o_data)[DIMM_DQ_MAX_MBA_PORTS]
+                                                 [DIMM_DQ_MAX_MBAPORT_DIMMS]
+                                                    [DIMM_DQ_MAX_DIMM_RANKS]);
 
 /**
  * @brief This function is called by the FAPI_ATTR_GET macro when getting