[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)
dmifly · Aug 17, 2022 · 6b0787b · 6b0787b
2 parents 4ab86a8 + 4bb5934
commit 6b0787b
Show file tree

Hide file tree

Showing 27 changed files with 923 additions and 1,007 deletions.
diff --git a/include/kernel-5.19 b/include/kernel-5.19
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.19 = .1
-LINUX_KERNEL_HASH-5.19.1 = f4e27b926ea2c66b808db1f5706254cf92a8899e2108eedb0c3a7d12499aea55
+LINUX_VERSION-5.19 = .2
+LINUX_KERNEL_HASH-5.19.2 = 48e40a1f5501ec6c40e3c86d3d5319200b688f2d9360f72833084d74801fe63d
diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mt76
-PKG_RELEASE=4
+PKG_RELEASE=5
 
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=

diff --git a/...rnel/mt76/patches/010.bypass-werror.patch → ...rnel/mt76/patches/010-bypass-werror.patch b/...rnel/mt76/patches/010.bypass-werror.patch → ...rnel/mt76/patches/010-bypass-werror.patch
diff --git a/package/kernel/mt76/patches/020-fix-crash-in-chip-reset-fail.patch b/package/kernel/mt76/patches/020-fix-crash-in-chip-reset-fail.patch
@@ -0,0 +1,11 @@
+--- a/mt7921/pci_mac.c
++++ b/mt7921/pci_mac.c
+@@ -261,7 +261,7 @@  int mt7921e_mac_reset(struct mt7921_dev *dev)
+
+ 	err = mt7921e_driver_own(dev);
+ 	if (err)
+-		return err;
++		goto out;
+
+ 	err = mt7921_run_firmware(dev);
+ 	if (err)
diff --git a/package/kernel/mt76/patches/090-backport-to-linux-5.19.patch b/package/kernel/mt76/patches/090-backport-to-linux-5.19.patch
@@ -0,0 +1,14 @@
+--- a/usb.c
++++ b/usb.c
+@@ -1068,7 +1068,11 @@
+
+ 	INIT_WORK(&usb->stat_work, mt76u_tx_status_data);
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,19,0)
+ 	usb->data_len = usb_maxpacket(udev, usb_sndctrlpipe(udev, 0), 1);
++#else
++	usb->data_len = usb_maxpacket(udev, usb_sndctrlpipe(udev, 0));
++#endif
+ 	if (usb->data_len < 32)
+ 		usb->data_len = 32;
+
diff --git a/package/lean/r8101/Makefile b/package/lean/r8101/Makefile
@@ -0,0 +1,48 @@
+#
+# Download realtek r8101 linux driver from official site:
+# [https://www.realtek.com/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software]
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+# SPDX-License-Identifier: GPL-3.0-only
+#
+# Copyright (C) 2022 ImmortalWrt.org
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=r8101
+PKG_VERSION:=1.037.01
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=https://github.com/umarizulkifli/r8101/blob/main/r8101-1.037.01.tar.bz2
+PKG_HASH:=45b3ae6af31054879b06c13ce4f0fb14
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_MAINTAINER:=umarizulkifli <umarizulkifli@gmail.com>
+PKG_LICENSE:=GPL-2.0-only
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/r8101
+  TITLE:=Driver for Realtek r8101 chipsets
+  SUBMENU:=Network Devices
+  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
+  DEPENDS:=@PCI_SUPPORT
+  FILES:= $(PKG_BUILD_DIR)/src/r8101.ko
+  AUTOLOAD:=$(call AutoProbe,r8101)
+endef
+
+define Package/r8101/description
+  This package contains a driver for Realtek r8101 chipsets.
+endef
+
+define Build/Compile
+	+$(KERNEL_MAKE) M=$(PKG_BUILD_DIR)/src modules
+endef
+
+$(eval $(call KernelPackage,r8101))
+
diff --git a/target/linux/generic/backport-5.19/002-struct-net_device.patch b/target/linux/generic/backport-5.19/002-struct-net_device.patch
@@ -32,7 +32,7 @@
  #endif
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -8006,9 +8006,7 @@ int cfg80211_register_netdevice(struct n
+@@ -8085,9 +8085,7 @@ int cfg80211_register_netdevice(struct n
   */
  static inline void cfg80211_unregister_netdevice(struct net_device *dev)
  {

diff --git a/target/linux/generic/hack-5.19/800-GPIO-add-named-gpio-exports.patch b/target/linux/generic/hack-5.19/800-GPIO-add-named-gpio-exports.patch
@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
  #include "gpiolib.h"
  #include "gpiolib-of.h"
-@@ -1057,3 +1059,72 @@ void of_gpio_dev_init(struct gpio_chip *
+@@ -1059,3 +1061,72 @@ void of_gpio_dev_init(struct gpio_chip *
  	else
  		gc->of_node = gdev->dev.of_node;
  }

diff --git a/target/linux/generic/hack-5.19/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.19/904-debloat_dma_buf.patch
@@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 +MODULE_LICENSE("GPL");
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -4284,6 +4284,7 @@ int wake_up_state(struct task_struct *p,
+@@ -4293,6 +4293,7 @@ int wake_up_state(struct task_struct *p,
  {
  	return try_to_wake_up(p, state, 0);
  }

diff --git a/...et/linux/generic/pending-5.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch b/...et/linux/generic/pending-5.19/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
@@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
 
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
-@@ -7702,7 +7702,7 @@ static void __init alloc_node_mem_map(st
+@@ -7698,7 +7698,7 @@ static void __init alloc_node_mem_map(st
  	if (pgdat == NODE_DATA(0)) {
  		mem_map = NODE_DATA(0)->node_mem_map;
  		if (page_to_pfn(mem_map) != pgdat->node_start_pfn)

diff --git a/target/linux/generic/pending-5.19/419-mtd-redboot-add-of_match_table-with-DT-binding.patch b/target/linux/generic/pending-5.19/419-mtd-redboot-add-of_match_table-with-DT-binding.patch
@@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
 
 --- a/drivers/mtd/parsers/redboot.c
 +++ b/drivers/mtd/parsers/redboot.c
-@@ -304,6 +304,7 @@ nogood:
+@@ -305,6 +305,7 @@ nogood:
 
  static const struct of_device_id mtd_parser_redboot_of_match_table[] = {
  	{ .compatible = "redboot-fis" },

diff --git a/target/linux/generic/pending-5.19/420-mtd-redboot_space.patch b/target/linux/generic/pending-5.19/420-mtd-redboot_space.patch
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/drivers/mtd/parsers/redboot.c
 +++ b/drivers/mtd/parsers/redboot.c
-@@ -277,14 +277,21 @@ nogood:
+@@ -278,14 +278,21 @@ nogood:
  #endif
  		names += strlen(names) + 1;
 

diff --git a/target/linux/generic/pending-5.19/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-5.19/811-pci_disable_usb_common_quirks.patch
@@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  #endif  /*  __LINUX_USB_PCI_QUIRKS_H  */
 --- a/include/linux/usb/hcd.h
 +++ b/include/linux/usb/hcd.h
-@@ -497,7 +497,14 @@ extern int usb_hcd_pci_probe(struct pci_
+@@ -498,7 +498,14 @@ extern int usb_hcd_pci_probe(struct pci_
  extern void usb_hcd_pci_remove(struct pci_dev *dev);
  extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
 

diff --git a/target/linux/generic/pending-5.19/920-mangle_bootargs.patch b/target/linux/generic/pending-5.19/920-mangle_bootargs.patch
@@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  	help
 --- a/init/main.c
 +++ b/init/main.c
-@@ -606,6 +606,29 @@ static inline void setup_nr_cpu_ids(void
+@@ -607,6 +607,29 @@ static inline void setup_nr_cpu_ids(void
  static inline void smp_prepare_cpus(unsigned int maxcpus) { }
  #endif
 
@@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  /*
   * We need to store the untouched command line for future reference.
   * We also need to store the touched command line since the parameter
-@@ -949,6 +972,7 @@ asmlinkage __visible void __init __no_sa
+@@ -950,6 +973,7 @@ asmlinkage __visible void __init __no_sa
  	pr_notice("%s", linux_banner);
  	early_security_init();
  	setup_arch(&command_line);