kernel: bump to 5.4.229, 5.10.164, 5.15.89, 6.1.7 (#10785)

* kernel: bump 5.15 to 5.15.89

* kernel: bump 6.1 to 6.1.7

* kernel: bump 5.4 to 5.4.229

* kernel: bump 5.10 to 5.10.164
This commit is contained in:
lovehackintosh 2023-01-19 14:03:33 +08:00 committed by GitHub
parent dd6c384a06
commit 37c47e967a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
72 changed files with 157 additions and 157 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .163 LINUX_VERSION-5.10 = .164
LINUX_KERNEL_HASH-5.10.163 = 96e226e2d388abc0600434e0f4f365a8829ef901f4d8e761e7ffe2799dc09b20 LINUX_KERNEL_HASH-5.10.164 = 0c7eaaa87b012c6662440f4ce2ea6e1bb961c1845cafd102eab08a57efeb8278

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .88 LINUX_VERSION-5.15 = .89
LINUX_KERNEL_HASH-5.15.88 = 417539fdd96a3af97ef9ad2b51ca13967cb922f53970563b60290b935a81a181 LINUX_KERNEL_HASH-5.15.89 = e7311b874e014bb6d37c051319bd6a4a4e3d05a1c32546522deabbfd2d752fe8

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .228 LINUX_VERSION-5.4 = .229
LINUX_KERNEL_HASH-5.4.228 = 80253b2cac54c256dfdfd1061800aef907f88432090f7aef74c0ddf50f6e6524 LINUX_KERNEL_HASH-5.4.229 = c5c592071195efef62082febe10efe6c793412670dfce89e476383d0493fa7af

View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .6 LINUX_VERSION-6.1 = .7
LINUX_KERNEL_HASH-6.1.6 = 3e4d8e561da5703a205ae8d7b2bed6c5c64fc4299eebcbfd20481e63b57d5ee3 LINUX_KERNEL_HASH-6.1.7 = 4ab048bad2e7380d3b827f1fad5ad2d2fc4f2e80e1c604d85d1f8781debe600f

View File

@ -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
@@ -1897,6 +1897,7 @@ struct xhci_hcd { @@ -1901,6 +1901,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

@ -17,7 +17,7 @@ Signed-off-by: Nick Hainke <vincent@systemli.org>
--- 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
@@ -1987,7 +1987,7 @@ static int sr2_bit7_quad_enable(struct s @@ -1989,7 +1989,7 @@ static int sr2_bit7_quad_enable(struct s
static int spi_nor_clear_sr_bp(struct spi_nor *nor) static int spi_nor_clear_sr_bp(struct spi_nor *nor)
{ {
int ret; int ret;

View File

@ -127,7 +127,7 @@ it on BCM4708 family.
/* /*
--- a/drivers/usb/host/xhci.h --- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h
@@ -1890,6 +1890,7 @@ struct xhci_hcd { @@ -1894,6 +1894,7 @@ struct xhci_hcd {
#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(42) #define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(42)
#define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43) #define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43)
#define XHCI_RESET_TO_DEFAULT BIT_ULL(44) #define XHCI_RESET_TO_DEFAULT BIT_ULL(44)

View File

@ -107,7 +107,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
} }
static struct clk clk_pcie = { static struct clk clk_pcie = {
@@ -548,6 +562,21 @@ static struct clk_lookup bcm6368_clks[] @@ -550,6 +564,21 @@ static struct clk_lookup bcm6368_clks[]
CLKDEV_INIT(NULL, "ipsec", &clk_ipsec), CLKDEV_INIT(NULL, "ipsec", &clk_ipsec),
}; };
@ -129,7 +129,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
#define HSSPI_PLL_HZ_6328 133333333 #define HSSPI_PLL_HZ_6328 133333333
#define HSSPI_PLL_HZ_6362 400000000 #define HSSPI_PLL_HZ_6362 400000000
@@ -580,6 +609,10 @@ static int __init bcm63xx_clk_init(void) @@ -582,6 +611,10 @@ static int __init bcm63xx_clk_init(void)
case BCM6368_CPU_ID: case BCM6368_CPU_ID:
clkdev_add_table(bcm6368_clks, ARRAY_SIZE(bcm6368_clks)); clkdev_add_table(bcm6368_clks, ARRAY_SIZE(bcm6368_clks));
break; break;

View File

@ -57,7 +57,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
mask = CKCTL_6328_HSSPI_EN; mask = CKCTL_6328_HSSPI_EN;
else if (BCMCPU_IS_6362()) else if (BCMCPU_IS_6362())
mask = CKCTL_6362_HSSPI_EN; mask = CKCTL_6362_HSSPI_EN;
@@ -456,6 +458,19 @@ static struct clk_lookup bcm3368_clks[] @@ -458,6 +460,19 @@ static struct clk_lookup bcm3368_clks[]
CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1), CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1),
}; };
@ -77,7 +77,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
static struct clk_lookup bcm6328_clks[] = { static struct clk_lookup bcm6328_clks[] = {
/* fixed rate clocks */ /* fixed rate clocks */
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
@@ -577,6 +592,7 @@ static struct clk_lookup bcm63268_clks[] @@ -579,6 +594,7 @@ static struct clk_lookup bcm63268_clks[]
CLKDEV_INIT(NULL, "pcie", &clk_pcie), CLKDEV_INIT(NULL, "pcie", &clk_pcie),
}; };
@ -85,7 +85,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
#define HSSPI_PLL_HZ_6328 133333333 #define HSSPI_PLL_HZ_6328 133333333
#define HSSPI_PLL_HZ_6362 400000000 #define HSSPI_PLL_HZ_6362 400000000
@@ -586,6 +602,10 @@ static int __init bcm63xx_clk_init(void) @@ -588,6 +604,10 @@ static int __init bcm63xx_clk_init(void)
case BCM3368_CPU_ID: case BCM3368_CPU_ID:
clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks)); clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks));
break; break;

View File

@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
--- a/arch/mips/bcm63xx/clk.c --- a/arch/mips/bcm63xx/clk.c
+++ b/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c
@@ -501,6 +501,8 @@ static struct clk_lookup bcm3368_clks[] @@ -503,6 +503,8 @@ static struct clk_lookup bcm3368_clks[]
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
@ -18,7 +18,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet0", &clk_enet0),
CLKDEV_INIT(NULL, "enet1", &clk_enet1), CLKDEV_INIT(NULL, "enet1", &clk_enet1),
@@ -517,7 +519,9 @@ static struct clk_lookup bcm6318_clks[] @@ -519,7 +521,9 @@ static struct clk_lookup bcm6318_clks[]
/* fixed rate clocks */ /* fixed rate clocks */
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
@ -28,7 +28,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
CLKDEV_INIT(NULL, "usbh", &clk_usbh), CLKDEV_INIT(NULL, "usbh", &clk_usbh),
@@ -531,7 +535,10 @@ static struct clk_lookup bcm6328_clks[] @@ -533,7 +537,10 @@ static struct clk_lookup bcm6328_clks[]
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
@ -39,7 +39,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
CLKDEV_INIT(NULL, "usbh", &clk_usbh), CLKDEV_INIT(NULL, "usbh", &clk_usbh),
@@ -544,6 +551,7 @@ static struct clk_lookup bcm6338_clks[] @@ -546,6 +553,7 @@ static struct clk_lookup bcm6338_clks[]
/* fixed rate clocks */ /* fixed rate clocks */
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
@ -47,7 +47,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet0", &clk_enet0),
CLKDEV_INIT(NULL, "enet1", &clk_enet1), CLKDEV_INIT(NULL, "enet1", &clk_enet1),
@@ -558,6 +566,7 @@ static struct clk_lookup bcm6345_clks[] @@ -560,6 +568,7 @@ static struct clk_lookup bcm6345_clks[]
/* fixed rate clocks */ /* fixed rate clocks */
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
@ -55,7 +55,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet0", &clk_enet0),
CLKDEV_INIT(NULL, "enet1", &clk_enet1), CLKDEV_INIT(NULL, "enet1", &clk_enet1),
@@ -572,6 +581,7 @@ static struct clk_lookup bcm6348_clks[] @@ -574,6 +583,7 @@ static struct clk_lookup bcm6348_clks[]
/* fixed rate clocks */ /* fixed rate clocks */
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
@ -63,7 +63,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet0", &clk_enet0),
CLKDEV_INIT(NULL, "enet1", &clk_enet1), CLKDEV_INIT(NULL, "enet1", &clk_enet1),
@@ -588,6 +598,8 @@ static struct clk_lookup bcm6358_clks[] @@ -590,6 +600,8 @@ static struct clk_lookup bcm6358_clks[]
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
@ -72,7 +72,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enet0", &clk_enet0), CLKDEV_INIT(NULL, "enet0", &clk_enet0),
CLKDEV_INIT(NULL, "enet1", &clk_enet1), CLKDEV_INIT(NULL, "enet1", &clk_enet1),
@@ -607,7 +619,10 @@ static struct clk_lookup bcm6362_clks[] @@ -609,7 +621,10 @@ static struct clk_lookup bcm6362_clks[]
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
@ -83,7 +83,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
CLKDEV_INIT(NULL, "usbh", &clk_usbh), CLKDEV_INIT(NULL, "usbh", &clk_usbh),
@@ -623,6 +638,8 @@ static struct clk_lookup bcm6368_clks[] @@ -625,6 +640,8 @@ static struct clk_lookup bcm6368_clks[]
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
@ -92,7 +92,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
/* gated clocks */ /* gated clocks */
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
CLKDEV_INIT(NULL, "usbh", &clk_usbh), CLKDEV_INIT(NULL, "usbh", &clk_usbh),
@@ -637,7 +654,10 @@ static struct clk_lookup bcm63268_clks[] @@ -639,7 +656,10 @@ static struct clk_lookup bcm63268_clks[]
CLKDEV_INIT(NULL, "periph", &clk_periph), CLKDEV_INIT(NULL, "periph", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph), CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),

View File

@ -24,7 +24,7 @@
* Internal peripheral clock * Internal peripheral clock
*/ */
static struct clk clk_periph = { static struct clk clk_periph = {
@@ -624,6 +641,7 @@ static struct clk_lookup bcm6362_clks[] @@ -626,6 +643,7 @@ static struct clk_lookup bcm6362_clks[]
CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll), CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll),
CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll), CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll),
/* gated clocks */ /* gated clocks */
@ -32,7 +32,7 @@
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
CLKDEV_INIT(NULL, "usbh", &clk_usbh), CLKDEV_INIT(NULL, "usbh", &clk_usbh),
CLKDEV_INIT(NULL, "usbd", &clk_usbd), CLKDEV_INIT(NULL, "usbd", &clk_usbd),
@@ -641,6 +659,7 @@ static struct clk_lookup bcm6368_clks[] @@ -643,6 +661,7 @@ static struct clk_lookup bcm6368_clks[]
CLKDEV_INIT("10000100.serial", "refclk", &clk_periph), CLKDEV_INIT("10000100.serial", "refclk", &clk_periph),
CLKDEV_INIT("10000120.serial", "refclk", &clk_periph), CLKDEV_INIT("10000120.serial", "refclk", &clk_periph),
/* gated clocks */ /* gated clocks */
@ -40,7 +40,7 @@
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw), CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
CLKDEV_INIT(NULL, "usbh", &clk_usbh), CLKDEV_INIT(NULL, "usbh", &clk_usbh),
CLKDEV_INIT(NULL, "usbd", &clk_usbd), CLKDEV_INIT(NULL, "usbd", &clk_usbd),
@@ -659,6 +678,7 @@ static struct clk_lookup bcm63268_clks[] @@ -661,6 +680,7 @@ static struct clk_lookup bcm63268_clks[]
CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll), CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll),
CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll), CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll),
/* gated clocks */ /* gated clocks */

View File

@ -329,7 +329,7 @@ Change-Id: I25d9eda8c6bdc7c3653b9f210a159d6c247c81e8
/* forking complete and child started to run, tell ptracer */ /* forking complete and child started to run, tell ptracer */
--- a/kernel/sched/core.c --- a/kernel/sched/core.c
+++ b/kernel/sched/core.c +++ b/kernel/sched/core.c
@@ -4978,6 +4978,7 @@ context_switch(struct rq *rq, struct tas @@ -5007,6 +5007,7 @@ context_switch(struct rq *rq, struct tas
* finish_task_switch()'s mmdrop(). * finish_task_switch()'s mmdrop().
*/ */
switch_mm_irqs_off(prev->active_mm, next->mm, next); switch_mm_irqs_off(prev->active_mm, next->mm, next);

View File

@ -1,6 +1,6 @@
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -835,6 +835,61 @@ typedef u16 (*select_queue_fallback_t)(s @@ -842,6 +842,61 @@ typedef u16 (*select_queue_fallback_t)(s
struct sk_buff *skb, struct sk_buff *skb,
struct net_device *sb_dev); struct net_device *sb_dev);
@ -62,7 +62,7 @@
enum tc_setup_type { enum tc_setup_type {
TC_SETUP_QDISC_MQPRIO, TC_SETUP_QDISC_MQPRIO,
TC_SETUP_CLSU32, TC_SETUP_CLSU32,
@@ -1441,6 +1496,8 @@ struct net_device_ops { @@ -1448,6 +1503,8 @@ struct net_device_ops {
u32 flags); u32 flags);
int (*ndo_xsk_wakeup)(struct net_device *dev, int (*ndo_xsk_wakeup)(struct net_device *dev,
u32 queue_id, u32 flags); u32 queue_id, u32 flags);

View File

@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/realtek/r8169_main.c --- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -5018,7 +5018,7 @@ static int r8169_mdio_register(struct rt @@ -5015,7 +5015,7 @@ static int r8169_mdio_register(struct rt
return -EUNATCH; return -EUNATCH;
} }

View File

@ -20,7 +20,7 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
--- a/drivers/net/ethernet/realtek/r8169_main.c --- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -4559,12 +4559,13 @@ static int rtl8169_poll(struct napi_stru @@ -4556,12 +4556,13 @@ static int rtl8169_poll(struct napi_stru
static void r8169_phylink_handler(struct net_device *ndev) static void r8169_phylink_handler(struct net_device *ndev)
{ {
struct rtl8169_private *tp = netdev_priv(ndev); struct rtl8169_private *tp = netdev_priv(ndev);

View File

@ -22,7 +22,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/realtek/r8169_main.c --- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -5283,6 +5283,8 @@ static int rtl_init_one(struct pci_dev * @@ -5280,6 +5280,8 @@ static int rtl_init_one(struct pci_dev *
dev->hw_features |= NETIF_F_RXALL; dev->hw_features |= NETIF_F_RXALL;
dev->hw_features |= NETIF_F_RXFCS; dev->hw_features |= NETIF_F_RXFCS;

View File

@ -1,6 +1,6 @@
--- a/drivers/bus/mhi/core/pm.c --- a/drivers/bus/mhi/core/pm.c
+++ b/drivers/bus/mhi/core/pm.c +++ b/drivers/bus/mhi/core/pm.c
@@ -767,7 +767,7 @@ int mhi_pm_suspend(struct mhi_controller @@ -768,7 +768,7 @@ int mhi_pm_suspend(struct mhi_controller
} }
EXPORT_SYMBOL_GPL(mhi_pm_suspend); EXPORT_SYMBOL_GPL(mhi_pm_suspend);
@ -9,7 +9,7 @@
{ {
struct mhi_chan *itr, *tmp; struct mhi_chan *itr, *tmp;
struct device *dev = &mhi_cntrl->mhi_dev->dev; struct device *dev = &mhi_cntrl->mhi_dev->dev;
@@ -783,6 +783,13 @@ int mhi_pm_resume(struct mhi_controller @@ -784,6 +784,13 @@ int mhi_pm_resume(struct mhi_controller
if (MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state)) if (MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state))
return -EIO; return -EIO;
@ -23,7 +23,7 @@
/* Notify clients about exiting LPM */ /* Notify clients about exiting LPM */
list_for_each_entry_safe(itr, tmp, &mhi_cntrl->lpm_chans, node) { list_for_each_entry_safe(itr, tmp, &mhi_cntrl->lpm_chans, node) {
@@ -823,8 +830,19 @@ int mhi_pm_resume(struct mhi_controller @@ -824,8 +831,19 @@ int mhi_pm_resume(struct mhi_controller
return 0; return 0;
} }

View File

@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c --- a/kernel/sched/core.c
+++ b/kernel/sched/core.c +++ b/kernel/sched/core.c
@@ -4184,6 +4184,7 @@ int wake_up_state(struct task_struct *p, @@ -4213,6 +4213,7 @@ int wake_up_state(struct task_struct *p,
{ {
return try_to_wake_up(p, state, 0); return try_to_wake_up(p, state, 0);
} }

View File

@ -20,7 +20,7 @@
/* Part specific fixup hooks. */ /* Part specific fixup hooks. */
const struct spi_nor_fixups *fixups; const struct spi_nor_fixups *fixups;
@@ -1985,6 +1989,9 @@ static int spi_nor_clear_sr_bp(struct sp @@ -1987,6 +1991,9 @@ static int spi_nor_clear_sr_bp(struct sp
int ret; int ret;
u8 mask = SR_BP2 | SR_BP1 | SR_BP0; u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
@ -30,7 +30,7 @@
ret = read_sr(nor); ret = read_sr(nor);
if (ret < 0) { if (ret < 0) {
dev_err(nor->dev, "error while reading status register\n"); dev_err(nor->dev, "error while reading status register\n");
@@ -2338,7 +2345,7 @@ static const struct flash_info spi_nor_i @@ -2340,7 +2347,7 @@ static const struct flash_info spi_nor_i
{ "mx25l1606e", INFO(0xc22015, 0, 64 * 1024, 32, SECT_4K) }, { "mx25l1606e", INFO(0xc22015, 0, 64 * 1024, 32, SECT_4K) },
{ "mx25l3205d", INFO(0xc22016, 0, 64 * 1024, 64, SECT_4K) }, { "mx25l3205d", INFO(0xc22016, 0, 64 * 1024, 64, SECT_4K) },
{ "mx25l3255e", INFO(0xc29e16, 0, 64 * 1024, 64, SECT_4K) }, { "mx25l3255e", INFO(0xc29e16, 0, 64 * 1024, 64, SECT_4K) },
@ -39,7 +39,7 @@
{ "mx25u2033e", INFO(0xc22532, 0, 64 * 1024, 4, SECT_4K) }, { "mx25u2033e", INFO(0xc22532, 0, 64 * 1024, 4, SECT_4K) },
{ "mx25u3235f", INFO(0xc22536, 0, 64 * 1024, 64, { "mx25u3235f", INFO(0xc22536, 0, 64 * 1024, 64,
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
@@ -5027,6 +5034,9 @@ int spi_nor_scan(struct spi_nor *nor, co @@ -5029,6 +5036,9 @@ int spi_nor_scan(struct spi_nor *nor, co
if (info->flags & USE_CLSR) if (info->flags & USE_CLSR)
nor->flags |= SNOR_F_USE_CLSR; nor->flags |= SNOR_F_USE_CLSR;

View File

@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
device, it has to decide which ones to send first, which ones to device, it has to decide which ones to send first, which ones to
--- a/net/sched/sch_api.c --- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c +++ b/net/sched/sch_api.c
@@ -2278,7 +2278,7 @@ static int __init pktsched_init(void) @@ -2283,7 +2283,7 @@ static int __init pktsched_init(void)
return err; return err;
} }

View File

@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -1606,6 +1606,7 @@ enum netdev_priv_flags { @@ -1613,6 +1613,7 @@ enum netdev_priv_flags {
IFF_FAILOVER_SLAVE = 1<<28, IFF_FAILOVER_SLAVE = 1<<28,
IFF_L3MDEV_RX_HANDLER = 1<<29, IFF_L3MDEV_RX_HANDLER = 1<<29,
IFF_LIVE_RENAME_OK = 1<<30, IFF_LIVE_RENAME_OK = 1<<30,
@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}; };
#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
@@ -1638,6 +1639,7 @@ enum netdev_priv_flags { @@ -1645,6 +1646,7 @@ enum netdev_priv_flags {
#define IFF_FAILOVER_SLAVE IFF_FAILOVER_SLAVE #define IFF_FAILOVER_SLAVE IFF_FAILOVER_SLAVE
#define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER #define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER
#define IFF_LIVE_RENAME_OK IFF_LIVE_RENAME_OK #define IFF_LIVE_RENAME_OK IFF_LIVE_RENAME_OK
@ -31,7 +31,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* Specifies the type of the struct net_device::ml_priv pointer */ /* Specifies the type of the struct net_device::ml_priv pointer */
enum netdev_ml_priv_type { enum netdev_ml_priv_type {
@@ -1946,6 +1948,11 @@ struct net_device { @@ -1953,6 +1955,11 @@ struct net_device {
const struct tlsdev_ops *tlsdev_ops; const struct tlsdev_ops *tlsdev_ops;
#endif #endif
@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
const struct header_ops *header_ops; const struct header_ops *header_ops;
unsigned int flags; unsigned int flags;
@@ -2028,6 +2035,10 @@ struct net_device { @@ -2035,6 +2042,10 @@ struct net_device {
struct mpls_dev __rcu *mpls_ptr; struct mpls_dev __rcu *mpls_ptr;
#endif #endif

View File

@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c --- a/kernel/sched/core.c
+++ b/kernel/sched/core.c +++ b/kernel/sched/core.c
@@ -4331,6 +4331,7 @@ int wake_up_state(struct task_struct *p, @@ -4360,6 +4360,7 @@ int wake_up_state(struct task_struct *p,
{ {
return try_to_wake_up(p, state, 0); return try_to_wake_up(p, state, 0);
} }

View File

@ -8,7 +8,7 @@ Signed-off-by: Giuseppe Lippolis <giu.lippolis@gmail.com>
--- a/drivers/spi/spidev.c --- a/drivers/spi/spidev.c
+++ b/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c
@@ -678,6 +678,7 @@ static const struct of_device_id spidev_ @@ -689,6 +689,7 @@ static const struct of_device_id spidev_
{ .compatible = "lwn,bk4" }, { .compatible = "lwn,bk4" },
{ .compatible = "dh,dhcom-board" }, { .compatible = "dh,dhcom-board" },
{ .compatible = "menlo,m53cpld" }, { .compatible = "menlo,m53cpld" },

View File

@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- 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
@@ -2706,7 +2706,7 @@ static int spi_nor_write(struct mtd_info @@ -2708,7 +2708,7 @@ static int spi_nor_write(struct mtd_info
write_enable(nor); write_enable(nor);
ret = spi_nor_write_data(nor, addr, page_remain, buf + i); ret = spi_nor_write_data(nor, addr, page_remain, buf + i);

View File

@ -8,7 +8,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- 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
@@ -4884,6 +4884,7 @@ int spi_nor_scan(struct spi_nor *nor, co @@ -4886,6 +4886,7 @@ int spi_nor_scan(struct spi_nor *nor, co
*/ */
if (JEDEC_MFR(nor->info) == SNOR_MFR_ATMEL || if (JEDEC_MFR(nor->info) == SNOR_MFR_ATMEL ||
JEDEC_MFR(nor->info) == SNOR_MFR_INTEL || JEDEC_MFR(nor->info) == SNOR_MFR_INTEL ||

View File

@ -17,7 +17,7 @@ Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
--- 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
@@ -4398,6 +4398,7 @@ static void st_micron_set_default_init(s @@ -4400,6 +4400,7 @@ static void st_micron_set_default_init(s
static void winbond_set_default_init(struct spi_nor *nor) static void winbond_set_default_init(struct spi_nor *nor)
{ {
@ -25,7 +25,7 @@ Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
nor->params.set_4byte = winbond_set_4byte; nor->params.set_4byte = winbond_set_4byte;
} }
@@ -4886,6 +4887,7 @@ int spi_nor_scan(struct spi_nor *nor, co @@ -4888,6 +4889,7 @@ int spi_nor_scan(struct spi_nor *nor, co
JEDEC_MFR(nor->info) == SNOR_MFR_INTEL || JEDEC_MFR(nor->info) == SNOR_MFR_INTEL ||
JEDEC_MFR(nor->info) == SNOR_MFR_MACRONIX || JEDEC_MFR(nor->info) == SNOR_MFR_MACRONIX ||
JEDEC_MFR(nor->info) == SNOR_MFR_SST || JEDEC_MFR(nor->info) == SNOR_MFR_SST ||

View File

@ -39,7 +39,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
depends on OF && (ARM || ARM64 || COMPILE_TEST) depends on OF && (ARM || ARM64 || COMPILE_TEST)
--- 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
@@ -4464,6 +4464,7 @@ static void spi_nor_info_init_params(str @@ -4466,6 +4466,7 @@ static void spi_nor_info_init_params(str
struct spi_nor_erase_map *map = &params->erase_map; struct spi_nor_erase_map *map = &params->erase_map;
const struct flash_info *info = nor->info; const struct flash_info *info = nor->info;
struct device_node *np = spi_nor_get_flash_node(nor); struct device_node *np = spi_nor_get_flash_node(nor);
@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
u8 i, erase_mask; u8 i, erase_mask;
/* Initialize legacy flash parameters and settings. */ /* Initialize legacy flash parameters and settings. */
@@ -4527,6 +4528,21 @@ static void spi_nor_info_init_params(str @@ -4529,6 +4530,21 @@ static void spi_nor_info_init_params(str
*/ */
erase_mask = 0; erase_mask = 0;
i = 0; i = 0;
@ -69,7 +69,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (info->flags & SECT_4K_PMC) { if (info->flags & SECT_4K_PMC) {
erase_mask |= BIT(i); erase_mask |= BIT(i);
spi_nor_set_erase_type(&map->erase_type[i], 4096u, spi_nor_set_erase_type(&map->erase_type[i], 4096u,
@@ -4538,6 +4554,7 @@ static void spi_nor_info_init_params(str @@ -4540,6 +4556,7 @@ static void spi_nor_info_init_params(str
SPINOR_OP_BE_4K); SPINOR_OP_BE_4K);
i++; i++;
} }

View File

@ -8,7 +8,7 @@ Signed-off-by: Piotr Dymacz <pepe2k@gmail.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
@@ -2179,6 +2179,8 @@ static const struct flash_info spi_nor_i @@ -2181,6 +2181,8 @@ static const struct flash_info spi_nor_i
{ "en25q32b", INFO(0x1c3016, 0, 64 * 1024, 64, 0) }, { "en25q32b", INFO(0x1c3016, 0, 64 * 1024, 64, 0) },
{ "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) }, { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
{ "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) }, { "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) },

View File

@ -30,7 +30,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
--- 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
@@ -2507,6 +2507,9 @@ static const struct flash_info spi_nor_i @@ -2509,6 +2509,9 @@ static const struct flash_info spi_nor_i
/* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */ /* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */
{ "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

View File

@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
#include <linux/nvmem-provider.h> #include <linux/nvmem-provider.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
@@ -699,6 +700,15 @@ int add_mtd_device(struct mtd_info *mtd) @@ -701,6 +702,15 @@ int add_mtd_device(struct mtd_info *mtd)
of this try_ nonsense, and no bitching about it of this try_ nonsense, and no bitching about it
either. :) */ either. :) */
__module_get(THIS_MODULE); __module_get(THIS_MODULE);

View File

@ -42,7 +42,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
static int macronix_set_4byte(struct spi_nor *nor, bool enable) static int macronix_set_4byte(struct spi_nor *nor, bool enable)
{ {
if (nor->spimem) { if (nor->spimem) {
@@ -1261,6 +1277,10 @@ static int spi_nor_erase(struct mtd_info @@ -1263,6 +1279,10 @@ static int spi_nor_erase(struct mtd_info
if (ret) if (ret)
return ret; return ret;
@ -53,7 +53,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
/* whole-chip erase? */ /* whole-chip erase? */
if (len == mtd->size && !(nor->flags & SNOR_F_NO_OP_CHIP_ERASE)) { if (len == mtd->size && !(nor->flags & SNOR_F_NO_OP_CHIP_ERASE)) {
unsigned long timeout; unsigned long timeout;
@@ -1317,6 +1337,7 @@ static int spi_nor_erase(struct mtd_info @@ -1319,6 +1339,7 @@ static int spi_nor_erase(struct mtd_info
write_disable(nor); write_disable(nor);
erase_err: erase_err:
@ -61,7 +61,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_ERASE); spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_ERASE);
return ret; return ret;
@@ -1623,7 +1644,9 @@ static int spi_nor_lock(struct mtd_info @@ -1625,7 +1646,9 @@ static int spi_nor_lock(struct mtd_info
if (ret) if (ret)
return ret; return ret;
@ -71,7 +71,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_UNLOCK); spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_UNLOCK);
return ret; return ret;
@@ -1638,7 +1661,9 @@ static int spi_nor_unlock(struct mtd_inf @@ -1640,7 +1663,9 @@ static int spi_nor_unlock(struct mtd_inf
if (ret) if (ret)
return ret; return ret;
@ -81,7 +81,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK); spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
return ret; return ret;
@@ -1653,7 +1678,9 @@ static int spi_nor_is_locked(struct mtd_ @@ -1655,7 +1680,9 @@ static int spi_nor_is_locked(struct mtd_
if (ret) if (ret)
return ret; return ret;
@ -91,7 +91,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK); spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
return ret; return ret;
@@ -2560,6 +2587,10 @@ static int spi_nor_read(struct mtd_info @@ -2562,6 +2589,10 @@ static int spi_nor_read(struct mtd_info
if (ret) if (ret)
return ret; return ret;
@ -102,7 +102,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
while (len) { while (len) {
loff_t addr = from; loff_t addr = from;
@@ -2583,6 +2614,7 @@ static int spi_nor_read(struct mtd_info @@ -2585,6 +2616,7 @@ static int spi_nor_read(struct mtd_info
ret = 0; ret = 0;
read_err: read_err:
@ -110,7 +110,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ); spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
return ret; return ret;
} }
@@ -2600,6 +2632,10 @@ static int sst_write(struct mtd_info *mt @@ -2602,6 +2634,10 @@ static int sst_write(struct mtd_info *mt
if (ret) if (ret)
return ret; return ret;
@ -121,7 +121,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
write_enable(nor); write_enable(nor);
nor->sst_write_second = false; nor->sst_write_second = false;
@@ -2662,6 +2698,7 @@ static int sst_write(struct mtd_info *mt @@ -2664,6 +2700,7 @@ static int sst_write(struct mtd_info *mt
} }
sst_write_err: sst_write_err:
*retlen += actual; *retlen += actual;
@ -129,7 +129,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE); spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
return ret; return ret;
} }
@@ -2684,6 +2721,10 @@ static int spi_nor_write(struct mtd_info @@ -2686,6 +2723,10 @@ static int spi_nor_write(struct mtd_info
if (ret) if (ret)
return ret; return ret;
@ -140,7 +140,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
for (i = 0; i < len; ) { for (i = 0; i < len; ) {
ssize_t written; ssize_t written;
loff_t addr = to + i; loff_t addr = to + i;
@@ -2723,6 +2764,7 @@ static int spi_nor_write(struct mtd_info @@ -2725,6 +2766,7 @@ static int spi_nor_write(struct mtd_info
} }
write_err: write_err:
@ -148,7 +148,7 @@ Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE); spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
return ret; return ret;
} }
@@ -4727,9 +4769,13 @@ static int spi_nor_init(struct spi_nor * @@ -4729,9 +4771,13 @@ static int spi_nor_init(struct spi_nor *
* reboots (e.g., crashes). Warn the user (or hopefully, system * reboots (e.g., crashes). Warn the user (or hopefully, system
* designer) that this is bad. * designer) that this is bad.
*/ */

View File

@ -10,7 +10,7 @@ Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.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
@@ -2233,6 +2233,11 @@ static const struct flash_info spi_nor_i @@ -2235,6 +2235,11 @@ static const struct flash_info spi_nor_i
/* GigaDevice */ /* GigaDevice */
{ {

View File

@ -15,7 +15,7 @@ Signed-off-by: Mantas Pucka <mantas@8devices.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
@@ -2172,6 +2172,32 @@ static struct spi_nor_fixups gd25q256_fi @@ -2174,6 +2174,32 @@ static struct spi_nor_fixups gd25q256_fi
.default_init = gd25q256_default_init, .default_init = gd25q256_default_init,
}; };
@ -48,7 +48,7 @@ Signed-off-by: Mantas Pucka <mantas@8devices.com>
/* NOTE: double check command sets and memory organization when you add /* NOTE: double check command sets and memory organization when you add
* more nor chips. This current list focusses on newer chips, which * more nor chips. This current list focusses on newer chips, which
* have been converging on command sets which including JEDEC ID. * have been converging on command sets which including JEDEC ID.
@@ -2516,7 +2542,8 @@ static const struct flash_info spi_nor_i @@ -2518,7 +2544,8 @@ static const struct flash_info spi_nor_i
{ "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) }, { "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },
{ "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) }, { "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) },
{ "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) }, { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },

View File

@ -17,7 +17,7 @@ Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
--- a/drivers/mtd/mtdcore.c --- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c
@@ -1053,6 +1053,44 @@ out_unlock: @@ -1055,6 +1055,44 @@ out_unlock:
} }
EXPORT_SYMBOL_GPL(get_mtd_device_nm); EXPORT_SYMBOL_GPL(get_mtd_device_nm);

View File

@ -11,7 +11,7 @@ Submitted-by: Langhua Ye <y1248289414@outlook.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
@@ -2566,6 +2566,7 @@ static const struct flash_info spi_nor_i @@ -2568,6 +2568,7 @@ static const struct flash_info spi_nor_i
/* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */ /* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */
{ "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

View File

@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
goto out; goto out;
if (!net_eq(dev_net(dev), sock_net(sk))) if (!net_eq(dev_net(dev), sock_net(sk)))
@@ -2058,12 +2060,12 @@ static int packet_rcv(struct sk_buff *sk @@ -2068,12 +2070,12 @@ static int packet_rcv(struct sk_buff *sk
unsigned int snaplen, res; unsigned int snaplen, res;
bool is_drop_n_account = false; bool is_drop_n_account = false;
@ -71,7 +71,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;
@@ -2189,12 +2191,12 @@ static int tpacket_rcv(struct sk_buff *s @@ -2199,12 +2201,12 @@ static int tpacket_rcv(struct sk_buff *s
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);
@ -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;
@@ -3300,6 +3302,7 @@ static int packet_create(struct net *net @@ -3310,6 +3312,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;
@@ -3942,6 +3945,16 @@ packet_setsockopt(struct socket *sock, i @@ -3952,6 +3955,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;
} }
@@ -3998,6 +4011,13 @@ static int packet_getsockopt(struct sock @@ -4008,6 +4021,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

@ -23,7 +23,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -983,6 +983,13 @@ struct devlink; @@ -990,6 +990,13 @@ struct devlink;
struct tlsdev_ops; struct tlsdev_ops;
@ -37,7 +37,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
/* /*
* This structure defines the management hooks for network devices. * This structure defines the management hooks for network devices.
* The following hooks can be defined; unless noted otherwise, they are * The following hooks can be defined; unless noted otherwise, they are
@@ -1215,6 +1222,10 @@ struct tlsdev_ops; @@ -1222,6 +1229,10 @@ struct tlsdev_ops;
* int (*ndo_bridge_dellink)(struct net_device *dev, struct nlmsghdr *nlh, * int (*ndo_bridge_dellink)(struct net_device *dev, struct nlmsghdr *nlh,
* u16 flags); * u16 flags);
* *
@ -48,7 +48,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
* int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier); * int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier);
* Called to change device carrier. Soft-devices (like dummy, team, etc) * Called to change device carrier. Soft-devices (like dummy, team, etc)
* which do not represent real hardware may define this to allow their * which do not represent real hardware may define this to allow their
@@ -1462,6 +1473,8 @@ struct net_device_ops { @@ -1469,6 +1480,8 @@ struct net_device_ops {
int (*ndo_bridge_dellink)(struct net_device *dev, int (*ndo_bridge_dellink)(struct net_device *dev,
struct nlmsghdr *nlh, struct nlmsghdr *nlh,
u16 flags); u16 flags);

View File

@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -984,6 +984,7 @@ struct tlsdev_ops; @@ -991,6 +991,7 @@ struct tlsdev_ops;
struct flow_offload; struct flow_offload;
@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
enum flow_offload_type { enum flow_offload_type {
FLOW_OFFLOAD_ADD = 0, FLOW_OFFLOAD_ADD = 0,
@@ -1222,8 +1223,15 @@ enum flow_offload_type { @@ -1229,8 +1230,15 @@ enum flow_offload_type {
* int (*ndo_bridge_dellink)(struct net_device *dev, struct nlmsghdr *nlh, * int (*ndo_bridge_dellink)(struct net_device *dev, struct nlmsghdr *nlh,
* u16 flags); * u16 flags);
* *
@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
* Adds/deletes flow entry to/from net device flowtable. * Adds/deletes flow entry to/from net device flowtable.
* *
* int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier); * int (*ndo_change_carrier)(struct net_device *dev, bool new_carrier);
@@ -1473,8 +1481,11 @@ struct net_device_ops { @@ -1480,8 +1488,11 @@ struct net_device_ops {
int (*ndo_bridge_dellink)(struct net_device *dev, int (*ndo_bridge_dellink)(struct net_device *dev,
struct nlmsghdr *nlh, struct nlmsghdr *nlh,
u16 flags); u16 flags);

View File

@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -1988,6 +1988,8 @@ struct net_device { @@ -1995,6 +1995,8 @@ struct net_device {
struct netdev_hw_addr_list mc; struct netdev_hw_addr_list mc;
struct netdev_hw_addr_list dev_addrs; struct netdev_hw_addr_list dev_addrs;

View File

@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -340,6 +340,7 @@ struct napi_struct { @@ -347,6 +347,7 @@ struct napi_struct {
struct list_head dev_list; struct list_head dev_list;
struct hlist_node napi_hash_node; struct hlist_node napi_hash_node;
unsigned int napi_id; unsigned int napi_id;
@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}; };
enum { enum {
@@ -350,6 +351,7 @@ enum { @@ -357,6 +358,7 @@ enum {
NAPI_STATE_HASHED, /* In NAPI hash (busy polling possible) */ NAPI_STATE_HASHED, /* In NAPI hash (busy polling possible) */
NAPI_STATE_NO_BUSY_POLL,/* Do not add in napi_hash, no busy polling */ NAPI_STATE_NO_BUSY_POLL,/* Do not add in napi_hash, no busy polling */
NAPI_STATE_IN_BUSY_POLL,/* sk_busy_loop() owns this NAPI */ NAPI_STATE_IN_BUSY_POLL,/* sk_busy_loop() owns this NAPI */
@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}; };
enum { enum {
@@ -360,6 +362,7 @@ enum { @@ -367,6 +369,7 @@ enum {
NAPIF_STATE_HASHED = BIT(NAPI_STATE_HASHED), NAPIF_STATE_HASHED = BIT(NAPI_STATE_HASHED),
NAPIF_STATE_NO_BUSY_POLL = BIT(NAPI_STATE_NO_BUSY_POLL), NAPIF_STATE_NO_BUSY_POLL = BIT(NAPI_STATE_NO_BUSY_POLL),
NAPIF_STATE_IN_BUSY_POLL = BIT(NAPI_STATE_IN_BUSY_POLL), NAPIF_STATE_IN_BUSY_POLL = BIT(NAPI_STATE_IN_BUSY_POLL),
@ -50,7 +50,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}; };
enum gro_result { enum gro_result {
@@ -2158,6 +2161,7 @@ struct net_device { @@ -2165,6 +2168,7 @@ struct net_device {
struct lock_class_key addr_list_lock_key; struct lock_class_key addr_list_lock_key;
bool proto_down; bool proto_down;
unsigned wol_enabled:1; unsigned wol_enabled:1;
@ -58,7 +58,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
}; };
#define to_net_dev(d) container_of(d, struct net_device, dev) #define to_net_dev(d) container_of(d, struct net_device, dev)
@@ -2338,6 +2342,26 @@ void netif_napi_add(struct net_device *d @@ -2345,6 +2349,26 @@ void netif_napi_add(struct net_device *d
int (*poll)(struct napi_struct *, int), int weight); int (*poll)(struct napi_struct *, int), int weight);
/** /**
@ -279,7 +279,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* Some drivers may have called napi_schedule /* Some drivers may have called napi_schedule
* prior to exhausting their budget. * prior to exhausting their budget.
@@ -10353,6 +10413,10 @@ static int __init net_dev_init(void) @@ -10345,6 +10405,10 @@ static int __init net_dev_init(void)
sd->backlog.weight = weight_p; sd->backlog.weight = weight_p;
} }

View File

@ -193,7 +193,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
default y default y
--- a/drivers/mtd/spi-nor/core.c --- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c
@@ -1048,6 +1048,8 @@ static u8 spi_nor_convert_3to4_erase(u8 @@ -1049,6 +1049,8 @@ static u8 spi_nor_convert_3to4_erase(u8
static bool spi_nor_has_uniform_erase(const struct spi_nor *nor) static bool spi_nor_has_uniform_erase(const struct spi_nor *nor)
{ {
@ -202,7 +202,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
return !!nor->params->erase_map.uniform_erase_type; return !!nor->params->erase_map.uniform_erase_type;
} }
@@ -2147,6 +2149,7 @@ static int spi_nor_select_erase(struct s @@ -2148,6 +2150,7 @@ static int spi_nor_select_erase(struct s
{ {
struct spi_nor_erase_map *map = &nor->params->erase_map; struct spi_nor_erase_map *map = &nor->params->erase_map;
const struct spi_nor_erase_type *erase = NULL; const struct spi_nor_erase_type *erase = NULL;
@ -210,7 +210,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
struct mtd_info *mtd = &nor->mtd; struct mtd_info *mtd = &nor->mtd;
u32 wanted_size = nor->info->sector_size; u32 wanted_size = nor->info->sector_size;
int i; int i;
@@ -2179,8 +2182,9 @@ static int spi_nor_select_erase(struct s @@ -2180,8 +2183,9 @@ static int spi_nor_select_erase(struct s
*/ */
for (i = SNOR_ERASE_TYPE_MAX - 1; i >= 0; i--) { for (i = SNOR_ERASE_TYPE_MAX - 1; i >= 0; i--) {
if (map->erase_type[i].size) { if (map->erase_type[i].size) {
@ -222,7 +222,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
} }
} }
@@ -2188,6 +2192,9 @@ static int spi_nor_select_erase(struct s @@ -2189,6 +2193,9 @@ static int spi_nor_select_erase(struct s
return -EINVAL; return -EINVAL;
mtd->erasesize = erase->size; mtd->erasesize = erase->size;

View File

@ -61,7 +61,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+}; +};
--- a/drivers/mtd/spi-nor/core.c --- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c
@@ -1634,6 +1634,7 @@ static const struct spi_nor_manufacturer @@ -1635,6 +1635,7 @@ static const struct spi_nor_manufacturer
&spi_nor_winbond, &spi_nor_winbond,
&spi_nor_xilinx, &spi_nor_xilinx,
&spi_nor_xmc, &spi_nor_xmc,

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 @@ -2356,6 +2356,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

@ -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
@@ -2243,6 +2243,8 @@ static const struct flash_info spi_nor_i @@ -2245,6 +2245,8 @@ static const struct flash_info spi_nor_i
{ "en25qx128a", INFO(0x1c7118, 0, 64 * 1024, 256, SECT_4K) }, { "en25qx128a", INFO(0x1c7118, 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

@ -24,7 +24,7 @@ Reviewed-by: Grant Grundler <grundler@chromium.org>
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -776,6 +776,16 @@ struct xps_map { @@ -783,6 +783,16 @@ struct xps_map {
#define XPS_MIN_MAP_ALLOC ((L1_CACHE_ALIGN(offsetof(struct xps_map, queues[1])) \ #define XPS_MIN_MAP_ALLOC ((L1_CACHE_ALIGN(offsetof(struct xps_map, queues[1])) \
- sizeof(struct xps_map)) / sizeof(u16)) - sizeof(struct xps_map)) / sizeof(u16))
@ -41,7 +41,7 @@ Reviewed-by: Grant Grundler <grundler@chromium.org>
/* /*
* This structure holds all XPS maps for device. Maps are indexed by CPU. * This structure holds all XPS maps for device. Maps are indexed by CPU.
*/ */
@@ -1434,6 +1444,9 @@ struct net_device_ops { @@ -1441,6 +1451,9 @@ struct net_device_ops {
const struct sk_buff *skb, const struct sk_buff *skb,
u16 rxq_index, u16 rxq_index,
u32 flow_id); u32 flow_id);

View File

@ -12,7 +12,7 @@ Subject: SoC: add qualcomm syscon
obj-$(CONFIG_QCOM_SDM845_LLCC) += llcc-sdm845.o obj-$(CONFIG_QCOM_SDM845_LLCC) += llcc-sdm845.o
--- a/drivers/soc/qcom/Kconfig --- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig
@@ -183,6 +183,13 @@ config QCOM_SOCINFO @@ -184,6 +184,13 @@ config QCOM_SOCINFO
Say yes here to support the Qualcomm socinfo driver, providing Say yes here to support the Qualcomm socinfo driver, providing
information about the SoC to user space. information about the SoC to user space.

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
@@ -2653,6 +2653,8 @@ enum netdev_cmd { @@ -2660,6 +2660,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,
@ -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
@@ -3357,6 +3357,318 @@ static void *unit_find(struct idr *p, in @@ -3359,6 +3359,318 @@ static void *unit_find(struct idr *p, in
return idr_find(p, n); return idr_find(p, n);
} }

View File

@ -12,7 +12,7 @@ Subject: SoC: add qualcomm syscon
obj-$(CONFIG_QCOM_SDM845_LLCC) += llcc-sdm845.o obj-$(CONFIG_QCOM_SDM845_LLCC) += llcc-sdm845.o
--- a/drivers/soc/qcom/Kconfig --- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig
@@ -183,6 +183,13 @@ config QCOM_SOCINFO @@ -184,6 +184,13 @@ config QCOM_SOCINFO
Say yes here to support the Qualcomm socinfo driver, providing Say yes here to support the Qualcomm socinfo driver, providing
information about the SoC to user space. information about the SoC to user space.

View File

@ -106,7 +106,7 @@
__be16 vlan_proto, u16 vlan_id) __be16 vlan_proto, u16 vlan_id)
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -1647,6 +1647,20 @@ enum netdev_ml_priv_type { @@ -1654,6 +1654,20 @@ enum netdev_ml_priv_type {
ML_PRIV_CAN, ML_PRIV_CAN,
}; };
@ -127,7 +127,7 @@
/** /**
* struct net_device - The DEVICE structure. * struct net_device - The DEVICE structure.
* *
@@ -1957,6 +1971,7 @@ struct net_device { @@ -1964,6 +1978,7 @@ struct net_device {
unsigned int flags; unsigned int flags;
unsigned int priv_flags; unsigned int priv_flags;
@ -135,7 +135,7 @@
unsigned short gflags; unsigned short gflags;
unsigned short padded; unsigned short padded;
@@ -2640,6 +2655,10 @@ enum netdev_cmd { @@ -2647,6 +2662,10 @@ 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,
@ -352,7 +352,7 @@
break; break;
case AD_MUX_COLLECTING_DISTRIBUTING: case AD_MUX_COLLECTING_DISTRIBUTING:
if (!(port->sm_vars & AD_PORT_SELECTED) || if (!(port->sm_vars & AD_PORT_SELECTED) ||
@@ -1896,6 +1952,8 @@ static void ad_enable_collecting_distrib @@ -1897,6 +1953,8 @@ static void ad_enable_collecting_distrib
bool *update_slave_arr) bool *update_slave_arr)
{ {
if (port->aggregator->is_active) { if (port->aggregator->is_active) {
@ -361,7 +361,7 @@
slave_dbg(port->slave->bond->dev, port->slave->dev, slave_dbg(port->slave->bond->dev, port->slave->dev,
"Enabling port %d (LAG %d)\n", "Enabling port %d (LAG %d)\n",
port->actor_port_number, port->actor_port_number,
@@ -1903,6 +1961,16 @@ static void ad_enable_collecting_distrib @@ -1904,6 +1962,16 @@ static void ad_enable_collecting_distrib
__enable_port(port); __enable_port(port);
/* Slave array needs update */ /* Slave array needs update */
*update_slave_arr = true; *update_slave_arr = true;
@ -378,7 +378,7 @@
} }
} }
@@ -2775,3 +2843,101 @@ int bond_3ad_stats_fill(struct sk_buff * @@ -2776,3 +2844,101 @@ int bond_3ad_stats_fill(struct sk_buff *
return 0; return 0;
} }
@ -574,7 +574,7 @@
bond_sysfs_slave_del(slave); bond_sysfs_slave_del(slave);
/* recompute stats just before removing the slave */ /* recompute stats just before removing the slave */
@@ -2217,6 +2260,10 @@ static void bond_miimon_commit(struct bo @@ -2226,6 +2269,10 @@ static void bond_miimon_commit(struct bo
{ {
struct list_head *iter; struct list_head *iter;
struct slave *slave, *primary; struct slave *slave, *primary;
@ -585,7 +585,7 @@
bond_for_each_slave(bond, slave, iter) { bond_for_each_slave(bond, slave, iter) {
switch (slave->link_new_state) { switch (slave->link_new_state) {
@@ -2260,6 +2307,12 @@ static void bond_miimon_commit(struct bo @@ -2269,6 +2316,12 @@ static void bond_miimon_commit(struct bo
bond_miimon_link_change(bond, slave, BOND_LINK_UP); bond_miimon_link_change(bond, slave, BOND_LINK_UP);
@ -598,7 +598,7 @@
if (!bond->curr_active_slave || slave == primary) if (!bond->curr_active_slave || slave == primary)
goto do_failover; goto do_failover;
@@ -2301,6 +2354,15 @@ do_failover: @@ -2310,6 +2363,15 @@ do_failover:
} }
bond_set_carrier(bond); bond_set_carrier(bond);
@ -614,7 +614,7 @@
} }
/* bond_mii_monitor /* bond_mii_monitor
@@ -4385,6 +4447,11 @@ static void bond_destructor(struct net_d @@ -4399,6 +4461,11 @@ static void bond_destructor(struct net_d
struct bonding *bond = netdev_priv(bond_dev); struct bonding *bond = netdev_priv(bond_dev);
if (bond->wq) if (bond->wq)
destroy_workqueue(bond->wq); destroy_workqueue(bond->wq);
@ -626,7 +626,7 @@
} }
void bond_setup(struct net_device *bond_dev) void bond_setup(struct net_device *bond_dev)
@@ -4934,6 +5001,16 @@ int bond_create(struct net *net, const c @@ -4948,6 +5015,16 @@ int bond_create(struct net *net, const c
bond_work_init_all(bond); bond_work_init_all(bond);
rtnl_unlock(); rtnl_unlock();
@ -643,7 +643,7 @@
return 0; return 0;
} }
@@ -5029,6 +5106,203 @@ static void __exit bonding_exit(void) @@ -5043,6 +5120,203 @@ static void __exit bonding_exit(void)
#endif #endif
} }

View File

@ -19,7 +19,7 @@
extern void br_fdb_unregister_notify(struct notifier_block *nb); extern void br_fdb_unregister_notify(struct notifier_block *nb);
--- a/include/linux/netdevice.h --- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -1653,12 +1653,18 @@ enum netdev_priv_qca_ecm_flags { @@ -1660,12 +1660,18 @@ enum netdev_priv_qca_ecm_flags {
IFF_QCA_ECM_PPP_L2TPV2 = 1<<1, IFF_QCA_ECM_PPP_L2TPV2 = 1<<1,
IFF_QCA_ECM_PPP_L2TPV3 = 1<<2, IFF_QCA_ECM_PPP_L2TPV3 = 1<<2,
IFF_QCA_ECM_PPP_PPTP = 1<<3, IFF_QCA_ECM_PPP_PPTP = 1<<3,

View File

@ -39,7 +39,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
* Generic PPP layer for Linux. * Generic PPP layer for Linux.
* *
* Copyright 1999-2002 Paul Mackerras. * Copyright 1999-2002 Paul Mackerras.
@@ -3357,6 +3373,178 @@ static void *unit_find(struct idr *p, in @@ -3359,6 +3375,178 @@ static void *unit_find(struct idr *p, in
return idr_find(p, n); return idr_find(p, n);
} }
@ -218,7 +218,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
/* Module/initialization stuff */ /* Module/initialization stuff */
module_init(ppp_init); module_init(ppp_init);
@@ -3373,6 +3561,8 @@ EXPORT_SYMBOL(ppp_input_error); @@ -3375,6 +3563,8 @@ EXPORT_SYMBOL(ppp_input_error);
EXPORT_SYMBOL(ppp_output_wakeup); EXPORT_SYMBOL(ppp_output_wakeup);
EXPORT_SYMBOL(ppp_register_compressor); EXPORT_SYMBOL(ppp_register_compressor);
EXPORT_SYMBOL(ppp_unregister_compressor); EXPORT_SYMBOL(ppp_unregister_compressor);

View File

@ -18,7 +18,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
--- 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
@@ -3376,7 +3376,9 @@ static void *unit_find(struct idr *p, in @@ -3378,7 +3378,9 @@ static void *unit_find(struct idr *p, in
/* Updates the PPP interface statistics. */ /* Updates the PPP interface statistics. */
void ppp_update_stats(struct net_device *dev, unsigned long rx_packets, void ppp_update_stats(struct net_device *dev, unsigned long rx_packets,
unsigned long rx_bytes, unsigned long tx_packets, unsigned long rx_bytes, unsigned long tx_packets,
@ -29,7 +29,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
{ {
struct ppp *ppp; struct ppp *ppp;
@@ -3391,11 +3393,15 @@ void ppp_update_stats(struct net_device @@ -3393,11 +3395,15 @@ void ppp_update_stats(struct net_device
ppp_xmit_lock(ppp); ppp_xmit_lock(ppp);
ppp->stats64.tx_packets += tx_packets; ppp->stats64.tx_packets += tx_packets;
ppp->stats64.tx_bytes += tx_bytes; ppp->stats64.tx_bytes += tx_bytes;

View File

@ -14,7 +14,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
--- 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
@@ -3395,6 +3395,8 @@ void ppp_update_stats(struct net_device @@ -3397,6 +3397,8 @@ void ppp_update_stats(struct net_device
ppp->stats64.tx_bytes += tx_bytes; ppp->stats64.tx_bytes += tx_bytes;
ppp->dev->stats.tx_errors += tx_errors; ppp->dev->stats.tx_errors += tx_errors;
ppp->dev->stats.tx_dropped += tx_dropped; ppp->dev->stats.tx_dropped += tx_dropped;
@ -23,7 +23,7 @@ Signed-off-by: Murat Sezgin <msezgin@codeaurora.org>
ppp_xmit_unlock(ppp); ppp_xmit_unlock(ppp);
ppp_recv_lock(ppp); ppp_recv_lock(ppp);
@@ -3402,6 +3404,8 @@ void ppp_update_stats(struct net_device @@ -3404,6 +3406,8 @@ void ppp_update_stats(struct net_device
ppp->stats64.rx_bytes += rx_bytes; ppp->stats64.rx_bytes += rx_bytes;
ppp->dev->stats.rx_errors += rx_errors; ppp->dev->stats.rx_errors += rx_errors;
ppp->dev->stats.rx_dropped += rx_dropped; ppp->dev->stats.rx_dropped += rx_dropped;

View File

@ -271,7 +271,7 @@
#endif #endif
--- a/net/sched/sch_api.c --- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c +++ b/net/sched/sch_api.c
@@ -2297,4 +2297,26 @@ static int __init pktsched_init(void) @@ -2302,4 +2302,26 @@ static int __init pktsched_init(void)
return 0; return 0;
} }

View File

@ -8,7 +8,7 @@
#include <linux/nsproxy.h> #include <linux/nsproxy.h>
#include <net/net_namespace.h> #include <net/net_namespace.h>
@@ -3239,6 +3240,10 @@ ppp_connect_channel(struct channel *pch, @@ -3241,6 +3242,10 @@ ppp_connect_channel(struct channel *pch,
struct ppp_net *pn; struct ppp_net *pn;
int ret = -ENXIO; int ret = -ENXIO;
int hdrlen; int hdrlen;
@ -19,7 +19,7 @@
pn = ppp_pernet(pch->chan_net); pn = ppp_pernet(pch->chan_net);
@@ -3270,6 +3275,26 @@ ppp_connect_channel(struct channel *pch, @@ -3272,6 +3277,26 @@ ppp_connect_channel(struct channel *pch,
++ppp->n_channels; ++ppp->n_channels;
pch->ppp = ppp; pch->ppp = ppp;
refcount_inc(&ppp->file.refcnt); refcount_inc(&ppp->file.refcnt);
@ -46,7 +46,7 @@
ppp_unlock(ppp); ppp_unlock(ppp);
ret = 0; ret = 0;
@@ -3555,6 +3580,56 @@ void ppp_release_channels(struct ppp_cha @@ -3557,6 +3582,56 @@ void ppp_release_channels(struct ppp_cha
} }
EXPORT_SYMBOL(ppp_release_channels); EXPORT_SYMBOL(ppp_release_channels);

View File

@ -47,7 +47,7 @@
/* Prototypes. */ /* Prototypes. */
static int ppp_unattached_ioctl(struct net *net, struct ppp_file *pf, static int ppp_unattached_ioctl(struct net *net, struct ppp_file *pf,
struct file *file, unsigned int cmd, unsigned long arg); struct file *file, unsigned int cmd, unsigned long arg);
@@ -3244,6 +3264,7 @@ ppp_connect_channel(struct channel *pch, @@ -3246,6 +3266,7 @@ ppp_connect_channel(struct channel *pch,
int ppp_proto; int ppp_proto;
int version; int version;
/* QCA NSS ECM Support - End */ /* QCA NSS ECM Support - End */
@ -55,7 +55,7 @@
pn = ppp_pernet(pch->chan_net); pn = ppp_pernet(pch->chan_net);
@@ -3294,6 +3315,8 @@ ppp_connect_channel(struct channel *pch, @@ -3296,6 +3317,8 @@ ppp_connect_channel(struct channel *pch,
ppp->dev->priv_flags_qca_ecm |= IFF_QCA_ECM_PPP_L2TPV3; ppp->dev->priv_flags_qca_ecm |= IFF_QCA_ECM_PPP_L2TPV3;
} }
/* QCA NSS ECM support - End */ /* QCA NSS ECM support - End */
@ -64,7 +64,7 @@
out2: out2:
ppp_unlock(ppp); ppp_unlock(ppp);
ret = 0; ret = 0;
@@ -3302,6 +3325,16 @@ ppp_connect_channel(struct channel *pch, @@ -3304,6 +3327,16 @@ ppp_connect_channel(struct channel *pch,
write_unlock_bh(&pch->upl); write_unlock_bh(&pch->upl);
out: out:
mutex_unlock(&pn->all_ppp_mutex); mutex_unlock(&pn->all_ppp_mutex);
@ -81,7 +81,7 @@
return ret; return ret;
} }
@@ -3319,6 +3352,15 @@ ppp_disconnect_channel(struct channel *p @@ -3321,6 +3354,15 @@ ppp_disconnect_channel(struct channel *p
pch->ppp = NULL; pch->ppp = NULL;
write_unlock_bh(&pch->upl); write_unlock_bh(&pch->upl);
if (ppp) { if (ppp) {

View File

@ -39,7 +39,7 @@
/* check we are the Master VPE */ /* check we are the Master VPE */
local_irq_save(flags); local_irq_save(flags);
@@ -417,6 +418,8 @@ int __init vpe_module_init(void) @@ -416,6 +417,8 @@ int __init vpe_module_init(void)
} }
v->ntcs = hw_tcs - aprp_cpu_index(); v->ntcs = hw_tcs - aprp_cpu_index();

View File

@ -224,7 +224,7 @@ This reverts commit cf9441adb1a35506d7606866c382b9d8614169b5.
priv->burst = 128; /* might be 32 or 128 */ priv->burst = 128; /* might be 32 or 128 */
--- a/sound/soc/mediatek/common/mtk-btcvsd.c --- a/sound/soc/mediatek/common/mtk-btcvsd.c
+++ b/sound/soc/mediatek/common/mtk-btcvsd.c +++ b/sound/soc/mediatek/common/mtk-btcvsd.c
@@ -1335,8 +1335,10 @@ static int mtk_btcvsd_snd_probe(struct p @@ -1333,8 +1333,10 @@ static int mtk_btcvsd_snd_probe(struct p
/* irq */ /* irq */
irq_id = platform_get_irq(pdev, 0); irq_id = platform_get_irq(pdev, 0);
@ -252,8 +252,8 @@ This reverts commit cf9441adb1a35506d7606866c382b9d8614169b5.
IRQF_TRIGGER_NONE, "asys-isr", (void *)afe); IRQF_TRIGGER_NONE, "asys-isr", (void *)afe);
--- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c --- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
+++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c +++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
@@ -1074,8 +1074,10 @@ static int mt8173_afe_pcm_dev_probe(stru @@ -1149,8 +1149,10 @@ static int mt8173_afe_pcm_dev_probe(stru
afe->dev = &pdev->dev; goto err_pm_disable;
irq_id = platform_get_irq(pdev, 0); irq_id = platform_get_irq(pdev, 0);
- if (irq_id <= 0) - if (irq_id <= 0)

View File

@ -67,7 +67,7 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
obj-$(CONFIG_CRYPTO_XXHASH) += xxhash_generic.o obj-$(CONFIG_CRYPTO_XXHASH) += xxhash_generic.o
--- a/crypto/tcrypt.c --- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c +++ b/crypto/tcrypt.c
@@ -2049,6 +2049,9 @@ static int do_test(const char *alg, u32 @@ -2040,6 +2040,9 @@ static int do_test(const char *alg, u32
ret += tcrypt_test("cbc(sm4)"); ret += tcrypt_test("cbc(sm4)");
ret += tcrypt_test("ctr(sm4)"); ret += tcrypt_test("ctr(sm4)");
break; break;

View File

@ -23,7 +23,7 @@ Signed-off-by: Tudor Ambarus <tudor-dan.ambarus@nxp.com>
}; };
static u32 block_sizes[] = { 16, 64, 256, 1024, 1472, 8192, 0 }; static u32 block_sizes[] = { 16, 64, 256, 1024, 1472, 8192, 0 };
@@ -1983,6 +1982,10 @@ static int do_test(const char *alg, u32 @@ -1974,6 +1973,10 @@ static int do_test(const char *alg, u32
ret += tcrypt_test("hmac(streebog512)"); ret += tcrypt_test("hmac(streebog512)");
break; break;

View File

@ -378,7 +378,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
video->v_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NVSYNC); video->v_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NVSYNC);
video->h_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NHSYNC); video->h_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NHSYNC);
- memcpy(&dp->mode, adjusted, sizeof(*mode)); - drm_mode_copy(&dp->mode, adjusted);
+ memcpy(&dp->mhdp.mode, adjusted, sizeof(*mode)); + memcpy(&dp->mhdp.mode, adjusted, sizeof(*mode));
} }

View File

@ -11,7 +11,7 @@ Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.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
@@ -2420,7 +2420,7 @@ static const struct flash_info spi_nor_i @@ -2422,7 +2422,7 @@ static const struct flash_info spi_nor_i
{ "s25fl512s", INFO6(0x010220, 0x4d0080, 256 * 1024, 256, { "s25fl512s", INFO6(0x010220, 0x4d0080, 256 * 1024, 256,
SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
SPI_NOR_HAS_LOCK | USE_CLSR) }, SPI_NOR_HAS_LOCK | USE_CLSR) },

View File

@ -16,7 +16,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
--- a/drivers/usb/dwc3/core.c --- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c
@@ -1270,6 +1270,17 @@ static void dwc3_get_properties(struct d @@ -1275,6 +1275,17 @@ static void dwc3_get_properties(struct d
dwc->maximum_speed = usb_get_maximum_speed(dev); dwc->maximum_speed = usb_get_maximum_speed(dev);
dwc->dr_mode = usb_get_dr_mode(dev); dwc->dr_mode = usb_get_dr_mode(dev);

View File

@ -32,7 +32,7 @@ Reviewed-by: Peter Chen <peter.chen@nxp.com>
--- a/drivers/usb/dwc3/core.c --- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c
@@ -1365,6 +1365,9 @@ static void dwc3_get_properties(struct d @@ -1370,6 +1370,9 @@ static void dwc3_get_properties(struct d
dwc->dis_split_quirk = device_property_read_bool(dev, dwc->dis_split_quirk = device_property_read_bool(dev,
"snps,dis-split-quirk"); "snps,dis-split-quirk");

View File

@ -54,7 +54,7 @@ Signed-off-by: Li Jun <jun.li@nxp.com>
--- a/drivers/usb/dwc3/core.c --- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c
@@ -1040,6 +1040,21 @@ static int dwc3_core_init(struct dwc3 *d @@ -1045,6 +1045,21 @@ static int dwc3_core_init(struct dwc3 *d
reg |= DWC3_GUCTL_HSTINAUTORETRY; reg |= DWC3_GUCTL_HSTINAUTORETRY;
dwc3_writel(dwc->regs, DWC3_GUCTL, reg); dwc3_writel(dwc->regs, DWC3_GUCTL, reg);

View File

@ -98,7 +98,7 @@ Reviewed-by: Jun Li <jun.li@nxp.com>
/** /**
* dwc3_core_init - Low-level initialization of DWC3 Core * dwc3_core_init - Low-level initialization of DWC3 Core
* @dwc: Pointer to our controller context structure * @dwc: Pointer to our controller context structure
@@ -980,6 +1028,10 @@ static int dwc3_core_init(struct dwc3 *d @@ -985,6 +1033,10 @@ static int dwc3_core_init(struct dwc3 *d
dwc3_set_incr_burst_type(dwc); dwc3_set_incr_burst_type(dwc);
@ -109,7 +109,7 @@ Reviewed-by: Jun Li <jun.li@nxp.com>
usb_phy_set_suspend(dwc->usb2_phy, 0); usb_phy_set_suspend(dwc->usb2_phy, 0);
usb_phy_set_suspend(dwc->usb3_phy, 0); usb_phy_set_suspend(dwc->usb3_phy, 0);
ret = phy_power_on(dwc->usb2_generic_phy); ret = phy_power_on(dwc->usb2_generic_phy);
@@ -1933,12 +1985,9 @@ static const struct dev_pm_ops dwc3_dev_ @@ -1938,12 +1990,9 @@ static const struct dev_pm_ops dwc3_dev_
#ifdef CONFIG_OF #ifdef CONFIG_OF
static const struct of_device_id of_dwc3_match[] = { static const struct of_device_id of_dwc3_match[] = {

View File

@ -70,7 +70,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
/** /**
* dwc3_core_init - Low-level initialization of DWC3 Core * dwc3_core_init - Low-level initialization of DWC3 Core
* @dwc: Pointer to our controller context structure * @dwc: Pointer to our controller context structure
@@ -1028,10 +980,6 @@ static int dwc3_core_init(struct dwc3 *d @@ -1033,10 +985,6 @@ static int dwc3_core_init(struct dwc3 *d
dwc3_set_incr_burst_type(dwc); dwc3_set_incr_burst_type(dwc);
@ -81,7 +81,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
usb_phy_set_suspend(dwc->usb2_phy, 0); usb_phy_set_suspend(dwc->usb2_phy, 0);
usb_phy_set_suspend(dwc->usb3_phy, 0); usb_phy_set_suspend(dwc->usb3_phy, 0);
ret = phy_power_on(dwc->usb2_generic_phy); ret = phy_power_on(dwc->usb2_generic_phy);
@@ -1985,9 +1933,12 @@ static const struct dev_pm_ops dwc3_dev_ @@ -1990,9 +1938,12 @@ static const struct dev_pm_ops dwc3_dev_
#ifdef CONFIG_OF #ifdef CONFIG_OF
static const struct of_device_id of_dwc3_match[] = { static const struct of_device_id of_dwc3_match[] = {

View File

@ -97,7 +97,7 @@ Reviewed-by: Jun Li <jun.li@nxp.com>
/** /**
* dwc3_core_init - Low-level initialization of DWC3 Core * dwc3_core_init - Low-level initialization of DWC3 Core
* @dwc: Pointer to our controller context structure * @dwc: Pointer to our controller context structure
@@ -980,6 +1027,10 @@ static int dwc3_core_init(struct dwc3 *d @@ -985,6 +1032,10 @@ static int dwc3_core_init(struct dwc3 *d
dwc3_set_incr_burst_type(dwc); dwc3_set_incr_burst_type(dwc);
@ -108,7 +108,7 @@ Reviewed-by: Jun Li <jun.li@nxp.com>
usb_phy_set_suspend(dwc->usb2_phy, 0); usb_phy_set_suspend(dwc->usb2_phy, 0);
usb_phy_set_suspend(dwc->usb3_phy, 0); usb_phy_set_suspend(dwc->usb3_phy, 0);
ret = phy_power_on(dwc->usb2_generic_phy); ret = phy_power_on(dwc->usb2_generic_phy);
@@ -1933,12 +1984,16 @@ static const struct dev_pm_ops dwc3_dev_ @@ -1938,12 +1989,16 @@ static const struct dev_pm_ops dwc3_dev_
#ifdef CONFIG_OF #ifdef CONFIG_OF
static const struct of_device_id of_dwc3_match[] = { static const struct of_device_id of_dwc3_match[] = {

View File

@ -10,7 +10,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.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
@@ -4940,6 +4940,7 @@ int spi_nor_scan(struct spi_nor *nor, co @@ -4942,6 +4942,7 @@ int spi_nor_scan(struct spi_nor *nor, co
struct mtd_info *mtd = &nor->mtd; struct mtd_info *mtd = &nor->mtd;
struct device_node *np = spi_nor_get_flash_node(nor); struct device_node *np = spi_nor_get_flash_node(nor);
struct spi_nor_flash_parameter *params = &nor->params; struct spi_nor_flash_parameter *params = &nor->params;
@ -18,7 +18,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
int ret; int ret;
int i; int i;
@@ -5002,7 +5003,12 @@ int spi_nor_scan(struct spi_nor *nor, co @@ -5004,7 +5005,12 @@ int spi_nor_scan(struct spi_nor *nor, co
/* Init flash parameters based on flash_info struct and SFDP */ /* Init flash parameters based on flash_info struct and SFDP */
spi_nor_init_params(nor); spi_nor_init_params(nor);
@ -34,7 +34,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@imgtec.com>
mtd->type = MTD_NORFLASH; mtd->type = MTD_NORFLASH;
--- a/drivers/mtd/mtdcore.c --- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c
@@ -779,6 +779,17 @@ out_error: @@ -781,6 +781,17 @@ out_error:
*/ */
static void mtd_set_dev_defaults(struct mtd_info *mtd) static void mtd_set_dev_defaults(struct mtd_info *mtd)
{ {

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
@@ -2306,6 +2306,11 @@ static const struct flash_info spi_nor_i @@ -2308,6 +2308,11 @@ static const struct flash_info spi_nor_i
SPI_NOR_4B_OPCODES | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) SPI_NOR_4B_OPCODES | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
.fixups = &gd25q256_fixups, .fixups = &gd25q256_fixups,
}, },

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
@@ -2411,6 +2411,9 @@ static const struct flash_info spi_nor_i @@ -2413,6 +2413,9 @@ static const struct flash_info spi_nor_i
{ "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K_PMC) }, { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K_PMC) },
{ "pm25lq032", INFO(0x7f9d46, 0, 64 * 1024, 64, SECT_4K) }, { "pm25lq032", INFO(0x7f9d46, 0, 64 * 1024, 64, SECT_4K) },

View File

@ -21,7 +21,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- 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
@@ -2233,6 +2233,10 @@ static const struct flash_info spi_nor_i @@ -2235,6 +2235,10 @@ static const struct flash_info spi_nor_i
{ "at45db081d", INFO(0x1f2500, 0, 64 * 1024, 16, SECT_4K) }, { "at45db081d", INFO(0x1f2500, 0, 64 * 1024, 16, SECT_4K) },