PRD: use correct symbol when writing MBA markstore

Change-Id: I94db83c4ff438a02df04d8c8e7f17cd491c6c720
CQ: SW433063
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/60437
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
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: Zane C. Shelley <zshelle@us.ibm.com>

1 files changed, 6 insertions, 11 deletions

diff --git a/src/usr/diag/prdf/common/plat/mem/prdfMemMark.H b/src/usr/diag/prdf/common/plat/mem/prdfMemMark.H
index d0f8c57ef..2cd28b8dd 100644
--- a/src/usr/diag/prdf/common/plat/mem/prdfMemMark.H
+++ b/src/usr/diag/prdf/common/plat/mem/prdfMemMark.H
@@ -63,48 +63,43 @@ class MemMark
      */
     MemMark( TARGETING::TargetHandle_t i_trgt, const MemRank & i_rank,
              uint8_t i_galois ) :
-        iv_galois( i_galois ),
         iv_symbol( MemSymbol::fromGalois(i_trgt, i_rank, i_galois) )
     {}
 
     /**
-     * @brief Cosntructor from components.
+     * @brief Constructor from components.
      * @param i_trgt   MBA or MCA target.
      * @param i_rank   The rank this mark is on.
      * @param i_symbol The symbol representing this mark.
      */
     MemMark( TARGETING::TargetHandle_t i_trgt, const MemRank & i_rank,
              const MemSymbol & i_symbol ) :
-        iv_galois( i_symbol.getGalois() ),
         iv_symbol( i_symbol )
     {}
 
   public: // functions
 
     /** @return The Galois field representing this mark. */
-    uint8_t getGalois() const { return iv_galois; }
+    uint8_t getGalois() const { return iv_symbol.getGalois(); }
 
     /** @return The Galois field associated with the chip this mark is in.
      *  Will correspond to the rightmost/least index symbol in the chip. You
      *  must check for a valid symbol before calling this function. */
-    uint8_t getChipGalois() const
+    uint8_t getDramGalois() const
     {
         PRDF_ASSERT( iv_symbol.isValid() );
-        return symbol2Galois[(iv_symbol.getSymbol()/4)*4];
+        return symbol2Galois[iv_symbol.getDramSymbol()];
     }
 
     /** @return The symbol representing this mark. */
     MemSymbol getSymbol() const { return iv_symbol; }
 
-    /** @return The symbol representing this mark. */
+    /** @return True if the symbol representing this mark is valid. */
     bool isValid() const { return iv_symbol.isValid(); }
 
   private: // instance variables
 
-    /** Galois field representing any symbol on this mark. */
-    uint8_t iv_galois = 0;
-
-    /** Any symbol on this mark (must match iv_galois). */
+    /** Any symbol on this mark. */
     MemSymbol iv_symbol = MemSymbol();
 };