Skip to contentSkip to conversation

arm: kirkwood: Convert the GoFlex Home board Ethernet and SATA to Driver Model.

PATCH In review Tony Dinh 2 participants 8 messages Jul 30, 2021 – Aug 11, 2021

lore
Share & tools
lore

Tony Dinh

author
#0 lore raw

cover arm: kirkwood: Convert the GoFlex Home board Ethernet and SATA to Driver Model.

- Enable DM SATA and SATA MV driver
- Enable DM Ethernet.
- Use Ethernet PHY names from device tree.
- Replace the old Ethernet PHY addr lookup with a device tree parsing lookup function.

Tony Dinh (3):
arm: kirkwood: GoFlex Home: Add DM Ethernet, remove IDE, and add DM
SATA configs
arm: kirkwood: GoFlex Home: Add DM SATA configs
arm: kirkwood: GoFlex Home: Use Ethernet PHY name and address from
device tree

 board/Seagate/goflexhome/goflexhome.c | 57 +++++++++++++++++++++------
 configs/goflexhome_defconfig          |  5 ++-
 include/configs/goflexhome.h          |  6 +++
 3 files changed, 55 insertions(+), 13 deletions(-)
Signature · 1 line
2.20.1
author
#1 lore raw

PATCH 1/3 arm: kirkwood: GoFlex Home: Add DM Ethernet, remove IDE, and add DM SATA configs

Add DM_ETH, SATA_MV and associated configs to goflexhome_defconfig.

---

 configs/goflexhome_defconfig | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
configs/goflexhome_defconfig +4 -1
index 7207fa27e0..17adeca92f 100644
@@ -16,7 +16,6 @@ CONFIG_CONSOLE_MUX=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SYS_PROMPT="GoFlexHome> "
 # CONFIG_CMD_FLASH is not set
-CONFIG_CMD_IDE=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
@@ -48,3 +47,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
+CONFIG_CMD_SATA=y
+CONFIG_SATA_MV=y
+CONFIG_DM_ETH=y
+CONFIG_NET_RANDOM_ETHADDR=y
Signature · 1 line
2.20.1
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] arm: kirkwood: GoFlex Home: Add DM Ethernet, remove IDE, and add DM SATA configs

Quoted 3 lines · Tony Dinh

Add DM_ETH, SATA_MV and associated configs to goflexhome_defconfig.

Thanks,
Stefan

Quoted 19 lines

---

  configs/goflexhome_defconfig | 5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
configs/goflexhome_defconfig +0 -1
index 7207fa27e0..17adeca92f 100644
@@ -16,7 +16,6 @@ CONFIG_CONSOLE_MUX=y
  # CONFIG_DISPLAY_BOARDINFO is not set
  CONFIG_SYS_PROMPT="GoFlexHome> "
  # CONFIG_CMD_FLASH is not set
-CONFIG_CMD_IDE=y
  CONFIG_CMD_NAND=y
  CONFIG_CMD_USB=y
  # CONFIG_CMD_SETEXPR is not set

configs/goflexhome_defconfig CONFIG_SYS_NS16550=y · line 53

Quoted 7 lines
configs/goflexhome_defconfig +4 -0
@@ -48,3 +47,7 @@ CONFIG_SYS_NS16550=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_STORAGE=y
+CONFIG_CMD_SATA=y
+CONFIG_SATA_MV=y
+CONFIG_DM_ETH=y
+CONFIG_NET_RANDOM_ETHADDR=y

Viele Grüße,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
author
#3 lore raw

PATCH 2/3 arm: kirkwood: GoFlex Home: Add DM SATA configs

In reply to Tony Dinh

Enable DM SATA in board file.

---

 include/configs/goflexhome.h | 6 ++++++
 1 file changed, 6 insertions(+)
include/configs/goflexhome.h +6 -0
index a18e7869b0..2e89d72285 100644
@@ -72,4 +72,10 @@
 #define CONFIG_PHY_BASE_ADR	0
 #endif /* CONFIG_CMD_NET */
 
+/* SATA driver configuration */
+#ifdef CONFIG_SATA
+#define CONFIG_SYS_SATA_MAX_DEVICE	1
+#define CONFIG_LBA48
+#endif /* CONFIG_SATA */
+
 #endif /* _CONFIG_GOFLEXHOME_H */
Signature · 1 line
2.20.1
Reviewed-by on v1 2/3
#4 lore raw

Re: [PATCH 2/3] arm: kirkwood: GoFlex Home: Add DM SATA configs

Quoted 3 lines · Tony Dinh

Enable DM SATA in board file.

Thanks,
Stefan

Quoted 11 lines

---

  include/configs/goflexhome.h | 6 ++++++
  1 file changed, 6 insertions(+)
include/configs/goflexhome.h +0 -0
index a18e7869b0..2e89d72285 100644

include/configs/goflexhome.h line 81

Quoted 10 lines
include/configs/goflexhome.h +6 -0
@@ -72,4 +72,10 @@
  #define CONFIG_PHY_BASE_ADR	0
  #endif /* CONFIG_CMD_NET */
 
+/* SATA driver configuration */
+#ifdef CONFIG_SATA
+#define CONFIG_SYS_SATA_MAX_DEVICE	1
+#define CONFIG_LBA48
+#endif /* CONFIG_SATA */
+
  #endif /* _CONFIG_GOFLEXHOME_H */

Viele Grüße,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
author
#5 lore raw

PATCH 3/3 arm: kirkwood: GoFlex Home: Use Ethernet PHY name and address from device tree

In reply to Tony Dinh

In DM Ethernet, the old "egiga0" name is no longer valid, so replace these with Ethernet PHY names from device tree. Also, read Ethernet PHY address from device tree.

---

 board/Seagate/goflexhome/goflexhome.c | 57 +++++++++++++++++++++------
 1 file changed, 45 insertions(+), 12 deletions(-)
board/Seagate/goflexhome/goflexhome.c +45 -12
index af8cab7bdc..52be64fb8c 100644
@@ -1,5 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
+ * Copyright (C) 2021
+ * Tony Dinh <[email protected]>
+ * Suriyan Ramasami <[email protected]>
+ *
  * Copyright (C) 2013 Suriyan Ramasami <[email protected]>
  *
  * Based on dockstar.c originally written by
@@ -107,36 +111,65 @@ int board_init(void)
 	return 0;
 }
 
+static int fdt_get_phy_addr(const char *path)
+{
+	const void *fdt = gd->fdt_blob;
+	const u32 *reg;
+	const u32 *val;
+	int node, phandle, addr;
+
+	/* Find the node by its full path */
+	node = fdt_path_offset(fdt, path);
+	if (node >= 0) {
+		/* Look up phy-handle */
+		val = fdt_getprop(fdt, node, "phy-handle", NULL);
+		if (val) {
+			phandle = fdt32_to_cpu(*val);
+			if (!phandle)
+				return -1;
+			/* Follow it to its node */
+			node = fdt_node_offset_by_phandle(fdt, phandle);
+			if (node) {
+				/* Look up reg */
+				reg = fdt_getprop(fdt, node, "reg", NULL);
+				if (reg) {
+					addr = fdt32_to_cpu(*reg);
+					return addr;
+				}
+			}
+		}
+	}
+	return -1;
+}
+
 #ifdef CONFIG_RESET_PHY_R
 /* Configure and enable MV88E1116 PHY */
 void reset_phy(void)
 {
 	u16 reg;
-	u16 devadr;
-	char *name = "egiga0";
+	int phyaddr;
+	char *name = "ethernet-controller@72000";
+	char *eth0_path = "/ocp@f1000000/ethernet-controller@72000/ethernet0-port@0";
 
 	if (miiphy_set_current_dev(name))
 		return;
 
-	/* command to read PHY dev address */
-	if (miiphy_read(name, 0xEE, 0xEE, (u16 *)&devadr)) {
-		printf("Err..%s could not read PHY dev address\n",
-		       __func__);
+	phyaddr = fdt_get_phy_addr(eth0_path);
+	if (phyaddr < 0)
 		return;
-	}
 
 	/*
 	 * Enable RGMII delay on Tx and Rx for CPU port
 	 * Ref: sec 4.7.2 of chip datasheet
 	 */
-	miiphy_write(name, devadr, MV88E1116_PGADR_REG, 2);
-	miiphy_read(name, devadr, MV88E1116_MAC_CTRL_REG, &reg);
+	miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 2);
+	miiphy_read(name, phyaddr, MV88E1116_MAC_CTRL_REG, &reg);
 	reg |= (MV88E1116_RGMII_RXTM_CTRL | MV88E1116_RGMII_TXTM_CTRL);
-	miiphy_write(name, devadr, MV88E1116_MAC_CTRL_REG, reg);
-	miiphy_write(name, devadr, MV88E1116_PGADR_REG, 0);
+	miiphy_write(name, phyaddr, MV88E1116_MAC_CTRL_REG, reg);
+	miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 0);
 
 	/* reset the phy */
-	miiphy_reset(name, devadr);
+	miiphy_reset(name, phyaddr);
 
 	printf("88E1116 Initialized on %s\n", name);
 }
Signature · 1 line
2.20.1
Reviewed-by on v1 3/3
#6 lore raw

Re: [PATCH 3/3] arm: kirkwood: GoFlex Home: Use Ethernet PHY name and address from device tree

Quoted 5 lines · Tony Dinh

In DM Ethernet, the old "egiga0" name is no longer valid, so replace these with Ethernet PHY names from device tree. Also, read Ethernet PHY address from device tree.

Thanks,
Stefan

Quoted 88 lines

---

  board/Seagate/goflexhome/goflexhome.c | 57 +++++++++++++++++++++------
  1 file changed, 45 insertions(+), 12 deletions(-)
board/Seagate/goflexhome/goflexhome.c +42 -10
index af8cab7bdc..52be64fb8c 100644
@@ -1,5 +1,9 @@
  // SPDX-License-Identifier: GPL-2.0+
  /*
+ * Copyright (C) 2021
+ * Tony Dinh <[email protected]>
+ * Suriyan Ramasami <[email protected]>
+ *
   * Copyright (C) 2013 Suriyan Ramasami <[email protected]>
   *
   * Based on dockstar.c originally written by
@@ -107,36 +111,65 @@ int board_init(void)
  	return 0;
  }
 
+static int fdt_get_phy_addr(const char *path)
+{
+	const void *fdt = gd->fdt_blob;
+	const u32 *reg;
+	const u32 *val;
+	int node, phandle, addr;
+
+	/* Find the node by its full path */
+	node = fdt_path_offset(fdt, path);
+	if (node >= 0) {
+		/* Look up phy-handle */
+		val = fdt_getprop(fdt, node, "phy-handle", NULL);
+		if (val) {
+			phandle = fdt32_to_cpu(*val);
+			if (!phandle)
+				return -1;
+			/* Follow it to its node */
+			node = fdt_node_offset_by_phandle(fdt, phandle);
+			if (node) {
+				/* Look up reg */
+				reg = fdt_getprop(fdt, node, "reg", NULL);
+				if (reg) {
+					addr = fdt32_to_cpu(*reg);
+					return addr;
+				}
+			}
+		}
+	}
+	return -1;
+}
+
  #ifdef CONFIG_RESET_PHY_R
  /* Configure and enable MV88E1116 PHY */
  void reset_phy(void)
  {
  	u16 reg;
-	u16 devadr;
-	char *name = "egiga0";
+	int phyaddr;
+	char *name = "ethernet-controller@72000";
+	char *eth0_path = "/ocp@f1000000/ethernet-controller@72000/ethernet0-port@0";
 
  	if (miiphy_set_current_dev(name))
  		return;
 
-	/* command to read PHY dev address */
-	if (miiphy_read(name, 0xEE, 0xEE, (u16 *)&devadr)) {
-		printf("Err..%s could not read PHY dev address\n",
-		       __func__);
+	phyaddr = fdt_get_phy_addr(eth0_path);
+	if (phyaddr < 0)
  		return;
-	}
 
  	/*
  	 * Enable RGMII delay on Tx and Rx for CPU port
  	 * Ref: sec 4.7.2 of chip datasheet
  	 */
-	miiphy_write(name, devadr, MV88E1116_PGADR_REG, 2);
-	miiphy_read(name, devadr, MV88E1116_MAC_CTRL_REG, &reg);
+	miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 2);
+	miiphy_read(name, phyaddr, MV88E1116_MAC_CTRL_REG, &reg);
  	reg |= (MV88E1116_RGMII_RXTM_CTRL | MV88E1116_RGMII_TXTM_CTRL);
-	miiphy_write(name, devadr, MV88E1116_MAC_CTRL_REG, reg);

board/Seagate/goflexhome/goflexhome.c int board_init(void) · line 175

Quoted 10 lines
board/Seagate/goflexhome/goflexhome.c +3 -2
-	miiphy_write(name, devadr, MV88E1116_PGADR_REG, 0);
+	miiphy_write(name, phyaddr, MV88E1116_MAC_CTRL_REG, reg);
+	miiphy_write(name, phyaddr, MV88E1116_PGADR_REG, 0);
 
  	/* reset the phy */
-	miiphy_reset(name, devadr);
+	miiphy_reset(name, phyaddr);
 
  	printf("88E1116 Initialized on %s\n", name);
  }

Viele Grüße,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
#7 lore raw
In reply to Tony Dinh
Quoted 15 lines · Tony Dinh

- Enable DM SATA and SATA MV driver
- Enable DM Ethernet.
- Use Ethernet PHY names from device tree.
- Replace the old Ethernet PHY addr lookup with a device tree parsing lookup function.

Tony Dinh (3):
arm: kirkwood: GoFlex Home: Add DM Ethernet, remove IDE, and add DM
SATA configs
arm: kirkwood: GoFlex Home: Add DM SATA configs
arm: kirkwood: GoFlex Home: Use Ethernet PHY name and address from
device tree

Quoted 4 lines
  board/Seagate/goflexhome/goflexhome.c | 57 +++++++++++++++++++++------
  configs/goflexhome_defconfig          |  5 ++-
  include/configs/goflexhome.h          |  6 +++
  3 files changed, 55 insertions(+), 13 deletions(-)

Applied to u-boot-marvell/master

Thanks,
Stefan