p9_putRingUtils: clean up duplicated code

p9_putRingUtils had a copy of the RS4 container data structure
from p9_scan_compression. Code duplication is bad. In this particular
case we are going to make changes to the RS4 container data structure
in a follow-up commit. Hence it is the right point in time to clean up
that code duplication.

Change-Id: Ia047ced59b4c924635b0c2f428b15a652db645d7
RTC: 158078
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27695
Reviewed-by: RANGANATHPRASAD G. BRAHMASAMUDRA <prasadbgr@in.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27698
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

2 files changed, 1 insertions, 45 deletions

diff --git a/import/chips/p9/utils/p9_putRingUtils.C b/import/chips/p9/utils/p9_putRingUtils.C
index 1d1af2e7..5dbb9816 100644
--- a/import/chips/p9/utils/p9_putRingUtils.C
+++ b/import/chips/p9/utils/p9_putRingUtils.C
@@ -26,6 +26,7 @@
 // *HWP Consumed by: SBE:CME:SGPE:PGPE
 
 #include <p9_putRingUtils.H>
+#include <p9_scan_compression.H>
 
 using namespace RING_TYPES;
 namespace RS4
diff --git a/import/chips/p9/utils/p9_putRingUtils.H b/import/chips/p9/utils/p9_putRingUtils.H
index 68e8447a..16b07954 100644
--- a/import/chips/p9/utils/p9_putRingUtils.H
+++ b/import/chips/p9/utils/p9_putRingUtils.H
@@ -111,51 +111,6 @@ enum scanType_t
     POLLED_SCAN   = 3   ///< used in SGPE plat
 };
 
-///
-/// @brief This structure represents the header information that preceeds the
-///        RS4 compressed string.
-/// @note This structure will only be used to typecast the address of the
-///       RS4 header and then to dereference the offsets represented by the
-///       structure members.
-///       This structure need to be identical to similarly named structure
-///       used in generating a Ring Container.
-///
-struct CompressedScanData
-{
-    /// Magic number - See \ref scan_compression_magic
-    uint32_t iv_magic;
-
-    /// Compressed Size. Total size in bytes, including the container header
-    uint32_t iv_size;
-
-    /// Reserved to the algorithm
-    uint32_t iv_algorithmReserved;
-
-    /// Length of the original scan chain in bits
-    uint32_t iv_length;
-
-    /// The 64 bits of Scan Select register value
-    uint64_t iv_scanSelect;
-
-    /// Data structure (header) version
-    uint8_t iv_headerVersion;
-
-    /// Flush-state optimization
-    /// Normally, modifying the state of the ring requires XOR-ing the
-    /// difference state (the compressed state) with the current ring state as
-    /// it will appear in the Scan Data Register. If the current state of the
-    /// ring is the scan-0 flush state, then by definition the Scan Data
-    /// Register is always 0. Therefore we can simply write the difference to
-    /// the Scan Data Register rather than using a read-XOR-write.
-    uint8_t iv_flushOptimization;
-
-    /// Ring ID uniquely identifying the repair name.
-    uint8_t iv_ringId;
-
-    /// 7-bit pervasive chiplet Id + Multicast bit
-    uint8_t iv_chipletId;
-};
-
 //
 // Function Definitions
 //