From: Shiji Yang Date: Thu, 10 Jul 2025 15:59:14 +0000 (+0800) Subject: kernel: bump 6.6 to 6.6.97 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04d764576b766ce849ea68af5ed7f5cfd8f47260;p=thirdparty%2Fopenwrt.git kernel: bump 6.6 to 6.6.97 Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.97 Remove upstream patch: generic/backport-6.6/001-powerpc-kernel-Fix-pcc_save_regs-inclusion.patch[1] Manually rebased patch: bcm53xx/patches-6.6/180-usb-xhci-add-support-for-performing-fake-doorbell.patch[2] All other patches are automatically refreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.97&id=8a7ac2737211451b8b98657b919c4c4e0a4c0c2f [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.97&id=7609899eb6b70b536123eb58eeab27c764752b82 Signed-off-by: Shiji Yang Co-authored-by: John Audia Tested-by: Konstantin Demin Link: https://github.com/openwrt/openwrt/pull/19317 Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/bcm53xx/patches-6.6/180-usb-xhci-add-support-for-performing-fake-doorbell.patch b/target/linux/bcm53xx/patches-6.6/180-usb-xhci-add-support-for-performing-fake-doorbell.patch index 5886cef55ad..f8d8f0069bc 100644 --- a/target/linux/bcm53xx/patches-6.6/180-usb-xhci-add-support-for-performing-fake-doorbell.patch +++ b/target/linux/bcm53xx/patches-6.6/180-usb-xhci-add-support-for-performing-fake-doorbell.patch @@ -103,11 +103,11 @@ it on BCM4708 family. if (xhci->quirks & XHCI_NEC_HOST) --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1659,6 +1659,7 @@ struct xhci_hcd { - #define XHCI_WRITE_64_HI_LO BIT_ULL(47) +@@ -1660,6 +1660,7 @@ struct xhci_hcd { #define XHCI_CDNS_SCTX_QUIRK BIT_ULL(48) #define XHCI_ETRON_HOST BIT_ULL(49) -+#define XHCI_FAKE_DOORBELL BIT_ULL(50) + #define XHCI_LIMIT_ENDPOINT_INTERVAL_9 BIT_ULL(50) ++#define XHCI_FAKE_DOORBELL BIT_ULL(51) unsigned int num_active_eps; unsigned int limit_active_eps; diff --git a/target/linux/generic/backport-6.6/001-powerpc-kernel-Fix-pcc_save_regs-inclusion.patch b/target/linux/generic/backport-6.6/001-powerpc-kernel-Fix-pcc_save_regs-inclusion.patch deleted file mode 100644 index 3d3515f5ab7..00000000000 --- a/target/linux/generic/backport-6.6/001-powerpc-kernel-Fix-pcc_save_regs-inclusion.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 93bd4a80efeb521314485a06d8c21157240497bb Mon Sep 17 00:00:00 2001 -From: Madhavan Srinivasan -Date: Sun, 11 May 2025 09:41:11 +0530 -Subject: powerpc/kernel: Fix ppc_save_regs inclusion in build - -Recent patch fixed an old commit -'fc2a5a6161a2 ("powerpc/64s: ppc_save_regs is now needed for all 64s builds")' -which is to include building of ppc_save_reg.c only when XMON -and KEXEC_CORE and PPC_BOOK3S are enabled. This was valid, since -ppc_save_regs was called only in replay_system_reset() of old -irq.c which was under BOOK3S. - -But there has been multiple refactoring of irq.c and have -added call to ppc_save_regs() from __replay_soft_interrupts --> replay_soft_interrupts which is part of irq_64.c included -under CONFIG_PPC64. And since ppc_save_regs is called in -CRASH_DUMP path as part of crash_setup_regs in kexec.h, -CONFIG_PPC32 also needs it. - -So with this recent patch which enabled the building of -ppc_save_regs.c caused a build break when none of these -(XMON, KEXEC_CORE, BOOK3S) where enabled as part of config. -Patch to enable building of ppc_save_regs.c by defaults. - -Signed-off-by: Madhavan Srinivasan -Link: https://patch.msgid.link/20250511041111.841158-1-maddy@linux.ibm.com ---- - arch/powerpc/kernel/Makefile | 2 -- - 1 file changed, 2 deletions(-) - ---- a/arch/powerpc/kernel/Makefile -+++ b/arch/powerpc/kernel/Makefile -@@ -165,9 +165,7 @@ endif - - obj64-$(CONFIG_PPC_TRANSACTIONAL_MEM) += tm.o - --ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC_CORE)$(CONFIG_PPC_BOOK3S),) - obj-y += ppc_save_regs.o --endif - - obj-$(CONFIG_EPAPR_PARAVIRT) += epapr_paravirt.o epapr_hcalls.o - obj-$(CONFIG_KVM_GUEST) += kvm.o kvm_emul.o diff --git a/target/linux/generic/backport-6.6/0080-v6.9-smp-Avoid-setup_max_cpus_namespace_collision_shadowing.patch b/target/linux/generic/backport-6.6/0080-v6.9-smp-Avoid-setup_max_cpus_namespace_collision_shadowing.patch index c8cef08935c..f5459aaccd5 100644 --- a/target/linux/generic/backport-6.6/0080-v6.9-smp-Avoid-setup_max_cpus_namespace_collision_shadowing.patch +++ b/target/linux/generic/backport-6.6/0080-v6.9-smp-Avoid-setup_max_cpus_namespace_collision_shadowing.patch @@ -21,7 +21,7 @@ Cc: linux-kernel@vger.kernel.org --- a/include/linux/cpu.h +++ b/include/linux/cpu.h -@@ -111,7 +111,7 @@ void notify_cpu_starting(unsigned int cp +@@ -112,7 +112,7 @@ void notify_cpu_starting(unsigned int cp extern void cpu_maps_update_begin(void); extern void cpu_maps_update_done(void); int bringup_hibernate_cpu(unsigned int sleep_cpu); diff --git a/target/linux/generic/backport-6.6/792-v6.16-igc-enable-HW-vlan-tag-insertion-stripping-by-defaul.patch b/target/linux/generic/backport-6.6/792-v6.16-igc-enable-HW-vlan-tag-insertion-stripping-by-defaul.patch index 0ca219457c6..5be2e83ccea 100644 --- a/target/linux/generic/backport-6.6/792-v6.16-igc-enable-HW-vlan-tag-insertion-stripping-by-defaul.patch +++ b/target/linux/generic/backport-6.6/792-v6.16-igc-enable-HW-vlan-tag-insertion-stripping-by-defaul.patch @@ -20,7 +20,7 @@ Signed-off-by: Rui Salvaterra --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c -@@ -6850,6 +6850,9 @@ static int igc_probe(struct pci_dev *pde +@@ -6854,6 +6854,9 @@ static int igc_probe(struct pci_dev *pde netdev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT | NETDEV_XDP_ACT_XSK_ZEROCOPY; diff --git a/target/linux/generic/backport-6.6/806-01-v6.10-xhci-pci-Use-PCI_VENDOR_ID_RENESAS.patch b/target/linux/generic/backport-6.6/806-01-v6.10-xhci-pci-Use-PCI_VENDOR_ID_RENESAS.patch index f8edb5f3edc..7479d063710 100644 --- a/target/linux/generic/backport-6.6/806-01-v6.10-xhci-pci-Use-PCI_VENDOR_ID_RENESAS.patch +++ b/target/linux/generic/backport-6.6/806-01-v6.10-xhci-pci-Use-PCI_VENDOR_ID_RENESAS.patch @@ -15,7 +15,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -966,10 +966,10 @@ static const struct xhci_driver_data ren +@@ -991,10 +991,10 @@ static const struct xhci_driver_data ren /* PCI driver selection metadata; PCI hotplugging uses this */ static const struct pci_device_id pci_ids[] = { diff --git a/target/linux/generic/backport-6.6/806-03-v6.12-xhci-pci-Make-xhci-pci-renesas-a-proper-modular-driver.patch b/target/linux/generic/backport-6.6/806-03-v6.12-xhci-pci-Make-xhci-pci-renesas-a-proper-modular-driver.patch index 50fe87a983c..dfab7200e14 100644 --- a/target/linux/generic/backport-6.6/806-03-v6.12-xhci-pci-Make-xhci-pci-renesas-a-proper-modular-driver.patch +++ b/target/linux/generic/backport-6.6/806-03-v6.12-xhci-pci-Make-xhci-pci-renesas-a-proper-modular-driver.patch @@ -134,7 +134,7 @@ Signed-off-by: Greg Kroah-Hartman MODULE_LICENSE("GPL v2"); --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -300,15 +300,6 @@ static int xhci_pci_reinit(struct xhci_h +@@ -310,15 +310,6 @@ static int xhci_pci_reinit(struct xhci_h static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) { struct pci_dev *pdev = to_pci_dev(dev); @@ -150,7 +150,7 @@ Signed-off-by: Greg Kroah-Hartman /* Look for vendor-specific quirks */ if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC && -@@ -643,21 +634,13 @@ static int xhci_pci_update_hub_device(st +@@ -668,21 +659,13 @@ static int xhci_pci_update_hub_device(st * We need to register our own PCI probe function (instead of the USB core's * function) in order to create a second roothub under xHCI. */ @@ -173,7 +173,7 @@ Signed-off-by: Greg Kroah-Hartman reset = devm_reset_control_get_optional_exclusive(&dev->dev, NULL); if (IS_ERR(reset)) return PTR_ERR(reset); -@@ -722,8 +705,24 @@ put_runtime_pm: +@@ -747,8 +730,24 @@ put_runtime_pm: pm_runtime_put_noidle(&dev->dev); return retval; } @@ -199,7 +199,7 @@ Signed-off-by: Greg Kroah-Hartman { struct xhci_hcd *xhci; bool set_power_d3; -@@ -750,6 +749,7 @@ static void xhci_pci_remove(struct pci_d +@@ -775,6 +774,7 @@ static void xhci_pci_remove(struct pci_d if (set_power_d3) pci_set_power_state(dev, PCI_D3hot); } @@ -207,7 +207,7 @@ Signed-off-by: Greg Kroah-Hartman /* * In some Intel xHCI controllers, in order to get D3 working, -@@ -959,19 +959,8 @@ static void xhci_pci_shutdown(struct usb +@@ -984,19 +984,8 @@ static void xhci_pci_shutdown(struct usb /*-------------------------------------------------------------------------*/ @@ -227,7 +227,7 @@ Signed-off-by: Greg Kroah-Hartman /* handle any USB 3.0 xHCI controller */ { PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_XHCI, ~0), }, -@@ -979,14 +968,6 @@ static const struct pci_device_id pci_id +@@ -1004,14 +993,6 @@ static const struct pci_device_id pci_id }; MODULE_DEVICE_TABLE(pci, pci_ids); diff --git a/target/linux/generic/kernel-6.6 b/target/linux/generic/kernel-6.6 index 88d972d66a0..a98cd88bea2 100644 --- a/target/linux/generic/kernel-6.6 +++ b/target/linux/generic/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .96 -LINUX_KERNEL_HASH-6.6.96 = 9ee45843d43adb2e2ac5f6a8cb10a334e39e3e3384af8a0ce383a37f78221bdd +LINUX_VERSION-6.6 = .97 +LINUX_KERNEL_HASH-6.6.97 = 3b67c170638142da56b7a9c3295f2483b88e8c4d3bc26b2bda63b6cf0cb9ee3b diff --git a/target/linux/generic/pending-6.6/681-net-remove-NETIF_F_GSO_FRAGLIST-from-NETIF_F_GSO_SOF.patch b/target/linux/generic/pending-6.6/681-net-remove-NETIF_F_GSO_FRAGLIST-from-NETIF_F_GSO_SOF.patch index ff0a9ca5ae0..fffb6cbb54c 100644 --- a/target/linux/generic/pending-6.6/681-net-remove-NETIF_F_GSO_FRAGLIST-from-NETIF_F_GSO_SOF.patch +++ b/target/linux/generic/pending-6.6/681-net-remove-NETIF_F_GSO_FRAGLIST-from-NETIF_F_GSO_SOF.patch @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau if (sk_can_gso(sk)) { --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -1996,7 +1996,7 @@ void ieee80211_color_collision_detection +@@ -2005,7 +2005,7 @@ void ieee80211_color_collision_detection /* interface handling */ #define MAC80211_SUPPORTED_FEATURES_TX (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | \ NETIF_F_HW_CSUM | NETIF_F_SG | \ diff --git a/target/linux/mediatek/patches-6.6/330-snand-mtk-bmt-support.patch b/target/linux/mediatek/patches-6.6/330-snand-mtk-bmt-support.patch index 939ec048555..06026f375ec 100644 --- a/target/linux/mediatek/patches-6.6/330-snand-mtk-bmt-support.patch +++ b/target/linux/mediatek/patches-6.6/330-snand-mtk-bmt-support.patch @@ -8,7 +8,7 @@ static int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val) { -@@ -1347,6 +1348,7 @@ static int spinand_probe(struct spi_mem +@@ -1348,6 +1349,7 @@ static int spinand_probe(struct spi_mem if (ret) return ret; @@ -16,7 +16,7 @@ ret = mtd_device_register(mtd, NULL, 0); if (ret) goto err_spinand_cleanup; -@@ -1354,6 +1356,7 @@ static int spinand_probe(struct spi_mem +@@ -1355,6 +1357,7 @@ static int spinand_probe(struct spi_mem return 0; err_spinand_cleanup: @@ -24,7 +24,7 @@ spinand_cleanup(spinand); return ret; -@@ -1372,6 +1375,7 @@ static int spinand_remove(struct spi_mem +@@ -1373,6 +1376,7 @@ static int spinand_remove(struct spi_mem if (ret) return ret; diff --git a/target/linux/mediatek/patches-6.6/960-asus-hack-u-boot-ignore-mtdparts.patch b/target/linux/mediatek/patches-6.6/960-asus-hack-u-boot-ignore-mtdparts.patch index 0fe2b95e8a7..9b503527cef 100644 --- a/target/linux/mediatek/patches-6.6/960-asus-hack-u-boot-ignore-mtdparts.patch +++ b/target/linux/mediatek/patches-6.6/960-asus-hack-u-boot-ignore-mtdparts.patch @@ -29,7 +29,7 @@ Signed-off-by: Daniel Golle --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c -@@ -1441,6 +1441,7 @@ static int spinand_remove(struct spi_mem +@@ -1442,6 +1442,7 @@ static int spinand_remove(struct spi_mem static const struct spi_device_id spinand_ids[] = { { .name = "spi-nand" }, @@ -37,7 +37,7 @@ Signed-off-by: Daniel Golle { /* sentinel */ }, }; MODULE_DEVICE_TABLE(spi, spinand_ids); -@@ -1448,6 +1449,7 @@ MODULE_DEVICE_TABLE(spi, spinand_ids); +@@ -1449,6 +1450,7 @@ MODULE_DEVICE_TABLE(spi, spinand_ids); #ifdef CONFIG_OF static const struct of_device_id spinand_of_ids[] = { { .compatible = "spi-nand" },