Skip to content

Commit 8be8f60

Browse files
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: kernel: 5.19: refresh patches (coolsnowwolf#9966) mt76: mt7921e: fix crash in chip reset fail on rockchip 5.19 kernel mt76: add 5.19 kernel support kernel: bump 5.19 to 5.19.2 package: add realtek r8101 driver (coolsnowwolf#9964) rockchip: add NanoPi R5S dummy dts for build (coolsnowwolf#9961)
2 parents d0b4084 + 4bb5934 commit 8be8f60

27 files changed

+923
-1007
lines changed

include/kernel-5.19

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.19 = .1
2-
LINUX_KERNEL_HASH-5.19.1 = f4e27b926ea2c66b808db1f5706254cf92a8899e2108eedb0c3a7d12499aea55
1+
LINUX_VERSION-5.19 = .2
2+
LINUX_KERNEL_HASH-5.19.2 = 48e40a1f5501ec6c40e3c86d3d5319200b688f2d9360f72833084d74801fe63d

package/kernel/mt76/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include $(TOPDIR)/rules.mk
22

33
PKG_NAME:=mt76
4-
PKG_RELEASE=4
4+
PKG_RELEASE=5
55

66
PKG_LICENSE:=GPLv2
77
PKG_LICENSE_FILES:=
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- a/mt7921/pci_mac.c
2+
+++ b/mt7921/pci_mac.c
3+
@@ -261,7 +261,7 @@ int mt7921e_mac_reset(struct mt7921_dev *dev)
4+
5+
err = mt7921e_driver_own(dev);
6+
if (err)
7+
- return err;
8+
+ goto out;
9+
10+
err = mt7921_run_firmware(dev);
11+
if (err)
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- a/usb.c
2+
+++ b/usb.c
3+
@@ -1068,7 +1068,11 @@
4+
5+
INIT_WORK(&usb->stat_work, mt76u_tx_status_data);
6+
7+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,19,0)
8+
usb->data_len = usb_maxpacket(udev, usb_sndctrlpipe(udev, 0), 1);
9+
+#else
10+
+ usb->data_len = usb_maxpacket(udev, usb_sndctrlpipe(udev, 0));
11+
+#endif
12+
if (usb->data_len < 32)
13+
usb->data_len = 32;
14+

package/lean/r8101/Makefile

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#
2+
# Download realtek r8101 linux driver from official site:
3+
# [https://www.realtek.com/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software]
4+
#
5+
6+
include $(TOPDIR)/rules.mk
7+
include $(INCLUDE_DIR)/kernel.mk
8+
9+
# SPDX-License-Identifier: GPL-3.0-only
10+
#
11+
# Copyright (C) 2022 ImmortalWrt.org
12+
13+
include $(TOPDIR)/rules.mk
14+
include $(INCLUDE_DIR)/kernel.mk
15+
16+
PKG_NAME:=r8101
17+
PKG_VERSION:=1.037.01
18+
PKG_RELEASE:=$(AUTORELEASE)
19+
20+
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
21+
PKG_SOURCE_URL:=https://github.com/umarizulkifli/r8101/blob/main/r8101-1.037.01.tar.bz2
22+
PKG_HASH:=45b3ae6af31054879b06c13ce4f0fb14
23+
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
24+
25+
PKG_MAINTAINER:=umarizulkifli <[email protected]>
26+
PKG_LICENSE:=GPL-2.0-only
27+
28+
include $(INCLUDE_DIR)/package.mk
29+
30+
define KernelPackage/r8101
31+
TITLE:=Driver for Realtek r8101 chipsets
32+
SUBMENU:=Network Devices
33+
VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
34+
DEPENDS:=@PCI_SUPPORT
35+
FILES:= $(PKG_BUILD_DIR)/src/r8101.ko
36+
AUTOLOAD:=$(call AutoProbe,r8101)
37+
endef
38+
39+
define Package/r8101/description
40+
This package contains a driver for Realtek r8101 chipsets.
41+
endef
42+
43+
define Build/Compile
44+
+$(KERNEL_MAKE) M=$(PKG_BUILD_DIR)/src modules
45+
endef
46+
47+
$(eval $(call KernelPackage,r8101))
48+

target/linux/generic/backport-5.19/002-struct-net_device.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#endif
3333
--- a/include/net/cfg80211.h
3434
+++ b/include/net/cfg80211.h
35-
@@ -8006,9 +8006,7 @@ int cfg80211_register_netdevice(struct n
35+
@@ -8085,9 +8085,7 @@ int cfg80211_register_netdevice(struct n
3636
*/
3737
static inline void cfg80211_unregister_netdevice(struct net_device *dev)
3838
{

target/linux/generic/hack-5.19/800-GPIO-add-named-gpio-exports.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <[email protected]>
1515

1616
#include "gpiolib.h"
1717
#include "gpiolib-of.h"
18-
@@ -1057,3 +1059,72 @@ void of_gpio_dev_init(struct gpio_chip *
18+
@@ -1059,3 +1061,72 @@ void of_gpio_dev_init(struct gpio_chip *
1919
else
2020
gc->of_node = gdev->dev.of_node;
2121
}

target/linux/generic/hack-5.19/904-debloat_dma_buf.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
7373
+MODULE_LICENSE("GPL");
7474
--- a/kernel/sched/core.c
7575
+++ b/kernel/sched/core.c
76-
@@ -4284,6 +4284,7 @@ int wake_up_state(struct task_struct *p,
76+
@@ -4293,6 +4293,7 @@ int wake_up_state(struct task_struct *p,
7777
{
7878
return try_to_wake_up(p, state, 0);
7979
}

target/linux/generic/pending-5.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <[email protected]>
7171

7272
--- a/mm/page_alloc.c
7373
+++ b/mm/page_alloc.c
74-
@@ -7702,7 +7702,7 @@ static void __init alloc_node_mem_map(st
74+
@@ -7698,7 +7698,7 @@ static void __init alloc_node_mem_map(st
7575
if (pgdat == NODE_DATA(0)) {
7676
mem_map = NODE_DATA(0)->node_mem_map;
7777
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)

0 commit comments

Comments
 (0)