1 files changed, 22 insertions, 6 deletions

diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemDqBitmap.H b/src/usr/diag/prdf/common/plat/mem/prdfMemDqBitmap.H
index b407d9835..c3648dbc5 100644
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemDqBitmap.H
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemDqBitmap.H
@@ -73,7 +73,22 @@ class MemDqBitmap
     /** @brief Constructor from components */
     MemDqBitmap( TARGETING::TargetHandle_t i_trgt, const MemRank & i_rank,
                  BitmapData i_d ) : iv_trgt(i_trgt), iv_rank(i_rank),
-                 iv_x4Dram(PlatServices::isDramWidthX4(i_trgt)), iv_data(i_d){}
+                 iv_x4Dram(true), iv_data(i_d)
+    {
+        if ( TARGETING::TYPE_MEM_PORT == PlatServices::getTargetType(iv_trgt) ||
+             TARGETING::TYPE_OCMB_CHIP ==
+                  PlatServices::getTargetType(iv_trgt) )
+        {
+            // TODO RTC 210072 - Support multiple ports
+            TARGETING::TargetHandle_t dimm =
+                PlatServices::getConnectedDimm( iv_trgt, iv_rank );
+            iv_x4Dram = PlatServices::isDramWidthX4( dimm );
+        }
+        else
+        {
+            iv_x4Dram = PlatServices::isDramWidthX4( iv_trgt );
+        }
+    }
 
   public: // functions
 
@@ -224,7 +239,7 @@ class MemDqBitmap
 
   private: // instance variables
 
-    TARGETING::TargetHandle_t iv_trgt; ///< Target MBA/MCA/MEM_PORT
+    TARGETING::TargetHandle_t iv_trgt; ///< Target MBA/MCA/MEM_PORT/OCMB_CHIP
     MemRank iv_rank;                   ///< Target rank
     bool iv_x4Dram;                    ///< TRUE if iv_trgt uses x4 DRAMs
 
@@ -238,20 +253,21 @@ class MemDqBitmap
 
 /**
  * @brief  Sets the inputted dram in DRAM repairs VPD.
- * @param  i_chip MBA or MCA chip.
+ * @param  i_trgt MBA, MCA, MEM_PORT, or OCMB chip.
  * @param  i_rank Target rank.
  * @return Non-SUCCESS if an internal function fails. SUCCESS otherwise.
  */
-uint32_t setDramInVpd( ExtensibleChip * i_chip, const MemRank & i_rank,
+uint32_t setDramInVpd( TARGETING::TargetHandle_t i_trgt, const MemRank & i_rank,
                        MemSymbol i_symbol );
 
 /**
  * @brief  Clears the inputted dram in DRAM repairs VPD.
- * @param  i_chip MBA or MCA chip.
+ * @param  i_trgt MBA, MCA, MEM_PORT, or OCMB chip.
  * @param  i_rank Target rank.
  * @return Non-SUCCESS if an internal function fails. SUCCESS otherwise.
  */
-uint32_t clearDramInVpd( ExtensibleChip * i_chip, const MemRank & i_rank,
+uint32_t clearDramInVpd( TARGETING::TargetHandle_t i_trgt,
+                         const MemRank & i_rank,
                          MemSymbol i_symbol );
 
 } // end namespace PRDF