From 0c6e721a785058370a52f585f6bd32254009ae82 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 4 Apr 2021 20:08:14 +0800 Subject: [PATCH] kernel: bump to 4.9.264, 4.14.228, 4.19.184 Resolve conflicted: - generic/pending-4.19/611-netfilter_match_bypass_default_table.patch Refreshed all patches. Signed-off-by: Tianling Shen --- include/kernel-version.mk | 12 ++-- ...90-net-generalize-napi_complete_done.patch | 6 +- ...k-events-support-multiple-registrant.patch | 2 +- ...etfilter_match_bypass_default_checks.patch | 2 +- ...netfilter_match_bypass_default_table.patch | 4 +- .../302-dts-support-layerscape.patch | 56 +++++++++---------- ...-sun8i-Handle-integrated-external-MD.patch | 2 +- ...stmmac-sun8i-Restore-the-compatibles.patch | 2 +- ...-r8152-add-LED-configuration-from-OF.patch | 8 +-- 9 files changed, 47 insertions(+), 47 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index e552e3ea52..70e6eb2916 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .262 -LINUX_VERSION-4.14 = .227 -LINUX_VERSION-4.19 = .183 +LINUX_VERSION-4.9 = .264 +LINUX_VERSION-4.14 = .228 +LINUX_VERSION-4.19 = .184 -LINUX_KERNEL_HASH-4.9.262 = b22e764095362d9e63d76375db838d9372474ba5cbe6132c9a8b07f7533f07ff -LINUX_KERNEL_HASH-4.14.227 = 0722d3c4bc056ccee24d3d08792ba81b228a457ee4ed9c6f40bb1f407612e0c7 -LINUX_KERNEL_HASH-4.19.183 = bacfd95ddf51df70b2962fc685b5217fc449e644f16996e49d87eb259b84a5f5 +LINUX_KERNEL_HASH-4.9.264 = ecc62a94388b722d8bd924d9d021805f5fe180616c7d4c9bfee62766c46ec2b5 +LINUX_KERNEL_HASH-4.14.228 = 15074d44ab330bba00518df1c86d3d2c304a34514d70958c0529a9d28d93815b +LINUX_KERNEL_HASH-4.19.184 = 3dfaf6aae242cb4165d2c0df3405558264f86c3b04f7bbef71b99c83a87ab77c remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch index e978a171b3..00d414c2d7 100644 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch @@ -137,7 +137,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/can/c_can/c_can.c +++ b/drivers/net/can/c_can/c_can.c -@@ -1105,7 +1105,7 @@ static int c_can_poll(struct napi_struct +@@ -1093,7 +1093,7 @@ static int c_can_poll(struct napi_struct end: if (work_done < quota) { @@ -181,7 +181,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c -@@ -730,7 +730,7 @@ static int m_can_poll(struct napi_struct +@@ -727,7 +727,7 @@ static int m_can_poll(struct napi_struct work_done += m_can_do_rx_poll(dev, (quota - work_done)); if (work_done < quota) { @@ -1324,7 +1324,7 @@ Signed-off-by: David S. Miller return rxd_done; --- a/drivers/net/wan/fsl_ucc_hdlc.c +++ b/drivers/net/wan/fsl_ucc_hdlc.c -@@ -578,7 +578,7 @@ static int ucc_hdlc_poll(struct napi_str +@@ -582,7 +582,7 @@ static int ucc_hdlc_poll(struct napi_str howmany += hdlc_rx_done(priv, budget - howmany); if (howmany < budget) { diff --git a/target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch index 266624bdc3..710cbe2bcf 100644 --- a/target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch +++ b/target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch @@ -295,7 +295,7 @@ struct nf_conn *ct = item->ct; struct sk_buff *skb; unsigned int type; -@@ -3481,9 +3494,15 @@ static int ctnetlink_stat_exp_cpu(struct +@@ -3482,9 +3495,15 @@ static int ctnetlink_stat_exp_cpu(struct } #ifdef CONFIG_NF_CONNTRACK_EVENTS diff --git a/target/linux/generic/pending-4.19/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/pending-4.19/610-netfilter_match_bypass_default_checks.patch index d7a47305cf..1691146825 100644 --- a/target/linux/generic/pending-4.19/610-netfilter_match_bypass_default_checks.patch +++ b/target/linux/generic/pending-4.19/610-netfilter_match_bypass_default_checks.patch @@ -69,7 +69,7 @@ Signed-off-by: Felix Fietkau return -ENOMEM; @@ -821,6 +849,7 @@ copy_entries_to_user(unsigned int total_ - const struct xt_table_info *private = xt_table_get_private_protected(table); + const struct xt_table_info *private = table->private; int ret = 0; const void *loc_cpu_entry; + u8 flags; diff --git a/target/linux/generic/pending-4.19/611-netfilter_match_bypass_default_table.patch b/target/linux/generic/pending-4.19/611-netfilter_match_bypass_default_table.patch index 3c586d08cc..ba976b0751 100644 --- a/target/linux/generic/pending-4.19/611-netfilter_match_bypass_default_table.patch +++ b/target/linux/generic/pending-4.19/611-netfilter_match_bypass_default_table.patch @@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau /* Initialization */ + WARN_ON(!(table->valid_hooks & (1 << hook))); + local_bh_disable(); -+ private = rcu_access_pointer(table->private); ++ private = READ_ONCE(table->private); /* Address dependency. */ + cpu = smp_processor_id(); + table_base = private->entries; + @@ -80,7 +80,7 @@ Signed-off-by: Felix Fietkau - WARN_ON(!(table->valid_hooks & (1 << hook))); - local_bh_disable(); addend = xt_write_recseq_begin(); -- private = rcu_access_pointer(table->private); +- private = READ_ONCE(table->private); /* Address dependency. */ - cpu = smp_processor_id(); - table_base = private->entries; jumpstack = (struct ipt_entry **)private->jumpstack[cpu]; diff --git a/target/linux/layerscape/patches-4.14/302-dts-support-layerscape.patch b/target/linux/layerscape/patches-4.14/302-dts-support-layerscape.patch index 6723627785..51797cc6dd 100644 --- a/target/linux/layerscape/patches-4.14/302-dts-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/302-dts-support-layerscape.patch @@ -1679,7 +1679,7 @@ Signed-off-by: Zhao Qiang }; }; -@@ -247,7 +229,7 @@ +@@ -248,7 +230,7 @@ dcfg: dcfg@1ee0000 { compatible = "fsl,ls1012a-dcfg", "syscon"; @@ -1688,7 +1688,7 @@ Signed-off-by: Zhao Qiang big-endian; }; -@@ -304,44 +286,25 @@ +@@ -305,44 +287,25 @@ #thermal-sensor-cells = <1>; }; @@ -1744,7 +1744,7 @@ Signed-off-by: Zhao Qiang status = "disabled"; }; -@@ -351,7 +314,20 @@ +@@ -352,7 +315,20 @@ #size-cells = <0>; reg = <0x0 0x2190000 0x0 0x10000>; interrupts = <0 57 IRQ_TYPE_LEVEL_HIGH>; @@ -1765,7 +1765,7 @@ Signed-off-by: Zhao Qiang status = "disabled"; }; -@@ -400,6 +376,20 @@ +@@ -401,6 +377,20 @@ big-endian; }; @@ -1786,7 +1786,7 @@ Signed-off-by: Zhao Qiang sai1: sai@2b50000 { #sound-dai-cells = <0>; compatible = "fsl,vf610-sai"; -@@ -451,6 +441,8 @@ +@@ -452,6 +442,8 @@ dr_mode = "host"; snps,quirk-frame-length-adjustment = <0x20>; snps,dis_rxdet_inp3_quirk; @@ -1795,7 +1795,7 @@ Signed-off-by: Zhao Qiang }; sata: sata@3200000 { -@@ -471,5 +463,85 @@ +@@ -472,5 +464,85 @@ dr_mode = "host"; phy_type = "ulpi"; }; @@ -3100,7 +3100,7 @@ Signed-off-by: Zhao Qiang scfg: scfg@1570000 { compatible = "fsl,ls1043a-scfg", "syscon"; reg = <0x0 0x1570000 0x0 0x10000>; -@@ -255,7 +285,7 @@ +@@ -256,7 +286,7 @@ dcfg: dcfg@1ee0000 { compatible = "fsl,ls1043a-dcfg", "syscon"; @@ -3109,7 +3109,7 @@ Signed-off-by: Zhao Qiang big-endian; }; -@@ -342,36 +372,7 @@ +@@ -343,36 +373,7 @@ #thermal-sensor-cells = <1>; }; @@ -3147,7 +3147,7 @@ Signed-off-by: Zhao Qiang qman: qman@1880000 { compatible = "fsl,qman"; -@@ -422,7 +423,7 @@ +@@ -423,7 +424,7 @@ }; i2c0: i2c@2180000 { @@ -3156,7 +3156,7 @@ Signed-off-by: Zhao Qiang #address-cells = <1>; #size-cells = <0>; reg = <0x0 0x2180000 0x0 0x10000>; -@@ -432,6 +433,7 @@ +@@ -433,6 +434,7 @@ dmas = <&edma0 1 39>, <&edma0 1 38>; dma-names = "tx", "rx"; @@ -3164,7 +3164,7 @@ Signed-off-by: Zhao Qiang status = "disabled"; }; -@@ -536,6 +538,72 @@ +@@ -537,6 +539,72 @@ #interrupt-cells = <2>; }; @@ -3237,7 +3237,7 @@ Signed-off-by: Zhao Qiang lpuart0: serial@2950000 { compatible = "fsl,ls1021a-lpuart"; reg = <0x0 0x2950000 0x0 0x1000>; -@@ -590,6 +658,16 @@ +@@ -591,6 +659,16 @@ status = "disabled"; }; @@ -3254,7 +3254,7 @@ Signed-off-by: Zhao Qiang wdog0: wdog@2ad0000 { compatible = "fsl,ls1043a-wdt", "fsl,imx21-wdt"; reg = <0x0 0x2ad0000 0x0 0x10000>; -@@ -615,41 +693,81 @@ +@@ -616,41 +694,81 @@ <&clockgen 4 0>; }; @@ -3371,7 +3371,7 @@ Signed-off-by: Zhao Qiang }; msi1: msi-controller1@1571000 { -@@ -678,13 +796,13 @@ +@@ -679,13 +797,13 @@ reg = <0x00 0x03400000 0x0 0x00100000 /* controller registers */ 0x40 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; @@ -3389,7 +3389,7 @@ Signed-off-by: Zhao Qiang num-lanes = <4>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000 /* downstream I/O */ -@@ -696,6 +814,7 @@ +@@ -697,6 +815,7 @@ <0000 0 0 2 &gic 0 111 0x4>, <0000 0 0 3 &gic 0 112 0x4>, <0000 0 0 4 &gic 0 113 0x4>; @@ -3397,7 +3397,7 @@ Signed-off-by: Zhao Qiang }; pcie@3500000 { -@@ -703,13 +822,13 @@ +@@ -704,13 +823,13 @@ reg = <0x00 0x03500000 0x0 0x00100000 /* controller registers */ 0x48 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; @@ -3415,7 +3415,7 @@ Signed-off-by: Zhao Qiang num-lanes = <2>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x48 0x00010000 0x0 0x00010000 /* downstream I/O */ -@@ -721,6 +840,7 @@ +@@ -722,6 +841,7 @@ <0000 0 0 2 &gic 0 121 0x4>, <0000 0 0 3 &gic 0 122 0x4>, <0000 0 0 4 &gic 0 123 0x4>; @@ -3423,7 +3423,7 @@ Signed-off-by: Zhao Qiang }; pcie@3600000 { -@@ -728,13 +848,13 @@ +@@ -729,13 +849,13 @@ reg = <0x00 0x03600000 0x0 0x00100000 /* controller registers */ 0x50 0x00000000 0x0 0x00002000>; /* configuration space */ reg-names = "regs", "config"; @@ -3441,7 +3441,7 @@ Signed-off-by: Zhao Qiang num-lanes = <2>; bus-range = <0x0 0xff>; ranges = <0x81000000 0x0 0x00000000 0x50 0x00010000 0x0 0x00010000 /* downstream I/O */ -@@ -746,6 +866,14 @@ +@@ -747,6 +867,14 @@ <0000 0 0 2 &gic 0 155 0x4>, <0000 0 0 3 &gic 0 156 0x4>, <0000 0 0 4 &gic 0 157 0x4>; @@ -3456,7 +3456,7 @@ Signed-off-by: Zhao Qiang }; }; -@@ -753,3 +881,29 @@ +@@ -754,3 +882,29 @@ #include "qoriq-qman-portals.dtsi" #include "qoriq-bman-portals.dtsi" @@ -4662,7 +4662,7 @@ Signed-off-by: Zhao Qiang scfg: scfg@1570000 { compatible = "fsl,ls1046a-scfg", "syscon"; reg = <0x0 0x1570000 0x0 0x10000>; -@@ -362,36 +369,7 @@ +@@ -363,36 +370,7 @@ #thermal-sensor-cells = <1>; }; @@ -4700,7 +4700,7 @@ Signed-off-by: Zhao Qiang dspi: dspi@2100000 { compatible = "fsl,ls1021a-v1.0-dspi"; -@@ -407,7 +385,7 @@ +@@ -408,7 +386,7 @@ }; i2c0: i2c@2180000 { @@ -4709,7 +4709,7 @@ Signed-off-by: Zhao Qiang #address-cells = <1>; #size-cells = <0>; reg = <0x0 0x2180000 0x0 0x10000>; -@@ -416,6 +394,7 @@ +@@ -417,6 +395,7 @@ dmas = <&edma0 1 39>, <&edma0 1 38>; dma-names = "tx", "rx"; @@ -4717,7 +4717,7 @@ Signed-off-by: Zhao Qiang status = "disabled"; }; -@@ -440,12 +419,13 @@ +@@ -441,12 +420,13 @@ }; i2c3: i2c@21b0000 { @@ -4732,7 +4732,7 @@ Signed-off-by: Zhao Qiang status = "disabled"; }; -@@ -571,6 +551,15 @@ +@@ -572,6 +552,15 @@ status = "disabled"; }; @@ -4748,7 +4748,7 @@ Signed-off-by: Zhao Qiang wdog0: watchdog@2ad0000 { compatible = "fsl,imx21-wdt"; reg = <0x0 0x2ad0000 0x0 0x10000>; -@@ -595,40 +584,81 @@ +@@ -596,40 +585,81 @@ <&clockgen 4 1>; }; @@ -4864,7 +4864,7 @@ Signed-off-by: Zhao Qiang }; msi1: msi-controller@1580000 { -@@ -661,6 +691,125 @@ +@@ -662,6 +692,125 @@ ; }; @@ -4990,7 +4990,7 @@ Signed-off-by: Zhao Qiang }; reserved-memory { -@@ -689,7 +838,36 @@ +@@ -690,7 +839,36 @@ no-map; }; }; diff --git a/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch b/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch index 9f7f89c7e2..90266eeed3 100644 --- a/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch +++ b/target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch @@ -468,7 +468,7 @@ Signed-off-by: David S. Miller /* platform data specifying hardware features and callbacks. * hardware features were copied from Allwinner drivers. -@@ -979,9 +1047,34 @@ static int sun8i_dwmac_probe(struct plat +@@ -981,9 +1049,34 @@ static int sun8i_dwmac_probe(struct plat ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); if (ret) diff --git a/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch b/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch index 0e8d808b42..c496e06f69 100644 --- a/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch +++ b/target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch @@ -18,7 +18,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c -@@ -1078,6 +1078,14 @@ return ret; +@@ -1080,6 +1080,14 @@ return ret; } static const struct of_device_id sun8i_dwmac_match[] = { diff --git a/target/linux/sunxi/patches-4.19/022-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/sunxi/patches-4.19/022-net-usb-r8152-add-LED-configuration-from-OF.patch index c595508c97..54b70982c5 100644 --- a/target/linux/sunxi/patches-4.19/022-net-usb-r8152-add-LED-configuration-from-OF.patch +++ b/target/linux/sunxi/patches-4.19/022-net-usb-r8152-add-LED-configuration-from-OF.patch @@ -22,7 +22,7 @@ Signed-off-by: David Bauer #include #include #include -@@ -4006,6 +4007,22 @@ static void rtl_tally_reset(struct r8152 +@@ -3978,6 +3979,22 @@ static void rtl_tally_reset(struct r8152 ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); } @@ -45,7 +45,7 @@ Signed-off-by: David Bauer static void r8152b_init(struct r8152 *tp) { u32 ocp_data; -@@ -4047,6 +4064,8 @@ static void r8152b_init(struct r8152 *tp +@@ -4019,6 +4036,8 @@ static void r8152b_init(struct r8152 *tp ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); @@ -54,7 +54,7 @@ Signed-off-by: David Bauer } static void r8153_init(struct r8152 *tp) -@@ -4168,6 +4187,8 @@ static void r8153_init(struct r8152 *tp) +@@ -4145,6 +4164,8 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } @@ -63,7 +63,7 @@ Signed-off-by: David Bauer } static void r8153b_init(struct r8152 *tp) -@@ -4231,6 +4252,8 @@ static void r8153b_init(struct r8152 *tp +@@ -4208,6 +4229,8 @@ static void r8153b_init(struct r8152 *tp rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */