Skip to content

Commit 5cff029

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: kernel: add linux 6.1 stable release support Revert "kernel: export symbol dev_set_threaded"
2 parents fe74784 + 994a4c4 commit 5cff029

File tree

207 files changed

+40298
-32
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

207 files changed

+40298
-32
lines changed

‎include/kernel-6.1

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
LINUX_VERSION-6.1 =
2+
LINUX_KERNEL_HASH-6.1 = 2ca1f17051a430f6fed1196e4952717507171acfd97d96577212502703b25deb

‎package/kernel/linux/modules/fs.mk

+4-4
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ define KernelPackage/fs-cifs
109109
+kmod-crypto-ccm \
110110
+kmod-crypto-ecb \
111111
+kmod-crypto-des \
112-
+(LINUX_5_15||LINUX_6_0):kmod-asn1-decoder \
113-
+(LINUX_5_15||LINUX_6_0):kmod-oid-registry \
114-
+(LINUX_5_15||LINUX_6_0):kmod-dnsresolver
112+
+(LINUX_5_15||LINUX_6_0||LINUX_6_1):kmod-asn1-decoder \
113+
+(LINUX_5_15||LINUX_6_0||LINUX_6_1):kmod-oid-registry \
114+
+(LINUX_5_15||LINUX_6_0||LINUX_6_1):kmod-dnsresolver
115115
endef
116116

117117
define KernelPackage/fs-cifs/description
@@ -530,7 +530,7 @@ $(eval $(call KernelPackage,fs-ntfs))
530530
define KernelPackage/fs-ntfs3
531531
SUBMENU:=$(FS_MENU)
532532
TITLE:=NTFS3 Read-Write file system support
533-
DEPENDS:=@(LINUX_5_4||LINUX_5_10||LINUX_5_15||LINUX_6_0) +kmod-nls-base
533+
DEPENDS:=@(LINUX_5_4||LINUX_5_10||LINUX_5_15||LINUX_6_0||LINUX_6_1) +kmod-nls-base
534534
KCONFIG:= \
535535
CONFIG_NTFS3_FS \
536536
CONFIG_NTFS3_64BIT_CLUSTER=y \

‎package/kernel/linux/modules/netdevices.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ $(eval $(call KernelPackage,mii))
142142
define KernelPackage/mdio-devres
143143
SUBMENU:=$(NETWORK_DEVICES_MENU)
144144
TITLE:=Supports MDIO device registration
145-
DEPENDS:=@(LINUX_5_10||LINUX_5_15||LINUX_6_0) +kmod-libphy +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_tegra):kmod-of-mdio
145+
DEPENDS:=@(LINUX_5_10||LINUX_5_15||LINUX_6_0||LINUX_6_1) +kmod-libphy +(TARGET_armvirt||TARGET_bcm27xx_bcm2708||TARGET_tegra):kmod-of-mdio
146146
KCONFIG:=CONFIG_MDIO_DEVRES
147147
HIDDEN:=1
148148
FILES:=$(LINUX_DIR)/drivers/net/phy/mdio_devres.ko
@@ -597,7 +597,7 @@ $(eval $(call KernelPackage,8139cp))
597597
define KernelPackage/r8169
598598
SUBMENU:=$(NETWORK_DEVICES_MENU)
599599
TITLE:=RealTek RTL-8169 PCI Gigabit Ethernet Adapter kernel support
600-
DEPENDS:=@PCI_SUPPORT +kmod-mii +r8169-firmware +kmod-phy-realtek +(LINUX_5_10||LINUX_5_15||LINUX_6_0):kmod-mdio-devres
600+
DEPENDS:=@PCI_SUPPORT +kmod-mii +r8169-firmware +kmod-phy-realtek +(LINUX_5_10||LINUX_5_15||LINUX_6_0||LINUX_6_1):kmod-mdio-devres
601601
KCONFIG:= \
602602
CONFIG_R8169 \
603603
CONFIG_R8169_NAPI=y \
@@ -723,7 +723,7 @@ $(eval $(call KernelPackage,igbvf))
723723
define KernelPackage/ixgbe
724724
SUBMENU:=$(NETWORK_DEVICES_MENU)
725725
TITLE:=Intel(R) 82598/82599 PCI-Express 10 Gigabit Ethernet support
726-
DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-ptp +kmod-hwmon-core +kmod-libphy +(LINUX_5_10||LINUX_5_15||LINUX_6_0):kmod-mdio-devres
726+
DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-ptp +kmod-hwmon-core +kmod-libphy +(LINUX_5_10||LINUX_5_15||LINUX_6_0||LINUX_6_1):kmod-mdio-devres
727727
KCONFIG:=CONFIG_IXGBE \
728728
CONFIG_IXGBE_VXLAN=n \
729729
CONFIG_IXGBE_HWMON=y \

‎package/kernel/linux/modules/other.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -1136,8 +1136,8 @@ $(eval $(call KernelPackage,keys-trusted))
11361136
define KernelPackage/tpm
11371137
SUBMENU:=$(OTHER_MENU)
11381138
TITLE:=TPM Hardware Support
1139-
DEPENDS:= +kmod-random-core +(LINUX_5_15||LINUX_6_0):kmod-asn1-decoder \
1140-
+(LINUX_5_15||LINUX_6_0):kmod-asn1-encoder +(LINUX_5_15||LINUX_6_0):kmod-oid-registry
1139+
DEPENDS:= +kmod-random-core +(LINUX_5_15||LINUX_6_0||LINUX_6_1):kmod-asn1-decoder \
1140+
+(LINUX_5_15||LINUX_6_0||LINUX_6_1):kmod-asn1-encoder +(LINUX_5_15||LINUX_6_0||LINUX_6_1):kmod-oid-registry
11411141
KCONFIG:= CONFIG_TCG_TPM
11421142
FILES:= $(LINUX_DIR)/drivers/char/tpm/tpm.ko
11431143
AUTOLOAD:=$(call AutoLoad,10,tpm,1)
@@ -1283,7 +1283,7 @@ $(eval $(call KernelPackage,qcom-qmi-helpers))
12831283
define KernelPackage/mhi
12841284
SUBMENU:=$(OTHER_MENU)
12851285
TITLE:=Modem Host Interface (MHI) bus
1286-
DEPENDS:=@(LINUX_5_15||LINUX_6_0)
1286+
DEPENDS:=@(LINUX_5_15||LINUX_6_0||LINUX_6_1)
12871287
KCONFIG:=CONFIG_MHI_BUS \
12881288
CONFIG_MHI_BUS_DEBUG=y \
12891289
CONFIG_MHI_BUS_PCI_GENERIC=n \

‎package/kernel/linux/modules/usb.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@ $(eval $(call KernelPackage,usb-net-aqc111))
11381138

11391139
define KernelPackage/usb-net-asix
11401140
TITLE:=Kernel module for USB-to-Ethernet Asix convertors
1141-
DEPENDS:=+kmod-libphy +(LINUX_5_15||LINUX_6_0):kmod-mdio-devres
1141+
DEPENDS:=+kmod-libphy +(LINUX_5_15||LINUX_6_0||LINUX_6_1):kmod-mdio-devres
11421142
KCONFIG:=CONFIG_USB_NET_AX8817X
11431143
FILES:= \
11441144
$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.ko \

‎package/kernel/linux/modules/video.mk

+8-6
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ define KernelPackage/backlight
2828
CONFIG_BACKLIGHT_ADP8870=n \
2929
CONFIG_BACKLIGHT_OT200=n \
3030
CONFIG_BACKLIGHT_PM8941_WLED=n
31-
FILES:=$(LINUX_DIR)/drivers/video/backlight/backlight.ko
31+
FILES:=$(LINUX_DIR)/drivers/video/backlight/backlight.ko \
32+
$(LINUX_DIR)/drivers/acpi/[email protected] \
33+
$(LINUX_DIR)/drivers/platform/x86/[email protected]
3234
AUTOLOAD:=$(call AutoProbe,video backlight)
3335
endef
3436

@@ -244,7 +246,7 @@ define KernelPackage/drm
244246
TITLE:=Direct Rendering Manager (DRM) support
245247
HIDDEN:=1
246248
DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-i2c-algo-bit +PACKAGE_kmod-backlight:kmod-backlight \
247-
+(LINUX_5_15||LINUX_6_0):kmod-fb
249+
+(LINUX_5_15||LINUX_6_0||LINUX_6_1):kmod-fb
248250
KCONFIG:= \
249251
CONFIG_DRM \
250252
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y \
@@ -266,7 +268,7 @@ $(eval $(call KernelPackage,drm))
266268
define KernelPackage/drm-buddy
267269
SUBMENU:=$(VIDEO_MENU)
268270
TITLE:=A page based buddy allocator
269-
DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-drm @LINUX_6_0
271+
DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-drm @(LINUX_6_0||LINUX_6_1)
270272
KCONFIG:=CONFIG_DRM_BUDDY
271273
FILES:= $(LINUX_DIR)/drivers/gpu/drm/drm_buddy.ko
272274
AUTOLOAD:=$(call AutoProbe,drm_buddy)
@@ -311,7 +313,7 @@ $(eval $(call KernelPackage,drm-kms-helper))
311313
define KernelPackage/drm-display-helper
312314
SUBMENU:=$(VIDEO_MENU)
313315
TITLE:=DRM helpers for display adapters drivers
314-
DEPENDS:=@DISPLAY_SUPPORT +kmod-drm +TARGET_x86:kmod-drm-buddy @LINUX_6_0
316+
DEPENDS:=@DISPLAY_SUPPORT +kmod-drm +TARGET_x86:kmod-drm-buddy @(LINUX_6_0||LINUX_6_1)
315317
KCONFIG:=CONFIG_DRM_DISPLAY_HELPER
316318
FILES:=$(LINUX_DIR)/drivers/gpu/drm/display/drm_display_helper.ko
317319
AUTOLOAD:=$(call AutoProbe,drm_display_helper)
@@ -328,7 +330,7 @@ define KernelPackage/drm-amdgpu
328330
TITLE:=AMDGPU DRM support
329331
DEPENDS:=@TARGET_x86 @DISPLAY_SUPPORT +kmod-backlight +kmod-drm-ttm \
330332
+kmod-drm-kms-helper +kmod-i2c-algo-bit +amdgpu-firmware \
331-
+LINUX_6_0:kmod-drm-display-helper
333+
+(LINUX_6_0||LINUX_6_1):kmod-drm-display-helper
332334
KCONFIG:=CONFIG_DRM_AMDGPU \
333335
CONFIG_DRM_AMDGPU_SI=y \
334336
CONFIG_DRM_AMDGPU_CIK=y \
@@ -1103,7 +1105,7 @@ define KernelPackage/drm-i915
11031105
SUBMENU:=$(VIDEO_MENU)
11041106
TITLE:=Intel GPU drm support
11051107
DEPENDS:=@TARGET_x86 +kmod-drm-ttm +kmod-drm-kms-helper +i915-firmware \
1106-
+LINUX_6_0:kmod-drm-display-helper
1108+
+(LINUX_6_0||LINUX_6_1):kmod-drm-display-helper
11071109
KCONFIG:= \
11081110
CONFIG_INTEL_GTT \
11091111
CONFIG_DRM_I915 \

‎package/lean/r8125/patches/021-6.1-suppot.patch

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- a/src/r8125.h
2+
+++ b/src/r8125.h
3+
@@ -633,7 +633,11 @@
4+
typedef struct napi_struct *napi_ptr;
5+
typedef int napi_budget;
6+
7+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
8+
+#define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add_weight(ndev, &priv->napi, function, weight)
9+
+#else
10+
#define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add(ndev, &priv->napi, function, weight)
11+
+#endif
12+
#define RTL_NAPI_QUOTA(budget, ndev) min(budget, budget)
13+
#define RTL_GET_PRIV(stuct_ptr, priv_struct) container_of(stuct_ptr, priv_struct, stuct_ptr)
14+
#define RTL_GET_NETDEV(priv_ptr) struct net_device *dev = priv_ptr->dev;

‎package/lean/r8152/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
88

99
PKG_NAME:=r8152
1010
PKG_VERSION:=2.16.3.20220914
11-
PKG_RELEASE:=1
11+
PKG_RELEASE:=3
1212

1313
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1414
PKG_SOURCE_URL:=https://codeload.github.com/wget/realtek-r8152-linux/tar.gz/v$(PKG_VERSION)?

‎package/lean/r8152/patches/020-6.1-support.patch

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
--- a/compatibility.h
2+
+++ b/compatibility.h
3+
@@ -237,9 +237,15 @@
4+
#define napi_disable(napi_ptr) netif_poll_disable(container_of(napi_ptr, struct r8152, napi)->netdev)
5+
#define napi_schedule(napi_ptr) netif_rx_schedule(container_of(napi_ptr, struct r8152, napi)->netdev)
6+
#define napi_complete(napi_ptr) netif_rx_complete(container_of(napi_ptr, struct r8152, napi)->netdev)
7+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
8+
+ #define netif_napi_add_weight(ndev, napi_ptr, function, weight_t) \
9+
+ ndev->poll = function; \
10+
+ ndev->weight = weight_t;
11+
+#else
12+
#define netif_napi_add(ndev, napi_ptr, function, weight_t) \
13+
ndev->poll = function; \
14+
ndev->weight = weight_t;
15+
+#endif
16+
typedef unsigned long uintptr_t;
17+
#define DMA_BIT_MASK(value) \
18+
(value < 64 ? ((1ULL << value) - 1) : 0xFFFFFFFFFFFFFFFFULL)
19+
--- a/r8152.c
20+
+++ b/r8152.c
21+
@@ -20718,10 +20718,17 @@
22+
23+
usb_set_intfdata(intf, tp);
24+
25+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
26+
+ if (tp->support_2500full)
27+
+ netif_napi_add_weight(netdev, &tp->napi, r8152_poll, 256);
28+
+ else
29+
+ netif_napi_add_weight(netdev, &tp->napi, r8152_poll, 64);
30+
+#else
31+
if (tp->support_2500full)
32+
netif_napi_add(netdev, &tp->napi, r8152_poll, 256);
33+
else
34+
netif_napi_add(netdev, &tp->napi, r8152_poll, 64);
35+
+#endif
36+
37+
ret = register_netdev(netdev);
38+
if (ret != 0) {

‎package/lean/r8168/patches/030-5.19-support.patch ‎package/lean/r8168/patches/020-5.19-support.patch

File renamed without changes.

‎package/lean/r8168/patches/030-6.1-support.patch

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- a/src/r8168.h
2+
--- b/src/r8168.h
3+
@@ -566,7 +566,11 @@
4+
typedef struct napi_struct *napi_ptr;
5+
typedef int napi_budget;
6+
7+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
8+
+#define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add_weight(ndev, &priv->napi, function, weight)
9+
+#else
10+
#define RTL_NAPI_CONFIG(ndev, priv, function, weight) netif_napi_add(ndev, &priv->napi, function, weight)
11+
+#endif
12+
#define RTL_NAPI_QUOTA(budget, ndev) min(budget, budget)
13+
#define RTL_GET_PRIV(stuct_ptr, priv_struct) container_of(stuct_ptr, priv_struct, stuct_ptr)
14+
#define RTL_GET_NETDEV(priv_ptr) struct net_device *dev = priv_ptr->dev;

‎package/network/services/fullconenat/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2018 Chion Tang <[email protected]>
2+
# Copyright (C) 2022 Chion Tang <[email protected]>
33
#
44
# This is free software, licensed under the GNU General Public License v2.
55
# See /LICENSE for more information.
@@ -8,7 +8,7 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=fullconenat
11-
PKG_RELEASE:=6
11+
PKG_RELEASE:=9
1212

1313
PKG_SOURCE_DATE:=2022-02-13
1414
PKG_SOURCE_PROTO:=git

‎package/network/services/fullconenat/patches/001-linux-6.1-support.patch

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
--- a/xt_FULLCONENAT.c
2+
+++ b/xt_FULLCONENAT.c
3+
@@ -325,7 +325,11 @@
4+
/* for now we do the same thing for both --random and --random-fully */
5+
6+
/* select a random starting point */
7+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
8+
+ start = (uint16_t)(get_random_u32() % (u32)range_size);
9+
+#else
10+
start = (uint16_t)(prandom_u32() % (u32)range_size);
11+
+#endif
12+
} else {
13+
14+
if ((original_port >= min && original_port <= min + range_size - 1)
15+
@@ -995,7 +999,11 @@
16+
/* for now we do the same thing for both --random and --random-fully */
17+
18+
/* select a random starting point */
19+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
20+
+ start = (uint16_t)(get_random_u32() % (u32)range_size);
21+
+#else
22+
start = (uint16_t)(prandom_u32() % (u32)range_size);
23+
+#endif
24+
} else {
25+
26+
if ((original_port >= min && original_port <= min + range_size - 1)

‎target/linux/generic/backport-6.1/100-net-add-netdev_sw_irq_coalesce_default_on.patch

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
From e9aef3d90b4bd11fccbde3741f2396ea05a9f386 Mon Sep 17 00:00:00 2001
2+
From: Heiner Kallweit <[email protected]>
3+
Date: Wed, 30 Nov 2022 23:28:26 +0100
4+
Subject: [PATCH] net: add netdev_sw_irq_coalesce_default_on()
5+
6+
Add a helper for drivers wanting to set SW IRQ coalescing
7+
by default. The related sysfs attributes can be used to
8+
override the default values.
9+
10+
Follow Jakub's suggestion and put this functionality into
11+
net core so that drivers wanting to use software interrupt
12+
coalescing per default don't have to open-code it.
13+
14+
Note that this function needs to be called before the
15+
netdevice is registered.
16+
17+
Suggested-by: Jakub Kicinski <[email protected]>
18+
Signed-off-by: Heiner Kallweit <[email protected]>
19+
Signed-off-by: David S. Miller <[email protected]>
20+
---
21+
include/linux/netdevice.h | 1 +
22+
net/core/dev.c | 16 ++++++++++++++++
23+
2 files changed, 17 insertions(+)
24+
25+
--- a/include/linux/netdevice.h
26+
+++ b/include/linux/netdevice.h
27+
@@ -78,6 +78,7 @@ struct xdp_buff;
28+
void synchronize_net(void);
29+
void netdev_set_default_ethtool_ops(struct net_device *dev,
30+
const struct ethtool_ops *ops);
31+
+void netdev_sw_irq_coalesce_default_on(struct net_device *dev);
32+
33+
/* Backlog congestion levels */
34+
#define NET_RX_SUCCESS 0 /* keep 'em coming, baby */
35+
--- a/net/core/dev.c
36+
+++ b/net/core/dev.c
37+
@@ -10535,6 +10535,22 @@ void netdev_set_default_ethtool_ops(stru
38+
}
39+
EXPORT_SYMBOL_GPL(netdev_set_default_ethtool_ops);
40+
41+
+/**
42+
+ * netdev_sw_irq_coalesce_default_on() - enable SW IRQ coalescing by default
43+
+ * @dev: netdev to enable the IRQ coalescing on
44+
+ *
45+
+ * Sets a conservative default for SW IRQ coalescing. Users can use
46+
+ * sysfs attributes to override the default values.
47+
+ */
48+
+void netdev_sw_irq_coalesce_default_on(struct net_device *dev)
49+
+{
50+
+ WARN_ON(dev->reg_state == NETREG_REGISTERED);
51+
+
52+
+ dev->gro_flush_timeout = 20000;
53+
+ dev->napi_defer_hard_irqs = 1;
54+
+}
55+
+EXPORT_SYMBOL_GPL(netdev_sw_irq_coalesce_default_on);
56+
+
57+
void netdev_freemem(struct net_device *dev)
58+
{
59+
char *addr = (char *)dev - dev->padded;

0 commit comments

Comments
 (0)