Marvell/Library: ComPhyLib: Remove PCD string parsing

Simplify obtaining lane data, using arrays with direct enum values,
rather than strings. This is another step to completely remove
ParsePcdLib.

This patch replaces string-based description of ComPhy lanes
on Armada 70x0 DB with the enum values of type and speed -
for that purpose new [Defines] section was added to Armada.dsc.inc
file in order to increase readability.
PortingGuide is updated accordingly.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marcin Wojtas <mw@semihalf.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

5 files changed, 74 insertions, 72 deletions

diff --git a/Platform/Marvell/Armada/Armada.dsc.inc b/Platform/Marvell/Armada/Armada.dsc.inc
index 9549091553..cd26506055 100644
--- a/Platform/Marvell/Armada/Armada.dsc.inc
+++ b/Platform/Marvell/Armada/Armada.dsc.inc
@@ -479,3 +479,47 @@
       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

       gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000

   }

+

+################################################################################

+#

+# Defines - platform description macros

+#

+################################################################################

+[Defines]

+  # ComPhy speed

+  DEFINE CP_1_25G           = 0x1

+  DEFINE CP_1_5G            = 0x2

+  DEFINE CP_2_5G            = 0x3

+  DEFINE CP_3G              = 0x4

+  DEFINE CP_3_125G          = 0x5

+  DEFINE CP_5G              = 0x6

+  DEFINE CP_5_15625G        = 0x7

+  DEFINE CP_6G              = 0x8

+  DEFINE CP_6_25G           = 0x9

+  DEFINE CP_10_3125G        = 0xA

+

+  # ComPhy type

+  DEFINE CP_UNCONNECTED     = 0x0

+  DEFINE CP_PCIE0           = 0x1

+  DEFINE CP_PCIE1           = 0x2

+  DEFINE CP_PCIE2           = 0x3

+  DEFINE CP_PCIE3           = 0x4

+  DEFINE CP_SATA0           = 0x5

+  DEFINE CP_SATA1           = 0x6

+  DEFINE CP_SATA2           = 0x7

+  DEFINE CP_SATA3           = 0x8

+  DEFINE CP_SGMII0          = 0x9

+  DEFINE CP_SGMII1          = 0xA

+  DEFINE CP_SGMII2          = 0xB

+  DEFINE CP_SGMII3          = 0xC

+  DEFINE CP_QSGMII          = 0xD

+  DEFINE CP_USB3_HOST0      = 0xE

+  DEFINE CP_USB3_HOST1      = 0xF

+  DEFINE CP_USB3_DEVICE     = 0x10

+  DEFINE CP_XAUI0           = 0x11

+  DEFINE CP_XAUI1           = 0x12

+  DEFINE CP_XAUI2           = 0x13

+  DEFINE CP_XAUI3           = 0x14

+  DEFINE CP_RXAUI0          = 0x15

+  DEFINE CP_RXAUI1          = 0x16

+  DEFINE CP_SFI             = 0x17

diff --git a/Platform/Marvell/Armada/Armada70x0.dsc b/Platform/Marvell/Armada/Armada70x0.dsc
index 467dfa30ed..dae9715727 100644
--- a/Platform/Marvell/Armada/Armada70x0.dsc
+++ b/Platform/Marvell/Armada/Armada70x0.dsc
@@ -100,8 +100,15 @@
 

   #ComPhy

   gMarvellTokenSpaceGuid.PcdComPhyDevices|{ 0x1 }

-  gMarvellTokenSpaceGuid.PcdChip0ComPhyTypes|L"SGMII1;USB3_HOST0;SFI;SATA1;USB3_HOST1;PCIE2"

-  gMarvellTokenSpaceGuid.PcdChip0ComPhySpeeds|L"1250;5000;10310;5000;5000;5000"

+  # ComPhy0

+  # 0: SGMII1        1.25 Gbps

+  # 1: USB3_HOST0    5 Gbps

+  # 2: SFI           10.31 Gbps

+  # 3: SATA1         5 Gbps

+  # 4: USB3_HOST1    5 Gbps

+  # 5: PCIE2         5 Gbps

+  gMarvellTokenSpaceGuid.PcdChip0ComPhyTypes|{ $(CP_SGMII1), $(CP_USB3_HOST0), $(CP_SFI), $(CP_SATA1), $(CP_USB3_HOST1), $(CP_PCIE2) }

+  gMarvellTokenSpaceGuid.PcdChip0ComPhySpeeds|{ $(CP_1_25G), $(CP_5G), $(CP_10_3125G), $(CP_5G), $(CP_5G), $(CP_5G) }

 

   #UtmiPhy

   gMarvellTokenSpaceGuid.PcdUtmiPhyCount|2

diff --git a/Platform/Marvell/Library/ComPhyLib/ComPhyLib.c b/Platform/Marvell/Library/ComPhyLib/ComPhyLib.c
index 3eb5d9f6a9..bf21dca3fb 100644
--- a/Platform/Marvell/Library/ComPhyLib/ComPhyLib.c
+++ b/Platform/Marvell/Library/ComPhyLib/ComPhyLib.c
@@ -113,47 +113,6 @@ RegSetSilent16(
   MmioWrite16 (Addr, RegData);

 }

 

-/* This function returns enum with SerDesType */

-UINT32

-ParseSerdesTypeString (

-  CHAR16* String

-  )

-{

-  UINT32 i;

-

-  if (String == NULL)

-    return COMPHY_TYPE_INVALID;

-

-  for (i = 0; i < COMPHY_TYPE_MAX; i++) {

-    if (StrCmp (String, TypeStringTable[i]) == 0) {

-      return i;

-    }

-  }

-

-  /* PCD string doesn't match any supported SerDes Type */

-  return COMPHY_TYPE_INVALID;

-}

-

-/* This function converts SerDes speed in MHz to enum with SerDesSpeed */

-UINT32

-ParseSerdesSpeed (

-  UINT32 Value

-  )

-{

-  UINT32 i;

-  UINT32 ValueTable [] = {0, 1250, 1500, 2500, 3000, 3125,

-                          5000, 5156, 6000, 6250, 10310};

-

-  for (i = 0; i < COMPHY_SPEED_MAX; i++) {

-    if (Value == ValueTable[i]) {

-      return i;

-    }

-  }

-

-  /* PCD SerDes speed value doesn't match any supported SerDes speed */

-  return COMPHY_SPEED_INVALID;

-}

-

 CHAR16 *

 GetTypeString (

   UINT32 Type

@@ -182,7 +141,8 @@ GetSpeedString (
 

 VOID

 ComPhyPrint (

-  IN CHIP_COMPHY_CONFIG *PtrChipCfg

+  IN CHIP_COMPHY_CONFIG *PtrChipCfg,

+  IN UINT8 Index

   )

 {

   UINT32 Lane;

@@ -191,7 +151,7 @@ ComPhyPrint (
   for (Lane = 0; Lane < PtrChipCfg->LanesCount; Lane++) {

     SpeedStr = GetSpeedString(PtrChipCfg->MapData[Lane].Speed);

     TypeStr = GetTypeString(PtrChipCfg->MapData[Lane].Type);

-    DEBUG((DEBUG_ERROR, "Comphy-%d: %-13s %-10s\n", Lane, TypeStr, SpeedStr));

+    DEBUG ((DEBUG_ERROR, "Comphy%d-%d: %-13s %-10s\n", Index, Lane, TypeStr, SpeedStr));

   }

 

   DEBUG((DEBUG_ERROR, "\n"));

@@ -238,16 +198,16 @@ InitComPhyConfig (
    */

   switch (Id) {

   case 0:

-    GetComPhyPcd (ChipConfig, LaneData, 0);

+    GetComPhyPcd (LaneData, 0);

     break;

   case 1:

-    GetComPhyPcd (ChipConfig, LaneData, 1);

+    GetComPhyPcd (LaneData, 1);

     break;

   case 2:

-    GetComPhyPcd (ChipConfig, LaneData, 2);

+    GetComPhyPcd (LaneData, 2);

     break;

   case 3:

-    GetComPhyPcd (ChipConfig, LaneData, 3);

+    GetComPhyPcd (LaneData, 3);

     break;

   }

 }

@@ -288,12 +248,9 @@ MvComPhyInit (
     /* Get the count of the SerDes of the specific chip */

     MaxComphyCount = PtrChipCfg->LanesCount;

     for (Lane = 0; Lane < MaxComphyCount; Lane++) {

-      /* Parse PCD with string indicating SerDes Type */

-      PtrChipCfg->MapData[Lane].Type =

-        ParseSerdesTypeString (LaneData[Index].TypeStr[Lane]);

-      PtrChipCfg->MapData[Lane].Speed =

-        ParseSerdesSpeed (LaneData[Index].SpeedValue[Lane]);

-      PtrChipCfg->MapData[Lane].Invert = (UINT32)LaneData[Index].InvFlag[Lane];

+      PtrChipCfg->MapData[Lane].Type = LaneData[Index].Type[Lane];

+      PtrChipCfg->MapData[Lane].Speed = LaneData[Index].SpeedValue[Lane];

+      PtrChipCfg->MapData[Lane].Invert = LaneData[Index].InvFlag[Lane];

 

       if ((PtrChipCfg->MapData[Lane].Speed == COMPHY_SPEED_INVALID) ||

           (PtrChipCfg->MapData[Lane].Speed == COMPHY_SPEED_ERROR) ||

@@ -311,7 +268,7 @@ MvComPhyInit (
      return Status;

     }

 

-    ComPhyPrint (PtrChipCfg);

+    ComPhyPrint (PtrChipCfg, Index);

 

     /* PHY power UP sequence */

     PtrChipCfg->Init (PtrChipCfg);

diff --git a/Platform/Marvell/Library/ComPhyLib/ComPhyLib.h b/Platform/Marvell/Library/ComPhyLib/ComPhyLib.h
index 38989780ab..5899a4ac25 100644
--- a/Platform/Marvell/Library/ComPhyLib/ComPhyLib.h
+++ b/Platform/Marvell/Library/ComPhyLib/ComPhyLib.h
@@ -43,7 +43,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <Library/MvComPhyLib.h>

 #include <Library/IoLib.h>

 #include <Library/TimerLib.h>

-#include <Library/ParsePcdLib.h>

 

 #define MAX_LANE_OPTIONS          10

 

@@ -52,14 +51,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define GET_LANE_SPEED(id)        PcdGetPtr(PcdChip##id##ComPhySpeeds)

 #define GET_LANE_INV(id)          PcdGetPtr(PcdChip##id##ComPhyInvFlags)

 

-#define FillLaneMap(chip_struct, lane_struct, id) { \

-  ParsePcdString((CHAR16 *) GET_LANE_TYPE(id), chip_struct[id].LanesCount, NULL, lane_struct[id].TypeStr);     \

-  ParsePcdString((CHAR16 *) GET_LANE_SPEED(id), chip_struct[id].LanesCount, lane_struct[id].SpeedValue, NULL); \

-  ParsePcdString((CHAR16 *) GET_LANE_INV(id), chip_struct[id].LanesCount, lane_struct[id].InvFlag, NULL);      \

-}

-

-#define GetComPhyPcd(chip_struct, lane_struct, id) {               \

-  FillLaneMap(chip_struct, lane_struct, id);                       \

+#define GetComPhyPcd(lane_struct, id) {                      \

+  lane_struct[id].Type = (UINT8 *)GET_LANE_TYPE(id);         \

+  lane_struct[id].SpeedValue = (UINT8 *)GET_LANE_SPEED(id);  \

+  lane_struct[id].InvFlag = (UINT8 *)GET_LANE_SPEED(id);     \

 }

 

 /***** ComPhy *****/

@@ -573,15 +568,15 @@ typedef struct {
 } COMPHY_MUX_DATA;

 

 typedef struct {

-  UINT32 Type;

-  UINT32 Speed;

-  UINT32 Invert;

+  UINT8 Type;

+  UINT8 Speed;

+  UINT8 Invert;

 } COMPHY_MAP;

 

 typedef struct {

-  CHAR16 *TypeStr[MAX_LANE_OPTIONS];

-  UINTN SpeedValue[MAX_LANE_OPTIONS];

-  UINTN InvFlag[MAX_LANE_OPTIONS];

+  UINT8 *Type;

+  UINT8 *SpeedValue;

+  UINT8 *InvFlag;

 } PCD_LANE_MAP;

 

 typedef

diff --git a/Platform/Marvell/Library/ComPhyLib/ComPhyLib.inf b/Platform/Marvell/Library/ComPhyLib/ComPhyLib.inf
index e0f4634dca..c223fe5d04 100644
--- a/Platform/Marvell/Library/ComPhyLib/ComPhyLib.inf
+++ b/Platform/Marvell/Library/ComPhyLib/ComPhyLib.inf
@@ -51,7 +51,6 @@
   MemoryAllocationLib

   PcdLib

   IoLib

-  ParsePcdLib

 

 [Sources.common]

   ComPhyLib.c