Skip to contentSkip to conversation

board: freescale: cover all RGMII modes on DPAA 1 boards

PATCH New Madalin Bucur 2 participants 4 messages Nov 4, 2020 – Dec 11, 2020

lore
Share & tools
lore
#0 lore raw

cover board: freescale: cover all RGMII modes on DPAA 1 boards

Make sure all RGMII internal delay modes are covered.

Madalin Bucur (2):
armv8: ls1043/ls1046aqds: add support for all RGMII modes
board: freescale: powerpc: add support for all RGMII modes

 board/freescale/corenet_ds/eth_hydra.c      |  6 ++++++
 board/freescale/corenet_ds/eth_p4080.c      |  6 ++++++
 board/freescale/corenet_ds/eth_superhydra.c | 12 ++++++++++++
 board/freescale/ls1043aqds/eth.c            |  2 ++
 board/freescale/ls1046aqds/eth.c            |  2 ++
 board/freescale/p2041rdb/eth.c              | 29 +++++++++++++++++++----------
 board/freescale/t102xrdb/eth_t102xrdb.c     |  3 +++
 board/freescale/t104xrdb/eth.c              |  3 +++
 board/freescale/t208xqds/eth_t208xqds.c     |  3 +++
 board/freescale/t208xrdb/eth_t208xrdb.c     |  3 +++
 10 files changed, 59 insertions(+), 10 deletions(-)
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/2 armv8: ls1043/ls1046aqds: add support for all RGMII modes

Make sure all RGMII internal delay modes are covered.

---
 board/freescale/ls1043aqds/eth.c | 2 ++
 board/freescale/ls1046aqds/eth.c | 2 ++
 2 files changed, 4 insertions(+)
board/freescale/ls1043aqds/eth.c +2 -0
index 95412df..c3efe8a 100644
@@ -479,6 +479,8 @@ int board_eth_init(struct bd_info *bis)
 			break;
 		case PHY_INTERFACE_MODE_RGMII:
 		case PHY_INTERFACE_MODE_RGMII_TXID:
+		case PHY_INTERFACE_MODE_RGMII_RXID:
+		case PHY_INTERFACE_MODE_RGMII_ID:
 			if (i == FM1_DTSEC3)
 				mdio_mux[i] = EMI1_RGMII1;
 			else if (i == FM1_DTSEC4)
board/freescale/ls1046aqds/eth.c +2 -0
index 8f5f95e..33db552 100644
@@ -409,6 +409,8 @@ int board_eth_init(struct bd_info *bis)
 			break;
 		case PHY_INTERFACE_MODE_RGMII:
 		case PHY_INTERFACE_MODE_RGMII_TXID:
+		case PHY_INTERFACE_MODE_RGMII_RXID:
+		case PHY_INTERFACE_MODE_RGMII_ID:
 			if (i == FM1_DTSEC3)
 				mdio_mux[i] = EMI1_RGMII1;
 			else if (i == FM1_DTSEC4)
Signature · 1 line
2.1.0
#2 lore raw

PATCH 1/2 armv8: ls1043/ls1046aqds: add support for all RGMII modes

Quoted 9 lines

-----Original Message-----
From: Madalin Bucur <[email protected]>
Sent: Wednesday, November 4, 2020 6:39 PM
To: sjg at chromium.org; u-boot at lists.denx.de
Cc: Priyanka Jain <[email protected]>; Shengzhou Liu <[email protected]>; masahiroy at kernel.org; Madalin Bucur (OSS) <[email protected]>
Subject: [PATCH 1/2] armv8: ls1043/ls1046aqds: add support for all RGMII modes

Quoted 4 lines

Make sure all RGMII internal delay modes are covered.

---

<snip>
Applied to fsl-qoriq.
Awaiting upstream

Thanks
Priyanka

#3 lore raw

PATCH 2/2 board: freescale: powerpc: add support for all RGMII modes

In reply to Madalin Bucur

Make sure all RGMII internal delay modes are covered.

---
 board/freescale/corenet_ds/eth_hydra.c      |  6 ++++++
 board/freescale/corenet_ds/eth_p4080.c      |  6 ++++++
 board/freescale/corenet_ds/eth_superhydra.c | 12 ++++++++++++
 board/freescale/p2041rdb/eth.c              | 29 +++++++++++++++++++----------
 board/freescale/t102xrdb/eth_t102xrdb.c     |  3 +++
 board/freescale/t104xrdb/eth.c              |  3 +++
 board/freescale/t208xqds/eth_t208xqds.c     |  3 +++
 board/freescale/t208xrdb/eth_t208xrdb.c     |  3 +++
 8 files changed, 55 insertions(+), 10 deletions(-)
board/freescale/corenet_ds/eth_hydra.c +6 -0
index 8112c12..6500c2f 100644
@@ -350,6 +350,9 @@ void fdt_fixup_board_enet(void *fdt)
 			}
 			break;
 		case PHY_INTERFACE_MODE_RGMII:
+		case PHY_INTERFACE_MODE_RGMII_TXID:
+		case PHY_INTERFACE_MODE_RGMII_RXID:
+		case PHY_INTERFACE_MODE_RGMII_ID:
 			fdt_status_okay_by_alias(fdt, "emi1_rgmii");
 			break;
 		default:
@@ -449,6 +452,9 @@ int board_eth_init(struct bd_info *bis)
 				miiphy_get_dev_by_name("HYDRA_SGMII_MDIO"));
 			break;
 		case PHY_INTERFACE_MODE_RGMII:
+		case PHY_INTERFACE_MODE_RGMII_TXID:
+		case PHY_INTERFACE_MODE_RGMII_RXID:
+		case PHY_INTERFACE_MODE_RGMII_ID:
 			/*
 			 * If DTSEC4 is RGMII, then it's routed via via EC1 to
 			 * the first on-board RGMII port.  If DTSEC5 is RGMII,
board/freescale/corenet_ds/eth_p4080.c +6 -0
index 650013b..df5a69b 100644
@@ -367,6 +367,9 @@ int board_eth_init(struct bd_info *bis)
 			};
 			break;
 		case PHY_INTERFACE_MODE_RGMII:
+		case PHY_INTERFACE_MODE_RGMII_TXID:
+		case PHY_INTERFACE_MODE_RGMII_RXID:
+		case PHY_INTERFACE_MODE_RGMII_ID:
 			fm_info_set_phy_address(i, 0);
 			mdio_mux[i] = EMI1_RGMII;
 			fm_info_set_mdio(i,
@@ -434,6 +437,9 @@ int board_eth_init(struct bd_info *bis)
 			};
 			break;
 		case PHY_INTERFACE_MODE_RGMII:
+		case PHY_INTERFACE_MODE_RGMII_TXID:
+		case PHY_INTERFACE_MODE_RGMII_RXID:
+		case PHY_INTERFACE_MODE_RGMII_ID:
 			fm_info_set_phy_address(i, 0);
 			mdio_mux[i] = EMI1_RGMII;
 			fm_info_set_mdio(i,
board/freescale/corenet_ds/eth_superhydra.c +12 -0
index 35daa1e..de7b692 100644
@@ -317,6 +317,9 @@ void fdt_fixup_board_enet(void *fdt)
 			}
 			break;
 		case PHY_INTERFACE_MODE_RGMII:
+		case PHY_INTERFACE_MODE_RGMII_TXID:
+		case PHY_INTERFACE_MODE_RGMII_RXID:
+		case PHY_INTERFACE_MODE_RGMII_ID:
 			fdt_status_okay_by_alias(fdt, "hydra_rg");
 			debug("Enabled MDIO node hydra_rg\n");
 			break;
@@ -353,6 +356,9 @@ void fdt_fixup_board_enet(void *fdt)
 			}
 			break;
 		case PHY_INTERFACE_MODE_RGMII:
+		case PHY_INTERFACE_MODE_RGMII_TXID:
+		case PHY_INTERFACE_MODE_RGMII_RXID:
+		case PHY_INTERFACE_MODE_RGMII_ID:
 			fdt_status_okay_by_alias(fdt, "hydra_rg");
 			debug("Enabled MDIO node hydra_rg\n");
 			break;
@@ -557,6 +563,9 @@ int board_eth_init(struct bd_info *bis)
 			miiphy_get_dev_by_name("SUPER_HYDRA_FM1_SGMII_MDIO"));
 			break;
 		case PHY_INTERFACE_MODE_RGMII:
+		case PHY_INTERFACE_MODE_RGMII_TXID:
+		case PHY_INTERFACE_MODE_RGMII_RXID:
+		case PHY_INTERFACE_MODE_RGMII_ID:
 			/*
 			 * FM1 DTSEC5 is routed via EC1 to the first on-board
 			 * RGMII port. FM2 DTSEC5 is routed via EC2 to the
@@ -704,6 +713,9 @@ int board_eth_init(struct bd_info *bis)
 
 			break;
 		case PHY_INTERFACE_MODE_RGMII:
+		case PHY_INTERFACE_MODE_RGMII_TXID:
+		case PHY_INTERFACE_MODE_RGMII_RXID:
+		case PHY_INTERFACE_MODE_RGMII_ID:
 			/*
 			 * FM1 DTSEC5 is routed via EC1 to the first on-board
 			 * RGMII port. FM2 DTSEC5 is routed via EC2 to the
board/freescale/p2041rdb/eth.c +19 -10
index 3969816..23fd619 100644
@@ -81,17 +81,21 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
 {
 	phy_interface_t intf = fm_info_get_enet_if(port);
 	char phy[16];
+	int lane;
+	u8 slot;
 
+	switch (intf) {
 	/* The RGMII PHY is identified by the MAC connected to it */
-	if (intf == PHY_INTERFACE_MODE_RGMII) {
+	case PHY_INTERFACE_MODE_RGMII:
+	case PHY_INTERFACE_MODE_RGMII_TXID:
+	case PHY_INTERFACE_MODE_RGMII_RXID:
+	case PHY_INTERFACE_MODE_RGMII_ID:
 		sprintf(phy, "phy_rgmii_%u", port == FM1_DTSEC5 ? 0 : 1);
 		fdt_set_phy_handle(fdt, compat, addr, phy);
-	}
-
+		break;
 	/* The SGMII PHY is identified by the MAC connected to it */
-	if (intf == PHY_INTERFACE_MODE_SGMII) {
-		int lane = serdes_get_first_lane(SGMII_FM1_DTSEC1 + port);
-		u8 slot;
+	case PHY_INTERFACE_MODE_SGMII:
+		lane = serdes_get_first_lane(SGMII_FM1_DTSEC1 + port);
 		if (lane < 0)
 			return;
 		slot = lane_to_slot[lane];
@@ -106,16 +110,18 @@ void board_ft_fman_fixup_port(void *fdt, char *compat, phys_addr_t addr,
 					+ (port - FM1_DTSEC1));
 			fdt_set_phy_handle(fdt, compat, addr, phy);
 		}
-	}
-
-	if (intf == PHY_INTERFACE_MODE_XGMII) {
+		break;
+	case PHY_INTERFACE_MODE_XGMII:
 		/* XAUI */
-		int lane = serdes_get_first_lane(XAUI_FM1);
+		lane = serdes_get_first_lane(XAUI_FM1);
 		if (lane >= 0) {
 			/* The XAUI PHY is identified by the slot */
 			sprintf(phy, "phy_xgmii_%u", lane_to_slot[lane]);
 			fdt_set_phy_handle(fdt, compat, addr, phy);
 		}
+		break;
+	default:
+		break;
 	}
 }
 #endif /* #ifdef CONFIG_FMAN_ENET */
@@ -169,6 +175,9 @@ int board_eth_init(struct bd_info *bis)
 				fm_info_set_phy_address(i, riser_phy_addr[i]);
 			break;
 		case PHY_INTERFACE_MODE_RGMII:
+		case PHY_INTERFACE_MODE_RGMII_TXID:
+		case PHY_INTERFACE_MODE_RGMII_RXID:
+		case PHY_INTERFACE_MODE_RGMII_ID:
 			/* Only DTSEC4 and DTSEC5 can be routed to RGMII */
 			fm_info_set_phy_address(i, i == FM1_DTSEC5 ?
 					CONFIG_SYS_FM1_DTSEC5_PHY_ADDR :
board/freescale/t102xrdb/eth_t102xrdb.c +3 -0
index b64590f..56e6109 100644
@@ -89,6 +89,9 @@ int board_eth_init(struct bd_info *bis)
 		interface = fm_info_get_enet_if(i);
 		switch (interface) {
 		case PHY_INTERFACE_MODE_RGMII:
+		case PHY_INTERFACE_MODE_RGMII_TXID:
+		case PHY_INTERFACE_MODE_RGMII_RXID:
+		case PHY_INTERFACE_MODE_RGMII_ID:
 			dev = miiphy_get_dev_by_name(DEFAULT_FM_MDIO_NAME);
 			fm_info_set_mdio(i, dev);
 			break;
board/freescale/t104xrdb/eth.c +3 -0
index 8e2f035..b034f11 100644
@@ -77,6 +77,9 @@ int board_eth_init(struct bd_info *bis)
 			break;
 #endif
 		case PHY_INTERFACE_MODE_RGMII:
+		case PHY_INTERFACE_MODE_RGMII_TXID:
+		case PHY_INTERFACE_MODE_RGMII_RXID:
+		case PHY_INTERFACE_MODE_RGMII_ID:
 			if (FM1_DTSEC4 == i)
 				phy_addr = CONFIG_SYS_RGMII1_PHY_ADDR;
 			if (FM1_DTSEC5 == i)
board/freescale/t208xqds/eth_t208xqds.c +3 -0
index 5044b56..aaa3490 100644
@@ -765,6 +765,9 @@ int board_eth_init(struct bd_info *bis)
 			}
 			break;
 		case PHY_INTERFACE_MODE_RGMII:
+		case PHY_INTERFACE_MODE_RGMII_TXID:
+		case PHY_INTERFACE_MODE_RGMII_RXID:
+		case PHY_INTERFACE_MODE_RGMII_ID:
 			if (i == FM1_DTSEC3)
 				mdio_mux[i] = EMI1_RGMII1;
 			else if (i == FM1_DTSEC4 || FM1_DTSEC10)
board/freescale/t208xrdb/eth_t208xrdb.c +3 -0
index c165388..e77f3f7 100644
@@ -76,6 +76,9 @@ int board_eth_init(struct bd_info *bis)
 		interface = fm_info_get_enet_if(i);
 		switch (interface) {
 		case PHY_INTERFACE_MODE_RGMII:
+		case PHY_INTERFACE_MODE_RGMII_TXID:
+		case PHY_INTERFACE_MODE_RGMII_RXID:
+		case PHY_INTERFACE_MODE_RGMII_ID:
 			dev = miiphy_get_dev_by_name(DEFAULT_FM_MDIO_NAME);
 			fm_info_set_mdio(i, dev);
 			break;
Signature · 1 line
2.1.0