From: Greg Kroah-Hartman Date: Mon, 27 Oct 2025 07:45:19 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v5.4.301~28 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3513581444dcbdc77558ed1a2afb9c6a7f01079;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: binder-remove-invalid-inc-weak-check.patch comedi-fix-divide-by-zero-in-comedi_buf_munge.patch usb-core-quirks-add-huawei-me906s-to-wakeup-quirk.patch usb-serial-option-add-quectel-rg255c.patch usb-serial-option-add-telit-fn920c04-ecm-compositions.patch usb-serial-option-add-unisoc-uis7720.patch xhci-dbc-enable-back-dbc-in-resume-if-it-was-enabled-before-suspend.patch --- diff --git a/queue-5.4/binder-remove-invalid-inc-weak-check.patch b/queue-5.4/binder-remove-invalid-inc-weak-check.patch new file mode 100644 index 0000000000..225a4ca6cd --- /dev/null +++ b/queue-5.4/binder-remove-invalid-inc-weak-check.patch @@ -0,0 +1,55 @@ +From d90eeb8ecd227c204ab6c34a17b372bd950b7aa2 Mon Sep 17 00:00:00 2001 +From: Alice Ryhl +Date: Wed, 15 Oct 2025 14:26:55 +0000 +Subject: binder: remove "invalid inc weak" check + +From: Alice Ryhl + +commit d90eeb8ecd227c204ab6c34a17b372bd950b7aa2 upstream. + +There are no scenarios where a weak increment is invalid on binder_node. +The only possible case where it could be invalid is if the kernel +delivers BR_DECREFS to the process that owns the node, and then +increments the weak refcount again, effectively "reviving" a dead node. + +However, that is not possible: when the BR_DECREFS command is delivered, +the kernel removes and frees the binder_node. The fact that you were +able to call binder_inc_node_nilocked() implies that the node is not yet +destroyed, which implies that BR_DECREFS has not been delivered to +userspace, so incrementing the weak refcount is valid. + +Note that it's currently possible to trigger this condition if the owner +calls BINDER_THREAD_EXIT while node->has_weak_ref is true. This causes +BC_INCREFS on binder_ref instances to fail when they should not. + +Cc: stable@vger.kernel.org +Fixes: 457b9a6f09f0 ("Staging: android: add binder driver") +Reported-by: Yu-Ting Tseng +Signed-off-by: Alice Ryhl +Link: https://patch.msgid.link/20251015-binder-weak-inc-v1-1-7914b092c371@google.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/android/binder.c | 11 +---------- + 1 file changed, 1 insertion(+), 10 deletions(-) + +--- a/drivers/android/binder.c ++++ b/drivers/android/binder.c +@@ -1208,17 +1208,8 @@ static int binder_inc_node_nilocked(stru + } else { + if (!internal) + node->local_weak_refs++; +- if (!node->has_weak_ref && list_empty(&node->work.entry)) { +- if (target_list == NULL) { +- pr_err("invalid inc weak node for %d\n", +- node->debug_id); +- return -EINVAL; +- } +- /* +- * See comment above +- */ ++ if (!node->has_weak_ref && target_list && list_empty(&node->work.entry)) + binder_enqueue_work_ilocked(&node->work, target_list); +- } + } + return 0; + } diff --git a/queue-5.4/comedi-fix-divide-by-zero-in-comedi_buf_munge.patch b/queue-5.4/comedi-fix-divide-by-zero-in-comedi_buf_munge.patch new file mode 100644 index 0000000000..f7582895b4 --- /dev/null +++ b/queue-5.4/comedi-fix-divide-by-zero-in-comedi_buf_munge.patch @@ -0,0 +1,45 @@ +From 87b318ba81dda2ee7b603f4f6c55e78ec3e95974 Mon Sep 17 00:00:00 2001 +From: Deepanshu Kartikey +Date: Wed, 24 Sep 2025 15:56:39 +0530 +Subject: comedi: fix divide-by-zero in comedi_buf_munge() + +From: Deepanshu Kartikey + +commit 87b318ba81dda2ee7b603f4f6c55e78ec3e95974 upstream. + +The comedi_buf_munge() function performs a modulo operation +`async->munge_chan %= async->cmd.chanlist_len` without first +checking if chanlist_len is zero. If a user program submits a command with +chanlist_len set to zero, this causes a divide-by-zero error when the device +processes data in the interrupt handler path. + +Add a check for zero chanlist_len at the beginning of the +function, similar to the existing checks for !map and +CMDF_RAWDATA flag. When chanlist_len is zero, update +munge_count and return early, indicating the data was +handled without munging. + +This prevents potential kernel panics from malformed user commands. + +Reported-by: syzbot+f6c3c066162d2c43a66c@syzkaller.appspotmail.com +Closes: https://syzkaller.appspot.com/bug?extid=f6c3c066162d2c43a66c +Cc: stable@vger.kernel.org +Signed-off-by: Deepanshu Kartikey +Reviewed-by: Ian Abbott +Link: https://patch.msgid.link/20250924102639.1256191-1-kartikey406@gmail.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/staging/comedi/comedi_buf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/staging/comedi/comedi_buf.c ++++ b/drivers/staging/comedi/comedi_buf.c +@@ -369,7 +369,7 @@ static unsigned int comedi_buf_munge(str + unsigned int count = 0; + const unsigned int num_sample_bytes = comedi_bytes_per_sample(s); + +- if (!s->munge || (async->cmd.flags & CMDF_RAWDATA)) { ++ if (!s->munge || (async->cmd.flags & CMDF_RAWDATA) || async->cmd.chanlist_len == 0) { + async->munge_count += num_bytes; + count = num_bytes; + } else { diff --git a/queue-5.4/series b/queue-5.4/series index 0011e305c4..1c84847b40 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -197,3 +197,10 @@ mips-malta-fix-keyboard-resource-preventing-i8042-driver-from-registering.patch ocfs2-clear-extent-cache-after-moving-defragmenting-extents.patch net-usb-rtl8150-fix-frame-padding.patch net-ravb-ensure-memory-write-completes-before-ringing-tx-doorbell.patch +usb-serial-option-add-unisoc-uis7720.patch +usb-serial-option-add-quectel-rg255c.patch +usb-serial-option-add-telit-fn920c04-ecm-compositions.patch +usb-core-quirks-add-huawei-me906s-to-wakeup-quirk.patch +xhci-dbc-enable-back-dbc-in-resume-if-it-was-enabled-before-suspend.patch +binder-remove-invalid-inc-weak-check.patch +comedi-fix-divide-by-zero-in-comedi_buf_munge.patch diff --git a/queue-5.4/usb-core-quirks-add-huawei-me906s-to-wakeup-quirk.patch b/queue-5.4/usb-core-quirks-add-huawei-me906s-to-wakeup-quirk.patch new file mode 100644 index 0000000000..b82a63941d --- /dev/null +++ b/queue-5.4/usb-core-quirks-add-huawei-me906s-to-wakeup-quirk.patch @@ -0,0 +1,33 @@ +From dfc2cf4dcaa03601cd4ca0f7def88b2630fca6ab Mon Sep 17 00:00:00 2001 +From: Tim Guttzeit +Date: Mon, 20 Oct 2025 15:39:04 +0200 +Subject: usb/core/quirks: Add Huawei ME906S to wakeup quirk + +From: Tim Guttzeit + +commit dfc2cf4dcaa03601cd4ca0f7def88b2630fca6ab upstream. + +The list of Huawei LTE modules needing the quirk fixing spurious wakeups +was missing the IDs of the Huawei ME906S module, therefore suspend did not +work. + +Cc: stable +Signed-off-by: Tim Guttzeit +Signed-off-by: Werner Sembach +Link: https://patch.msgid.link/20251020134304.35079-1-wse@tuxedocomputers.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/core/quirks.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/usb/core/quirks.c ++++ b/drivers/usb/core/quirks.c +@@ -462,6 +462,8 @@ static const struct usb_device_id usb_qu + /* Huawei 4G LTE module */ + { USB_DEVICE(0x12d1, 0x15bb), .driver_info = + USB_QUIRK_DISCONNECT_SUSPEND }, ++ { USB_DEVICE(0x12d1, 0x15c1), .driver_info = ++ USB_QUIRK_DISCONNECT_SUSPEND }, + { USB_DEVICE(0x12d1, 0x15c3), .driver_info = + USB_QUIRK_DISCONNECT_SUSPEND }, + diff --git a/queue-5.4/usb-serial-option-add-quectel-rg255c.patch b/queue-5.4/usb-serial-option-add-quectel-rg255c.patch new file mode 100644 index 0000000000..74a7cb2a2c --- /dev/null +++ b/queue-5.4/usb-serial-option-add-quectel-rg255c.patch @@ -0,0 +1,63 @@ +From 89205c60c0fc96b73567a2e9fe27ee3f59d01193 Mon Sep 17 00:00:00 2001 +From: Reinhard Speyerer +Date: Wed, 22 Oct 2025 16:17:26 +0200 +Subject: USB: serial: option: add Quectel RG255C + +From: Reinhard Speyerer + +commit 89205c60c0fc96b73567a2e9fe27ee3f59d01193 upstream. + +Add support for Quectel RG255C devices to complement commit 5c964c8a97c1 +("net: usb: qmi_wwan: add Quectel RG255C"). +The composition is DM / NMEA / AT / QMI. + +T: Bus=01 Lev=02 Prnt=99 Port=01 Cnt=02 Dev#=110 Spd=480 MxCh= 0 +D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 +P: Vendor=2c7c ProdID=0316 Rev= 5.15 +S: Manufacturer=Quectel +S: Product=RG255C-GL +S: SerialNumber=xxxxxxxx +C:* #Ifs= 4 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 + +Signed-off-by: Reinhard Speyerer +Cc: stable@vger.kernel.org +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/option.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -273,6 +273,7 @@ static void option_instat_callback(struc + #define QUECTEL_PRODUCT_EM05CN 0x0312 + #define QUECTEL_PRODUCT_EM05G_GR 0x0313 + #define QUECTEL_PRODUCT_EM05G_RS 0x0314 ++#define QUECTEL_PRODUCT_RG255C 0x0316 + #define QUECTEL_PRODUCT_EM12 0x0512 + #define QUECTEL_PRODUCT_RM500Q 0x0800 + #define QUECTEL_PRODUCT_RM520N 0x0801 +@@ -1271,6 +1272,9 @@ static const struct usb_device_id option + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RG650V, 0xff, 0xff, 0x30) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RG650V, 0xff, 0, 0) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RG255C, 0xff, 0xff, 0x30) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RG255C, 0xff, 0, 0) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RG255C, 0xff, 0xff, 0x40) }, + + { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) }, + { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) }, diff --git a/queue-5.4/usb-serial-option-add-telit-fn920c04-ecm-compositions.patch b/queue-5.4/usb-serial-option-add-telit-fn920c04-ecm-compositions.patch new file mode 100644 index 0000000000..fa92bdd146 --- /dev/null +++ b/queue-5.4/usb-serial-option-add-telit-fn920c04-ecm-compositions.patch @@ -0,0 +1,95 @@ +From 622865c73ae30f254abdf182f4b66cccbe3e0f10 Mon Sep 17 00:00:00 2001 +From: LI Qingwu +Date: Thu, 23 Oct 2025 03:44:22 +0000 +Subject: USB: serial: option: add Telit FN920C04 ECM compositions + +From: LI Qingwu + +commit 622865c73ae30f254abdf182f4b66cccbe3e0f10 upstream. + +Add support for the Telit Cinterion FN920C04 module when operating in +ECM (Ethernet Control Model) mode. The following USB product IDs are +used by the module when AT#USBCFG is set to 3 or 7. + +0x10A3: ECM + tty (NMEA) + tty (DUN) [+ tty (DIAG)] +T: Bus=01 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#= 3 Spd=480 MxCh= 0 +D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 +P: Vendor=1bc7 ProdID=10a3 Rev= 5.15 +S: Manufacturer=Telit Cinterion +S: Product=FN920 +S: SerialNumber=76e7cb38 +C:* #Ifs= 5 Cfg#= 1 Atr=e0 MxPwr=500mA +I:* If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=06 Prot=00 Driver=cdc_ether +E: Ad=82(I) Atr=03(Int.) MxPS= 16 Ivl=32ms +I: If#= 1 Alt= 0 #EPs= 0 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether +I:* If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether +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= 3 Cls=ff(vend.) Sub=ff Prot=60 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=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 3 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=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option +E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms + +0x10A8: ECM + tty (DUN) + tty (AUX) [+ tty (DIAG)] +T: Bus=03 Lev=02 Prnt=02 Port=00 Cnt=01 Dev#= 3 Spd=480 MxCh= 0 +D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 +P: Vendor=1bc7 ProdID=10a8 Rev= 5.15 +S: Manufacturer=Telit Cinterion +S: Product=FN920 +S: SerialNumber=76e7cb38 +C:* #Ifs= 5 Cfg#= 1 Atr=e0 MxPwr=500mA +I:* If#= 0 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=06 Prot=00 Driver=cdc_ether +E: Ad=82(I) Atr=03(Int.) MxPS= 16 Ivl=32ms +I: If#= 1 Alt= 0 #EPs= 0 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether +I:* If#= 1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=00 Driver=cdc_ether +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= 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=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 3 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=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option +E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms + +Adding these IDs allows the option driver to automatically create the +corresponding /dev/ttyUSB* ports under ECM mode. + +Tested with FN920C04 under ECM configuration (USBCFG=3 and 7). + +Signed-off-by: LI Qingwu +Cc: stable@vger.kernel.org +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/option.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -1403,10 +1403,14 @@ static const struct usb_device_id option + .driver_info = RSVD(0) | NCTRL(3) }, + { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a2, 0xff), /* Telit FN920C04 (MBIM) */ + .driver_info = NCTRL(4) }, ++ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a3, 0xff), /* Telit FN920C04 (ECM) */ ++ .driver_info = NCTRL(4) }, + { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a4, 0xff), /* Telit FN20C04 (rmnet) */ + .driver_info = RSVD(0) | NCTRL(3) }, + { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a7, 0xff), /* Telit FN920C04 (MBIM) */ + .driver_info = NCTRL(4) }, ++ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a8, 0xff), /* Telit FN920C04 (ECM) */ ++ .driver_info = NCTRL(4) }, + { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10a9, 0xff), /* Telit FN20C04 (rmnet) */ + .driver_info = RSVD(0) | NCTRL(2) | RSVD(3) | RSVD(4) }, + { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x10aa, 0xff), /* Telit FN920C04 (MBIM) */ diff --git a/queue-5.4/usb-serial-option-add-unisoc-uis7720.patch b/queue-5.4/usb-serial-option-add-unisoc-uis7720.patch new file mode 100644 index 0000000000..92467ad7cf --- /dev/null +++ b/queue-5.4/usb-serial-option-add-unisoc-uis7720.patch @@ -0,0 +1,73 @@ +From 71c07570b918f000de5d0f7f1bf17a2887e303b5 Mon Sep 17 00:00:00 2001 +From: Renjun Wang +Date: Sun, 19 Oct 2025 18:44:38 +0800 +Subject: USB: serial: option: add UNISOC UIS7720 + +From: Renjun Wang + +commit 71c07570b918f000de5d0f7f1bf17a2887e303b5 upstream. + +Add support for UNISOC (Spreadtrum) UIS7720 (A7720) module. + +T: Bus=05 Lev=01 Prnt=01 Port=00 Cnt=01 Dev#= 5 Spd=480 MxCh= 0 +D: Ver= 2.10 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 +P: Vendor=1782 ProdID=4064 Rev=04.04 +S: Manufacturer=Unisoc-phone +S: Product=Unisoc-phone +S: SerialNumber=0123456789ABCDEF +C: #Ifs= 9 Cfg#= 1 Atr=c0 MxPwr=500mA +I: If#= 0 Alt= 0 #EPs= 1 Cls=e0(wlcon) Sub=01 Prot=03 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=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I: If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 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=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I: If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I: If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I: If#= 6 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=06(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I: If#= 7 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=07(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I: If#= 8 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none) +E: Ad=08(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=89(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms + +0&1: RNDIS, 2: LOG, 3: DIAG, 4&5: AT Ports, 6&7: AT2 Ports, 8: ADB + +Signed-off-by: Renjun Wang +Cc: stable@vger.kernel.org +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/option.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -617,6 +617,7 @@ static void option_instat_callback(struc + #define UNISOC_VENDOR_ID 0x1782 + /* TOZED LT70-C based on UNISOC SL8563 uses UNISOC's vendor ID */ + #define TOZED_PRODUCT_LT70C 0x4055 ++#define UNISOC_PRODUCT_UIS7720 0x4064 + /* Luat Air72*U series based on UNISOC UIS8910 uses UNISOC's vendor ID */ + #define LUAT_PRODUCT_AIR720U 0x4e00 + +@@ -2466,6 +2467,7 @@ static const struct usb_device_id option + { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9291, 0xff, 0xff, 0x30) }, + { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9291, 0xff, 0xff, 0x40) }, + { USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, TOZED_PRODUCT_LT70C, 0xff, 0, 0) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, UNISOC_PRODUCT_UIS7720, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(UNISOC_VENDOR_ID, LUAT_PRODUCT_AIR720U, 0xff, 0, 0) }, + { USB_DEVICE_INTERFACE_CLASS(0x1bbb, 0x0530, 0xff), /* TCL IK512 MBIM */ + .driver_info = NCTRL(1) }, diff --git a/queue-5.4/xhci-dbc-enable-back-dbc-in-resume-if-it-was-enabled-before-suspend.patch b/queue-5.4/xhci-dbc-enable-back-dbc-in-resume-if-it-was-enabled-before-suspend.patch new file mode 100644 index 0000000000..afffda657a --- /dev/null +++ b/queue-5.4/xhci-dbc-enable-back-dbc-in-resume-if-it-was-enabled-before-suspend.patch @@ -0,0 +1,50 @@ +From 2bbd38fcd29670e46c0fdb9cd0e90507a8a1bf6a Mon Sep 17 00:00:00 2001 +From: Mathias Nyman +Date: Tue, 14 Oct 2025 01:55:42 +0300 +Subject: xhci: dbc: enable back DbC in resume if it was enabled before suspend +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Mathias Nyman + +commit 2bbd38fcd29670e46c0fdb9cd0e90507a8a1bf6a upstream. + +DbC is currently only enabled back if it's in configured state during +suspend. + +If system is suspended after DbC is enabled, but before the device is +properly enumerated by the host, then DbC would not be enabled back in +resume. + +Always enable DbC back in resume if it's suspended in enabled, +connected, or configured state + +Cc: stable +Fixes: dfba2174dc42 ("usb: xhci: Add DbC support in xHCI driver") +Tested-by: Łukasz Bartosik +Signed-off-by: Mathias Nyman +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/host/xhci-dbgcap.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- a/drivers/usb/host/xhci-dbgcap.c ++++ b/drivers/usb/host/xhci-dbgcap.c +@@ -975,8 +975,15 @@ int xhci_dbc_suspend(struct xhci_hcd *xh + if (!dbc) + return 0; + +- if (dbc->state == DS_CONFIGURED) ++ switch (dbc->state) { ++ case DS_ENABLED: ++ case DS_CONNECTED: ++ case DS_CONFIGURED: + dbc->resume_required = 1; ++ break; ++ default: ++ break; ++ } + + xhci_dbc_stop(xhci); +