net: dsa: Add Vitesse VSC73xx parallel mode
Subsystems (4)
v3 cover net: dsa: Add Vitesse VSC73xx parallel mode
Main goal of this patch series is to add support for CPU attached parallel bus in Vitesse VSC73xx switches. Existing driver supports only SPI mode.
Second change is needed for devices in unmanaged state.
V3:
- fix commit messages and descriptions about memory-mapped I/O mode
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 | 58 ++++-
drivers/net/dsa/Kconfig | 20 +-
drivers/net/dsa/Makefile | 4 +-
...tesse-vsc73xx.c => vitesse-vsc73xx-core.c} | 206 +++---------------
drivers/net/dsa/vitesse-vsc73xx-platform.c | 164 ++++++++++++++
drivers/net/dsa/vitesse-vsc73xx-spi.c | 203 +++++++++++++++++
drivers/net/dsa/vitesse-vsc73xx.h | 29 +++
7 files changed, 499 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.hSignature · 1 line
2.20.1
PATCH v3 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 | 58 +++++++++++++++++-- 1 file changed, 54 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt +54 -4
@@ -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,14 @@ 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 + +When the chip is connected to a parallel memory bus and work in memory-mapped +I/O mode, a platform device is used to represent the vsc73xx. In this case it +must reside inside a platform bus device tree node. Required properties:
@@ -38,6 +44,7 @@ and subnodes of DSA switches. Examples: +SPI: switch@0 { compatible = "vitesse,vsc7395"; reg = <0>;
@@ -79,3 +86,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
PATCH v3 2/4 net: dsa: vsc73xx: Split vsc73xx driver
In reply to Pawel DembickiThis 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.hdrivers/net/dsa/Kconfig +9 -2
@@ -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
@@ -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
@@ -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
PATCH v3 3/4 net: dsa: vsc73xx: add support for parallel mode
In reply to Pawel DembickiThis patch add platform part of vsc73xx driver.
It allows to use chip connected to a parallel memory bus and work in memory-mapped I/O mode. (aka PI bus in chip manual)
By default device is working in big endian mode.
--- drivers/net/dsa/Kconfig | 9 ++ drivers/net/dsa/Makefile | 1 + drivers/net/dsa/vitesse-vsc73xx-platform.c | 164 +++++++++++++++++++++ 3 files changed, 174 insertions(+) create mode 100644 drivers/net/dsa/vitesse-vsc73xx-platform.c
drivers/net/dsa/Kconfig +9 -0
@@ -116,4 +116,13 @@ 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, connected over + a CPU-attached address bus and work in memory-mapped I/O mode. endmenu
drivers/net/dsa/Makefile +1 -0
@@ -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 +164 -0
164 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH v3 3/4] net: dsa: vsc73xx: add support for parallel mode
Quoted 8 lines · Pawel Dembicki
This patch add platform part of vsc73xx driver.
It allows to use chip connected to a parallel memory bus and work in memory-mapped I/O mode. (aka PI bus in chip manual)By default device is working in big endian mode.
Signed-off-by Pawel Dembicki <[email protected]>Reviewed-by Linus Walleij <[email protected]>
Signature · 1 line
Florian
PATCH v3 4/4 net: dsa: vsc73xx: Assert reset if iCPU is enabled
In reply to Pawel DembickiDriver 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
@@ -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 seems 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
David Miller
maintainerFrom: Pawel Dembicki <[email protected]>
Date: Fri, 5 Jul 2019 00:29:03 +0200
Quoted 8 lines
Main goal of this patch series is to add support for CPU attached parallel bus in Vitesse VSC73xx switches. Existing driver supports only SPI mode.
Second change is needed for devices in unmanaged state.
V3:
- fix commit messages and descriptions about memory-mapped I/O mode
Quoted 7 lines
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
- fixdevm_ioremap_resourceresult check
- add cover letter
Series applied to net-next, thank you.