From: Greg Kroah-Hartman Date: Tue, 7 Oct 2025 07:24:37 +0000 (+0200) Subject: 6.16-stable patches X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=564e846326ced0eabcb695004841f53b2e183ddd;p=thirdparty%2Fkernel%2Fstable-queue.git 6.16-stable patches added patches: bluetooth-btusb-add-usb-id-2001-332a-for-d-link-ax9u-rev.-a1.patch rust-block-fix-srctree-links.patch rust-drm-fix-srctree-links.patch rust-pci-fix-incorrect-platform-reference-in-pci-driver-probe-doc-comment.patch usb-serial-option-add-simcom-8230c-compositions.patch wifi-rtl8xxxu-don-t-claim-usb-id-07b8-8188.patch wifi-rtlwifi-rtl8192cu-don-t-claim-usb-id-07b8-8188.patch --- diff --git a/queue-6.16/bluetooth-btusb-add-usb-id-2001-332a-for-d-link-ax9u-rev.-a1.patch b/queue-6.16/bluetooth-btusb-add-usb-id-2001-332a-for-d-link-ax9u-rev.-a1.patch new file mode 100644 index 0000000000..f807e10084 --- /dev/null +++ b/queue-6.16/bluetooth-btusb-add-usb-id-2001-332a-for-d-link-ax9u-rev.-a1.patch @@ -0,0 +1,78 @@ +From 34ecb8760190606472f71ebf4ca2817928ce5d40 Mon Sep 17 00:00:00 2001 +From: Zenm Chen +Date: Sat, 26 Jul 2025 00:14:32 +0800 +Subject: Bluetooth: btusb: Add USB ID 2001:332a for D-Link AX9U rev. A1 + +From: Zenm Chen + +commit 34ecb8760190606472f71ebf4ca2817928ce5d40 upstream. + +Add USB ID 2001:332a for D-Link AX9U rev. A1 which is based on a Realtek +RTL8851BU chip. + +The information in /sys/kernel/debug/usb/devices about the Bluetooth +device is listed as the below: + +T: Bus=03 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#= 2 Spd=480 MxCh= 0 +D: Ver= 2.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=2001 ProdID=332a Rev= 0.00 +S: Manufacturer=Realtek +S: Product=802.11ax WLAN Adapter +S: SerialNumber=00e04c000001 +C:* #Ifs= 3 Cfg#= 1 Atr=e0 MxPwr=500mA +A: FirstIf#= 0 IfCount= 2 Cls=e0(wlcon) Sub=01 Prot=01 +I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms +E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms +I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms +I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms +I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms +I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms +I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms +I: If#= 1 Alt= 6 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb +E: Ad=03(O) Atr=01(Isoc) MxPS= 63 Ivl=1ms +E: Ad=83(I) Atr=01(Isoc) MxPS= 63 Ivl=1ms +I:* If#= 2 Alt= 0 #EPs= 8 Cls=ff(vend.) Sub=ff Prot=ff Driver=rtw89_8851bu_git +E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=06(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=07(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=09(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=0a(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=0b(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=0c(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms + +Cc: stable@vger.kernel.org # 6.12.x +Signed-off-by: Zenm Chen +Reviewed-by: Paul Menzel +Signed-off-by: Luiz Augusto von Dentz +Signed-off-by: Greg Kroah-Hartman +--- + drivers/bluetooth/btusb.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -520,6 +520,8 @@ static const struct usb_device_id quirks + /* Realtek 8851BU Bluetooth devices */ + { USB_DEVICE(0x3625, 0x010b), .driver_info = BTUSB_REALTEK | + BTUSB_WIDEBAND_SPEECH }, ++ { USB_DEVICE(0x2001, 0x332a), .driver_info = BTUSB_REALTEK | ++ BTUSB_WIDEBAND_SPEECH }, + + /* Realtek 8852AE Bluetooth devices */ + { USB_DEVICE(0x0bda, 0x2852), .driver_info = BTUSB_REALTEK | diff --git a/queue-6.16/rust-block-fix-srctree-links.patch b/queue-6.16/rust-block-fix-srctree-links.patch new file mode 100644 index 0000000000..a181146096 --- /dev/null +++ b/queue-6.16/rust-block-fix-srctree-links.patch @@ -0,0 +1,36 @@ +From 208d7f788e84e80992d7b1c82ff17b620eb1371e Mon Sep 17 00:00:00 2001 +From: Miguel Ojeda +Date: Wed, 30 Jul 2025 15:07:14 +0200 +Subject: rust: block: fix `srctree/` links + +From: Miguel Ojeda + +commit 208d7f788e84e80992d7b1c82ff17b620eb1371e upstream. + +This `srctree/` link pointed to a file with an underscore, but the header +used a dash instead. + +Thus fix it. + +This cleans a future warning that will check our `srctree/` links. + +Cc: stable@vger.kernel.org +Fixes: 3253aba3408a ("rust: block: introduce `kernel::block::mq` module") +Reviewed-by: Daniel Almeida +Signed-off-by: Miguel Ojeda +Signed-off-by: Greg Kroah-Hartman +--- + rust/kernel/block/mq/gen_disk.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/rust/kernel/block/mq/gen_disk.rs ++++ b/rust/kernel/block/mq/gen_disk.rs +@@ -3,7 +3,7 @@ + //! Generic disk abstraction. + //! + //! C header: [`include/linux/blkdev.h`](srctree/include/linux/blkdev.h) +-//! C header: [`include/linux/blk_mq.h`](srctree/include/linux/blk_mq.h) ++//! C header: [`include/linux/blk-mq.h`](srctree/include/linux/blk-mq.h) + + use crate::block::mq::{raw_writer::RawWriter, Operations, TagSet}; + use crate::{bindings, error::from_err_ptr, error::Result, sync::Arc}; diff --git a/queue-6.16/rust-drm-fix-srctree-links.patch b/queue-6.16/rust-drm-fix-srctree-links.patch new file mode 100644 index 0000000000..64c49e8271 --- /dev/null +++ b/queue-6.16/rust-drm-fix-srctree-links.patch @@ -0,0 +1,89 @@ +From c2783c7cfefd55b1a5be781679cbee5191c0fd87 Mon Sep 17 00:00:00 2001 +From: Miguel Ojeda +Date: Wed, 30 Jul 2025 15:07:15 +0200 +Subject: rust: drm: fix `srctree/` links + +From: Miguel Ojeda + +commit c2783c7cfefd55b1a5be781679cbee5191c0fd87 upstream. + +These `srctree/` links pointed inside `linux/`, but they are directly +under `drm/`. + +Thus fix them. + +This cleans a future warning that will check our `srctree/` links. + +Cc: stable@vger.kernel.org +Fixes: a98a73be9ee9 ("rust: drm: file: Add File abstraction") +Fixes: c284d3e42338 ("rust: drm: gem: Add GEM object abstraction") +Fixes: 07c9016085f9 ("rust: drm: add driver abstractions") +Fixes: 1e4b8896c0f3 ("rust: drm: add device abstraction") +Fixes: 9a69570682b1 ("rust: drm: ioctl: Add DRM ioctl abstraction") +Acked-by: Danilo Krummrich +Reviewed-by: Daniel Almeida +Signed-off-by: Miguel Ojeda +Signed-off-by: Greg Kroah-Hartman +--- + rust/kernel/drm/device.rs | 2 +- + rust/kernel/drm/driver.rs | 2 +- + rust/kernel/drm/file.rs | 2 +- + rust/kernel/drm/gem/mod.rs | 2 +- + rust/kernel/drm/ioctl.rs | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +--- a/rust/kernel/drm/device.rs ++++ b/rust/kernel/drm/device.rs +@@ -2,7 +2,7 @@ + + //! DRM device. + //! +-//! C header: [`include/linux/drm/drm_device.h`](srctree/include/linux/drm/drm_device.h) ++//! C header: [`include/drm/drm_device.h`](srctree/include/drm/drm_device.h) + + use crate::{ + alloc::allocator::Kmalloc, +--- a/rust/kernel/drm/driver.rs ++++ b/rust/kernel/drm/driver.rs +@@ -2,7 +2,7 @@ + + //! DRM driver core. + //! +-//! C header: [`include/linux/drm/drm_drv.h`](srctree/include/linux/drm/drm_drv.h) ++//! C header: [`include/drm/drm_drv.h`](srctree/include/drm/drm_drv.h) + + use crate::{ + bindings, device, +--- a/rust/kernel/drm/file.rs ++++ b/rust/kernel/drm/file.rs +@@ -2,7 +2,7 @@ + + //! DRM File objects. + //! +-//! C header: [`include/linux/drm/drm_file.h`](srctree/include/linux/drm/drm_file.h) ++//! C header: [`include/drm/drm_file.h`](srctree/include/drm/drm_file.h) + + use crate::{bindings, drm, error::Result, prelude::*, types::Opaque}; + use core::marker::PhantomData; +--- a/rust/kernel/drm/gem/mod.rs ++++ b/rust/kernel/drm/gem/mod.rs +@@ -2,7 +2,7 @@ + + //! DRM GEM API + //! +-//! C header: [`include/linux/drm/drm_gem.h`](srctree/include/linux/drm/drm_gem.h) ++//! C header: [`include/drm/drm_gem.h`](srctree/include/drm/drm_gem.h) + + use crate::{ + alloc::flags::*, +--- a/rust/kernel/drm/ioctl.rs ++++ b/rust/kernel/drm/ioctl.rs +@@ -2,7 +2,7 @@ + + //! DRM IOCTL definitions. + //! +-//! C header: [`include/linux/drm/drm_ioctl.h`](srctree/include/linux/drm/drm_ioctl.h) ++//! C header: [`include/drm/drm_ioctl.h`](srctree/include/drm/drm_ioctl.h) + + use crate::ioctl; + diff --git a/queue-6.16/rust-pci-fix-incorrect-platform-reference-in-pci-driver-probe-doc-comment.patch b/queue-6.16/rust-pci-fix-incorrect-platform-reference-in-pci-driver-probe-doc-comment.patch new file mode 100644 index 0000000000..26de7cdfe8 --- /dev/null +++ b/queue-6.16/rust-pci-fix-incorrect-platform-reference-in-pci-driver-probe-doc-comment.patch @@ -0,0 +1,33 @@ +From 855318e7c0c4a3e3014c0469dd5bc93a1c0df30c Mon Sep 17 00:00:00 2001 +From: Rahul Rameshbabu +Date: Sun, 14 Sep 2025 03:18:34 +0000 +Subject: rust: pci: fix incorrect platform reference in PCI driver probe doc comment + +From: Rahul Rameshbabu + +commit 855318e7c0c4a3e3014c0469dd5bc93a1c0df30c upstream. + +Substitute 'platform' with 'pci'. + +Fixes: 1bd8b6b2c5d3 ("rust: pci: add basic PCI device / driver abstractions") +Cc: stable@kernel.org +Signed-off-by: Rahul Rameshbabu +Signed-off-by: Danilo Krummrich +Signed-off-by: Greg Kroah-Hartman +--- + rust/kernel/pci.rs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/rust/kernel/pci.rs ++++ b/rust/kernel/pci.rs +@@ -238,8 +238,8 @@ pub trait Driver: Send { + + /// PCI driver probe. + /// +- /// Called when a new platform device is added or discovered. +- /// Implementers should attempt to initialize the device here. ++ /// Called when a new pci device is added or discovered. Implementers should ++ /// attempt to initialize the device here. + fn probe(dev: &Device, id_info: &Self::IdInfo) -> Result>>; + } + diff --git a/queue-6.16/series b/queue-6.16/series index 060ade6938..5028477621 100644 --- a/queue-6.16/series +++ b/queue-6.16/series @@ -2,3 +2,10 @@ alsa-hda-tas2781-fix-the-order-of-tas2781-calibrated-data.patch drm-amdgpu-enable-mes-lr_compute_wa-by-default.patch wifi-rtw89-mcc-stop-tx-during-mcc-prepare.patch wifi-rtw89-fix-use-after-free-in-rtw89_core_tx_kick_off_and_wait.patch +usb-serial-option-add-simcom-8230c-compositions.patch +bluetooth-btusb-add-usb-id-2001-332a-for-d-link-ax9u-rev.-a1.patch +wifi-rtlwifi-rtl8192cu-don-t-claim-usb-id-07b8-8188.patch +wifi-rtl8xxxu-don-t-claim-usb-id-07b8-8188.patch +rust-drm-fix-srctree-links.patch +rust-block-fix-srctree-links.patch +rust-pci-fix-incorrect-platform-reference-in-pci-driver-probe-doc-comment.patch diff --git a/queue-6.16/usb-serial-option-add-simcom-8230c-compositions.patch b/queue-6.16/usb-serial-option-add-simcom-8230c-compositions.patch new file mode 100644 index 0000000000..f685d24b86 --- /dev/null +++ b/queue-6.16/usb-serial-option-add-simcom-8230c-compositions.patch @@ -0,0 +1,118 @@ +From 0e0ba0ecec3d6e819e0c2348331ff99afe2eb5d5 Mon Sep 17 00:00:00 2001 +From: Xiaowei Li +Date: Wed, 24 Sep 2025 11:16:50 +0800 +Subject: USB: serial: option: add SIMCom 8230C compositions + +From: Xiaowei Li + +commit 0e0ba0ecec3d6e819e0c2348331ff99afe2eb5d5 upstream. + +Add support for SIMCom 8230C which is based on Qualcomm SDX35 chip. + +USB Device Listings: + +0x9071: tty (DM) + tty (NMEA) + tty (AT) + rmnet (QMI mode) + adb +T: Bus=01 Lev=01 Prnt=01 Port=05 Cnt=02 Dev#= 10 Spd=480 MxCh= 0 +D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 +P: Vendor=1e0e ProdID=9071 Rev= 5.15 +S: Manufacturer=SIMCOM +S: Product=SDXBAAGHA-IDP _SN:D744C4C5 +S: SerialNumber=0123456789ABCDEF +C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA +I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option +E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option +E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms +E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan +E: Ad=86(I) Atr=03(Int.) MxPS= 8 Ivl=32ms +E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none) +E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms + +0x9078: tty (DM) + tty (NMEA) + tty (AT) + ECM + adb +T: Bus=01 Lev=01 Prnt=01 Port=05 Cnt=02 Dev#= 9 Spd=480 MxCh= 0 +D: Ver= 2.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=1e0e ProdID=9078 Rev= 5.15 +S: Manufacturer=SIMCOM +S: Product=SDXBAAGHA-IDP _SN:D744C4C5 +S: SerialNumber=0123456789ABCDEF +C:* #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA +I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option +E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option +E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=32ms +E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 3 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=06 Prot=00 Driver=cdc_ether +E: Ad=86(I) Atr=03(Int.) MxPS= 16 Ivl=32ms +I: If#= 4 Alt= 0 #EPs= 0 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether +I:* If#= 4 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether +E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none) +E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms + +0x907b: RNDIS + tty (DM) + tty (NMEA) + tty (AT) + adb +T: Bus=01 Lev=01 Prnt=01 Port=05 Cnt=02 Dev#= 8 Spd=480 MxCh= 0 +D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 +P: Vendor=1e0e ProdID=907b Rev= 5.15 +S: Manufacturer=SIMCOM +S: Product=SDXBAAGHA-IDP _SN:D744C4C5 +S: SerialNumber=0123456789ABCDEF +C:* #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA +A: FirstIf#= 0 IfCount= 2 Cls=ef(misc ) Sub=04 Prot=01 +I:* If#= 0 Alt= 0 #EPs= 1 Cls=ef(misc ) Sub=04 Prot=01 Driver=rndis_host +E: Ad=82(I) Atr=03(Int.) MxPS= 8 Ivl=32ms +I:* If#= 1 Alt= 0 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=rndis_host +E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option +E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option +E: Ad=86(I) Atr=03(Int.) MxPS= 10 Ivl=32ms +E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none) +E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms + +Signed-off-by: Xiaowei Li +Cc: stable@vger.kernel.org +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/option.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -2114,6 +2114,12 @@ static const struct usb_device_id option + { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9003, 0xff) }, /* Simcom SIM7500/SIM7600 MBIM mode */ + { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9011, 0xff), /* Simcom SIM7500/SIM7600 RNDIS mode */ + .driver_info = RSVD(7) }, ++ { USB_DEVICE(0x1e0e, 0x9071), /* Simcom SIM8230 RMNET mode */ ++ .driver_info = RSVD(3) | RSVD(4) }, ++ { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9078, 0xff), /* Simcom SIM8230 ECM mode */ ++ .driver_info = RSVD(5) }, ++ { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x907b, 0xff), /* Simcom SIM8230 RNDIS mode */ ++ .driver_info = RSVD(5) }, + { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9205, 0xff) }, /* Simcom SIM7070/SIM7080/SIM7090 AT+ECM mode */ + { USB_DEVICE_INTERFACE_CLASS(0x1e0e, 0x9206, 0xff) }, /* Simcom SIM7070/SIM7080/SIM7090 AT-only mode */ + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200), diff --git a/queue-6.16/wifi-rtl8xxxu-don-t-claim-usb-id-07b8-8188.patch b/queue-6.16/wifi-rtl8xxxu-don-t-claim-usb-id-07b8-8188.patch new file mode 100644 index 0000000000..b7619cb1b9 --- /dev/null +++ b/queue-6.16/wifi-rtl8xxxu-don-t-claim-usb-id-07b8-8188.patch @@ -0,0 +1,34 @@ +From ec0b44736b1d22b763ee94f1aee856f9e793f3fe Mon Sep 17 00:00:00 2001 +From: Bitterblue Smith +Date: Mon, 11 Aug 2025 18:33:28 +0300 +Subject: wifi: rtl8xxxu: Don't claim USB ID 07b8:8188 + +From: Bitterblue Smith + +commit ec0b44736b1d22b763ee94f1aee856f9e793f3fe upstream. + +This ID appears to be RTL8188SU, not RTL8188CU. This is the wrong driver +for RTL8188SU. The r8712u driver from staging used to handle this ID. + +Closes: https://lore.kernel.org/linux-wireless/ee0acfef-a753-4f90-87df-15f8eaa9c3a8@gmx.de/ +Cc: stable@vger.kernel.org +Signed-off-by: Bitterblue Smith +Reviewed-by: Ping-Ke Shih +Signed-off-by: Ping-Ke Shih +Link: https://patch.msgid.link/f147b2ab-4505-435a-aa32-62964e4f1f1e@gmail.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/realtek/rtl8xxxu/core.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/drivers/net/wireless/realtek/rtl8xxxu/core.c ++++ b/drivers/net/wireless/realtek/rtl8xxxu/core.c +@@ -8170,8 +8170,6 @@ static const struct usb_device_id dev_ta + .driver_info = (unsigned long)&rtl8192cu_fops}, + {USB_DEVICE_AND_INTERFACE_INFO(0x06f8, 0xe033, 0xff, 0xff, 0xff), + .driver_info = (unsigned long)&rtl8192cu_fops}, +-{USB_DEVICE_AND_INTERFACE_INFO(0x07b8, 0x8188, 0xff, 0xff, 0xff), +- .driver_info = (unsigned long)&rtl8192cu_fops}, + {USB_DEVICE_AND_INTERFACE_INFO(0x07b8, 0x8189, 0xff, 0xff, 0xff), + .driver_info = (unsigned long)&rtl8192cu_fops}, + {USB_DEVICE_AND_INTERFACE_INFO(0x0846, 0x9041, 0xff, 0xff, 0xff), diff --git a/queue-6.16/wifi-rtlwifi-rtl8192cu-don-t-claim-usb-id-07b8-8188.patch b/queue-6.16/wifi-rtlwifi-rtl8192cu-don-t-claim-usb-id-07b8-8188.patch new file mode 100644 index 0000000000..861c8bdec1 --- /dev/null +++ b/queue-6.16/wifi-rtlwifi-rtl8192cu-don-t-claim-usb-id-07b8-8188.patch @@ -0,0 +1,33 @@ +From e798f2ac6040f46a04795d7de977341fa9aeabae Mon Sep 17 00:00:00 2001 +From: Bitterblue Smith +Date: Mon, 11 Aug 2025 18:32:55 +0300 +Subject: wifi: rtlwifi: rtl8192cu: Don't claim USB ID 07b8:8188 + +From: Bitterblue Smith + +commit e798f2ac6040f46a04795d7de977341fa9aeabae upstream. + +This ID appears to be RTL8188SU, not RTL8188CU. This is the wrong driver +for RTL8188SU. The r8712u driver from staging used to handle this ID. + +Closes: https://lore.kernel.org/linux-wireless/ee0acfef-a753-4f90-87df-15f8eaa9c3a8@gmx.de/ +Cc: stable@vger.kernel.org +Signed-off-by: Bitterblue Smith +Acked-by: Ping-Ke Shih +Signed-off-by: Ping-Ke Shih +Link: https://patch.msgid.link/2e5e2348-bdb3-44b2-92b2-0231dbf464b0@gmail.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c ++++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c +@@ -291,7 +291,6 @@ static const struct usb_device_id rtl819 + {RTL_USB_DEVICE(0x050d, 0x1102, rtl92cu_hal_cfg)}, /*Belkin - Edimax*/ + {RTL_USB_DEVICE(0x050d, 0x11f2, rtl92cu_hal_cfg)}, /*Belkin - ISY*/ + {RTL_USB_DEVICE(0x06f8, 0xe033, rtl92cu_hal_cfg)}, /*Hercules - Edimax*/ +- {RTL_USB_DEVICE(0x07b8, 0x8188, rtl92cu_hal_cfg)}, /*Abocom - Abocom*/ + {RTL_USB_DEVICE(0x07b8, 0x8189, rtl92cu_hal_cfg)}, /*Funai - Abocom*/ + {RTL_USB_DEVICE(0x0846, 0x9041, rtl92cu_hal_cfg)}, /*NetGear WNA1000M*/ + {RTL_USB_DEVICE(0x0846, 0x9043, rtl92cu_hal_cfg)}, /*NG WNA1000Mv2*/