net: dsa: Change DT bindings for Vitesse VSC73xx switches
Subsystems (4)
PATCH 1/4 net: dsa: Change DT bindings for Vitesse VSC73xx switches
This commit document changes after split vsc73xx driver into core and spi part. The change of DT bindings is required for support the same vsc73xx chip, which need PI bus to communicate with CPU. It also introduce how to use vsc73xx platform driver.
--- .../bindings/net/dsa/vitesse,vsc73xx.txt | 74 ++++++++++++++++--- 1 file changed, 64 insertions(+), 10 deletions(-)
Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt +64 -10
@@ -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,16 +11,26 @@ 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: -- compatible: must be exactly one of: - "vitesse,vsc7385" - "vitesse,vsc7388" - "vitesse,vsc7395" - "vitesse,vsc7398" +- compatible (SPI): must be exactly one of: + "vitesse,vsc7385-spi" + "vitesse,vsc7388-spi" + "vitesse,vsc7395-spi" + "vitesse,vsc7398-spi" +- compatible (Platform): must be exactly one of: + "vitesse,vsc7385-platform" + "vitesse,vsc7388-platform" + "vitesse,vsc7395-platform" + "vitesse,vsc7398-platform" - gpio-controller: indicates that this switch is also a GPIO controller, see gpio/gpio.txt - #gpio-cells: this must be set to <2> and indicates that we are a twocell
@@ -38,8 +48,9 @@ and subnodes of DSA switches. Examples: +SPI: switch@0 { - compatible = "vitesse,vsc7395"; + compatible = "vitesse,vsc7395-spi"; reg = <0>; /* Specified for 2.5 MHz or below */ spi-max-frequency = <2500000>;
@@ -79,3 +90,46 @@ switch@0 { }; }; }; + +Platform: +switch@2,0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "vitesse,vsc7385-platform"; + 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 2/4 net: dsa: vsc73xx: Split vsc73xx driver
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.
---
arch/arm/boot/dts/gemini-sl93512r.dts | 2 +-
arch/arm/boot/dts/gemini-sq201.dts | 2 +-
drivers/net/dsa/Kconfig | 11 +-
drivers/net/dsa/Makefile | 3 +-
...tesse-vsc73xx.c => vitesse-vsc73xx-core.c} | 265 ++++--------------
drivers/net/dsa/vitesse-vsc73xx-spi.c | 201 +++++++++++++
drivers/net/dsa/vitesse-vsc73xx.h | 30 ++
7 files changed, 297 insertions(+), 217 deletions(-)
rename drivers/net/dsa/{vitesse-vsc73xx.c => vitesse-vsc73xx-core.c} (85%)
create mode 100644 drivers/net/dsa/vitesse-vsc73xx-spi.c
create mode 100644 drivers/net/dsa/vitesse-vsc73xx.harch/arm/boot/dts/gemini-sl93512r.dts +1 -1
@@ -94,7 +94,7 @@ num-chipselects = <1>; switch@0 { - compatible = "vitesse,vsc7385"; + compatible = "vitesse,vsc7385-spi"; reg = <0>; /* Specified for 2.5 MHz or below */ spi-max-frequency = <2500000>;
arch/arm/boot/dts/gemini-sq201.dts +1 -1
@@ -79,7 +79,7 @@ num-chipselects = <1>; switch@0 { - compatible = "vitesse,vsc7395"; + compatible = "vitesse,vsc7395-spi"; reg = <0>; /* Specified for 2.5 MHz or below */ spi-max-frequency = <2500000>;
drivers/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 +53 -212
570 lines not on this page · raw message
drivers/net/dsa/vitesse-vsc73xx-spi.c new file +201 -0
201 lines not on this page · raw message
drivers/net/dsa/vitesse-vsc73xx.h new file +30 -0
@@ -0,0 +1,30 @@ +/* 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 ]; +struct mutex lock;/* Protects SPI traffic */ +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
Andrew Lunn
maintainerRe: [PATCH 2/4] net: dsa: vsc73xx: Split vsc73xx driver
drivers/net/dsa/vitesse-vsc73xx-core.c static int vsc73xx_update_bits(struct vsc73xx *vsc, u8 block, u8 subblock, · line 388
Quoted 12 lines
drivers/net/dsa/vitesse-vsc73xx-core.c renamed from drivers/net/dsa/vitesse-vsc73xx.c +2
-2@@ -495,12 +380,12 @@ static int vsc73xx_update_bits(struct vsc73xx *vsc, u8 block, u8 subblock,int ret;/* Same read-modify-write algorithm as e.g. regmap */ - ret =vsc73xx_read (vsc, block, subblock, reg, &orig); + ret = vsc->ops->read (vsc, block, subblock, reg, &orig);if (ret)return ret; tmp = orig & ~mask; tmp |= val & mask; -return vsc73xx_write (vsc, block, subblock, reg, tmp); +return vsc->ops->write (vsc, block, subblock, reg, tmp);
This patch would be a lot less invasive and smaller if you hid the difference between SPI and platform inside vsc73xx_write() and vsc73xx_read().
drivers/net/dsa/vitesse-vsc73xx-core.c static int vsc73xx_gpio_probe(struct vsc73xx *vsc) · line 1250
Quoted 4 lines
drivers/net/dsa/vitesse-vsc73xx-core.c renamed from drivers/net/dsa/vitesse-vsc73xx.c +1
-2-static int vsc73xx_probe (struct spi_device *spi) +int vsc73xx_probe (struct vsc73xx *vsc) { -struct device *dev = &spi->dev;
struct device *dev = vsc->dev;
and then a lot of the changes you make here go away.
In general, think about how to make the changes small. It saves your time from actually making changes, and reviewer time since the patch it smaller.
Andrew
PATCH v2 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.
---
Changes in v2:
- Make patch less invasive
- Move mutex to SPI part of driver
- v2 also tested by Linus
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 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 by PI interface.
--- drivers/net/dsa/Kconfig | 8 + drivers/net/dsa/Makefile | 1 + drivers/net/dsa/vitesse-vsc73xx-platform.c | 166 +++++++++++++++++++++ 3 files changed, 175 insertions(+) create mode 100644 drivers/net/dsa/vitesse-vsc73xx-platform.c
drivers/net/dsa/Kconfig +8 -0
@@ -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
@@ -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 +166 -0
166 lines not on this page · raw message
Signature · 1 line
2.20.1
Andrew Lunn
maintainerRe: [PATCH 3/4] net: dsa: vsc73xx: add support for parallel mode
Quoted 4 lines · Pawel Dembicki
drivers/net/dsa/vitesse-vsc73xx-platform.c new file +4
-0+static int vsc73xx_platform_read (struct vsc73xx *vsc,u8 block,u8 subblock, +u8 reg,u32 *val) +{ +struct vsc73xx_platform *vsc_platform = vsc->priv;
drivers/net/dsa/vitesse-vsc73xx-platform.c line 67
Quoted 10 lines
drivers/net/dsa/vitesse-vsc73xx-platform.c new file +10
-0+u32 offset; + +if (!vsc73xx_is_addr_valid (block, subblock)) +return -EINVAL ; + + offset =vsc73xx_make_addr (block, subblock, reg); + +mutex_lock (&vsc->lock); + *val =ioread32be (vsc_platform->base_addr + offset); +mutex_unlock (&vsc->lock);
Hi Pawel
What is this mutex protecting?
Plus the indentation is wrong.
Thanks
Andrew
Re: [PATCH 3/4] net: dsa: vsc73xx: add support for parallel mode
In reply to Pawel DembickiQuoted 5 lines · Pawel Dembicki
This patch add platform part of vsc73xx driver.
It allows to use chip connected by PI interface.Signed-off-by Pawel Dembicki <[email protected]>---
[snip]
drivers/net/dsa/vitesse-vsc73xx-platform.c line 85
Quoted 11 lines
drivers/net/dsa/vitesse-vsc73xx-platform.c new file +11
-0+struct vsc73xx_platform *vsc_platform = vsc->priv; +u32 offset; + +if (!vsc73xx_is_addr_valid (block, subblock)) +return -EINVAL ; + + offset =vsc73xx_make_addr (block, subblock, reg); + +mutex_lock (&vsc->lock); +iowrite32be (val, vsc_platform->base_addr + offset); +mutex_unlock (&vsc->lock);
Similar question from Andrew, why is the locking done in the platform layer, should not that be done in the core I/O operation instead?
Quoted 20 lines
drivers/net/dsa/vitesse-vsc73xx-platform.c new file +20
-0+ +return 0 ; +} + +static int vsc73xx_platform_probe (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; +struct vsc73xx_platform *vsc_platform; +struct resource *res =NULL ; +int ret; + + vsc_platform =devm_kzalloc (dev,sizeof (*vsc_platform),GFP_KERNEL ); +if (!vsc_platform) +return -ENOMEM ; + +platform_set_drvdata (pdev, vsc_platform); + vsc_platform->pdev = pdev; + vsc_platform->vsc.dev = dev; + vsc_platform->vsc.priv = vsc_platform; + vsc_platform->vsc.ops = &vsc73xx_platform_ops;
drivers/net/dsa/vitesse-vsc73xx-platform.c line 115
Quoted 10 lines
drivers/net/dsa/vitesse-vsc73xx-platform.c new file +10
-0+ +/* obtain I/O memory space */ + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); +if (!res) { +dev_err (&pdev->dev,"cannot obtain I/O memory space\n" ); + ret = -ENXIO ; +return ret; + } + + vsc_platform->base_addr =devm_ioremap_resource (&pdev->dev, res);
devm_ioremap_resource takes care of checking that the resource pointer is valid, no need to do that here.
drivers/net/dsa/vitesse-vsc73xx-platform.c line 116
Quoted 1 line
drivers/net/dsa/vitesse-vsc73xx-platform.c new file +1
-0+if (!vsc_platform->base_addr) {
if (IS_ERR(vsc_platform->base_addr))
Signature · 1 line
Florian
PATCH v2 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 by parallel interface.
---
Changes in v2:
- drop mutex
- fix indentation
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
@@ -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
@@ -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
PATCH 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
@@ -405,22 +405,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 = vsc->ops->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 = vsc->ops->read(vsc, VSC73XX_BLOCK_SYSTEM, 0,
@@ -471,9 +457,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,
@@ -1147,6 +1132,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 (vsc->dev,"no chip found (%d)\n" , ret);return -ENODEV ;
Signature · 1 line
2.20.1
PATCH v2 4/4 net: dsa: vsc73xx: Assert reset if iCPU is enabled
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.
---
Changes in v2:
- rebase commit after changes 1-3/4 patches
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 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
Andrew Lunn
maintainerQuoted 3 lines · Pawel Dembicki
This commit document changes after split vsc73xx driver into core and spi part. The change of DT bindings is required for support the same vsc73xx chip, which need PI bus to communicate with CPU. It also
SPI
Quoted 33 lines
introduce how to use vsc73xx platform driver.
Signed-off-by Pawel Dembicki <[email protected]>--- .../bindings/net/dsa/vitesse,vsc73xx.txt | 74 ++++++++++++++++--- 1 file changed, 64 insertions(+), 10 deletions(-)Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt +7
-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,16 +11,26 @@ 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 +
Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt Vitesse VSC7388 SparX-G8 8-port Integrated Gigabit Ethernet Switch · line 23
Quoted 10 lines
Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt +2
-5+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: -- compatible: must be exactly one of: - "vitesse,vsc7385" - "vitesse,vsc7388" - "vitesse,vsc7395" - "vitesse,vsc7398"
You cannot remove these. It will break backwards compatibility. Adding new compatible strings is fine, but you cannot remove existing ones.
Andrew
Quoted 28 lines · Pawel Dembicki
This commit document changes after split vsc73xx driver into core and spi part. The change of DT bindings is required for support the same vsc73xx chip, which need PI bus to communicate with CPU. It also introduce how to use vsc73xx platform driver.
Signed-off-by Pawel Dembicki <[email protected]>--- .../bindings/net/dsa/vitesse,vsc73xx.txt | 74 ++++++++++++++++--- 1 file changed, 64 insertions(+), 10 deletions(-)Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt +2
-2@@ -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,16 +11,26 @@ 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
Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt Vitesse VSC7388 SparX-G8 8-port Integrated Gigabit Ethernet Switch · line 20
Quoted 10 lines
Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt +7
-2-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.
That should not be required because the device remains the same and how it connects to the host is entirely described by the Device Tree topology.
Take b53 for instance which supports MDIO and SPI by default, and optionally memory mapped and SRAB (indirect memory map) accesses, they all have the same compatible strings. Whether the switches will appear as spi_device, platform_device, or something else is entirely based on how the Device Tree is laid out.
Signature · 1 line
Florian
Quoted 5 lines · Florian Fainelli
Take b53 for instance which supports MDIO and SPI by default, and optionally memory mapped and SRAB (indirect memory map) accesses, they all have the same compatible strings. Whether the switches will appear as
spi_device,platform_device, or something else is entirely based on how the Device Tree is laid out.
That's clever.
Pawel can you restructure the series around this observation?
Yours,
Linus Walleij
PATCH v2 1/4 net: dsa: Change DT bindings for Vitesse VSC73xx switches
In reply to Pawel DembickiThis commit introduce how to use vsc73xx platform driver.
---
Changes in v2:
- Drop -spi and -platform suffix
- Change commit message
.../bindings/net/dsa/vitesse,vsc73xx.txt | 57 +++++++++++++++++-- 1 file changed, 53 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt +53 -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,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
Quoted 7 lines · Pawel Dembicki
This commit introduce how to use vsc73xx platform driver.
Signed-off-by Pawel Dembicki <[email protected]>---
Changes in v2:
- Drop -spi and -platform suffix
- Change commit message
Yours,
Linus Walleij
Quoted 3 lines · Pawel Dembicki
This commit introduce how to use vsc73xx platform driver.
Signed-off-by Pawel Dembicki <[email protected]>
Pawel, please resubmit your patches starting a new thread, not as reply to the existing ones, see
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/networking/netdev-FAQ.rst#n134
for details. Also, David Miller typically likes to have a cover letter for patch count > 1.
Thanks!
Quoted 95 lines
---
Changes in v2:
- Drop -spi and -platform suffix
- Change commit message.../bindings/net/dsa/vitesse,vsc73xx.txt | 57 +++++++++++++++++-- 1 file changed, 53 insertions(+), 4 deletions(-)Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt +53
-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,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
Florian