kernel: bump 5.4 to 5.4.191 (#9329)

Signed-off-by: José Hwong <88561480+JoseCoW@users.noreply.github.com>
This commit is contained in:
José Hwong 2022-04-29 23:56:09 +09:00 committed by GitHub
parent 28faa95120
commit d5622e3534
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
33 changed files with 60 additions and 62 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .190 LINUX_VERSION-5.4 = .191
LINUX_KERNEL_HASH-5.4.190 = 81d4e707775d55a20bcb30d22c61e91fafba057a5080918338b2f7542873f194 LINUX_KERNEL_HASH-5.4.191 = 288ca85fcdad18e950ccbe3d640594ee36d5aac226321ed935076fadb0cc0a3a

View File

@ -48,7 +48,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
#include "xhci.h" #include "xhci.h"
#include "xhci-trace.h" #include "xhci-trace.h"
@@ -72,6 +74,44 @@ @@ -74,6 +76,44 @@
#define PCI_DEVICE_ID_ASMEDIA_2142_XHCI 0x2142 #define PCI_DEVICE_ID_ASMEDIA_2142_XHCI 0x2142
#define PCI_DEVICE_ID_ASMEDIA_3242_XHCI 0x3242 #define PCI_DEVICE_ID_ASMEDIA_3242_XHCI 0x3242
@ -93,7 +93,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
static const char hcd_name[] = "xhci_hcd"; static const char hcd_name[] = "xhci_hcd";
static struct hc_driver __read_mostly xhci_pci_hc_driver; static struct hc_driver __read_mostly xhci_pci_hc_driver;
@@ -327,6 +367,873 @@ static void xhci_pme_acpi_rtd3_enable(st @@ -334,6 +374,873 @@ static void xhci_pme_acpi_rtd3_enable(st
static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { } static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
#endif /* CONFIG_ACPI */ #endif /* CONFIG_ACPI */
@ -967,7 +967,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
/* called during probe() after chip reset completes */ /* called during probe() after chip reset completes */
static int xhci_pci_setup(struct usb_hcd *hcd) static int xhci_pci_setup(struct usb_hcd *hcd)
{ {
@@ -368,6 +1275,27 @@ static int xhci_pci_probe(struct pci_dev @@ -375,6 +1282,27 @@ static int xhci_pci_probe(struct pci_dev
struct hc_driver *driver; struct hc_driver *driver;
struct usb_hcd *hcd; struct usb_hcd *hcd;
@ -995,7 +995,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
driver = (struct hc_driver *)id->driver_data; driver = (struct hc_driver *)id->driver_data;
/* Prevent runtime suspending between USB-2 and USB-3 initialization */ /* Prevent runtime suspending between USB-2 and USB-3 initialization */
@@ -429,6 +1357,16 @@ static void xhci_pci_remove(struct pci_d @@ -436,6 +1364,16 @@ static void xhci_pci_remove(struct pci_d
{ {
struct xhci_hcd *xhci; struct xhci_hcd *xhci;
@ -1012,7 +1012,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
xhci = hcd_to_xhci(pci_get_drvdata(dev)); xhci = hcd_to_xhci(pci_get_drvdata(dev));
xhci->xhc_state |= XHCI_STATE_REMOVING; xhci->xhc_state |= XHCI_STATE_REMOVING;
@@ -568,6 +1506,11 @@ static int xhci_pci_resume(struct usb_hc @@ -575,6 +1513,11 @@ static int xhci_pci_resume(struct usb_hc
if (pdev->vendor == PCI_VENDOR_ID_INTEL) if (pdev->vendor == PCI_VENDOR_ID_INTEL)
usb_enable_intel_xhci_ports(pdev); usb_enable_intel_xhci_ports(pdev);

View File

@ -13,7 +13,7 @@ produce a noisy warning.
--- a/drivers/usb/host/xhci-pci.c --- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c
@@ -297,6 +297,7 @@ static void xhci_pci_quirks(struct devic @@ -302,6 +302,7 @@ static void xhci_pci_quirks(struct devic
pdev->device == 0x0015) { pdev->device == 0x0015) {
xhci->quirks |= XHCI_RESET_ON_RESUME; xhci->quirks |= XHCI_RESET_ON_RESUME;
xhci->quirks |= XHCI_ZERO_64B_REGS; xhci->quirks |= XHCI_ZERO_64B_REGS;
@ -23,7 +23,7 @@ produce a noisy warning.
xhci->quirks |= XHCI_RESET_ON_RESUME; xhci->quirks |= XHCI_RESET_ON_RESUME;
--- a/drivers/usb/host/xhci.c --- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c
@@ -427,10 +427,14 @@ static int xhci_try_enable_msi(struct us @@ -425,10 +425,14 @@ static int xhci_try_enable_msi(struct us
free_irq(hcd->irq, hcd); free_irq(hcd->irq, hcd);
hcd->irq = 0; hcd->irq = 0;
@ -43,7 +43,7 @@ produce a noisy warning.
hcd->msi_enabled = 1; hcd->msi_enabled = 1;
--- a/drivers/usb/host/xhci.h --- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h
@@ -1887,6 +1887,7 @@ struct xhci_hcd { @@ -1890,6 +1890,7 @@ struct xhci_hcd {
struct xhci_hub usb2_rhub; struct xhci_hub usb2_rhub;
struct xhci_hub usb3_rhub; struct xhci_hub usb3_rhub;
/* support xHCI 1.0 spec USB2 hardware LPM */ /* support xHCI 1.0 spec USB2 hardware LPM */

View File

@ -14,7 +14,6 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -294,6 +294,9 @@ config BCM63XX
@@ -292,6 +292,9 @@ config BCM63XX @@ -292,6 +292,9 @@ config BCM63XX
select SYNC_R4K select SYNC_R4K
select DMA_NONCOHERENT select DMA_NONCOHERENT

View File

@ -423,7 +423,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
if (bgmac->irq < 0) if (bgmac->irq < 0)
--- a/drivers/net/ethernet/cadence/macb_main.c --- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -4229,7 +4229,6 @@ static int macb_probe(struct platform_de @@ -4237,7 +4237,6 @@ static int macb_probe(struct platform_de
struct net_device *dev; struct net_device *dev;
struct resource *regs; struct resource *regs;
void __iomem *mem; void __iomem *mem;
@ -431,7 +431,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
struct macb *bp; struct macb *bp;
int err, val; int err, val;
@@ -4342,15 +4341,11 @@ static int macb_probe(struct platform_de @@ -4350,15 +4349,11 @@ static int macb_probe(struct platform_de
if (bp->caps & MACB_CAPS_NEEDS_RSTONUBR) if (bp->caps & MACB_CAPS_NEEDS_RSTONUBR)
bp->rx_intr_mask |= MACB_BIT(RXUBR); bp->rx_intr_mask |= MACB_BIT(RXUBR);

View File

@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk))) if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop; goto drop;
@@ -3296,6 +3298,7 @@ static int packet_create(struct net *net @@ -3301,6 +3303,7 @@ static int packet_create(struct net *net
mutex_init(&po->pg_vec_lock); mutex_init(&po->pg_vec_lock);
po->rollover = NULL; po->rollover = NULL;
po->prot_hook.func = packet_rcv; po->prot_hook.func = packet_rcv;
@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (sock->type == SOCK_PACKET) if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt; po->prot_hook.func = packet_rcv_spkt;
@@ -3939,6 +3942,16 @@ packet_setsockopt(struct socket *sock, i @@ -3944,6 +3947,16 @@ packet_setsockopt(struct socket *sock, i
po->xmit = val ? packet_direct_xmit : dev_queue_xmit; po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
return 0; return 0;
} }
@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
default: default:
return -ENOPROTOOPT; return -ENOPROTOOPT;
} }
@@ -3995,6 +4008,13 @@ static int packet_getsockopt(struct sock @@ -4000,6 +4013,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR: case PACKET_VNET_HDR:
val = po->has_vnet_hdr; val = po->has_vnet_hdr;
break; break;

View File

@ -15,7 +15,7 @@ Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -206,6 +206,18 @@ @@ -207,6 +207,18 @@
interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
}; };

View File

@ -56,7 +56,7 @@ Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
}; };
}; };
@@ -353,6 +354,12 @@ @@ -354,6 +355,12 @@
regulator; regulator;
}; };

View File

@ -59,7 +59,7 @@ Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
#interrupt-cells = <2>; #interrupt-cells = <2>;
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -201,6 +201,7 @@ @@ -202,6 +202,7 @@
compatible = "qcom,ipq4019-pinctrl"; compatible = "qcom,ipq4019-pinctrl";
reg = <0x01000000 0x300000>; reg = <0x01000000 0x300000>;
gpio-controller; gpio-controller;

View File

@ -23,7 +23,7 @@ Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -166,6 +166,7 @@ @@ -167,6 +167,7 @@
<1 4 0xf08>, <1 4 0xf08>,
<1 1 0xf08>; <1 1 0xf08>;
clock-frequency = <48000000>; clock-frequency = <48000000>;

View File

@ -37,7 +37,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
depends on ARCH_MOXART || COMPILE_TEST depends on ARCH_MOXART || COMPILE_TEST
--- a/drivers/net/phy/Makefile --- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile
@@ -49,6 +49,7 @@ obj-$(CONFIG_MDIO_CAVIUM) += mdio-cavium @@ -50,6 +50,7 @@ obj-$(CONFIG_MDIO_CAVIUM) += mdio-cavium
obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o
obj-$(CONFIG_MDIO_HISI_FEMAC) += mdio-hisi-femac.o obj-$(CONFIG_MDIO_HISI_FEMAC) += mdio-hisi-femac.o
obj-$(CONFIG_MDIO_I2C) += mdio-i2c.o obj-$(CONFIG_MDIO_I2C) += mdio-i2c.o

View File

@ -21,7 +21,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -577,5 +577,33 @@ @@ -578,5 +578,33 @@
"legacy"; "legacy";
status = "disabled"; status = "disabled";
}; };

View File

@ -18,7 +18,7 @@ Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
--- a/drivers/mtd/spi-nor/spi-nor.c --- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -2354,6 +2354,8 @@ static const struct flash_info spi_nor_i @@ -2353,6 +2353,8 @@ static const struct flash_info spi_nor_i
{ "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) }, { "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) }, { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) }, { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },

View File

@ -13,7 +13,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -209,6 +209,16 @@ @@ -210,6 +210,16 @@
interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
}; };

View File

@ -15,7 +15,7 @@ Reviewed-by: Vinod Koul <vkoul@kernel.org>
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -615,5 +615,79 @@ @@ -616,5 +616,79 @@
reg = <4>; reg = <4>;
}; };
}; };

View File

@ -13,7 +13,7 @@ Cc: Luka Perkov <luka.perkov@sartura.hr>
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -190,7 +190,7 @@ @@ -191,7 +191,7 @@
reg = <0x1800000 0x60000>; reg = <0x1800000 0x60000>;
}; };
@ -22,7 +22,7 @@ Cc: Luka Perkov <luka.perkov@sartura.hr>
compatible = "qcom,prng"; compatible = "qcom,prng";
reg = <0x22000 0x140>; reg = <0x22000 0x140>;
clocks = <&gcc GCC_PRNG_AHB_CLK>; clocks = <&gcc GCC_PRNG_AHB_CLK>;
@@ -310,7 +310,7 @@ @@ -311,7 +311,7 @@
status = "disabled"; status = "disabled";
}; };
@ -31,7 +31,7 @@ Cc: Luka Perkov <luka.perkov@sartura.hr>
compatible = "qcom,crypto-v5.1"; compatible = "qcom,crypto-v5.1";
reg = <0x08e3a000 0x6000>; reg = <0x08e3a000 0x6000>;
clocks = <&gcc GCC_CRYPTO_AHB_CLK>, clocks = <&gcc GCC_CRYPTO_AHB_CLK>,
@@ -396,7 +396,7 @@ @@ -397,7 +397,7 @@
dma-names = "rx", "tx"; dma-names = "rx", "tx";
}; };

View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/spi-nor/spi-nor.c --- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -2240,6 +2240,8 @@ static const struct flash_info spi_nor_i @@ -2242,6 +2242,8 @@ static const struct flash_info spi_nor_i
{ "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256, SECT_4K) }, { "en25q128", INFO(0x1c3018, 0, 64 * 1024, 256, SECT_4K) },
{ "en25q80a", INFO(0x1c3014, 0, 64 * 1024, 16, { "en25q80a", INFO(0x1c3014, 0, 64 * 1024, 16,
SECT_4K | SPI_NOR_DUAL_READ) }, SECT_4K | SPI_NOR_DUAL_READ) },

View File

@ -14,7 +14,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -616,6 +616,29 @@ @@ -617,6 +617,29 @@
}; };
}; };

View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -580,6 +580,13 @@ config XILINX_GMII2RGMII @@ -584,6 +584,13 @@ config XILINX_GMII2RGMII
the Reduced Gigabit Media Independent Interface(RGMII) between the Reduced Gigabit Media Independent Interface(RGMII) between
Ethernet physical media devices and the Gigabit Ethernet controller. Ethernet physical media devices and the Gigabit Ethernet controller.
@ -16,7 +16,7 @@
config MICREL_KS8995MA config MICREL_KS8995MA
--- a/drivers/net/phy/Makefile --- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile
@@ -68,6 +68,7 @@ ifdef CONFIG_HWMON @@ -69,6 +69,7 @@ ifdef CONFIG_HWMON
aquantia-objs += aquantia_hwmon.o aquantia-objs += aquantia_hwmon.o
endif endif
obj-$(CONFIG_AQUANTIA_PHY) += aquantia.o obj-$(CONFIG_AQUANTIA_PHY) += aquantia.o

View File

@ -25,7 +25,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -533,6 +533,12 @@ config NXP_TJA11XX_PHY @@ -537,6 +537,12 @@ config NXP_TJA11XX_PHY
---help--- ---help---
Currently supports the NXP TJA1100 and TJA1101 PHY. Currently supports the NXP TJA1100 and TJA1101 PHY.
@ -40,7 +40,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
---help--- ---help---
--- a/drivers/net/phy/Makefile --- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile
@@ -102,6 +102,7 @@ obj-$(CONFIG_MICROSEMI_PHY) += mscc.o @@ -103,6 +103,7 @@ obj-$(CONFIG_MICROSEMI_PHY) += mscc.o
obj-$(CONFIG_NATIONAL_PHY) += national.o obj-$(CONFIG_NATIONAL_PHY) += national.o
obj-$(CONFIG_NXP_TJA11XX_PHY) += nxp-tja11xx.o obj-$(CONFIG_NXP_TJA11XX_PHY) += nxp-tja11xx.o
obj-$(CONFIG_QSEMI_PHY) += qsemi.o obj-$(CONFIG_QSEMI_PHY) += qsemi.o

View File

@ -20,7 +20,7 @@ Signed-off-by: Robert Marko <robert.marko@sartura.hr>
/ { / {
#address-cells = <1>; #address-cells = <1>;
@@ -597,22 +598,39 @@ @@ -598,22 +599,39 @@
ethphy0: ethernet-phy@0 { ethphy0: ethernet-phy@0 {
reg = <0>; reg = <0>;

View File

@ -37,7 +37,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
obj-$(CONFIG_RMNET) += rmnet/ obj-$(CONFIG_RMNET) += rmnet/
--- a/drivers/net/ethernet/qualcomm/essedma/edma.c --- a/drivers/net/ethernet/qualcomm/essedma/edma.c
+++ b/drivers/net/ethernet/qualcomm/essedma/edma.c +++ b/drivers/net/ethernet/qualcomm/essedma/edma.c
@@ -1491,7 +1491,7 @@ int edma_rx_flow_steer(struct net_device @@ -1487,7 +1487,7 @@ int edma_rx_flow_steer(struct net_device
int res; int res;
if (skb->protocol == htons(ETH_P_IPV6)) { if (skb->protocol == htons(ETH_P_IPV6)) {

View File

@ -25,7 +25,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
}; };
cpus { cpus {
@@ -657,6 +659,64 @@ @@ -658,6 +660,64 @@
status = "disabled"; status = "disabled";
}; };

View File

@ -1,6 +1,6 @@
--- a/arch/arm/Kconfig --- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -1794,6 +1794,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL @@ -1830,6 +1830,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
endchoice endchoice
@ -17,7 +17,7 @@
default "" default ""
--- a/drivers/of/fdt.c --- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c +++ b/drivers/of/fdt.c
@@ -1056,6 +1056,17 @@ int __init early_init_dt_scan_chosen(uns @@ -1060,6 +1060,17 @@ int __init early_init_dt_scan_chosen(uns
if (p != NULL && l > 0) if (p != NULL && l > 0)
strlcpy(data, p, min(l, COMMAND_LINE_SIZE)); strlcpy(data, p, min(l, COMMAND_LINE_SIZE));

View File

@ -24,7 +24,7 @@ Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -665,8 +665,7 @@ @@ -666,8 +666,7 @@
qcom,page-mode = <0>; qcom,page-mode = <0>;
qcom,rx_head_buf_size = <1540>; qcom,rx_head_buf_size = <1540>;
qcom,mdio_supported; qcom,mdio_supported;
@ -34,7 +34,7 @@ Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
interrupts = <0 65 IRQ_TYPE_EDGE_RISING interrupts = <0 65 IRQ_TYPE_EDGE_RISING
0 66 IRQ_TYPE_EDGE_RISING 0 66 IRQ_TYPE_EDGE_RISING
0 67 IRQ_TYPE_EDGE_RISING 0 67 IRQ_TYPE_EDGE_RISING
@@ -704,7 +703,7 @@ @@ -705,7 +704,7 @@
gmac0: gmac0 { gmac0: gmac0 {
local-mac-address = [00 00 00 00 00 00]; local-mac-address = [00 00 00 00 00 00];

View File

@ -40,7 +40,7 @@
#endif #endif
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -2595,6 +2595,8 @@ enum netdev_cmd { @@ -2596,6 +2596,8 @@ enum netdev_cmd {
NETDEV_CVLAN_FILTER_DROP_INFO, NETDEV_CVLAN_FILTER_DROP_INFO,
NETDEV_SVLAN_FILTER_PUSH_INFO, NETDEV_SVLAN_FILTER_PUSH_INFO,
NETDEV_SVLAN_FILTER_DROP_INFO, NETDEV_SVLAN_FILTER_DROP_INFO,
@ -125,7 +125,7 @@
#endif #endif
--- a/drivers/net/phy/phy.c --- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c
@@ -703,6 +703,7 @@ void phy_stop_machine(struct phy_device *phydev) @@ -723,6 +723,7 @@ void phy_stop_machine(struct phy_device *phydev)
phydev->state = PHY_UP; phydev->state = PHY_UP;
mutex_unlock(&phydev->lock); mutex_unlock(&phydev->lock);
} }
@ -135,7 +135,7 @@
* phy_error - enter HALTED state for this PHY device * phy_error - enter HALTED state for this PHY device
--- a/drivers/net/ppp/ppp_generic.c --- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c
@@ -3341,6 +3341,318 @@ static void *unit_find(struct idr *p, int n) @@ -3357,6 +3357,318 @@ static void *unit_find(struct idr *p, int n)
return idr_find(p, n); return idr_find(p, n);
} }
@ -467,7 +467,7 @@
/* /*
* Determine initial path cost based on speed. * Determine initial path cost based on speed.
* using recommendations from 802.1d standard * using recommendations from 802.1d standard
@@ -681,6 +685,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev, @@ -695,6 +699,8 @@ int br_add_if(struct net_bridge *br, struct net_device *dev,
kobject_uevent(&p->kobj, KOBJ_ADD); kobject_uevent(&p->kobj, KOBJ_ADD);
@ -476,7 +476,7 @@
return 0; return 0;
err7: err7:
@@ -714,6 +720,8 @@ int br_del_if(struct net_bridge *br, struct net_device *dev) @@ -731,6 +737,8 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)
if (!p || p->br != br) if (!p || p->br != br)
return -EINVAL; return -EINVAL;
@ -485,7 +485,7 @@
/* Since more than one interface can be attached to a bridge, /* Since more than one interface can be attached to a bridge,
* there still maybe an alternate path for netconsole to use; * there still maybe an alternate path for netconsole to use;
* therefore there is no reason for a NETDEV_RELEASE event. * therefore there is no reason for a NETDEV_RELEASE event.
@@ -768,6 +776,65 @@ void br_dev_update_stats(struct net_device *dev, @@ -785,6 +793,65 @@ void br_dev_update_stats(struct net_device *dev,
} }
EXPORT_SYMBOL_GPL(br_dev_update_stats); EXPORT_SYMBOL_GPL(br_dev_update_stats);

View File

@ -8,5 +8,5 @@
+ if (p != NULL && l > 0) + if (p != NULL && l > 0)
+ strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE)); + strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
/* /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different
* CONFIG_CMDLINE is meant to be a default in case nothing else * device tree option of chosen/bootargs-override. This is

View File

@ -22,7 +22,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
const __be32 *_id = of_get_property(np, "reg", NULL); const __be32 *_id = of_get_property(np, "reg", NULL);
struct phylink *phylink; struct phylink *phylink;
int phy_mode, id, err; int phy_mode, id, err;
@@ -3034,6 +3034,9 @@ static int mtk_add_mac(struct mtk_eth *e @@ -3033,6 +3034,9 @@ static int mtk_add_mac(struct mtk_eth *e
eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN; eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN;

View File

@ -2091,10 +2091,9 @@ static int __init rtl838x_eth_probe(struct platform_device *pdev)
* 1) from device tree data * 1) from device tree data
* 2) from internal registers set by bootloader * 2) from internal registers set by bootloader
*/ */
mac = of_get_mac_address(pdev->dev.of_node); of_get_mac_address(pdev->dev.of_node, dev->dev_addr);
if (!IS_ERR(mac)) { if (is_valid_ether_addr(dev->dev_addr)) {
memcpy(dev->dev_addr, mac, ETH_ALEN); rtl838x_set_mac_hw(dev, (u8 *)dev->dev_addr);
rtl838x_set_mac_hw(dev, (u8 *)mac);
} else { } else {
dev->dev_addr[0] = (sw_r32(priv->r->mac) >> 8) & 0xff; dev->dev_addr[0] = (sw_r32(priv->r->mac) >> 8) & 0xff;
dev->dev_addr[1] = sw_r32(priv->r->mac) & 0xff; dev->dev_addr[1] = sw_r32(priv->r->mac) & 0xff;

View File

@ -10,7 +10,7 @@
platforms += sgi-ip27 platforms += sgi-ip27
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -636,6 +636,26 @@ config RALINK @@ -634,6 +634,26 @@ config RALINK
select ARCH_HAS_RESET_CONTROLLER select ARCH_HAS_RESET_CONTROLLER
select RESET_CONTROLLER select RESET_CONTROLLER

View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/phylink.c --- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c
@@ -1247,6 +1247,11 @@ int phylink_ethtool_ksettings_set(struct @@ -1242,6 +1242,11 @@ int phylink_ethtool_ksettings_set(struct
/* If we have a PHY, configure the phy */ /* If we have a PHY, configure the phy */
if (pl->phydev) { if (pl->phydev) {
@ -12,7 +12,7 @@
ret = phy_ethtool_ksettings_set(pl->phydev, &our_kset); ret = phy_ethtool_ksettings_set(pl->phydev, &our_kset);
if (ret) if (ret)
return ret; return ret;
@@ -1425,8 +1430,11 @@ int phylink_ethtool_get_eee(struct phyli @@ -1420,8 +1425,11 @@ int phylink_ethtool_get_eee(struct phyli
ASSERT_RTNL(); ASSERT_RTNL();
@ -25,7 +25,7 @@
return ret; return ret;
} }
@@ -1443,9 +1451,11 @@ int phylink_ethtool_set_eee(struct phyli @@ -1438,9 +1446,11 @@ int phylink_ethtool_set_eee(struct phyli
ASSERT_RTNL(); ASSERT_RTNL();

View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -536,6 +536,12 @@ config REALTEK_PHY @@ -540,6 +540,12 @@ config REALTEK_PHY
---help--- ---help---
Supports the Realtek 821x PHY. Supports the Realtek 821x PHY.
@ -15,7 +15,7 @@
---help--- ---help---
--- a/drivers/net/phy/Makefile --- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile
@@ -101,6 +101,7 @@ obj-$(CONFIG_NATIONAL_PHY) += national.o @@ -102,6 +102,7 @@ obj-$(CONFIG_NATIONAL_PHY) += national.o
obj-$(CONFIG_NXP_TJA11XX_PHY) += nxp-tja11xx.o obj-$(CONFIG_NXP_TJA11XX_PHY) += nxp-tja11xx.o
obj-$(CONFIG_QSEMI_PHY) += qsemi.o obj-$(CONFIG_QSEMI_PHY) += qsemi.o
obj-$(CONFIG_REALTEK_PHY) += realtek.o obj-$(CONFIG_REALTEK_PHY) += realtek.o

View File

@ -3134,7 +3134,7 @@
--- a/drivers/net/ethernet/intel/igc/igc_i225.c 2022-03-02 18:41:18.000000000 +0800 --- a/drivers/net/ethernet/intel/igc/igc_i225.c 2022-03-02 18:41:18.000000000 +0800
+++ b/drivers/net/ethernet/intel/igc/igc_i225.c 2022-03-10 14:46:02.453700756 +0800 +++ b/drivers/net/ethernet/intel/igc/igc_i225.c 2022-03-10 14:46:02.453700756 +0800
@@ -473,13 +473,11 @@ @@ -480,13 +480,11 @@
/* NVM Function Pointers */ /* NVM Function Pointers */
if (igc_get_flash_presence_i225(hw)) { if (igc_get_flash_presence_i225(hw)) {
@ -3148,7 +3148,7 @@
nvm->ops.read = igc_read_nvm_eerd; nvm->ops.read = igc_read_nvm_eerd;
nvm->ops.write = NULL; nvm->ops.write = NULL;
nvm->ops.validate = NULL; nvm->ops.validate = NULL;
@@ -487,3 +485,159 @@ @@ -494,3 +492,159 @@
} }
return 0; return 0;
} }