Skip to contentSkip to conversation

DT doc: net: cpsw mac-address is optional

PATCH Superseded Markus Pargmann 2 participants 11 messages Sep 7, 2014 – Sep 9, 2014

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v6 cover DT doc: net: cpsw mac-address is optional

This series adds support to the cpsw driver to read the MACIDs of the am335x chip and use them as fallback. These addresses are only used if there are no mac addresses in the devicetree, for example set by a bootloader.

v6 moves the machine check in patch 5 out of cpsw_am33xx_cm_get_macid() so that this function is only called for am33xx.

Best regards,

Markus

Markus Pargmann (7):
DT doc: net: cpsw mac-address is optional
net: cpsw: Add missing return value
net: cpsw: header, Add missing include
net: cpsw: Replace pr_err by dev_err
net: cpsw: Add am33xx MACID readout
am33xx: define syscon control module device node
arm: dts: am33xx, Add syscon phandle to cpsw node

 Documentation/devicetree/bindings/net/cpsw.txt |  6 +++-
 arch/arm/boot/dts/am33xx.dtsi                  |  6 ++++
 drivers/net/ethernet/ti/Kconfig                |  2 ++
 drivers/net/ethernet/ti/cpsw.c                 | 45 ++++++++++++++++++++++++--
 drivers/net/ethernet/ti/cpsw.h                 |  1 +
 5 files changed, 57 insertions(+), 3 deletions(-)
Signature · 1 line
2.1.0
#1 lore raw

PATCH v6 1/7 DT doc: net: cpsw mac-address is optional

mac-address is an optional property. If no mac-address is set, a random mac-address will be generated.

---
 Documentation/devicetree/bindings/net/cpsw.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/net/cpsw.txt +1 -1
index ae2b8b7f9c38..107caf174a0e 100644
@@ -29,10 +29,10 @@ Slave Properties:
 Required properties:
 - phy_id		: Specifies slave phy id
 - phy-mode		: See ethernet.txt file in the same directory
-- mac-address		: See ethernet.txt file in the same directory
 
 Optional properties:
 - dual_emac_res_vlan	: Specifies VID to be used to segregate the ports
+- mac-address		: See ethernet.txt file in the same directory
 
 Note: "ti,hwmods" field is used to fetch the base address and irq
 resources from TI, omap hwmod data base during device registration.
Signature · 1 line
2.1.0
#2 lore raw

PATCH v6 2/7 net: cpsw: Add missing return value

In reply to Markus Pargmann

ret is set 0 at this point, so jumping to that error label would result in a return value of 0. Set ret to -ENOMEM to return a proper error value.

---
 drivers/net/ethernet/ti/cpsw.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/ethernet/ti/cpsw.c +1 -0
index 999fb72688d2..f09b4639ad31 100644
@@ -2063,6 +2063,7 @@ static int cpsw_probe(struct platform_device *pdev)
 	priv->irq_enabled = true;
 	if (!priv->cpts) {
 		dev_err(&pdev->dev, "error allocating cpts\n");
+		ret = -ENOMEM;
 		goto clean_ndev_ret;
 	}
 
Signature · 1 line
2.1.0
#3 lore raw

PATCH v6 3/7 net: cpsw: header, Add missing include

In reply to Markus Pargmann

"MII_BUS_ID_SIZE" is defined in linux/phy.h which is not included in the cpsw.h file.

---
 drivers/net/ethernet/ti/cpsw.h | 1 +
 1 file changed, 1 insertion(+)
drivers/net/ethernet/ti/cpsw.h +1 -0
index 574f49da693f..1b710674630c 100644
@@ -15,6 +15,7 @@
 #define __CPSW_H__
 
 #include <linux/if_ether.h>
+#include <linux/phy.h>
 
 struct cpsw_slave_data {
 	char		phy_id[MII_BUS_ID_SIZE];
Signature · 1 line
2.1.0
#4 lore raw

PATCH v6 4/7 net: cpsw: Replace pr_err by dev_err

In reply to Markus Pargmann

Use dev_err instead of pr_err.

---
 drivers/net/ethernet/ti/cpsw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/ti/cpsw.c +1 -1
index f09b4639ad31..0bc2c2a2c236 100644
@@ -1921,7 +1921,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
 		mdio = of_find_device_by_node(mdio_node);
 		of_node_put(mdio_node);
 		if (!mdio) {
-			pr_err("Missing mdio platform device\n");
+			dev_err(&pdev->dev, "Missing mdio platform device\n");
 			return -EINVAL;
 		}
 		snprintf(slave_data->phy_id, sizeof(slave_data->phy_id),
Signature · 1 line
2.1.0
#5 lore raw

PATCH v6 5/7 net: cpsw: Add am33xx MACID readout

In reply to Markus Pargmann

This patch adds a function to get the MACIDs from the am33xx SoC control module registers which hold unique vendor MACIDs. This is only used if of_get_mac_address() fails to get a valid mac address.

---

Notes:
Changes in v6:
- Move machine check outside of cpsw_am33xx_cm_get_macid()

Changes in v5:
- Fixed indention

 Documentation/devicetree/bindings/net/cpsw.txt |  4 +++
 drivers/net/ethernet/ti/Kconfig                |  2 ++
 drivers/net/ethernet/ti/cpsw.c                 | 42 +++++++++++++++++++++++++-
 3 files changed, 47 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/net/cpsw.txt +4 -0
index 107caf174a0e..33fe8462edf4 100644
@@ -24,6 +24,8 @@ Optional properties:
 - ti,hwmods		: Must be "cpgmac0"
 - no_bd_ram		: Must be 0 or 1
 - dual_emac		: Specifies Switch to act as Dual EMAC
+- syscon		: Phandle to the system control device node, which is
+			  the control module device of the am33x
 
 Slave Properties:
 Required properties:
@@ -57,6 +59,7 @@ Examples:
 		active_slave = <0>;
 		cpts_clock_mult = <0x80000000>;
 		cpts_clock_shift = <29>;
+		syscon = <&cm>;
 		cpsw_emac0: slave at 0 {
 			phy_id = <&davinci_mdio>, <0>;
 			phy-mode = "rgmii-txid";
@@ -85,6 +88,7 @@ Examples:
 		active_slave = <0>;
 		cpts_clock_mult = <0x80000000>;
 		cpts_clock_shift = <29>;
+		syscon = <&cm>;
 		cpsw_emac0: slave at 0 {
 			phy_id = <&davinci_mdio>, <0>;
 			phy-mode = "rgmii-txid";
drivers/net/ethernet/ti/Kconfig +2 -0
index 1769700a6070..5d8cb7956113 100644
@@ -62,6 +62,8 @@ config TI_CPSW
 	select TI_DAVINCI_CPDMA
 	select TI_DAVINCI_MDIO
 	select TI_CPSW_PHY_SEL
+	select MFD_SYSCON
+	select REGMAP
 	---help---
 	  This driver supports TI's CPSW Ethernet Switch.
 
drivers/net/ethernet/ti/cpsw.c +41 -1

61 lines not on this page · raw message

Signature · 1 line
2.1.0
#6 lore raw

PATCH v6 5/7 net: cpsw: Add am33xx MACID readout

Quoted 3 lines · Markus Pargmann

This patch adds a function to get the MACIDs from the am33xx SoC control module registers which hold unique vendor MACIDs. This is only used if of_get_mac_address() fails to get a valid mac address.

...

Quoted 8 lines
drivers/net/ethernet/ti/cpsw.c +2 -1
@@ -1928,8 +1960,16 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
 			 PHY_ID_FMT, mdio->name, phyid);
 
 		mac_addr = of_get_mac_address(slave_node);
-		if (mac_addr)
+		if (mac_addr) {
 			memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);
+		} else {

drivers/net/ethernet/ti/cpsw.c static int cpsw_probe_dt(struct cpsw_platform_data *data, · line 1975

Quoted 10 lines
drivers/net/ethernet/ti/cpsw.c +7 -0
+			if (of_machine_is_compatible("ti,am33xx")) {
+				ret = cpsw_am33xx_cm_get_macid(&pdev->dev, i,
+							slave_data->mac_addr);
+				if (ret)
+					return ret;
+			}
+		}
 
 		slave_data->phy_if = of_get_phy_mode(slave_node);
 		if (slave_data->phy_if < 0) {

Thanks for updating this, this looks more future proof for adding the dra7 related patch.

For the long run, it probably makes sense to add SoC specific compatible values such as "ti,cpsw-am3350" and so on. Then the mac address functions can be initialized based on the of_device_id entry for .data. The wiring is cleary SoC specific here.

So for the purpose of this series, I'm fine with this series, please feel free to add for this patch:

Regards,

Tony

#7 lore raw

PATCH v6 5/7 net: cpsw: Add am33xx MACID readout

Quoted 28 lines · Tony Lindgren
Quoted 3 lines · Markus Pargmann

This patch adds a function to get the MACIDs from the am33xx SoC control module registers which hold unique vendor MACIDs. This is only used if of_get_mac_address() fails to get a valid mac address.

...

Quoted 8 lines
drivers/net/ethernet/ti/cpsw.c +2 -1
@@ -1928,8 +1960,16 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
 			 PHY_ID_FMT, mdio->name, phyid);
 
 		mac_addr = of_get_mac_address(slave_node);
-		if (mac_addr)
+		if (mac_addr) {
 			memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);
+		} else {

drivers/net/ethernet/ti/cpsw.c static int cpsw_probe_dt(struct cpsw_platform_data *data, · line 1975

Quoted 10 lines
drivers/net/ethernet/ti/cpsw.c +7 -0
+			if (of_machine_is_compatible("ti,am33xx")) {
+				ret = cpsw_am33xx_cm_get_macid(&pdev->dev, i,
+							slave_data->mac_addr);
+				if (ret)
+					return ret;
+			}
+		}
 
 		slave_data->phy_if = of_get_phy_mode(slave_node);
 		if (slave_data->phy_if < 0) {

Thanks for updating this, this looks more future proof for adding the dra7 related patch.

Quoted 4 lines

For the long run, it probably makes sense to add SoC specific compatible values such as "ti,cpsw-am3350" and so on. Then the mac address functions can be initialized based on the of_device_id entry for .data. The wiring is cleary SoC specific here.

The hardware doesn't differ across the SoCs, so I thought it may be better to keep one compatible and parse the machine compatible for the MACID location. But different compatible values are also ok.

Quoted 5 lines

So for the purpose of this series, I'm fine with this series, please feel free to add for this patch:

Thanks.

Best regards,

Markus

Signature · 11 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140909/a3df3974/attachment.sig>
#8 lore raw

PATCH v6 5/7 net: cpsw: Add am33xx MACID readout

Quoted 29 lines · Markus Pargmann
Quoted 28 lines · Tony Lindgren
Quoted 3 lines · Markus Pargmann

This patch adds a function to get the MACIDs from the am33xx SoC control module registers which hold unique vendor MACIDs. This is only used if of_get_mac_address() fails to get a valid mac address.

...

Quoted 8 lines
drivers/net/ethernet/ti/cpsw.c +2 -1
@@ -1928,8 +1960,16 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
 			 PHY_ID_FMT, mdio->name, phyid);
 
 		mac_addr = of_get_mac_address(slave_node);
-		if (mac_addr)
+		if (mac_addr) {
 			memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);
+		} else {

drivers/net/ethernet/ti/cpsw.c static int cpsw_probe_dt(struct cpsw_platform_data *data, · line 1975

Quoted 10 lines
drivers/net/ethernet/ti/cpsw.c +7 -0
+			if (of_machine_is_compatible("ti,am33xx")) {
+				ret = cpsw_am33xx_cm_get_macid(&pdev->dev, i,
+							slave_data->mac_addr);
+				if (ret)
+					return ret;
+			}
+		}
 
 		slave_data->phy_if = of_get_phy_mode(slave_node);
 		if (slave_data->phy_if < 0) {

Thanks for updating this, this looks more future proof for adding the dra7 related patch.

Quoted 8 lines
Quoted 4 lines

For the long run, it probably makes sense to add SoC specific compatible values such as "ti,cpsw-am3350" and so on. Then the mac address functions can be initialized based on the of_device_id entry for .data. The wiring is cleary SoC specific here.

The hardware doesn't differ across the SoCs, so I thought it may be better to keep one compatible and parse the machine compatible for the MACID location. But different compatible values are also ok.

Yes both will work, and you're right the Ethernet hardware is the same. I already forgot that we're getting mac address from the system control module.. And that's really SoC specific so your solution is better at least for now.

Regards,

Tony

#9 lore raw

PATCH v6 6/7 am33xx: define syscon control module device node

In reply to Markus Pargmann
---
 arch/arm/boot/dts/am33xx.dtsi | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm/boot/dts/am33xx.dtsi +5 -0
index 3a0a161342ba..25e38b6ac376 100644
@@ -132,6 +132,11 @@
 			};
 		};
 
+		cm: syscon at 44e10000 {
+			compatible = "ti,am33xx-controlmodule", "syscon";
+			reg = <0x44e10000 0x800>;
+		};
+
 		intc: interrupt-controller at 48200000 {
 			compatible = "ti,omap2-intc";
 			interrupt-controller;
Signature · 1 line
2.1.0
#10 lore raw

PATCH v6 7/7 arm: dts: am33xx, Add syscon phandle to cpsw node

In reply to Markus Pargmann

There are 2 MACIDs stored in the control module of the am33xx. These are read by the cpsw driver if no valid MACID was found in the devicetree.

---
 arch/arm/boot/dts/am33xx.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/boot/dts/am33xx.dtsi +1 -0
index 25e38b6ac376..13e44b0f5adc 100644
@@ -701,6 +701,7 @@
 			 */
 			interrupts = <40 41 42 43>;
 			ranges;
+			syscon = <&cm>;
 			status = "disabled";
 
 			davinci_mdio: mdio at 4a101000 {
Signature · 1 line
2.1.0