diff mbox series

lx2160a: Add the serdes configurtion details for QDS

Message ID 1579758708-22736-1-git-send-email-vikas.singh@nxp.com
State New
Headers show
Series lx2160a: Add the serdes configurtion details for QDS | expand

Commit Message

Vikas Singh Jan. 23, 2020, 5:52 a.m. UTC
Add 8_10_0 and 21_2_0 seredes protocol for QDS
Add 10_12_3 seredes protocol for QDS
Add the IOSLOT and the mezzanine card mapping against each serdes protocol.

Signed-off-by: Vikas Singh <vikas.singh at nxp.com>
---
 board/freescale/lx2160a/eth_lx2160aqds.c | 84 +++++++++++++++++++++++++++++++-
 1 file changed, 83 insertions(+), 1 deletion(-)

Comments

Priyanka Jain (OSS) Jan. 31, 2020, 10:32 a.m. UTC | #1
>-----Original Message-----
>From: U-Boot <u-boot-bounces at lists.denx.de> On Behalf Of Vikas Singh
>Sent: Thursday, January 23, 2020 11:22 AM
>To: Priyanka Jain <priyanka.jain at nxp.com>; u-boot at lists.denx.de
>Subject: [PATCH] lx2160a: Add the serdes configurtion details for QDS
Sp mistake in configuration. n
>
>Add 8_10_0 and 21_2_0 seredes protocol for QDS Add 10_12_3 seredes
>protocol for QDS Add the IOSLOT and the mezzanine card mapping against
>each serdes protocol.
>
>Signed-off-by: Vikas Singh <vikas.singh at nxp.com>
>---
> board/freescale/lx2160a/eth_lx2160aqds.c | 84
>+++++++++++++++++++++++++++++++-
> 1 file changed, 83 insertions(+), 1 deletion(-)
>
>diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c
>b/board/freescale/lx2160a/eth_lx2160aqds.c
>index 55e8a42..741cca7 100644
>--- a/board/freescale/lx2160a/eth_lx2160aqds.c
>+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
>@@ -75,6 +75,29 @@ struct serdes_phy_config {
>  * This table has limited serdes protocol entries. It can be expanded as per
>  * requirement.
>  */
>+/***************************************************************
>**
>+ |   SERDES_1 PROTOCOL   |      IO_SLOT         |       CARD     |
>+
>*****************************************************************
>+ |      3                |      IO_SLOT_1       |  M11-USXGMII   |
>+ |      7                |      IO_SLOT_1       |  M11-USXGMII   |
>+ |                       |      IO_SLOT_2       |  M4-PCIE-SGMII |
>+ |      8                |      IO_SLOT_1       |  M12-XFI       |
>+ |      10               |      IO_SLOT_1       |  M11-USXGMII   |
>+ |                       |      IO_SLOT_2       |  M12-XFI       |
>+ |      13               |      IO_SLOT_1       |  M8-100G       |
>+ |                       |      IO_SLOT_2       |  M8-100G       |
>+ |      14               |      IO_SLOT_1       |  M8-100G       |
>+ |      15               |      IO_SLOT_1       |  M13-25G       |
>+ |      17               |      IO_SLOT_1       |  M13-25G       |
>+ |      19               |      IO_SLOT_1       |  M11-USXGMII   |
>+ |                       |      IO_SLOT_2       |  M7-40G        |
>+ |                       |      IO_SLOT_6       |  M13-25G       |
>+ |      20               |      IO_SLOT_1       |  M7-40G        |
>+ |                       |      IO_SLOT_2       |  M7-40G        |
>+ |      21               |      IO_SLOT_1       |  M13-25G       |
>+ |                       |      IO_SLOT_2       |  M13-25G       |
>+
>*****************************************************************
>+ */
Why you need so much information here. Can't we move this to README?
> static const struct serdes_phy_config serdes1_phy_config[] = {
> 	{3, {{WRIOP1_DPMAC3, {AQ_PHY_ADDR1, -1},
> 	      EMI1, IO_SLOT_1},
>@@ -101,6 +124,12 @@ static const struct serdes_phy_config
>serdes1_phy_config[] = {
> 	    {WRIOP1_DPMAC10, {SGMII_CARD_PORT4_PHY_ADDR, -1},
> 	     EMI1, IO_SLOT_2} } },
> 	{8, {} },
>+	{10, {{WRIOP1_DPMAC4, {AQ_PHY_ADDR2, -1},
>+               EMI1, IO_SLOT_1},
>+             {WRIOP1_DPMAC5, {AQ_PHY_ADDR3, -1},
>+              EMI1, IO_SLOT_1},
>+             {WRIOP1_DPMAC6, {AQ_PHY_ADDR4, -1},
>+              EMI1, IO_SLOT_1} } },
These code changes does not match with what subject says.
Please split into separate patches
> 	{13, {{WRIOP1_DPMAC1, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1},
> 	       EMI1, IO_SLOT_1},
> 	     {WRIOP1_DPMAC2, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1},
>@@ -132,13 +161,49 @@ static const struct serdes_phy_config
>serdes1_phy_config[] = {
> 	{20, {{WRIOP1_DPMAC1, {CORTINA_PHY_ADDR1, -1},
> 	       EMI1, IO_SLOT_1},
> 	     {WRIOP1_DPMAC2, {CORTINA_PHY_ADDR1, -1},
>-	      EMI1, IO_SLOT_2} } }
>+	      EMI1, IO_SLOT_2} } },
>+	{21, {{WRIOP1_DPMAC3, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1},
>+              EMI1, IO_SLOT_1},
>+             {WRIOP1_DPMAC4, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1},
>+              EMI1, IO_SLOT_1},
>+             {WRIOP1_DPMAC5, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1},
>+              EMI1, IO_SLOT_1},
>+             {WRIOP1_DPMAC6, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1},
>+              EMI1, IO_SLOT_1},
>+             {WRIOP1_DPMAC9, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1},
>+              EMI1, IO_SLOT_2},
>+             {WRIOP1_DPMAC10, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1},
>+              EMI1, IO_SLOT_2} } }
> };
>
>+/***************************************************************
>**
>+ |   SERDES_2 PROTOCOL   |      IO_SLOT         |       CARD     |
>+
>*****************************************************************
>+ |      2                |      IO_SLOT_7       |  M4-PCIE-SGMII |
>+ |                       |      IO_SLOT_8       |  M4-PCIE-SGMII |
>+ |      3                |      IO_SLOT_7       |  M4-PCIE-SGMII |
>+ |                       |      IO_SLOT_8       |  M4-PCIE-SGMII |
>+ |      5                |      IO_SLOT_7       |  M4-PCIE-SGMII |
>+ |      10               |      IO_SLOT_7       |  M4-PCIE-SGMII |
>+ |                       |      IO_SLOT_8       |  M4-PCIE-SGMII |
>+ |      11               |      IO_SLOT_7       |  M4-PCIE-SGMII |
>+ |                       |      IO_SLOT_8       |  M4-PCIE-SGMII |
>+ |      12               |      IO_SLOT_7       |  M4-PCIE-SGMII |
>+ |                       |      IO_SLOT_8       |  M4-PCIE-SGMII |
>+
>*****************************************************************
>+ */
> static const struct serdes_phy_config serdes2_phy_config[] = {
> 	{2, {} },
> 	{3, {} },
> 	{5, {} },
>+	{10, {{WRIOP1_DPMAC11, {SGMII_CARD_PORT1_PHY_ADDR, -1},
>+               EMI1, IO_SLOT_7},
>+             {WRIOP1_DPMAC12, {SGMII_CARD_PORT2_PHY_ADDR, -1},
>+              EMI1, IO_SLOT_7},
>+             {WRIOP1_DPMAC17, {SGMII_CARD_PORT3_PHY_ADDR, -1},
>+              EMI1, IO_SLOT_7},
>+             {WRIOP1_DPMAC18, {SGMII_CARD_PORT4_PHY_ADDR, -1},
>+              EMI1, IO_SLOT_7} } },
> 	{11, {{WRIOP1_DPMAC12, {SGMII_CARD_PORT2_PHY_ADDR, -1},
> 	       EMI1, IO_SLOT_7},
> 	     {WRIOP1_DPMAC17, {SGMII_CARD_PORT3_PHY_ADDR, -1}, @@ -
>151,8 +216,25 @@ static const struct serdes_phy_config serdes2_phy_config[]
>= {
> 	      EMI1, IO_SLOT_8},
> 	     {WRIOP1_DPMAC14, {SGMII_CARD_PORT4_PHY_ADDR, -1},
> 	      EMI1, IO_SLOT_8} } },
>+	{12, {{WRIOP1_DPMAC11, {SGMII_CARD_PORT1_PHY_ADDR, -1},
>+               EMI1, IO_SLOT_7},
>+             {WRIOP1_DPMAC12, {SGMII_CARD_PORT2_PHY_ADDR, -1},
>+              EMI1, IO_SLOT_7},
>+             {WRIOP1_DPMAC17, {SGMII_CARD_PORT3_PHY_ADDR, -1},
>+              EMI1, IO_SLOT_7},
>+             {WRIOP1_DPMAC18, {SGMII_CARD_PORT4_PHY_ADDR, -1},
>+              EMI1, IO_SLOT_7} } }
> };
>
>+/***************************************************************
>**
>+ |   SERDES_3 PROTOCOL   |      IO_SLOT         |       CARD     |
>+
>*****************************************************************
>+ |      2                |      IO_SLOT_5       |  M4-PCIE-SGMII |
>+ |                       |      IO_SLOT_6       |  M4-PCIE-SGMII |
>+ |      3                |      IO_SLOT_5       |  M4-PCIE-SGMII |
>+ |                       |      IO_SLOT_6       |  M4-PCIE-SGMII |
>+
>*****************************************************************
>+ */
> static const struct serdes_phy_config serdes3_phy_config[] = {
> 	{2, {} },
> 	{3, {} }
>--
>2.7.4
-priyankajain
diff mbox series

Patch

diff --git a/board/freescale/lx2160a/eth_lx2160aqds.c b/board/freescale/lx2160a/eth_lx2160aqds.c
index 55e8a42..741cca7 100644
--- a/board/freescale/lx2160a/eth_lx2160aqds.c
+++ b/board/freescale/lx2160a/eth_lx2160aqds.c
@@ -75,6 +75,29 @@  struct serdes_phy_config {
  * This table has limited serdes protocol entries. It can be expanded as per
  * requirement.
  */
+/*****************************************************************
+ |   SERDES_1 PROTOCOL   |      IO_SLOT         |       CARD     |
+ *****************************************************************
+ |      3                |      IO_SLOT_1       |  M11-USXGMII   |
+ |      7                |      IO_SLOT_1       |  M11-USXGMII   |
+ |                       |      IO_SLOT_2       |  M4-PCIE-SGMII |
+ |      8                |      IO_SLOT_1       |  M12-XFI       |
+ |      10               |      IO_SLOT_1       |  M11-USXGMII   |
+ |                       |      IO_SLOT_2       |  M12-XFI       |
+ |      13               |      IO_SLOT_1       |  M8-100G       |
+ |                       |      IO_SLOT_2       |  M8-100G       |
+ |      14               |      IO_SLOT_1       |  M8-100G       |
+ |      15               |      IO_SLOT_1       |  M13-25G       |
+ |      17               |      IO_SLOT_1       |  M13-25G       |
+ |      19               |      IO_SLOT_1       |  M11-USXGMII   |
+ |                       |      IO_SLOT_2       |  M7-40G        |
+ |                       |      IO_SLOT_6       |  M13-25G       |
+ |      20               |      IO_SLOT_1       |  M7-40G        |
+ |                       |      IO_SLOT_2       |  M7-40G        |
+ |      21               |      IO_SLOT_1       |  M13-25G       |
+ |                       |      IO_SLOT_2       |  M13-25G       |
+ *****************************************************************
+ */
 static const struct serdes_phy_config serdes1_phy_config[] = {
 	{3, {{WRIOP1_DPMAC3, {AQ_PHY_ADDR1, -1},
 	      EMI1, IO_SLOT_1},
@@ -101,6 +124,12 @@  static const struct serdes_phy_config serdes1_phy_config[] = {
 	    {WRIOP1_DPMAC10, {SGMII_CARD_PORT4_PHY_ADDR, -1},
 	     EMI1, IO_SLOT_2} } },
 	{8, {} },
+	{10, {{WRIOP1_DPMAC4, {AQ_PHY_ADDR2, -1},
+               EMI1, IO_SLOT_1},
+             {WRIOP1_DPMAC5, {AQ_PHY_ADDR3, -1},
+              EMI1, IO_SLOT_1},
+             {WRIOP1_DPMAC6, {AQ_PHY_ADDR4, -1},
+              EMI1, IO_SLOT_1} } },
 	{13, {{WRIOP1_DPMAC1, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1},
 	       EMI1, IO_SLOT_1},
 	     {WRIOP1_DPMAC2, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1},
@@ -132,13 +161,49 @@  static const struct serdes_phy_config serdes1_phy_config[] = {
 	{20, {{WRIOP1_DPMAC1, {CORTINA_PHY_ADDR1, -1},
 	       EMI1, IO_SLOT_1},
 	     {WRIOP1_DPMAC2, {CORTINA_PHY_ADDR1, -1},
-	      EMI1, IO_SLOT_2} } }
+	      EMI1, IO_SLOT_2} } },
+	{21, {{WRIOP1_DPMAC3, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1},
+              EMI1, IO_SLOT_1},
+             {WRIOP1_DPMAC4, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1},
+              EMI1, IO_SLOT_1},
+             {WRIOP1_DPMAC5, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1},
+              EMI1, IO_SLOT_1},
+             {WRIOP1_DPMAC6, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1},
+              EMI1, IO_SLOT_1},
+             {WRIOP1_DPMAC9, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1},
+              EMI1, IO_SLOT_2},
+             {WRIOP1_DPMAC10, {INPHI_PHY_ADDR1, INPHI_PHY_ADDR2, -1},
+              EMI1, IO_SLOT_2} } }
 };
 
+/*****************************************************************
+ |   SERDES_2 PROTOCOL   |      IO_SLOT         |       CARD     |
+ *****************************************************************
+ |      2                |      IO_SLOT_7       |  M4-PCIE-SGMII |
+ |                       |      IO_SLOT_8       |  M4-PCIE-SGMII |
+ |      3                |      IO_SLOT_7       |  M4-PCIE-SGMII |
+ |                       |      IO_SLOT_8       |  M4-PCIE-SGMII |
+ |      5                |      IO_SLOT_7       |  M4-PCIE-SGMII |
+ |      10               |      IO_SLOT_7       |  M4-PCIE-SGMII |
+ |                       |      IO_SLOT_8       |  M4-PCIE-SGMII |
+ |      11               |      IO_SLOT_7       |  M4-PCIE-SGMII |
+ |                       |      IO_SLOT_8       |  M4-PCIE-SGMII |
+ |      12               |      IO_SLOT_7       |  M4-PCIE-SGMII |
+ |                       |      IO_SLOT_8       |  M4-PCIE-SGMII |
+ *****************************************************************
+ */
 static const struct serdes_phy_config serdes2_phy_config[] = {
 	{2, {} },
 	{3, {} },
 	{5, {} },
+	{10, {{WRIOP1_DPMAC11, {SGMII_CARD_PORT1_PHY_ADDR, -1},
+               EMI1, IO_SLOT_7},
+             {WRIOP1_DPMAC12, {SGMII_CARD_PORT2_PHY_ADDR, -1},
+              EMI1, IO_SLOT_7},
+             {WRIOP1_DPMAC17, {SGMII_CARD_PORT3_PHY_ADDR, -1},
+              EMI1, IO_SLOT_7},
+             {WRIOP1_DPMAC18, {SGMII_CARD_PORT4_PHY_ADDR, -1},
+              EMI1, IO_SLOT_7} } },
 	{11, {{WRIOP1_DPMAC12, {SGMII_CARD_PORT2_PHY_ADDR, -1},
 	       EMI1, IO_SLOT_7},
 	     {WRIOP1_DPMAC17, {SGMII_CARD_PORT3_PHY_ADDR, -1},
@@ -151,8 +216,25 @@  static const struct serdes_phy_config serdes2_phy_config[] = {
 	      EMI1, IO_SLOT_8},
 	     {WRIOP1_DPMAC14, {SGMII_CARD_PORT4_PHY_ADDR, -1},
 	      EMI1, IO_SLOT_8} } },
+	{12, {{WRIOP1_DPMAC11, {SGMII_CARD_PORT1_PHY_ADDR, -1},
+               EMI1, IO_SLOT_7},
+             {WRIOP1_DPMAC12, {SGMII_CARD_PORT2_PHY_ADDR, -1},
+              EMI1, IO_SLOT_7},
+             {WRIOP1_DPMAC17, {SGMII_CARD_PORT3_PHY_ADDR, -1},
+              EMI1, IO_SLOT_7},
+             {WRIOP1_DPMAC18, {SGMII_CARD_PORT4_PHY_ADDR, -1},
+              EMI1, IO_SLOT_7} } }
 };
 
+/*****************************************************************
+ |   SERDES_3 PROTOCOL   |      IO_SLOT         |       CARD     |
+ *****************************************************************
+ |      2                |      IO_SLOT_5       |  M4-PCIE-SGMII |
+ |                       |      IO_SLOT_6       |  M4-PCIE-SGMII |
+ |      3                |      IO_SLOT_5       |  M4-PCIE-SGMII |
+ |                       |      IO_SLOT_6       |  M4-PCIE-SGMII |
+ *****************************************************************
+ */
 static const struct serdes_phy_config serdes3_phy_config[] = {
 	{2, {} },
 	{3, {} }