Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mvebu: refresh 5.15 patches

Browse source 
Deleted (upstreamed):
303-linksys_hardcode_nand_ecc_settings.patch [1]

Deleted (not needed):
314-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch [2]

Manually rebased:
700-mvneta-tx-queue-workaround.patch

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4daff3e5b42422cd4af758cc7768223d2b7f6e14
[2] https://git.openwrt.org/?p=openwrt/openwrt.git;a=commitdiff;h=7f73acade0cde61341cb77e0dc74de51ac059d4f

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
This commit is contained in:
Rui Salvaterra 2022-04-10 12:42:32 +01:00
parent fb29b91c5b
commit 7d139bd5f3
16 changed files with 32 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
target/linux/mvebu/patches-5.15/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch
View file

@ -28,7 +28,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
--- a/arch/arm/Kconfig --- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -1781,6 +1781,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN @@ -1727,6 +1727,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
The command-line arguments provided by the boot loader will be The command-line arguments provided by the boot loader will be
appended to the the device tree bootargs property. appended to the the device tree bootargs property.
@ -176,7 +176,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
} }
--- a/init/main.c --- a/init/main.c
+++ b/init/main.c +++ b/init/main.c
@@ -110,6 +110,10 @@ @@ -113,6 +113,10 @@
#include <kunit/test.h> #include <kunit/test.h>
@ -187,7 +187,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
static int kernel_init(void *); static int kernel_init(void *);
extern void init_IRQ(void); extern void init_IRQ(void);
@@ -904,6 +908,18 @@ asmlinkage __visible void __init __no_sa @@ -990,6 +994,18 @@ asmlinkage __visible void __init __no_sa
page_alloc_init(); page_alloc_init();
pr_notice("Kernel command line: %s\n", saved_command_line); pr_notice("Kernel command line: %s\n", saved_command_line);

2
target/linux/mvebu/patches-5.15/302-add_powertables.patch
View file

@ -1,6 +1,6 @@
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi --- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -212,11 +212,19 @@ @@ -214,11 +214,19 @@
&pcie1 { &pcie1 {
/* Marvell 88W8864, 5GHz-only */ /* Marvell 88W8864, 5GHz-only */
status = "okay"; status = "okay";

17
target/linux/mvebu/patches-5.15/303-linksys_hardcode_nand_ecc_settings.patch
View file

@ -1,17 +0,0 @@
Newer Linksys boards might come with a Winbond W29N02GV which can be
configured in different ways. Make sure we configure it the same way
as the older chips so everything keeps working.
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -148,6 +148,8 @@
reg = <0>;
label = "pxa3xx_nand-0";
nand-rb = <0>;
+ nand-ecc-strength = <4>;
+ nand-ecc-step-size = <512>;
marvell,nand-keep-config;
nand-on-flash-bbt;
};

34
target/linux/mvebu/patches-5.15/314-arm64-dts-uDPU-switch-PHY-operation-mode-to-2500base.patch
View file

@ -1,34 +0,0 @@
Certain SFP modules (most notably Nokia GPON ones) first check
connectivity on 1000base-x, and switch to 2500base-x afterwards. This
is considered a quirk so the phylink switches the interface to
2500base-x as well.
However, after power-cycling the uDPU device, network interface/SFP module
will not work correctly until the module is re-seated. This patch
resolves this issue by forcing the interface to be brought up in
2500base-x mode by default.
Signed-off-by: Jakov Petrina <jakov.petrina@sartura.hr>
Signed-off-by: Vladimir Vid <vladimir.vid@sartura.hr>
Cc: Luka Perkov <luka.perkov@sartura.hr>
--- a/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
@@ -162,7 +162,7 @@
};
&eth0 {
- phy-mode = "sgmii";
+ phy-mode = "2500base-x";
status = "okay";
managed = "in-band-status";
phys = <&comphy1 0>;
@@ -170,7 +170,7 @@
};
&eth1 {
- phy-mode = "sgmii";
+ phy-mode = "2500base-x";
status = "okay";
managed = "in-band-status";
phys = <&comphy0 1>;

10
target/linux/mvebu/patches-5.15/700-mvneta-tx-queue-workaround.patch
View file

@ -9,8 +9,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- ---
--- a/drivers/net/ethernet/marvell/mvneta.c --- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -4903,6 +4903,16 @@ static int mvneta_ethtool_set_eee(struct @@ -4987,6 +4987,16 @@ static int mvneta_setup_tc(struct net_de
return phylink_ethtool_set_eee(pp->phylink, eee); }
} }
+#ifndef CONFIG_ARM64 +#ifndef CONFIG_ARM64
@ -26,13 +26,13 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static const struct net_device_ops mvneta_netdev_ops = { static const struct net_device_ops mvneta_netdev_ops = {
.ndo_open = mvneta_open, .ndo_open = mvneta_open,
.ndo_stop = mvneta_stop, .ndo_stop = mvneta_stop,
@@ -4913,6 +4923,9 @@ static const struct net_device_ops mvnet @@ -4997,6 +5007,9 @@ static const struct net_device_ops mvnet
.ndo_fix_features = mvneta_fix_features, .ndo_fix_features = mvneta_fix_features,
.ndo_get_stats64 = mvneta_get_stats64, .ndo_get_stats64 = mvneta_get_stats64,
.ndo_do_ioctl = mvneta_ioctl, .ndo_eth_ioctl = mvneta_ioctl,
+#ifndef CONFIG_ARM64 +#ifndef CONFIG_ARM64
+ .ndo_select_queue = mvneta_select_queue, + .ndo_select_queue = mvneta_select_queue,
+#endif +#endif
.ndo_bpf = mvneta_xdp, .ndo_bpf = mvneta_xdp,
.ndo_xdp_xmit = mvneta_xdp_xmit, .ndo_xdp_xmit = mvneta_xdp_xmit,
}; .ndo_setup_tc = mvneta_setup_tc,

4
target/linux/mvebu/patches-5.15/702-net-next-ethernet-marvell-mvnetaMQPrioOffload.patch
View file

@ -26,7 +26,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
#include <linux/bpf_trace.h> #include <linux/bpf_trace.h>
/* Registers */ /* Registers */
@@ -4933,14 +4934,14 @@ static void mvneta_setup_rx_prio_map(str @@ -4947,14 +4948,14 @@ static void mvneta_setup_rx_prio_map(str
} }
static int mvneta_setup_mqprio(struct net_device *dev, static int mvneta_setup_mqprio(struct net_device *dev,
@ -44,7 +44,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (num_tc > rxq_number) if (num_tc > rxq_number)
return -EINVAL; return -EINVAL;
@@ -4951,13 +4952,15 @@ static int mvneta_setup_mqprio(struct ne @@ -4965,13 +4966,15 @@ static int mvneta_setup_mqprio(struct ne
return 0; return 0;
} }

2
target/linux/mvebu/patches-5.15/703-net-next-ethernet-marvell-mvnetaMQPrioFlag.patch
View file

@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/marvell/mvneta.c --- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -4940,7 +4940,9 @@ static int mvneta_setup_mqprio(struct ne @@ -4954,7 +4954,9 @@ static int mvneta_setup_mqprio(struct ne
u8 num_tc; u8 num_tc;
int i; int i;

6
target/linux/mvebu/patches-5.15/704-net-next-ethernet-marvell-mvnetaMQPrioQueue.patch
View file

@ -30,7 +30,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
phy_interface_t phy_interface; phy_interface_t phy_interface;
struct device_node *dn; struct device_node *dn;
@@ -4922,13 +4921,12 @@ static void mvneta_clear_rx_prio_map(str @@ -4936,13 +4935,12 @@ static void mvneta_clear_rx_prio_map(str
mvreg_write(pp, MVNETA_VLAN_PRIO_TO_RXQ, 0); mvreg_write(pp, MVNETA_VLAN_PRIO_TO_RXQ, 0);
} }
@ -48,7 +48,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvreg_write(pp, MVNETA_VLAN_PRIO_TO_RXQ, val); mvreg_write(pp, MVNETA_VLAN_PRIO_TO_RXQ, val);
} }
@@ -4937,8 +4935,8 @@ static int mvneta_setup_mqprio(struct ne @@ -4951,8 +4949,8 @@ static int mvneta_setup_mqprio(struct ne
struct tc_mqprio_qopt_offload *mqprio) struct tc_mqprio_qopt_offload *mqprio)
{ {
struct mvneta_port *pp = netdev_priv(dev); struct mvneta_port *pp = netdev_priv(dev);
@ -58,7 +58,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (mqprio->qopt.hw != TC_MQPRIO_HW_OFFLOAD_TCS) if (mqprio->qopt.hw != TC_MQPRIO_HW_OFFLOAD_TCS)
return 0; return 0;
@@ -4948,21 +4946,28 @@ static int mvneta_setup_mqprio(struct ne @@ -4962,21 +4960,28 @@ static int mvneta_setup_mqprio(struct ne
if (num_tc > rxq_number) if (num_tc > rxq_number)
return -EINVAL; return -EINVAL;

6
target/linux/mvebu/patches-5.15/705-net-next-ethernet-marvell-mvnetaMQPrioTCOffload.patch
View file

@ -62,7 +62,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
#define MVNETA_LPI_CTRL_0 0x2cc0 #define MVNETA_LPI_CTRL_0 0x2cc0
#define MVNETA_LPI_CTRL_1 0x2cc4 #define MVNETA_LPI_CTRL_1 0x2cc4
#define MVNETA_LPI_REQUEST_ENABLE BIT(0) #define MVNETA_LPI_REQUEST_ENABLE BIT(0)
@@ -4931,11 +4958,74 @@ static void mvneta_map_vlan_prio_to_rxq( @@ -4945,11 +4972,74 @@ static void mvneta_map_vlan_prio_to_rxq(
mvreg_write(pp, MVNETA_VLAN_PRIO_TO_RXQ, val); mvreg_write(pp, MVNETA_VLAN_PRIO_TO_RXQ, val);
} }
@ -138,7 +138,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
u8 num_tc; u8 num_tc;
if (mqprio->qopt.hw != TC_MQPRIO_HW_OFFLOAD_TCS) if (mqprio->qopt.hw != TC_MQPRIO_HW_OFFLOAD_TCS)
@@ -4949,6 +5039,7 @@ static int mvneta_setup_mqprio(struct ne @@ -4963,6 +5053,7 @@ static int mvneta_setup_mqprio(struct ne
mvneta_clear_rx_prio_map(pp); mvneta_clear_rx_prio_map(pp);
if (!num_tc) { if (!num_tc) {
@ -146,7 +146,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
netdev_reset_tc(dev); netdev_reset_tc(dev);
return 0; return 0;
} }
@@ -4969,6 +5060,33 @@ static int mvneta_setup_mqprio(struct ne @@ -4983,6 +5074,33 @@ static int mvneta_setup_mqprio(struct ne
} }
} }

6
target/linux/mvebu/patches-5.15/801-pci-mvebu-time-out-reset-on-link-up.patch
View file

@ -13,7 +13,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/pci/controller/pci-mvebu.c --- a/drivers/pci/controller/pci-mvebu.c
+++ b/drivers/pci/controller/pci-mvebu.c +++ b/drivers/pci/controller/pci-mvebu.c
@@ -941,6 +941,7 @@ static int mvebu_pcie_powerup(struct mve @@ -1023,6 +1023,7 @@ static int mvebu_pcie_powerup(struct mve
if (port->reset_gpio) { if (port->reset_gpio) {
u32 reset_udelay = PCI_PM_D3COLD_WAIT * 1000; u32 reset_udelay = PCI_PM_D3COLD_WAIT * 1000;
@ -21,7 +21,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
of_property_read_u32(port->dn, "reset-delay-us", of_property_read_u32(port->dn, "reset-delay-us",
&reset_udelay); &reset_udelay);
@@ -948,7 +949,13 @@ static int mvebu_pcie_powerup(struct mve @@ -1030,7 +1031,13 @@ static int mvebu_pcie_powerup(struct mve
udelay(100); udelay(100);
gpiod_set_value_cansleep(port->reset_gpio, 0); gpiod_set_value_cansleep(port->reset_gpio, 0);
@ -36,7 +36,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
} }
return 0; return 0;
@@ -1108,15 +1115,16 @@ static int mvebu_pcie_probe(struct platf @@ -1190,15 +1197,16 @@ static int mvebu_pcie_probe(struct platf
if (!child) if (!child)
continue; continue;

2
target/linux/mvebu/patches-5.15/901-dt-bindings-Add-IEI-vendor-prefix-and-IEI-WT61P803-P.patch
View file

@ -207,7 +207,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
+ }; + };
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -475,6 +475,8 @@ patternProperties: @@ -519,6 +519,8 @@ patternProperties:
description: IC Plus Corp. description: IC Plus Corp.
"^idt,.*": "^idt,.*":
description: Integrated Device Technologies, Inc. description: Integrated Device Technologies, Inc.

6
target/linux/mvebu/patches-5.15/902-drivers-mfd-Add-a-driver-for-IEI-WT61P803-PUZZLE-MCU.patch
View file

@ -26,7 +26,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
--- a/drivers/mfd/Kconfig --- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig
@@ -2155,6 +2155,15 @@ config SGI_MFD_IOC3 @@ -2187,6 +2187,15 @@ config SGI_MFD_IOC3
If you have an SGI Origin, Octane, or a PCI IOC3 card, If you have an SGI Origin, Octane, or a PCI IOC3 card,
then say Y. Otherwise say N. then say Y. Otherwise say N.
@ -44,8 +44,8 @@ Cc: Robert Marko <robert.marko@sartura.hr>
depends on SPI_MASTER depends on SPI_MASTER
--- a/drivers/mfd/Makefile --- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile
@@ -237,6 +237,7 @@ obj-$(CONFIG_MFD_HI655X_PMIC) += hi655 @@ -237,6 +237,7 @@ obj-$(CONFIG_MFD_DLN2) += dln2.o
obj-$(CONFIG_MFD_DLN2) += dln2.o obj-$(CONFIG_MFD_RT4831) += rt4831.o
obj-$(CONFIG_MFD_RT5033) += rt5033.o obj-$(CONFIG_MFD_RT5033) += rt5033.o
obj-$(CONFIG_MFD_SKY81452) += sky81452.o obj-$(CONFIG_MFD_SKY81452) += sky81452.o
+obj-$(CONFIG_MFD_IEI_WT61P803_PUZZLE) += iei-wt61p803-puzzle.o +obj-$(CONFIG_MFD_IEI_WT61P803_PUZZLE) += iei-wt61p803-puzzle.o

4
target/linux/mvebu/patches-5.15/903-drivers-hwmon-Add-the-IEI-WT61P803-PUZZLE-HWMON-driv.patch
View file

@ -26,7 +26,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
--- a/drivers/hwmon/Kconfig --- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig
@@ -722,6 +722,14 @@ config SENSORS_IBMPOWERNV @@ -732,6 +732,14 @@ config SENSORS_IBMPOWERNV
This driver can also be built as a module. If so, the module This driver can also be built as a module. If so, the module
will be called ibmpowernv. will be called ibmpowernv.
@ -43,7 +43,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
depends on IIO depends on IIO
--- a/drivers/hwmon/Makefile --- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile
@@ -83,6 +83,7 @@ obj-$(CONFIG_SENSORS_HIH6130) += hih6130 @@ -84,6 +84,7 @@ obj-$(CONFIG_SENSORS_HIH6130) += hih6130
obj-$(CONFIG_SENSORS_ULTRA45) += ultra45_env.o obj-$(CONFIG_SENSORS_ULTRA45) += ultra45_env.o
obj-$(CONFIG_SENSORS_I5500) += i5500_temp.o obj-$(CONFIG_SENSORS_I5500) += i5500_temp.o
obj-$(CONFIG_SENSORS_I5K_AMB) += i5k_amb.o obj-$(CONFIG_SENSORS_I5K_AMB) += i5k_amb.o

6
target/linux/mvebu/patches-5.15/904-drivers-leds-Add-the-IEI-WT61P803-PUZZLE-LED-driver.patch
View file

@ -30,7 +30,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
--- a/drivers/leds/Kconfig --- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig
@@ -333,6 +333,14 @@ config LEDS_IPAQ_MICRO @@ -306,6 +306,14 @@ config LEDS_IPAQ_MICRO
Choose this option if you want to use the notification LED on Choose this option if you want to use the notification LED on
Compaq/HP iPAQ h3100 and h3600. Compaq/HP iPAQ h3100 and h3600.
@ -47,14 +47,14 @@ Cc: Robert Marko <robert.marko@sartura.hr>
depends on LEDS_CLASS depends on LEDS_CLASS
--- a/drivers/leds/Makefile --- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile +++ b/drivers/leds/Makefile
@@ -35,6 +35,7 @@ obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx. @@ -33,6 +33,7 @@ obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.
obj-$(CONFIG_LEDS_INTEL_SS4200) += leds-ss4200.o obj-$(CONFIG_LEDS_INTEL_SS4200) += leds-ss4200.o
obj-$(CONFIG_LEDS_IP30) += leds-ip30.o obj-$(CONFIG_LEDS_IP30) += leds-ip30.o
obj-$(CONFIG_LEDS_IPAQ_MICRO) += leds-ipaq-micro.o obj-$(CONFIG_LEDS_IPAQ_MICRO) += leds-ipaq-micro.o
+obj-$(CONFIG_LEDS_IEI_WT61P803_PUZZLE) += leds-iei-wt61p803-puzzle.o +obj-$(CONFIG_LEDS_IEI_WT61P803_PUZZLE) += leds-iei-wt61p803-puzzle.o
obj-$(CONFIG_LEDS_IS31FL319X) += leds-is31fl319x.o obj-$(CONFIG_LEDS_IS31FL319X) += leds-is31fl319x.o
obj-$(CONFIG_LEDS_IS31FL32XX) += leds-is31fl32xx.o obj-$(CONFIG_LEDS_IS31FL32XX) += leds-is31fl32xx.o
obj-$(CONFIG_LEDS_KTD2692) += leds-ktd2692.o obj-$(CONFIG_LEDS_LM3530) += leds-lm3530.o
--- /dev/null --- /dev/null
+++ b/drivers/leds/leds-iei-wt61p803-puzzle.c +++ b/drivers/leds/leds-iei-wt61p803-puzzle.c
@@ -0,0 +1,147 @@ @@ -0,0 +1,147 @@

2
target/linux/mvebu/patches-5.15/906-Documentation-hwmon-Add-iei-wt61p803-puzzle-hwmon-dr.patch
View file

@ -64,7 +64,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
+================= == ===================================================== +================= == =====================================================
--- a/Documentation/hwmon/index.rst --- a/Documentation/hwmon/index.rst
+++ b/Documentation/hwmon/index.rst +++ b/Documentation/hwmon/index.rst
@@ -71,6 +71,7 @@ Hardware Monitoring Kernel Drivers @@ -74,6 +74,7 @@ Hardware Monitoring Kernel Drivers
ibmaem ibmaem
ibm-cffps ibm-cffps
ibmpowernv ibmpowernv

2
target/linux/mvebu/patches-5.15/907-MAINTAINERS-Add-an-entry-for-the-IEI-WT61P803-PUZZLE.patch
View file

@ -16,7 +16,7 @@ Cc: Robert Marko <robert.marko@sartura.hr>
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -8538,6 +8538,22 @@ F: include/net/nl802154.h @@ -9066,6 +9066,22 @@ F: include/net/nl802154.h
F: net/ieee802154/ F: net/ieee802154/
F: net/mac802154/ F: net/mac802154/