Skip to contentSkip to conversation

net: dsa: Add Vitesse VSC73xx parallel mode

PATCH Superseded Pawel Dembicki 4 participants 14 messages Jul 3, 2019 – Jul 4, 2019

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover net: dsa: Add Vitesse VSC73xx parallel mode

Main goal of this patch series is to add support for parallel bus in Vitesse VSC73xx switches. Existing driver supports only SPI mode.

Second change is needed for devices in unmanaged state.

V2:
- drop changes in compatible strings
- make changes less invasive
- drop mutex in platform part and move mutex from core to spi part
- fix indentation
- fix devm_ioremap_resource result check
- add cover letter

Pawel Dembicki (4):
net: dsa: Change DT bindings for Vitesse VSC73xx switches
net: dsa: vsc73xx: Split vsc73xx driver
net: dsa: vsc73xx: add support for parallel mode
net: dsa: vsc73xx: Assert reset if iCPU is enabled

 .../bindings/net/dsa/vitesse,vsc73xx.txt      |  57 ++++-
 drivers/net/dsa/Kconfig                       |  19 +-
 drivers/net/dsa/Makefile                      |   4 +-
 ...tesse-vsc73xx.c => vitesse-vsc73xx-core.c} | 206 +++---------------
 drivers/net/dsa/vitesse-vsc73xx-platform.c    | 160 ++++++++++++++
 drivers/net/dsa/vitesse-vsc73xx-spi.c         | 203 +++++++++++++++++
 drivers/net/dsa/vitesse-vsc73xx.h             |  29 +++
 7 files changed, 493 insertions(+), 185 deletions(-)
 rename drivers/net/dsa/{vitesse-vsc73xx.c => vitesse-vsc73xx-core.c} (90%)
 create mode 100644 drivers/net/dsa/vitesse-vsc73xx-platform.c
 create mode 100644 drivers/net/dsa/vitesse-vsc73xx-spi.c
 create mode 100644 drivers/net/dsa/vitesse-vsc73xx.h
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 1/4 net: dsa: Change DT bindings for Vitesse VSC73xx switches

This commit introduce how to use vsc73xx platform driver.

---
 .../bindings/net/dsa/vitesse,vsc73xx.txt      | 57 +++++++++++++++++--
 1 file changed, 53 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt +53 -4
index ed4710c40641..c55e0148657d 100644
@@ -2,8 +2,8 @@ Vitesse VSC73xx Switches
 ========================
 
 This defines device tree bindings for the Vitesse VSC73xx switch chips.
-The Vitesse company has been acquired by Microsemi and Microsemi in turn
-acquired by Microchip but retains this vendor branding.
+The Vitesse company has been acquired by Microsemi and Microsemi has
+been acquired Microchip but retains this vendor branding.
 
 The currently supported switch chips are:
 Vitesse VSC7385 SparX-G5 5+1-port Integrated Gigabit Ethernet Switch
@@ -11,8 +11,13 @@ Vitesse VSC7388 SparX-G8 8-port Integrated Gigabit Ethernet Switch
 Vitesse VSC7395 SparX-G5e 5+1-port Integrated Gigabit Ethernet Switch
 Vitesse VSC7398 SparX-G8e 8-port Integrated Gigabit Ethernet Switch
 
-The device tree node is an SPI device so it must reside inside a SPI bus
-device tree node, see spi/spi-bus.txt
+This switch could have two different management interface.
+
+If SPI interface is used, the device tree node is an SPI device so it must
+reside inside a SPI bus device tree node, see spi/spi-bus.txt
+
+If Platform driver is used, the device tree node is an platform device so it
+must reside inside a platform bus device tree node.
 
 Required properties:
 
@@ -38,6 +43,7 @@ and subnodes of DSA switches.
 
 Examples:
 
+SPI:
 switch@0 {
 	compatible = "vitesse,vsc7395";
 	reg = <0>;
@@ -79,3 +85,46 @@ switch@0 {
 		};
 	};
 };
+
+Platform:
+switch@2,0 {
+	#address-cells = <1>;
+	#size-cells = <1>;
+	compatible = "vitesse,vsc7385";
+	reg = <0x2 0x0 0x20000>;
+	reset-gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
+
+	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		port@0 {
+			reg = <0>;
+			label = "lan1";
+		};
+		port@1 {
+			reg = <1>;
+			label = "lan2";
+		};
+		port@2 {
+			reg = <2>;
+			label = "lan3";
+		};
+		port@3 {
+			reg = <3>;
+			label = "lan4";
+		};
+		vsc: port@6 {
+			reg = <6>;
+			label = "cpu";
+			ethernet = <&enet0>;
+			phy-mode = "rgmii";
+			fixed-link {
+				speed = <1000>;
+				full-duplex;
+				pause;
+			};
+		};
+	};
+
+};
Signature · 1 line
2.20.1
Reviewed-by on v2 1/4
#2 lore raw

Re: [PATCH v2 1/4] net: dsa: Change DT bindings for Vitesse VSC73xx switches

Quoted 3 lines · Pawel Dembicki

This commit introduce how to use vsc73xx platform driver.

Nice!

Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt Vitesse VSC7388 SparX-G8 8-port Integrated Gigabit Ethernet Switch · line 20

Quoted 2 lines
Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt +2 -0
+If Platform driver is used, the device tree node is an platform device so it
+must reside inside a platform bus device tree node.

I would write something like "when connected to a memory bus, and used in memory-mapped I/O mode, a platform device is used to represent the vsc73xx" so it is clear what is going on.

Yours,
Linus Walleij

Reviewed-by
#3 lore raw

Re: [PATCH v2 1/4] net: dsa: Change DT bindings for Vitesse VSC73xx switches

Quoted 6 lines · Linus Walleij
Quoted 3 lines · Pawel Dembicki

This commit introduce how to use vsc73xx platform driver.

Quoted 8 lines

Nice!

Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt Vitesse VSC7388 SparX-G8 8-port Integrated Gigabit Ethernet Switch · line 20

Quoted 2 lines
Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt +2 -0
+If Platform driver is used, the device tree node is an platform device so it
+must reside inside a platform bus device tree node.

I would write something like "when connected to a memory bus, and used in memory-mapped I/O mode, a platform device is used to represent the vsc73xx" so it is clear what is going on.

Agreed, with that fixed:

Signature · 1 line
Florian
#4 lore raw

PATCH v2 2/4 net: dsa: vsc73xx: Split vsc73xx driver

In reply to Pawel Dembicki

This driver (currently) only takes control of the switch chip over SPI and configures it to route packages around when connected to a CPU port. But Vitesse chip support also parallel interface.

This patch split driver into two parts: core and spi. It is required for add support to another managing interface.

---
 drivers/net/dsa/Kconfig                       |  11 +-
 drivers/net/dsa/Makefile                      |   3 +-
 ...tesse-vsc73xx.c => vitesse-vsc73xx-core.c} | 170 +--------------
 drivers/net/dsa/vitesse-vsc73xx-spi.c         | 203 ++++++++++++++++++
 drivers/net/dsa/vitesse-vsc73xx.h             |  29 +++
 5 files changed, 254 insertions(+), 162 deletions(-)
 rename drivers/net/dsa/{vitesse-vsc73xx.c => vitesse-vsc73xx-core.c} (91%)
 create mode 100644 drivers/net/dsa/vitesse-vsc73xx-spi.c
 create mode 100644 drivers/net/dsa/vitesse-vsc73xx.h
drivers/net/dsa/Kconfig +9 -2
index b91e78e3598f..4ab2aa09e2e4 100644
@@ -99,8 +99,8 @@ config NET_DSA_SMSC_LAN9303_MDIO
 	  for MDIO managed mode.
 
 config NET_DSA_VITESSE_VSC73XX
-	tristate "Vitesse VSC7385/7388/7395/7398 support"
-	depends on OF && SPI
+	tristate
+	depends on OF
 	depends on NET_DSA
 	select FIXED_PHY
 	select VITESSE_PHY
@@ -109,4 +109,11 @@ config NET_DSA_VITESSE_VSC73XX
 	  This enables support for the Vitesse VSC7385, VSC7388,
 	  VSC7395 and VSC7398 SparX integrated ethernet switches.
 
+config NET_DSA_VITESSE_VSC73XX_SPI
+	tristate "Vitesse VSC7385/7388/7395/7398 SPI mode support"
+	depends on SPI
+	select NET_DSA_VITESSE_VSC73XX
+	---help---
+	  This enables support for the Vitesse VSC7385, VSC7388, VSC7395
+	  and VSC7398 SparX integrated ethernet switches in SPI managed mode.
 endmenu
drivers/net/dsa/Makefile +2 -1
index fefb6aaa82ba..117bf78be211 100644
@@ -14,7 +14,8 @@ realtek-objs			:= realtek-smi.o rtl8366.o rtl8366rb.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303) += lan9303-core.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303_I2C) += lan9303_i2c.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303_MDIO) += lan9303_mdio.o
-obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX) += vitesse-vsc73xx.o
+obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX) += vitesse-vsc73xx-core.o
+obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_SPI) += vitesse-vsc73xx-spi.o
 obj-y				+= b53/
 obj-y				+= microchip/
 obj-y				+= mv88e6xxx/
drivers/net/dsa/vitesse-vsc73xx-core.c renamed from drivers/net/dsa/vitesse-vsc73xx.c +11 -159

249 lines not on this page · raw message

drivers/net/dsa/vitesse-vsc73xx-spi.c new file +203 -0

203 lines not on this page · raw message

drivers/net/dsa/vitesse-vsc73xx.h new file +29 -0
new file mode 100644
index 000000000000..7478f8d4e0a9
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#include <linux/device.h>
+#include <linux/etherdevice.h>
+#include <linux/gpio/driver.h>
+
+/**
+ * struct vsc73xx - VSC73xx state container
+ */
+struct vsc73xx {
+	struct device			*dev;
+	struct gpio_desc		*reset;
+	struct dsa_switch		*ds;
+	struct gpio_chip		gc;
+	u16				chipid;
+	u8				addr[ETH_ALEN];
+	const struct vsc73xx_ops	*ops;
+	void				*priv;
+};
+
+struct vsc73xx_ops {
+	int (*read)(struct vsc73xx *vsc, u8 block, u8 subblock, u8 reg,
+		    u32 *val);
+	int (*write)(struct vsc73xx *vsc, u8 block, u8 subblock, u8 reg,
+		     u32 val);
+};
+
+int vsc73xx_is_addr_valid(u8 block, u8 subblock);
+int vsc73xx_probe(struct vsc73xx *vsc);
+int vsc73xx_remove(struct vsc73xx *vsc);
Signature · 1 line
2.20.1
Reviewed-by on v2 2/4
#5 lore raw

Re: [PATCH v2 2/4] net: dsa: vsc73xx: Split vsc73xx driver

Quoted 9 lines · Pawel Dembicki

This driver (currently) only takes control of the switch chip over SPI and configures it to route packages around when connected to a CPU port. But Vitesse chip support also parallel interface.

This patch split driver into two parts: core and spi. It is required for add support to another managing interface.

That's a nice and clean split.

Yours,
Linus Walleij

Reviewed-by on v2 2/4
#6 lore raw

Re: [PATCH v2 2/4] net: dsa: vsc73xx: Split vsc73xx driver

In reply to Pawel Dembicki
Quoted 9 lines · Pawel Dembicki

This driver (currently) only takes control of the switch chip over SPI and configures it to route packages around when connected to a CPU port. But Vitesse chip support also parallel interface.

This patch split driver into two parts: core and spi. It is required for add support to another managing interface.

Signature · 1 line
Florian
#7 lore raw

PATCH v2 3/4 net: dsa: vsc73xx: add support for parallel mode

In reply to Pawel Dembicki

This patch add platform part of vsc73xx driver. It allows to use chip connected by parallel interface.

---
 drivers/net/dsa/Kconfig                    |   8 ++
 drivers/net/dsa/Makefile                   |   1 +
 drivers/net/dsa/vitesse-vsc73xx-platform.c | 160 +++++++++++++++++++++
 3 files changed, 169 insertions(+)
 create mode 100644 drivers/net/dsa/vitesse-vsc73xx-platform.c
drivers/net/dsa/Kconfig +8 -0
index 4ab2aa09e2e4..80965808949d 100644
@@ -116,4 +116,12 @@ config NET_DSA_VITESSE_VSC73XX_SPI
 	---help---
 	  This enables support for the Vitesse VSC7385, VSC7388, VSC7395
 	  and VSC7398 SparX integrated ethernet switches in SPI managed mode.
+
+config NET_DSA_VITESSE_VSC73XX_PLATFORM
+	tristate "Vitesse VSC7385/7388/7395/7398 Platform mode support"
+	depends on HAS_IOMEM
+	select NET_DSA_VITESSE_VSC73XX
+	---help---
+	  This enables support for the Vitesse VSC7385, VSC7388, VSC7395
+	  and VSC7398 SparX integrated ethernet switches in Platform managed mode.
 endmenu
drivers/net/dsa/Makefile +1 -0
index 117bf78be211..d5e4c668ac03 100644
@@ -15,6 +15,7 @@ obj-$(CONFIG_NET_DSA_SMSC_LAN9303) += lan9303-core.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303_I2C) += lan9303_i2c.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303_MDIO) += lan9303_mdio.o
 obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX) += vitesse-vsc73xx-core.o
+obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM) += vitesse-vsc73xx-platform.o
 obj-$(CONFIG_NET_DSA_VITESSE_VSC73XX_SPI) += vitesse-vsc73xx-spi.o
 obj-y				+= b53/
 obj-y				+= microchip/
drivers/net/dsa/vitesse-vsc73xx-platform.c new file +160 -0

160 lines not on this page · raw message

Signature · 1 line
2.20.1
Reviewed-by on v2 3/4
#8 lore raw

Re: [PATCH v2 3/4] net: dsa: vsc73xx: add support for parallel mode

Hi Pawel,

this looks overall good and the following is just
documentation nit-pick so feel free to add my

Quoted 4 lines · Pawel Dembicki

This patch add platform part of vsc73xx driver. It allows to use chip connected by parallel interface.

I would elaborate on the fact that we're dealing with memory-mapped I/O but perhaps even more important to do that in the source code file and Kconfig so it is close to the users rather than in the changelog.

Write something about the address bus wireing making all accesses big endian.

drivers/net/dsa/Kconfig config NET_DSA_VITESSE_VSC73XX_SPI · line 126

Quoted 7 lines
drivers/net/dsa/Kconfig +7 -0
+config NET_DSA_VITESSE_VSC73XX_PLATFORM
+       tristate "Vitesse VSC7385/7388/7395/7398 Platform mode support"
+       depends on HAS_IOMEM
+       select NET_DSA_VITESSE_VSC73XX
+       ---help---
+         This enables support for the Vitesse VSC7385, VSC7388, VSC7395
+         and VSC7398 SparX integrated ethernet switches in Platform managed mode.

I would insert something about memory-mapped I/O mode over a CPU-attached address bus.

Yours,
Linus Walleij

#9 lore raw

PATCH v2 4/4 net: dsa: vsc73xx: Assert reset if iCPU is enabled

In reply to Pawel Dembicki

Driver allow to use devices with disabled iCPU only.

Some devices have pre-initialised iCPU by bootloader. That state make switch unmanaged. This patch force reset if device is in unmanaged state. In the result chip lost internal firmware from RAM and it can be managed.

---
 drivers/net/dsa/vitesse-vsc73xx-core.c | 36 ++++++++++++--------------
 1 file changed, 17 insertions(+), 19 deletions(-)
drivers/net/dsa/vitesse-vsc73xx-core.c +17 -19
index 10063f31d9a3..4525702faf68 100644
@@ -417,22 +417,8 @@ static int vsc73xx_detect(struct vsc73xx *vsc)
 	}
 
 	if (val == 0xffffffff) {
-		dev_info(vsc->dev, "chip seems dead, assert reset\n");
-		gpiod_set_value_cansleep(vsc->reset, 1);
-		/* Reset pulse should be 20ns minimum, according to datasheet
-		 * table 245, so 10us should be fine
-		 */
-		usleep_range(10, 100);
-		gpiod_set_value_cansleep(vsc->reset, 0);
-		/* Wait 20ms according to datasheet table 245 */
-		msleep(20);
-
-		ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,
-				   VSC73XX_ICPU_MBOX_VAL, &val);
-		if (val == 0xffffffff) {
-			dev_err(vsc->dev, "seems not to help, giving up\n");
-			return -ENODEV;
-		}
+		dev_info(vsc->dev, "chip seems dead.\n");
+		return -EAGAIN;
 	}
 
 	ret = vsc73xx_read(vsc, VSC73XX_BLOCK_SYSTEM, 0,
@@ -483,9 +469,8 @@ static int vsc73xx_detect(struct vsc73xx *vsc)
 	}
 	if (icpu_si_boot_en && !icpu_pi_en) {
 		dev_err(vsc->dev,
-			"iCPU enabled boots from SI, no external memory\n");
-		dev_err(vsc->dev, "no idea how to deal with this\n");
-		return -ENODEV;
+			"iCPU enabled boots from PI/SI, no external memory\n");
+		return -EAGAIN;
 	}
 	if (!icpu_si_boot_en && icpu_pi_en) {
 		dev_err(vsc->dev,
@@ -1158,6 +1143,19 @@ int vsc73xx_probe(struct vsc73xx *vsc)
 		msleep(20);
 
 	ret = vsc73xx_detect(vsc);
+	if (ret == -EAGAIN) {
+		dev_err(vsc->dev,
+			"Chip seams to be out of control. Assert reset and try again.\n");
+		gpiod_set_value_cansleep(vsc->reset, 1);
+		/* Reset pulse should be 20ns minimum, according to datasheet
+		 * table 245, so 10us should be fine
+		 */
+		usleep_range(10, 100);
+		gpiod_set_value_cansleep(vsc->reset, 0);
+		/* Wait 20ms according to datasheet table 245 */
+		msleep(20);
+		ret = vsc73xx_detect(vsc);
+	}
 	if (ret) {
 		dev_err(dev, "no chip found (%d)\n", ret);
 		return -ENODEV;
Signature · 1 line
2.20.1
Reviewed-by on v2 4/4
#10 lore raw

Re: [PATCH v2 4/4] net: dsa: vsc73xx: Assert reset if iCPU is enabled

Quoted 8 lines · Pawel Dembicki

Driver allow to use devices with disabled iCPU only.

Some devices have pre-initialised iCPU by bootloader. That state make switch unmanaged. This patch force reset if device is in unmanaged state. In the result chip lost internal firmware from RAM and it can be managed.

My devices do not have direct access to the reset line so I can't assert reset no matter how I try, if it works for you, the code is certainly better like this.

Yours,
Linus Walleij

#11 lore raw

Re: [PATCH v2 4/4] net: dsa: vsc73xx: Assert reset if iCPU is enabled

Quoted 5 lines · On 4/7/19 09:22 Linus Walleij <[email protected]> wrote:

My devices do not have direct access to the reset line so I can't assert reset no matter how I try, if it works for you, the code is certainly better like this.

In P2020RDB, VSC7385 reset is connected to GPIO. U-boot put binary file to iCPU and make VSC7385 unmanaged.
However reset flush internal memory and iCPU stop.
In this case bootlog looks like that:

[    2.989047] vsc73xx-platform ffb00000.switch: VSC7385 (rev: 2) switch found
[    2.996192] vsc73xx-platform ffb00000.switch: iCPU enabled boots
from PI/SI, no external memory
[    3.005057] vsc73xx-platform ffb00000.switch: Chip seems to be out
of control. Assert reset and try again.
[    3.045034] vsc73xx-platform ffb00000.switch: VSC7385 (rev: 2) switch found
[    3.052171] vsc73xx-platform ffb00000.switch: iCPU disabled, no

external memory

Best Regards,
Pawel Dembicki

Reviewed-by on v2 4/4
#12 lore raw

Re: [PATCH v2 4/4] net: dsa: vsc73xx: Assert reset if iCPU is enabled

In reply to Pawel Dembicki
Quoted 9 lines · Pawel Dembicki

Driver allow to use devices with disabled iCPU only.

Some devices have pre-initialised iCPU by bootloader. That state make switch unmanaged. This patch force reset if device is in unmanaged state. In the result chip lost internal firmware from RAM and it can be managed.

---

[snip]

drivers/net/dsa/vitesse-vsc73xx-core.c int vsc73xx_probe(struct vsc73xx *vsc) · line 1149

Quoted 8 lines
drivers/net/dsa/vitesse-vsc73xx-core.c +4 -0
@@ -1158,6 +1143,19 @@ int vsc73xx_probe(struct vsc73xx *vsc)
 		msleep(20);
 
 	ret = vsc73xx_detect(vsc);
+	if (ret == -EAGAIN) {
+		dev_err(vsc->dev,
+			"Chip seams to be out of control. Assert reset and try again.\n");
+		gpiod_set_value_cansleep(vsc->reset, 1);

s/seams/seems/

With that fixed:

Signature · 1 line
Florian
maintainer
#13 lore raw
In reply to Pawel Dembicki

From: Pawel Dembicki <[email protected]>
Date: Wed, 3 Jul 2019 19:19:20 +0200

Quoted 4 lines

Main goal of this patch series is to add support for parallel bus in Vitesse VSC73xx switches. Existing driver supports only SPI mode.

Second change is needed for devices in unmanaged state.

Please respin with the documentation description changes suggested in the review for this series.

Thanks.