diff mbox

[U-Boot] powerpc/sgmii: To support PHY link state auto detect in SGMII mode

Message ID 1342085993-13379-1-git-send-email-B38951@freescale.com
State Accepted
Commit 308bc61db72a2e759ce8ce10070c03a45cf4a8c8
Delegated to: Andy Fleming
Headers show

Commit Message

Hongtao Jia July 12, 2012, 9:39 a.m. UTC 
PHYs on SGMII riser card are used in SGMII mode with different external
IRQs from eTSEC. This means in SGMII mode phy-handle and phy-connection-type
under ethernet node should be updated. Otherwise the PHY interrupt can not
be handled therefor PHY link state change can not be auto detected.

For we have seperate SGMII PHY nodes, ethernet PHY reg fixup is not needed
but it's still be kept to guarantee the sgmii mode could work with old
device tree.

Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Jia Hongtao <B38951@freescale.com>
---
 board/freescale/common/sgmii_riser.c |   57 +++++++++++++++++++++++++++++-----
 1 files changed, 49 insertions(+), 8 deletions(-)

Comments

Hongtao Jia July 12, 2012, 10:27 a.m. UTC | #1 
Note that this patch works with new dts.
Please refer to:
http://patchwork.ozlabs.org/patch/170617/

-Hongtao.

> -----Original Message-----
> From: Jia Hongtao-B38951
> Sent: Thursday, July 12, 2012 5:40 PM
> To: u-boot@lists.denx.de
> Cc: afleming@gmail.com; sun york-R58495; Li Yang-R58472; Jia Hongtao-
> B38951
> Subject: [PATCH] powerpc/sgmii: To support PHY link state auto detect in
> SGMII mode
> 
> PHYs on SGMII riser card are used in SGMII mode with different external
> IRQs from eTSEC. This means in SGMII mode phy-handle and phy-connection-
> type
> under ethernet node should be updated. Otherwise the PHY interrupt can
> not
> be handled therefor PHY link state change can not be auto detected.
> 
> For we have seperate SGMII PHY nodes, ethernet PHY reg fixup is not
> needed
> but it's still be kept to guarantee the sgmii mode could work with old
> device tree.
> 
> Signed-off-by: Li Yang <leoli@freescale.com>
> Signed-off-by: Jia Hongtao <B38951@freescale.com>
> ---
>  board/freescale/common/sgmii_riser.c |   57
> +++++++++++++++++++++++++++++-----
>  1 files changed, 49 insertions(+), 8 deletions(-)
>
Andy Fleming Aug. 9, 2012, 12:28 a.m. UTC | #2 
On Thu, Jul 12, 2012 at 4:39 AM, Jia Hongtao <B38951@freescale.com> wrote:
> PHYs on SGMII riser card are used in SGMII mode with different external
> IRQs from eTSEC. This means in SGMII mode phy-handle and phy-connection-type
> under ethernet node should be updated. Otherwise the PHY interrupt can not
> be handled therefor PHY link state change can not be auto detected.
>
> For we have seperate SGMII PHY nodes, ethernet PHY reg fixup is not needed
> but it's still be kept to guarantee the sgmii mode could work with old
> device tree.
>
> Signed-off-by: Li Yang <leoli@freescale.com>
> Signed-off-by: Jia Hongtao <B38951@freescale.com>

Applied, thanks
diff mbox

Patch

diff --git a/board/freescale/common/sgmii_riser.c b/board/freescale/common/sgmii_riser.c
index 4f40a1d..5c3c593 100644
--- a/board/freescale/common/sgmii_riser.c
+++ b/board/freescale/common/sgmii_riser.c
@@ -17,6 +17,7 @@ 
 #include <net.h>
 #include <libfdt.h>
 #include <tsec.h>
+#include <fdt_support.h>
 
 void fsl_sgmii_riser_init(struct tsec_info_struct *tsec_info, int num)
 {
@@ -31,6 +32,7 @@  void fsl_sgmii_riser_fdt_fixup(void *fdt)
 {
 	struct eth_device *dev;
 	int node;
+	int mdio_node;
 	int i = -1;
 	int etsec_num = 0;
 
@@ -40,16 +42,38 @@  void fsl_sgmii_riser_fdt_fixup(void *fdt)
 
 	while ((dev = eth_get_dev_by_index(++i)) != NULL) {
 		struct tsec_private *priv;
+		int phy_node;
 		int enet_node;
+		uint32_t ph;
+		char sgmii_phy[16];
 		char enet[16];
 		const u32 *phyh;
-		int phynode;
 		const char *model;
 		const char *path;
 
 		if (!strstr(dev->name, "eTSEC"))
 			continue;
 
+		priv = dev->priv;
+		if (!(priv->flags & TSEC_SGMII)) {
+			etsec_num++;
+			continue;
+		}
+
+		mdio_node = fdt_node_offset_by_compatible(fdt, -1,
+				"fsl,gianfar-mdio");
+		if (mdio_node < 0)
+			return;
+
+		sprintf(sgmii_phy, "sgmii-phy@%d", etsec_num);
+		phy_node = fdt_subnode_offset(fdt, mdio_node, sgmii_phy);
+		if (phy_node > 0) {
+			fdt_increase_size(fdt, 32);
+			ph = fdt_create_phandle(fdt, phy_node);
+			if (!ph)
+				continue;
+		}
+
 		sprintf(enet, "ethernet%d", etsec_num++);
 		path = fdt_getprop(fdt, node, enet, NULL);
 		if (!path) {
@@ -74,15 +98,32 @@  void fsl_sgmii_riser_fdt_fixup(void *fdt)
 		if (!strstr(model, "TSEC"))
 			continue;
 
-		phyh = fdt_getprop(fdt, enet_node, "phy-handle", NULL);
-		if (!phyh)
-			continue;
+		if (phy_node < 0) {
+			/*
+			 * This part is only for old device tree without
+			 * sgmii_phy nodes. It's kept just for compatible
+			 * reason. Soon to be deprecated if all device tree
+			 * get updated.
+			 */
+			phyh = fdt_getprop(fdt, enet_node, "phy-handle", NULL);
+			if (!phyh)
+				continue;
 
-		phynode = fdt_node_offset_by_phandle(fdt, fdt32_to_cpu(*phyh));
+			phy_node = fdt_node_offset_by_phandle(fdt,
+					fdt32_to_cpu(*phyh));
 
-		priv = dev->priv;
+			priv = dev->priv;
 
-		if (priv->flags & TSEC_SGMII)
-			fdt_setprop_cell(fdt, phynode, "reg", priv->phyaddr);
+			if (priv->flags & TSEC_SGMII)
+				fdt_setprop_cell(fdt, phy_node, "reg",
+						priv->phyaddr);
+		} else {
+			fdt_setprop(fdt, enet_node, "phy-handle", &ph,
+					sizeof(ph));
+			fdt_setprop_string(fdt, enet_node,
+					"phy-connection-type",
+					phy_string_for_interface(
+						PHY_INTERFACE_MODE_SGMII));
+		}
 	}
 }