fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sunxi: refresh kernel patches

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2021-06-20 13:10:43 +08:00
parent f01b7cd3cc
commit c6ad48657b
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
16 changed files with 28 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/generic/hack-5.4/952-net-conntrack-events-support-multiple-registrant.patch
View File

@ -98,9 +98,9 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
#if defined(CONFIG_NF_CONNTRACK_LABELS)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -148,6 +148,14 @@ config NF_CONNTRACK_RTCACHE
To compile it as a module, choose M here. If unsure, say N.
The module will be called nf_conntrack_rtcache.
@@ -136,6 +136,14 @@ config NF_CONNTRACK_EVENTS
If unsure, say `N'.
+config NF_CONNTRACK_CHAIN_EVENTS
+ bool "Register multiple callbacks to ct events"
@ -295,7 +295,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
struct nf_conn *ct = item->ct;
struct sk_buff *skb;
unsigned int type;
@@ -3504,9 +3511,15 @@ static int ctnetlink_stat_exp_cpu(struct
@@ -3505,9 +3512,15 @@ static int ctnetlink_stat_exp_cpu(struct
}
#ifdef CONFIG_NF_CONNTRACK_EVENTS

6
target/linux/generic/hack-5.4/953-net-patch-linux-kernel-to-support-shortcut-fe.patch
View File

@ -99,7 +99,7 @@
#ifdef CONFIG_ETHERNET_PACKET_MANGLE
if (!dev->eth_mangle_tx ||
(skb = dev->eth_mangle_tx(dev, skb)) != NULL)
@@ -4695,6 +4703,11 @@ void netdev_rx_handler_unregister(struct
@@ -4714,6 +4722,11 @@ void netdev_rx_handler_unregister(struct
}
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);
@ -111,7 +111,7 @@
/*
* Limit the use of PFMEMALLOC reserves to those protocols that implement
* the special handling of PFMEMALLOC skbs.
@@ -4745,6 +4758,10 @@ static int __netif_receive_skb_core(stru
@@ -4764,6 +4777,10 @@ static int __netif_receive_skb_core(stru
int ret = NET_RX_DROP;
__be16 type;
@ -122,7 +122,7 @@
net_timestamp_check(!netdev_tstamp_prequeue, skb);
trace_netif_receive_skb(skb);
@@ -4784,6 +4801,16 @@ another_round:
@@ -4803,6 +4820,16 @@ another_round:
goto out;
}

2
target/linux/generic/hack-5.4/993-usb-serial-option-add-u9300.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -1373,6 +1373,7 @@ static const struct usb_device_id produc
@@ -1359,6 +1359,7 @@ static const struct usb_device_id produc
{QMI_FIXED_INTF(0x03f0, 0x9d1d, 1)}, /* HP lt4120 Snapdragon X5 LTE */
{QMI_FIXED_INTF(0x22de, 0x9061, 3)}, /* WeTelecom WPD-600N */
{QMI_QUIRK_SET_DTR(0x1e0e, 0x9001, 5)}, /* SIMCom 7100E, 7230E, 7600E ++ */

14
target/linux/generic/pending-5.4/601-add-kernel-imq-support.patch
View File

@ -1120,7 +1120,7 @@
+
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1938,6 +1938,11 @@ struct net_device {
@@ -1945,6 +1945,11 @@ struct net_device {
/*
* Cache lines mostly used on receive path (including eth_type_trans())
*/
@ -1132,7 +1132,7 @@
/* Interface address info used in eth_type_trans() */
unsigned char *dev_addr;
@@ -4037,6 +4042,19 @@ static inline void netif_tx_unlock_bh(st
@@ -4072,6 +4077,19 @@ static inline void netif_tx_unlock_bh(st
} \
}
@ -1282,7 +1282,7 @@
if (qdisc_run_begin(q)) {
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -796,6 +796,13 @@ static inline int qdisc_enqueue(struct s
@@ -829,6 +829,13 @@ static inline int qdisc_enqueue(struct s
return sch->enqueue(skb, sch, to_free);
}
@ -1441,7 +1441,7 @@
/* Note : this field could be in headers_start/headers_end section
* It is not yet because we do not want to have a 16 bit hole
@@ -4170,6 +4245,13 @@ void __init skb_init(void)
@@ -4182,6 +4257,13 @@ void __init skb_init(void)
0,
SLAB_HWCACHE_ALIGN|SLAB_PANIC,
NULL);
@ -1457,7 +1457,7 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -941,6 +941,18 @@ config NETFILTER_XT_TARGET_LOG
@@ -929,6 +929,18 @@ config NETFILTER_XT_TARGET_LOG
To compile it as a module, choose M here. If unsure, say N.
@ -1478,7 +1478,7 @@
depends on NETFILTER_ADVANCED
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -145,6 +145,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CT) +=
@@ -142,6 +142,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_CT) +=
obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
obj-$(CONFIG_NETFILTER_XT_TARGET_HMARK) += xt_HMARK.o
@ -1660,7 +1660,7 @@
+
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -273,6 +273,14 @@ trace:
@@ -296,6 +296,14 @@ trace:
return skb;
}

8
target/linux/sunxi/patches-5.4/003-net-usb-r8152-add-LED-configuration-from-OF.patch
View File

@ -22,7 +22,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
#include <linux/crc32.h>
#include <linux/if_vlan.h>
#include <linux/uaccess.h>
@@ -4363,6 +4364,22 @@ static void rtl_tally_reset(struct r8152
@@ -4335,6 +4336,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 <mail@david-bauer.net>
static void r8152b_init(struct r8152 *tp)
{
u32 ocp_data;
@@ -4404,6 +4421,8 @@ static void r8152b_init(struct r8152 *tp
@@ -4376,6 +4393,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 <mail@david-bauer.net>
}
static void r8153_init(struct r8152 *tp)
@@ -4533,6 +4552,8 @@ static void r8153_init(struct r8152 *tp)
@@ -4510,6 +4529,8 @@ static void r8153_init(struct r8152 *tp)
tp->coalesce = COALESCE_SLOW;
break;
}
@ -63,7 +63,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
}
static void r8153b_init(struct r8152 *tp)
@@ -4609,6 +4630,8 @@ static void r8153b_init(struct r8152 *tp
@@ -4586,6 +4607,8 @@ static void r8153b_init(struct r8152 *tp
rtl_tally_reset(tp);
tp->coalesce = 15000; /* 15 us */

14
target/linux/sunxi/patches-5.4/011-v5.6-thermal_hwmon-Add-devres-wrapper.patch
View File

@ -25,11 +25,9 @@ Link: https://lore.kernel.org/r/20191210164153.10463-12-andrew.smirnov@gmail.com
drivers/thermal/thermal_hwmon.h | 7 +++++++
2 files changed, 35 insertions(+)
diff --git a/drivers/thermal/thermal_hwmon.c b/drivers/thermal/thermal_hwmon.c
index dd5d8ee379287..c8d2620f2e427 100644
--- a/drivers/thermal/thermal_hwmon.c
+++ b/drivers/thermal/thermal_hwmon.c
@@ -248,3 +248,31 @@ void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
@@ -248,3 +248,31 @@ void thermal_remove_hwmon_sysfs(struct t
kfree(hwmon);
}
EXPORT_SYMBOL_GPL(thermal_remove_hwmon_sysfs);
@ -61,8 +59,6 @@ index dd5d8ee379287..c8d2620f2e427 100644
+ return ret;
+}
+EXPORT_SYMBOL_GPL(devm_thermal_add_hwmon_sysfs);
diff --git a/drivers/thermal/thermal_hwmon.h b/drivers/thermal/thermal_hwmon.h
index a160b9d62dd0a..1a9d65f6a6a8b 100644
--- a/drivers/thermal/thermal_hwmon.h
+++ b/drivers/thermal/thermal_hwmon.h
@@ -17,6 +17,7 @@
@ -73,16 +69,16 @@ index a160b9d62dd0a..1a9d65f6a6a8b 100644
void thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz);
#else
static inline int
@@ -25,6 +26,12 @@ thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
@@ -24,6 +25,12 @@ thermal_add_hwmon_sysfs(struct thermal_z
{
return 0;
}
+
+static inline int
+devm_thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
+{
+ return 0;
+}
+
static inline void
thermal_remove_hwmon_sysfs(struct thermal_zone_device *tz)
{

6
target/linux/sunxi/patches-5.4/012-thermal-drivers-sun8i-Add-thermal-driver.patch
View File

@ -22,8 +22,6 @@ Link: https://lore.kernel.org/r/20191219172823.1652600-2-anarsoul@gmail.com
4 files changed, 662 insertions(+)
create mode 100644 drivers/thermal/sun8i_thermal.c
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index dc36941aef6e5..5a05db5438d60 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -262,6 +262,20 @@ config SPEAR_THERMAL
@ -47,11 +45,9 @@ index dc36941aef6e5..5a05db5438d60 100644
config ROCKCHIP_THERMAL
tristate "Rockchip thermal driver"
depends on ARCH_ROCKCHIP || COMPILE_TEST
diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile
index d502a597a7174..9fb88e26fb102 100644
--- a/drivers/thermal/Makefile
+++ b/drivers/thermal/Makefile
@@ -31,6 +31,7 @@ thermal_sys-$(CONFIG_DEVFREQ_THERMAL) += devfreq_cooling.o
@@ -31,6 +31,7 @@ thermal_sys-$(CONFIG_DEVFREQ_THERMAL) +=
obj-y += broadcom/
obj-$(CONFIG_THERMAL_MMIO) += thermal_mmio.o
obj-$(CONFIG_SPEAR_THERMAL) += spear_thermal.o

4
target/linux/sunxi/patches-5.4/013-ARM-dts-sun8i-h3-Add-thermal-sensor-and-thermal-zones.patch
View File

@ -13,8 +13,6 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
arch/arm/boot/dts/sunxi-h3-h5.dtsi | 6 ++++++
2 files changed, 26 insertions(+)
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi
index b4f1673df9ee0..20217e2ca4d3a 100644
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
@@ -186,6 +186,26 @@
@ -44,8 +42,6 @@ index b4f1673df9ee0..20217e2ca4d3a 100644
};
};
diff --git a/arch/arm/boot/dts/sunxi-h3-h5.dtsi b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
index 0afea59486c24..6e68ed8310159 100644
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi
@@ -230,6 +230,12 @@

2
target/linux/sunxi/patches-5.4/014-ARM-dts-sun8i-h3-Add-thermal-trip-points-cooling-maps.patch
View File

@ -23,8 +23,6 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
arch/arm/boot/dts/sun8i-h3.dtsi | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi
index 20217e2ca4d3a..e83aa6866e7ea 100644
--- a/arch/arm/boot/dts/sun8i-h3.dtsi
+++ b/arch/arm/boot/dts/sun8i-h3.dtsi
@@ -41,6 +41,7 @@

2
target/linux/sunxi/patches-5.4/015-arm64-dts-allwinner-h5-Add-thermal-sensor-and-thermal.patch
View File

@ -13,8 +13,6 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 26 ++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
index 3e724788dd3e6..9893aa64dd0b9 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
@@ -174,6 +174,32 @@

2
target/linux/sunxi/patches-5.4/016-arm64-dts-allwinner-h5-Add-clock-to-CPU-cores.patch
View File

@ -14,8 +14,6 @@ Link: https://lore.kernel.org/r/20200717160053.31191-5-wens@kernel.org
arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
index 4462a68c06815..09523f6011c5e 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
@@ -52,6 +52,8 @@

2
target/linux/sunxi/patches-5.4/017-arm64-dts-allwinner-h5-Add-trip-and-cooling-maps.patch
View File

@ -14,8 +14,6 @@ Link: https://lore.kernel.org/r/20200717160053.31191-6-wens@kernel.org
arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 30 ++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
index 09523f6011c5e..6735e316a39c3 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
@@ -42,6 +42,8 @@

3
target/linux/sunxi/patches-5.4/018-arm64-dts-allwinner-h5-Add-CPU-OPP-table.patch
View File

@ -26,9 +26,6 @@ Link: https://lore.kernel.org/r/20200717160053.31191-7-wens@kernel.org
1 file changed, 79 insertions(+)
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-cpu-opp.dtsi
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-cpu-opp.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5-cpu-opp.dtsi
new file mode 100644
index 0000000000000..b2657201957eb
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-cpu-opp.dtsi
@@ -0,0 +1,97 @@

2
target/linux/sunxi/patches-5.4/101-sunxi-h5-add-support-for-nanopi-r1s-h5.patch
View File

@ -14,7 +14,7 @@
- const: gemei,g9
--- a/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
@@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-or
@@ -17,6 +17,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-em
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-libretech-all-h3-cc.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo2.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-nanopi-neo-plus2.dtb

2
target/linux/sunxi/patches-5.4/441-arm64-dts-add-PWM-node.patch
View File

@ -16,7 +16,7 @@ Signed-off-by: Clément Péron <peron.clem@gmail.com>
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
@@ -231,6 +231,16 @@
@@ -254,6 +254,16 @@
status = "disabled";
};

2
target/linux/sunxi/patches-5.4/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch
View File

@ -9,7 +9,7 @@ Subject: [PATCH] kernel: dma: adjust default coherent_pool to 2MiB
--- a/kernel/dma/remap.c
+++ b/kernel/dma/remap.c
@@ -101,7 +101,7 @@ void dma_common_free_remap(void *cpu_addr, size_t size)
@@ -101,7 +101,7 @@ void dma_common_free_remap(void *cpu_add
#ifdef CONFIG_DMA_DIRECT_REMAP
static struct gen_pool *atomic_pool __ro_after_init;