The following patches were removed because they are integrated in the upstream kernel 5.4: * backport-5.4/047-v4.21-mtd-keep-original-flags-for-every-struct-mtd_info.patch * backport-5.4/048-v4.21-mtd-improve-calculating-partition-boundaries-when-ch.patch * backport-5.4/080-v5.1-0001-bcma-keep-a-direct-pointer-to-the-struct-device.patch * backport-5.4/080-v5.1-0002-bcma-use-dev_-printing-functions.patch * backport-5.4/095-Allow-class-e-address-assignment-via-ifconfig-ioctl.patch * backport-5.4/101-arm-cns3xxx-use-actual-size-reads-for-PCIe.patch * backport-5.4/200-v5.2-usb-dwc2-Set-lpm-mode-parameters-depend-on-HW-configuration.patch * backport-5.4/210-arm64-sve-Disentangle-uapi-asm-ptrace.h-from-uapi-as.patch * backport-5.4/380-v5.3-net-sched-Introduce-act_ctinfo-action.patch * backport-5.4/450-v5.0-mtd-spinand-winbond-Add-support-for-W25N01GV.patch * backport-5.4/451-v5.0-mtd-spinand-Add-initial-support-for-Toshiba-TC58CVG2.patch * backport-5.4/452-v5.0-mtd-spinand-add-support-for-GigaDevice-GD5FxGQ4xA.patch * backport-5.4/455-v5.1-mtd-spinand-Add-support-for-all-Toshiba-Memory-produ.patch * backport-5.4/456-v5.1-mtd-spinand-Add-support-for-GigaDevice-GD5F1GQ4UExxG.patch * backport-5.4/460-v5.0-mtd-spi-nor-Add-support-for-mx25u12835f.patch * backport-5.4/460-v5.3-mtd-spinand-Define-macros-for-page-read-ops-with-thr.patch * backport-5.4/461-v5.3-mtd-spinand-Add-support-for-two-byte-device-IDs.patch * backport-5.4/462-v5.3-mtd-spinand-Add-support-for-GigaDevice-GD5F1GQ4UFxxG.patch * backport-5.4/463-v5.3-mtd-spinand-Add-initial-support-for-Paragon-PN26G0xA.patch * backport-5.4/700-v5.1-net-phylink-only-call-mac_config-during-resolve-when.patch * backport-5.4/701-v5.2-net-phylink-ensure-inband-AN-works-correctly.patch * backport-5.4/702-v4.20-net-ethernet-Add-helper-for-MACs-which-support-asym-.patch * backport-5.4/703-v4.20-net-ethernet-Add-helper-for-set_pauseparam-for-Asym-.patch * backport-5.4/704-v4.20-net-phy-Stop-with-excessive-soft-reset.patch * backport-5.4/705-v5.1-net-phy-provide-full-set-of-accessor-functions-to-MM.patch * backport-5.4/706-v5.1-net-phy-add-register-modifying-helpers-returning-1-o.patch * backport-5.4/707-v5.1-net-phy-add-genphy_c45_check_and_restart_aneg.patch * backport-5.4/708-v5.3-net-phylink-remove-netdev-from-phylink-mii-ioctl-emu.patch * backport-5.4/709-v5.3-net-phylink-support-for-link-gpio-interrupt.patch * backport-5.4/710-v5.3-net-phy-allow-Clause-45-access-via-mii-ioctl.patch * backport-5.4/711-v5.3-net-sfp-add-mandatory-attach-detach-methods-for-sfp-.patch * backport-5.4/712-v5.3-net-sfp-remove-sfp-bus-use-of-netdevs.patch * backport-5.4/713-v5.2-net-phylink-avoid-reducing-support-mask.patch * backport-5.4/714-v5.3-net-sfp-Stop-SFP-polling-and-interrupt-handling-duri.patch * backport-5.4/715-v5.3-net-phylink-don-t-start-and-stop-SGMII-PHYs-in-SFP-m.patch * backport-5.4/740-v5.5-net-phy-avoid-matching-all-ones-clause-45-PHY-IDs.patch * backport-5.4/741-v5.5-net-phylink-fix-link-mode-modification-in-PHY-mode.patch * pending-5.4/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch * pending-5.4/131-spi-use-gpio_set_value_cansleep-for-setting-chipsele.patch * pending-5.4/132-spi-spi-gpio-fix-crash-when-num-chipselects-is-0.patch * pending-5.4/220-optimize_inlining.patch * pending-5.4/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch * pending-5.4/475-mtd-spi-nor-Add-Winbond-w25q128jv-support.patch * pending-5.4/477-mtd-add-spi-nor-add-mx25u3235f.patch * pending-5.4/479-mtd-spi-nor-add-eon-en25qh64.patch Some bigger changes were done to this feature and we did not port this patch yet: * hack-5.4/207-disable-modorder.patch This depends on BOOTMEM which was removed from the kernel, this needs some bigger changes: * hack-5.4/930-crashlog.patch A different version of the FPU disable patch was merged upstream, OpenWrt needs some adaptations. * pending-5.4/304-mips_disable_fpu.patch - no crashlog support yet as a required file got deleted upstream - Removed patch below, which is now seen as a recursive dependency [1] - Removed patch below due to build error [2] - fix still required to avoid identical function def [3] - Fixes included from Blocktrron - Fixes included from Chunkeey - Fix included from nbd regarding "dst leak in Flow Offload" [1] target/linux/generic/hack-5.4/260-crypto_test_dependencies.patch [2] target/linux/generic/hack-5.4/207-disable-modorder.patch [3] target/linux/generic/pending-5.4/613-netfilter_optional_tcp_window_check.patch Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> Signed-off-by: David Bauer <mail@david-bauer.net> Signed-off-by: Christian Lamparter <chunkeey@gmail.com> Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> Signed-off-by: Robert Marko <robimarko@gmail.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
		
			
				
	
	
		
			141 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			141 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From 36e516290611e613aa92996cb4339561452695b4 Mon Sep 17 00:00:00 2001
 | 
						|
From: Felix Fietkau <nbd@nbd.name>
 | 
						|
Date: Fri, 7 Jul 2017 17:24:23 +0200
 | 
						|
Subject: net: swconfig: adds openwrt switch layer
 | 
						|
 | 
						|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
 | 
						|
---
 | 
						|
 drivers/net/phy/Kconfig   | 83 +++++++++++++++++++++++++++++++++++++++++++++++
 | 
						|
 drivers/net/phy/Makefile  | 15 +++++++++
 | 
						|
 include/uapi/linux/Kbuild |  1 +
 | 
						|
 3 files changed, 99 insertions(+)
 | 
						|
 | 
						|
--- a/drivers/net/phy/Kconfig
 | 
						|
+++ b/drivers/net/phy/Kconfig
 | 
						|
@@ -249,6 +249,89 @@ config LED_TRIGGER_PHY
 | 
						|
 		for any speed known to the PHY.
 | 
						|
 
 | 
						|
 
 | 
						|
+comment "Switch configuration API + drivers"
 | 
						|
+
 | 
						|
+config SWCONFIG
 | 
						|
+	tristate "Switch configuration API"
 | 
						|
+	---help---
 | 
						|
+	  Switch configuration API using netlink. This allows
 | 
						|
+	  you to configure the VLAN features of certain switches.
 | 
						|
+
 | 
						|
+config SWCONFIG_LEDS
 | 
						|
+	bool "Switch LED trigger support"
 | 
						|
+	depends on (SWCONFIG && LEDS_TRIGGERS)
 | 
						|
+
 | 
						|
+config ADM6996_PHY
 | 
						|
+	tristate "Driver for ADM6996 switches"
 | 
						|
+	select SWCONFIG
 | 
						|
+	---help---
 | 
						|
+	  Currently supports the ADM6996FC and ADM6996M switches.
 | 
						|
+	  Support for FC is very limited.
 | 
						|
+
 | 
						|
+config AR8216_PHY
 | 
						|
+	tristate "Driver for Atheros AR8216 switches"
 | 
						|
+	select ETHERNET_PACKET_MANGLE
 | 
						|
+	select SWCONFIG
 | 
						|
+
 | 
						|
+config AR8216_PHY_LEDS
 | 
						|
+	bool "Atheros AR8216 switch LED support"
 | 
						|
+	depends on (AR8216_PHY && LEDS_CLASS)
 | 
						|
+
 | 
						|
+source "drivers/net/phy/b53/Kconfig"
 | 
						|
+
 | 
						|
+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 MVSW61XX_PHY
 | 
						|
+	tristate "Driver for Marvell 88E6171/6172 switches"
 | 
						|
+	select SWCONFIG
 | 
						|
+
 | 
						|
+config PSB6970_PHY
 | 
						|
+	tristate "Lantiq XWAY Tantos (PSB6970) Ethernet switch"
 | 
						|
+	select SWCONFIG
 | 
						|
+	select ETHERNET_PACKET_MANGLE
 | 
						|
+
 | 
						|
+config RTL8306_PHY
 | 
						|
+	tristate "Driver for Realtek RTL8306S switches"
 | 
						|
+	select SWCONFIG
 | 
						|
+
 | 
						|
+config RTL8366_SMI
 | 
						|
+	tristate "Driver for the RTL8366 SMI interface"
 | 
						|
+	depends on GPIOLIB
 | 
						|
+	---help---
 | 
						|
+	  This module implements the SMI interface protocol which is used
 | 
						|
+	  by some RTL8366 ethernet switch devices via the generic GPIO API.
 | 
						|
+
 | 
						|
+if RTL8366_SMI
 | 
						|
+
 | 
						|
+config RTL8366_SMI_DEBUG_FS
 | 
						|
+	bool "RTL8366 SMI interface debugfs support"
 | 
						|
+        depends on DEBUG_FS
 | 
						|
+        default n
 | 
						|
+
 | 
						|
+config RTL8366S_PHY
 | 
						|
+	tristate "Driver for the Realtek RTL8366S switch"
 | 
						|
+	select SWCONFIG
 | 
						|
+
 | 
						|
+config RTL8366RB_PHY
 | 
						|
+	tristate "Driver for the Realtek RTL8366RB switch"
 | 
						|
+	select SWCONFIG
 | 
						|
+
 | 
						|
+config RTL8367_PHY
 | 
						|
+	tristate "Driver for the Realtek RTL8367R/M switches"
 | 
						|
+	select SWCONFIG
 | 
						|
+
 | 
						|
+config RTL8367B_PHY
 | 
						|
+	tristate "Driver fot the Realtek RTL8367R-VB switch"
 | 
						|
+	select SWCONFIG
 | 
						|
+
 | 
						|
+endif # RTL8366_SMI
 | 
						|
+
 | 
						|
 comment "MII PHY device drivers"
 | 
						|
 
 | 
						|
 config SFP
 | 
						|
--- a/drivers/net/phy/Makefile
 | 
						|
+++ b/drivers/net/phy/Makefile
 | 
						|
@@ -22,6 +22,21 @@ libphy-$(CONFIG_LED_TRIGGER_PHY)	+= phy_
 | 
						|
 obj-$(CONFIG_PHYLINK)		+= phylink.o
 | 
						|
 obj-$(CONFIG_PHYLIB)		+= libphy.o
 | 
						|
 
 | 
						|
+obj-$(CONFIG_SWCONFIG)		+= swconfig.o
 | 
						|
+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_MVSW61XX_PHY)	+= mvsw61xx.o
 | 
						|
+obj-$(CONFIG_PSB6970_PHY)	+= psb6970.o
 | 
						|
+obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
 | 
						|
+obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
 | 
						|
+obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o
 | 
						|
+obj-$(CONFIG_RTL8366RB_PHY)	+= rtl8366rb.o
 | 
						|
+obj-$(CONFIG_RTL8367_PHY)	+= rtl8367.o
 | 
						|
+obj-$(CONFIG_RTL8367B_PHY)	+= rtl8367b.o
 | 
						|
+
 | 
						|
 obj-$(CONFIG_MDIO_ASPEED)	+= mdio-aspeed.o
 | 
						|
 obj-$(CONFIG_MDIO_BCM_IPROC)	+= mdio-bcm-iproc.o
 | 
						|
 obj-$(CONFIG_MDIO_BCM_UNIMAC)	+= mdio-bcm-unimac.o
 | 
						|
--- a/include/linux/platform_data/b53.h
 | 
						|
+++ b/include/linux/platform_data/b53.h
 | 
						|
@@ -29,6 +29,9 @@ struct b53_platform_data {
 | 
						|
 	u32 chip_id;
 | 
						|
 	u16 enabled_ports;
 | 
						|
 
 | 
						|
+	/* allow to specify an ethX alias */
 | 
						|
+	const char *alias;
 | 
						|
+
 | 
						|
 	/* only used by MMAP'd driver */
 | 
						|
 	unsigned big_endian:1;
 | 
						|
 	void __iomem *regs;
 |