domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move mvswitch 88E6060 driver to the ath25

Browse Source 
ath25 requires a 88E6060 driver to support boards such as Fonera 2.0g
(FON2202). The swconfig based mvswitch driver has not yet been ported to
the 5.10 kernel as the only user is the ath25 target while all other
targets have been switched to the upstream DSA implementation.

Switching ath25 to the DSA implementation is a complex task, since we
need either per-board platform data or DTS support. ath25 lacks both of
them and builds only a single generic image. So we need to keep the
swconfig driver implementation to easly and quickly port ath25 to the
5.10 kernel.

Since porting the mvswitch driver to 5.10 as a generic driver is not an
option, and since the ath25 is its only user, make mvswitch a target
specific driver to be able to port it to the 5.10 kernel as part of the
kernel version update of the target. This will allow us quickly migrate
to the next kernel version and not delay the next firmware release.

Suggested-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
This commit is contained in:
Sergey Ryazanov
2021-12-19 17:31:51 +03:00
committed by Daniel Golle
parent a3774d72c8
commit 0b2c1d8b9a
6 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
target/linux/generic/files/drivers/net/phy/mvswitch.c → target/linux/ath25/files/drivers/net/phy/mvswitch.c
View File

0
target/linux/generic/files/drivers/net/phy/mvswitch.h → target/linux/ath25/files/drivers/net/phy/mvswitch.h
View File

23
target/linux/ath25/patches-5.4/700-swconfig_mvswitch.patch Normal file
View File

@@ -0,0 +1,23 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -284,6 +284,10 @@ config IP17XX_PHY
tristate "Driver for IC+ IP17xx switches"
select SWCONFIG
+config MVSWITCH_PHY
+ tristate "Driver for Marvell 88E6060 switches"
+ select ETHERNET_PACKET_MANGLE
+
config PSB6970_PHY
tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch"
select SWCONFIG
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o
obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
obj-$(CONFIG_SWCONFIG_B53) += b53/
obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
+obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
obj-$(CONFIG_PSB6970_PHY) += psb6970.o
obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o

1
target/linux/generic/config-5.10
View File

@@ -3675,7 +3675,6 @@ CONFIG_MULTIUSER=y
# CONFIG_MVMDIO is not set # CONFIG_MVMDIO is not set
# CONFIG_MVNETA_BM is not set # CONFIG_MVNETA_BM is not set
# CONFIG_MVSW61XX_PHY is not set # CONFIG_MVSW61XX_PHY is not set
# CONFIG_MVSWITCH_PHY is not set
# CONFIG_MV_XOR_V2 is not set # CONFIG_MV_XOR_V2 is not set
# CONFIG_MWAVE is not set # CONFIG_MWAVE is not set
# CONFIG_MWL8K is not set # CONFIG_MWL8K is not set

1
target/linux/generic/config-5.4
View File

@@ -3343,7 +3343,6 @@ CONFIG_MULTIUSER=y
# CONFIG_MV643XX_ETH is not set # CONFIG_MV643XX_ETH is not set
# CONFIG_MVMDIO is not set # CONFIG_MVMDIO is not set
# CONFIG_MVNETA_BM is not set # CONFIG_MVNETA_BM is not set
# CONFIG_MVSWITCH_PHY is not set
# CONFIG_MV_XOR_V2 is not set # CONFIG_MV_XOR_V2 is not set
# CONFIG_MWAVE is not set # CONFIG_MWAVE is not set
# CONFIG_MWL8K is not set # CONFIG_MWL8K is not set

9
target/linux/generic/hack-5.4/700-swconfig_switch_drivers.patch
View File

@@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -250,6 +250,85 @@ config LED_TRIGGER_PHY @@ -250,6 +250,81 @@ config LED_TRIGGER_PHY
for any speed known to the PHY. for any speed known to the PHY.
@@ -50,10 +50,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ tristate "Driver for IC+ IP17xx switches" + tristate "Driver for IC+ IP17xx switches"
+ select SWCONFIG + select SWCONFIG
+ +
+config MVSWITCH_PHY
+ tristate "Driver for Marvell 88E6060 switches"
+ select ETHERNET_PACKET_MANGLE
+
+config PSB6970_PHY +config PSB6970_PHY
+ tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch" + tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch"
+ select SWCONFIG + select SWCONFIG
@@ -100,7 +96,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
config SFP config SFP
--- a/drivers/net/phy/Makefile --- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile
@@ -22,6 +22,20 @@ libphy-$(CONFIG_LED_TRIGGER_PHY) += phy_ @@ -22,6 +22,19 @@ libphy-$(CONFIG_LED_TRIGGER_PHY) += phy_
obj-$(CONFIG_PHYLINK) += phylink.o obj-$(CONFIG_PHYLINK) += phylink.o
obj-$(CONFIG_PHYLIB) += libphy.o obj-$(CONFIG_PHYLIB) += libphy.o
@@ -109,7 +105,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o +obj-$(CONFIG_AR8216_PHY) += ar8216.o ar8327.o
+obj-$(CONFIG_SWCONFIG_B53) += b53/ +obj-$(CONFIG_SWCONFIG_B53) += b53/
+obj-$(CONFIG_IP17XX_PHY) += ip17xx.o +obj-$(CONFIG_IP17XX_PHY) += ip17xx.o
+obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
+obj-$(CONFIG_PSB6970_PHY) += psb6970.o +obj-$(CONFIG_PSB6970_PHY) += psb6970.o
+obj-$(CONFIG_RTL8306_PHY) += rtl8306.o +obj-$(CONFIG_RTL8306_PHY) += rtl8306.o
+obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o +obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi.o