Modify Rosetta map to reflect port corrections

Change-Id: I4b0387bc71b804a83bc93ace3918c9e72e4399bc
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43084
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: JACOB L. HARVEY <jlharvey@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/52085
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>

1 files changed, 19 insertions, 19 deletions

diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/rosetta_map/rosetta_map.C b/src/import/chips/p9/procedures/hwp/memory/lib/rosetta_map/rosetta_map.C
index b1c8560e5..e88b9b413 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/rosetta_map/rosetta_map.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/rosetta_map/rosetta_map.C
@@ -28,7 +28,7 @@
 /// @file rosetta_map.C
 /// @brief Mapping tables for memory controller pin names to PHY instance names
 /// @note: this file is automatically generated by gen_rosetta_map.pl
-///        from input file chips/p9/procedures/hwp/memory/lib/rosetta_map/src_data/Monza_DDR_pin_xref.csv
+///        from input file src_data/DDR_Rosetta_Stone_New.csv
 ///
 // *HWP HWP Owner: Louis Stermole <stermole@us.ibm.com>
 // *HWP HWP Backup: Andre Marin <aamarin@us.ibm.com>
@@ -68,18 +68,6 @@ const rosetta_map::PhyMap rosettaTraits<fapi2::TARGET_TYPE_MCA, DQ>::C4_TO_PHY =
         {1, 10}, {1, 8}, {1, 11}, {1, 9}, {1, 12}, {1, 14}, {1, 15}, {1, 13}, {1, 4}, {1, 6}, {1, 5}, {1, 7}, {1, 0}, {1, 2}, {1, 1}, {1, 3},
         {3, 2}, {3, 0}, {3, 1}, {3, 3}, {3, 6}, {3, 4}, {3, 7}, {3, 5}
     },
-    {   {3, 13}, {3, 15}, {3, 14}, {3, 12}, {3, 9}, {3, 11}, {3, 8}, {3, 10}, {2, 4}, {2, 6}, {2, 7}, {2, 5}, {2, 2}, {2, 0}, {2, 3}, {2, 1},
-        {4, 4}, {4, 6}, {4, 7}, {4, 5}, {4, 0}, {4, 2}, {4, 3}, {4, 1}, {3, 2}, {3, 0}, {3, 3}, {3, 1}, {3, 6}, {3, 4}, {3, 7}, {3, 5},
-        {0, 4}, {0, 6}, {0, 7}, {0, 5}, {0, 0}, {0, 2}, {0, 3}, {0, 1}, {0, 14}, {0, 12}, {0, 15}, {0, 13}, {0, 10}, {0, 8}, {0, 11}, {0, 9},
-        {2, 12}, {2, 14}, {2, 15}, {2, 13}, {2, 10}, {2, 8}, {2, 11}, {2, 9}, {1, 7}, {1, 4}, {1, 5}, {1, 6}, {1, 1}, {1, 0}, {1, 3}, {1, 2},
-        {1, 15}, {1, 13}, {1, 12}, {1, 14}, {1, 9}, {1, 11}, {1, 8}, {1, 10}
-    },
-    {   {3, 3}, {3, 1}, {3, 2}, {3, 0}, {3, 7}, {3, 5}, {3, 4}, {3, 6}, {4, 1}, {4, 3}, {4, 0}, {4, 2}, {4, 7}, {4, 5}, {4, 6}, {4, 4},
-        {3, 9}, {3, 11}, {3, 10}, {3, 8}, {3, 15}, {3, 13}, {3, 12}, {3, 14}, {2, 7}, {2, 5}, {2, 4}, {2, 6}, {2, 1}, {2, 3}, {2, 2}, {2, 0},
-        {1, 14}, {1, 12}, {1, 13}, {1, 15}, {1, 8}, {1, 10}, {1, 9}, {1, 11}, {0, 4}, {0, 6}, {0, 7}, {0, 5}, {0, 0}, {0, 2}, {0, 3}, {0, 1},
-        {0, 14}, {0, 12}, {0, 15}, {0, 13}, {0, 8}, {0, 10}, {0, 9}, {0, 11}, {1, 2}, {1, 3}, {1, 0}, {1, 1}, {1, 4}, {1, 7}, {1, 6}, {1, 5},
-        {2, 11}, {2, 9}, {2, 10}, {2, 8}, {2, 13}, {2, 15}, {2, 12}, {2, 14}
-    },
     {   {4, 2}, {4, 0}, {4, 3}, {4, 1}, {4, 6}, {4, 4}, {4, 5}, {4, 7}, {3, 6}, {3, 4}, {3, 7}, {3, 5}, {3, 0}, {3, 2}, {3, 3}, {3, 1},
         {3, 9}, {3, 11}, {3, 8}, {3, 10}, {3, 15}, {3, 13}, {3, 14}, {3, 12}, {2, 4}, {2, 6}, {2, 7}, {2, 5}, {2, 0}, {2, 2}, {2, 1}, {2, 3},
         {1, 2}, {1, 0}, {1, 3}, {1, 1}, {1, 5}, {1, 4}, {1, 6}, {1, 7}, {0, 5}, {0, 7}, {0, 4}, {0, 6}, {0, 3}, {0, 1}, {0, 2}, {0, 0},
@@ -91,6 +79,18 @@ const rosetta_map::PhyMap rosettaTraits<fapi2::TARGET_TYPE_MCA, DQ>::C4_TO_PHY =
         {1, 5}, {1, 7}, {1, 6}, {1, 4}, {1, 0}, {1, 2}, {1, 1}, {1, 3}, {1, 13}, {1, 15}, {1, 14}, {1, 12}, {1, 11}, {1, 9}, {1, 10}, {1, 8},
         {0, 10}, {0, 8}, {0, 9}, {0, 11}, {0, 12}, {0, 14}, {0, 13}, {0, 15}, {0, 1}, {0, 3}, {0, 0}, {0, 2}, {0, 7}, {0, 5}, {0, 4}, {0, 6},
         {3, 11}, {3, 9}, {3, 10}, {3, 8}, {3, 13}, {3, 15}, {3, 14}, {3, 12}
+    },
+    {   {3, 13}, {3, 15}, {3, 14}, {3, 12}, {3, 9}, {3, 11}, {3, 8}, {3, 10}, {2, 4}, {2, 6}, {2, 7}, {2, 5}, {2, 2}, {2, 0}, {2, 3}, {2, 1},
+        {4, 4}, {4, 6}, {4, 7}, {4, 5}, {4, 0}, {4, 2}, {4, 3}, {4, 1}, {3, 2}, {3, 0}, {3, 3}, {3, 1}, {3, 6}, {3, 4}, {3, 7}, {3, 5},
+        {0, 4}, {0, 6}, {0, 7}, {0, 5}, {0, 0}, {0, 2}, {0, 3}, {0, 1}, {0, 14}, {0, 12}, {0, 15}, {0, 13}, {0, 10}, {0, 8}, {0, 11}, {0, 9},
+        {2, 12}, {2, 14}, {2, 15}, {2, 13}, {2, 10}, {2, 8}, {2, 11}, {2, 9}, {1, 7}, {1, 4}, {1, 5}, {1, 6}, {1, 1}, {1, 0}, {1, 3}, {1, 2},
+        {1, 15}, {1, 13}, {1, 12}, {1, 14}, {1, 9}, {1, 11}, {1, 8}, {1, 10}
+    },
+    {   {3, 3}, {3, 1}, {3, 2}, {3, 0}, {3, 7}, {3, 5}, {3, 4}, {3, 6}, {4, 1}, {4, 3}, {4, 0}, {4, 2}, {4, 7}, {4, 5}, {4, 6}, {4, 4},
+        {3, 9}, {3, 11}, {3, 10}, {3, 8}, {3, 15}, {3, 13}, {3, 12}, {3, 14}, {2, 7}, {2, 5}, {2, 4}, {2, 6}, {2, 1}, {2, 3}, {2, 2}, {2, 0},
+        {1, 14}, {1, 12}, {1, 13}, {1, 15}, {1, 8}, {1, 10}, {1, 9}, {1, 11}, {0, 4}, {0, 6}, {0, 7}, {0, 5}, {0, 0}, {0, 2}, {0, 3}, {0, 1},
+        {0, 14}, {0, 12}, {0, 15}, {0, 13}, {0, 8}, {0, 10}, {0, 9}, {0, 11}, {1, 2}, {1, 3}, {1, 0}, {1, 1}, {1, 4}, {1, 7}, {1, 6}, {1, 5},
+        {2, 11}, {2, 9}, {2, 10}, {2, 8}, {2, 13}, {2, 15}, {2, 12}, {2, 14}
     }
 };
 
@@ -109,17 +109,17 @@ const rosetta_map::PhyMap rosettaTraits<fapi2::TARGET_TYPE_MCA, DQS>::C4_TO_PHY
     {   {4, 16}, {2, 16}, {3, 20}, {2, 20}, {0, 20}, {0, 18}, {1, 20}, {1, 18}, {3, 16}, {4, 18}, {2, 18}, {3, 22}, {2, 22}, {0, 22}, {0, 16}, {1, 22},
         {1, 16}, {3, 18}
     },
-    {   {3, 22}, {2, 18}, {4, 18}, {3, 16}, {0, 18}, {0, 22}, {2, 22}, {1, 18}, {1, 22}, {3, 20}, {2, 16}, {4, 16}, {3, 18}, {0, 16}, {0, 20}, {2, 20},
-        {1, 16}, {1, 20}
-    },
-    {   {3, 16}, {4, 16}, {3, 20}, {2, 18}, {1, 22}, {0, 18}, {0, 22}, {1, 16}, {2, 20}, {3, 18}, {4, 18}, {3, 22}, {2, 16}, {1, 20}, {0, 16}, {0, 20},
-        {1, 18}, {2, 22}
-    },
     {   {4, 16}, {3, 18}, {3, 20}, {2, 18}, {1, 16}, {0, 18}, {1, 22}, {0, 22}, {2, 20}, {4, 18}, {3, 16}, {3, 22}, {2, 16}, {1, 18}, {0, 16}, {1, 20},
         {0, 20}, {2, 22}
     },
     {   {2, 18}, {3, 16}, {4, 16}, {2, 22}, {1, 18}, {1, 22}, {0, 20}, {0, 16}, {3, 20}, {2, 16}, {3, 18}, {4, 18}, {2, 20}, {1, 16}, {1, 20}, {0, 22},
         {0, 18}, {3, 22}
+    },
+    {   {3, 22}, {2, 18}, {4, 18}, {3, 16}, {0, 18}, {0, 22}, {2, 22}, {1, 18}, {1, 22}, {3, 20}, {2, 16}, {4, 16}, {3, 18}, {0, 16}, {0, 20}, {2, 20},
+        {1, 16}, {1, 20}
+    },
+    {   {3, 16}, {4, 16}, {3, 20}, {2, 18}, {1, 22}, {0, 18}, {0, 22}, {1, 16}, {2, 20}, {3, 18}, {4, 18}, {3, 22}, {2, 16}, {1, 20}, {0, 16}, {0, 20},
+        {1, 18}, {2, 22}
     }
 };