From: Greg Kroah-Hartman Date: Mon, 11 Nov 2024 11:52:51 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v5.15.172~31 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=615c8ae5279e2b487200e5a0719f2450dbafbccb;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: fs-proc-fix-compile-warning-about-variable-vmcore_mmap_ops.patch irqchip-gic-v3-force-propagation-of-the-active-state-with-a-read-back.patch ocfs2-remove-entry-once-instead-of-null-ptr-dereference-in-ocfs2_xa_remove.patch usb-musb-sunxi-fix-accessing-an-released-usb-phy.patch usb-serial-io_edgeport-fix-use-after-free-in-debug-printk.patch usb-serial-option-add-fibocom-fg132-0x0112-composition.patch usb-serial-option-add-quectel-rg650v.patch usb-serial-qcserial-add-support-for-sierra-wireless-em86xx.patch --- diff --git a/queue-4.19/fs-proc-fix-compile-warning-about-variable-vmcore_mmap_ops.patch b/queue-4.19/fs-proc-fix-compile-warning-about-variable-vmcore_mmap_ops.patch new file mode 100644 index 00000000000..76d8ae422a2 --- /dev/null +++ b/queue-4.19/fs-proc-fix-compile-warning-about-variable-vmcore_mmap_ops.patch @@ -0,0 +1,58 @@ +From b8ee299855f08539e04d6c1a6acb3dc9e5423c00 Mon Sep 17 00:00:00 2001 +From: Qi Xi +Date: Fri, 1 Nov 2024 11:48:03 +0800 +Subject: fs/proc: fix compile warning about variable 'vmcore_mmap_ops' + +From: Qi Xi + +commit b8ee299855f08539e04d6c1a6acb3dc9e5423c00 upstream. + +When build with !CONFIG_MMU, the variable 'vmcore_mmap_ops' +is defined but not used: + +>> fs/proc/vmcore.c:458:42: warning: unused variable 'vmcore_mmap_ops' + 458 | static const struct vm_operations_struct vmcore_mmap_ops = { + +Fix this by only defining it when CONFIG_MMU is enabled. + +Link: https://lkml.kernel.org/r/20241101034803.9298-1-xiqi2@huawei.com +Fixes: 9cb218131de1 ("vmcore: introduce remap_oldmem_pfn_range()") +Signed-off-by: Qi Xi +Reported-by: kernel test robot +Closes: https://lore.kernel.org/lkml/202410301936.GcE8yUos-lkp@intel.com/ +Cc: Baoquan He +Cc: Dave Young +Cc: Michael Holzheu +Cc: Vivek Goyal +Cc: Wang ShaoBo +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + fs/proc/vmcore.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +--- a/fs/proc/vmcore.c ++++ b/fs/proc/vmcore.c +@@ -431,10 +431,6 @@ static vm_fault_t mmap_vmcore_fault(stru + #endif + } + +-static const struct vm_operations_struct vmcore_mmap_ops = { +- .fault = mmap_vmcore_fault, +-}; +- + /** + * vmcore_alloc_buf - allocate buffer in vmalloc memory + * @sizez: size of buffer +@@ -462,6 +458,11 @@ static inline char *vmcore_alloc_buf(siz + * virtually contiguous user-space in ELF layout. + */ + #ifdef CONFIG_MMU ++ ++static const struct vm_operations_struct vmcore_mmap_ops = { ++ .fault = mmap_vmcore_fault, ++}; ++ + /* + * remap_oldmem_pfn_checked - do remap_oldmem_pfn_range replacing all pages + * reported as not being ram with the zero page. diff --git a/queue-4.19/irqchip-gic-v3-force-propagation-of-the-active-state-with-a-read-back.patch b/queue-4.19/irqchip-gic-v3-force-propagation-of-the-active-state-with-a-read-back.patch new file mode 100644 index 00000000000..d65d549cde5 --- /dev/null +++ b/queue-4.19/irqchip-gic-v3-force-propagation-of-the-active-state-with-a-read-back.patch @@ -0,0 +1,57 @@ +From 464cb98f1c07298c4c10e714ae0c36338d18d316 Mon Sep 17 00:00:00 2001 +From: Marc Zyngier +Date: Wed, 6 Nov 2024 08:44:18 +0000 +Subject: irqchip/gic-v3: Force propagation of the active state with a read-back + +From: Marc Zyngier + +commit 464cb98f1c07298c4c10e714ae0c36338d18d316 upstream. + +Christoffer reports that on some implementations, writing to +GICR_ISACTIVER0 (and similar GICD registers) can race badly with a guest +issuing a deactivation of that interrupt via the system register interface. + +There are multiple reasons to this: + + - this uses an early write-acknoledgement memory type (nGnRE), meaning + that the write may only have made it as far as some interconnect + by the time the store is considered "done" + + - the GIC itself is allowed to buffer the write until it decides to + take it into account (as long as it is in finite time) + +The effects are that the activation may not have taken effect by the time +the kernel enters the guest, forcing an immediate exit, or that a guest +deactivation occurs before the interrupt is active, doing nothing. + +In order to guarantee that the write to the ISACTIVER register has taken +effect, read back from it, forcing the interconnect to propagate the write, +and the GIC to process the write before returning the read. + +Reported-by: Christoffer Dall +Signed-off-by: Marc Zyngier +Signed-off-by: Thomas Gleixner +Acked-by: Christoffer Dall +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/all/20241106084418.3794612-1-maz@kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + drivers/irqchip/irq-gic-v3.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/irqchip/irq-gic-v3.c ++++ b/drivers/irqchip/irq-gic-v3.c +@@ -252,6 +252,13 @@ static int gic_irq_set_irqchip_state(str + } + + gic_poke_irq(d, reg); ++ ++ /* ++ * Force read-back to guarantee that the active state has taken ++ * effect, and won't race with a guest-driven deactivation. ++ */ ++ if (reg == GICD_ISACTIVER) ++ gic_peek_irq(d, reg); + return 0; + } + diff --git a/queue-4.19/ocfs2-remove-entry-once-instead-of-null-ptr-dereference-in-ocfs2_xa_remove.patch b/queue-4.19/ocfs2-remove-entry-once-instead-of-null-ptr-dereference-in-ocfs2_xa_remove.patch new file mode 100644 index 00000000000..c93abd3fb5d --- /dev/null +++ b/queue-4.19/ocfs2-remove-entry-once-instead-of-null-ptr-dereference-in-ocfs2_xa_remove.patch @@ -0,0 +1,91 @@ +From 0b63c0e01fba40e3992bc627272ec7b618ccaef7 Mon Sep 17 00:00:00 2001 +From: Andrew Kanner +Date: Sun, 3 Nov 2024 20:38:45 +0100 +Subject: ocfs2: remove entry once instead of null-ptr-dereference in ocfs2_xa_remove() + +From: Andrew Kanner + +commit 0b63c0e01fba40e3992bc627272ec7b618ccaef7 upstream. + +Syzkaller is able to provoke null-ptr-dereference in ocfs2_xa_remove(): + +[ 57.319872] (a.out,1161,7):ocfs2_xa_remove:2028 ERROR: status = -12 +[ 57.320420] (a.out,1161,7):ocfs2_xa_cleanup_value_truncate:1999 ERROR: Partial truncate while removing xattr overlay.upper. Leaking 1 clusters and removing the entry +[ 57.321727] BUG: kernel NULL pointer dereference, address: 0000000000000004 +[...] +[ 57.325727] RIP: 0010:ocfs2_xa_block_wipe_namevalue+0x2a/0xc0 +[...] +[ 57.331328] Call Trace: +[ 57.331477] +[...] +[ 57.333511] ? do_user_addr_fault+0x3e5/0x740 +[ 57.333778] ? exc_page_fault+0x70/0x170 +[ 57.334016] ? asm_exc_page_fault+0x2b/0x30 +[ 57.334263] ? __pfx_ocfs2_xa_block_wipe_namevalue+0x10/0x10 +[ 57.334596] ? ocfs2_xa_block_wipe_namevalue+0x2a/0xc0 +[ 57.334913] ocfs2_xa_remove_entry+0x23/0xc0 +[ 57.335164] ocfs2_xa_set+0x704/0xcf0 +[ 57.335381] ? _raw_spin_unlock+0x1a/0x40 +[ 57.335620] ? ocfs2_inode_cache_unlock+0x16/0x20 +[ 57.335915] ? trace_preempt_on+0x1e/0x70 +[ 57.336153] ? start_this_handle+0x16c/0x500 +[ 57.336410] ? preempt_count_sub+0x50/0x80 +[ 57.336656] ? _raw_read_unlock+0x20/0x40 +[ 57.336906] ? start_this_handle+0x16c/0x500 +[ 57.337162] ocfs2_xattr_block_set+0xa6/0x1e0 +[ 57.337424] __ocfs2_xattr_set_handle+0x1fd/0x5d0 +[ 57.337706] ? ocfs2_start_trans+0x13d/0x290 +[ 57.337971] ocfs2_xattr_set+0xb13/0xfb0 +[ 57.338207] ? dput+0x46/0x1c0 +[ 57.338393] ocfs2_xattr_trusted_set+0x28/0x30 +[ 57.338665] ? ocfs2_xattr_trusted_set+0x28/0x30 +[ 57.338948] __vfs_removexattr+0x92/0xc0 +[ 57.339182] __vfs_removexattr_locked+0xd5/0x190 +[ 57.339456] ? preempt_count_sub+0x50/0x80 +[ 57.339705] vfs_removexattr+0x5f/0x100 +[...] + +Reproducer uses faultinject facility to fail ocfs2_xa_remove() -> +ocfs2_xa_value_truncate() with -ENOMEM. + +In this case the comment mentions that we can return 0 if +ocfs2_xa_cleanup_value_truncate() is going to wipe the entry +anyway. But the following 'rc' check is wrong and execution flow do +'ocfs2_xa_remove_entry(loc);' twice: +* 1st: in ocfs2_xa_cleanup_value_truncate(); +* 2nd: returning back to ocfs2_xa_remove() instead of going to 'out'. + +Fix this by skipping the 2nd removal of the same entry and making +syzkaller repro happy. + +Link: https://lkml.kernel.org/r/20241103193845.2940988-1-andrew.kanner@gmail.com +Fixes: 399ff3a748cf ("ocfs2: Handle errors while setting external xattr values.") +Signed-off-by: Andrew Kanner +Reported-by: syzbot+386ce9e60fa1b18aac5b@syzkaller.appspotmail.com +Closes: https://lore.kernel.org/all/671e13ab.050a0220.2b8c0f.01d0.GAE@google.com/T/ +Tested-by: syzbot+386ce9e60fa1b18aac5b@syzkaller.appspotmail.com +Reviewed-by: Joseph Qi +Cc: Mark Fasheh +Cc: Joel Becker +Cc: Junxiao Bi +Cc: Changwei Ge +Cc: Jun Piao +Cc: +Signed-off-by: Andrew Morton +Signed-off-by: Greg Kroah-Hartman +--- + fs/ocfs2/xattr.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/fs/ocfs2/xattr.c ++++ b/fs/ocfs2/xattr.c +@@ -2050,8 +2050,7 @@ static int ocfs2_xa_remove(struct ocfs2_ + rc = 0; + ocfs2_xa_cleanup_value_truncate(loc, "removing", + orig_clusters); +- if (rc) +- goto out; ++ goto out; + } + } + diff --git a/queue-4.19/series b/queue-4.19/series index bbbbf0aae63..fa5df468955 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -27,3 +27,11 @@ btrfs-reinitialize-delayed-ref-list-after-deleting-it-from-the-list.patch bonding-gcc13-synchronize-bond_-a-t-lb_xmit-types.patch net-bridge-xmit-make-sure-we-have-at-least-eth-header-len-bytes.patch media-uvcvideo-skip-parsing-frames-of-type-uvc_vs_undefined-in-uvc_parse_format.patch +fs-proc-fix-compile-warning-about-variable-vmcore_mmap_ops.patch +usb-musb-sunxi-fix-accessing-an-released-usb-phy.patch +usb-serial-io_edgeport-fix-use-after-free-in-debug-printk.patch +usb-serial-qcserial-add-support-for-sierra-wireless-em86xx.patch +usb-serial-option-add-fibocom-fg132-0x0112-composition.patch +usb-serial-option-add-quectel-rg650v.patch +irqchip-gic-v3-force-propagation-of-the-active-state-with-a-read-back.patch +ocfs2-remove-entry-once-instead-of-null-ptr-dereference-in-ocfs2_xa_remove.patch diff --git a/queue-4.19/usb-musb-sunxi-fix-accessing-an-released-usb-phy.patch b/queue-4.19/usb-musb-sunxi-fix-accessing-an-released-usb-phy.patch new file mode 100644 index 00000000000..faa49623368 --- /dev/null +++ b/queue-4.19/usb-musb-sunxi-fix-accessing-an-released-usb-phy.patch @@ -0,0 +1,50 @@ +From 498dbd9aea205db9da674994b74c7bf8e18448bd Mon Sep 17 00:00:00 2001 +From: Zijun Hu +Date: Tue, 29 Oct 2024 23:13:38 +0800 +Subject: usb: musb: sunxi: Fix accessing an released usb phy + +From: Zijun Hu + +commit 498dbd9aea205db9da674994b74c7bf8e18448bd upstream. + +Commit 6ed05c68cbca ("usb: musb: sunxi: Explicitly release USB PHY on +exit") will cause that usb phy @glue->xceiv is accessed after released. + +1) register platform driver @sunxi_musb_driver +// get the usb phy @glue->xceiv +sunxi_musb_probe() -> devm_usb_get_phy(). + +2) register and unregister platform driver @musb_driver +musb_probe() -> sunxi_musb_init() +use the phy here +//the phy is released here +musb_remove() -> sunxi_musb_exit() -> devm_usb_put_phy() + +3) register @musb_driver again +musb_probe() -> sunxi_musb_init() +use the phy here but the phy has been released at 2). +... + +Fixed by reverting the commit, namely, removing devm_usb_put_phy() +from sunxi_musb_exit(). + +Fixes: 6ed05c68cbca ("usb: musb: sunxi: Explicitly release USB PHY on exit") +Cc: stable@vger.kernel.org +Signed-off-by: Zijun Hu +Link: https://lore.kernel.org/r/20241029-sunxi_fix-v1-1-9431ed2ab826@quicinc.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/musb/sunxi.c | 2 -- + 1 file changed, 2 deletions(-) + +--- a/drivers/usb/musb/sunxi.c ++++ b/drivers/usb/musb/sunxi.c +@@ -286,8 +286,6 @@ static int sunxi_musb_exit(struct musb * + if (test_bit(SUNXI_MUSB_FL_HAS_SRAM, &glue->flags)) + sunxi_sram_release(musb->controller->parent); + +- devm_usb_put_phy(glue->dev, glue->xceiv); +- + return 0; + } + diff --git a/queue-4.19/usb-serial-io_edgeport-fix-use-after-free-in-debug-printk.patch b/queue-4.19/usb-serial-io_edgeport-fix-use-after-free-in-debug-printk.patch new file mode 100644 index 00000000000..488d82cf84c --- /dev/null +++ b/queue-4.19/usb-serial-io_edgeport-fix-use-after-free-in-debug-printk.patch @@ -0,0 +1,49 @@ +From 37bb5628379295c1254c113a407cab03a0f4d0b4 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Thu, 31 Oct 2024 12:48:30 +0300 +Subject: USB: serial: io_edgeport: fix use after free in debug printk + +From: Dan Carpenter + +commit 37bb5628379295c1254c113a407cab03a0f4d0b4 upstream. + +The "dev_dbg(&urb->dev->dev, ..." which happens after usb_free_urb(urb) +is a use after free of the "urb" pointer. Store the "dev" pointer at the +start of the function to avoid this issue. + +Fixes: 984f68683298 ("USB: serial: io_edgeport.c: remove dbg() usage") +Cc: stable@vger.kernel.org +Signed-off-by: Dan Carpenter +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/io_edgeport.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/usb/serial/io_edgeport.c ++++ b/drivers/usb/serial/io_edgeport.c +@@ -846,11 +846,12 @@ static void edge_bulk_out_data_callback( + static void edge_bulk_out_cmd_callback(struct urb *urb) + { + struct edgeport_port *edge_port = urb->context; ++ struct device *dev = &urb->dev->dev; + int status = urb->status; + + atomic_dec(&CmdUrbs); +- dev_dbg(&urb->dev->dev, "%s - FREE URB %p (outstanding %d)\n", +- __func__, urb, atomic_read(&CmdUrbs)); ++ dev_dbg(dev, "%s - FREE URB %p (outstanding %d)\n", __func__, urb, ++ atomic_read(&CmdUrbs)); + + + /* clean up the transfer buffer */ +@@ -860,8 +861,7 @@ static void edge_bulk_out_cmd_callback(s + usb_free_urb(urb); + + if (status) { +- dev_dbg(&urb->dev->dev, +- "%s - nonzero write bulk status received: %d\n", ++ dev_dbg(dev, "%s - nonzero write bulk status received: %d\n", + __func__, status); + return; + } diff --git a/queue-4.19/usb-serial-option-add-fibocom-fg132-0x0112-composition.patch b/queue-4.19/usb-serial-option-add-fibocom-fg132-0x0112-composition.patch new file mode 100644 index 00000000000..665899a15e6 --- /dev/null +++ b/queue-4.19/usb-serial-option-add-fibocom-fg132-0x0112-composition.patch @@ -0,0 +1,53 @@ +From 393c74ccbd847bacf18865a01b422586fc7341cf Mon Sep 17 00:00:00 2001 +From: Reinhard Speyerer +Date: Fri, 18 Oct 2024 23:07:06 +0200 +Subject: USB: serial: option: add Fibocom FG132 0x0112 composition + +From: Reinhard Speyerer + +commit 393c74ccbd847bacf18865a01b422586fc7341cf upstream. + +Add Fibocom FG132 0x0112 composition: + +T: Bus=03 Lev=02 Prnt=06 Port=01 Cnt=02 Dev#= 10 Spd=12 MxCh= 0 +D: Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 +P: Vendor=2cb7 ProdID=0112 Rev= 5.15 +S: Manufacturer=Fibocom Wireless Inc. +S: Product=Fibocom Module +S: SerialNumber=xxxxxxxx +C:* #Ifs= 4 Cfg#= 1 Atr=a0 MxPwr=500mA +I:* If#= 0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan +E: Ad=82(I) Atr=03(Int.) MxPS= 8 Ivl=32ms +E: Ad=81(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms +E: Ad=01(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms +I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option +E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms +E: Ad=83(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms +I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option +E: Ad=85(I) Atr=03(Int.) MxPS= 10 Ivl=32ms +E: Ad=84(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms +E: Ad=03(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms +I:* If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=86(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms +E: Ad=04(O) Atr=02(Bulk) MxPS= 64 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 | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -2320,6 +2320,9 @@ static const struct usb_device_id option + { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0xff, 0x30) }, /* Fibocom FG150 Diag */ + { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0, 0) }, /* Fibocom FG150 AT */ + { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0111, 0xff) }, /* Fibocom FM160 (MBIM mode) */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x0112, 0xff, 0xff, 0x30) }, /* Fibocom FG132 Diag */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x0112, 0xff, 0xff, 0x40) }, /* Fibocom FG132 AT */ ++ { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x0112, 0xff, 0, 0) }, /* Fibocom FG132 NMEA */ + { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0115, 0xff), /* Fibocom FM135 (laptop MBIM) */ + .driver_info = RSVD(5) }, + { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) }, /* Fibocom NL668-AM/NL652-EU (laptop MBIM) */ diff --git a/queue-4.19/usb-serial-option-add-quectel-rg650v.patch b/queue-4.19/usb-serial-option-add-quectel-rg650v.patch new file mode 100644 index 00000000000..057ea549513 --- /dev/null +++ b/queue-4.19/usb-serial-option-add-quectel-rg650v.patch @@ -0,0 +1,68 @@ +From 3b05949ba39f305b585452d0e177470607842165 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Beno=C3=AEt=20Monin?= +Date: Thu, 24 Oct 2024 17:09:19 +0200 +Subject: USB: serial: option: add Quectel RG650V +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Benoît Monin + +commit 3b05949ba39f305b585452d0e177470607842165 upstream. + +Add support for Quectel RG650V which is based on Qualcomm SDX65 chip. +The composition is DIAG / NMEA / AT / AT / QMI. + +T: Bus=02 Lev=01 Prnt=01 Port=03 Cnt=01 Dev#= 4 Spd=5000 MxCh= 0 +D: Ver= 3.20 Cls=00(>ifc ) Sub=00 Prot=00 MxPS= 9 #Cfgs= 1 +P: Vendor=2c7c ProdID=0122 Rev=05.15 +S: Manufacturer=Quectel +S: Product=RG650V-EU +S: SerialNumber=xxxxxxx +C: #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=896mA +I: If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option +E: Ad=01(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=81(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +I: If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=02(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=82(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +I: If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=03(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=83(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=84(I) Atr=03(Int.) MxPS= 10 Ivl=9ms +I: If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option +E: Ad=04(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=85(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=86(I) Atr=03(Int.) MxPS= 10 Ivl=9ms +I: If#= 4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan +E: Ad=05(O) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=87(I) Atr=02(Bulk) MxPS=1024 Ivl=0ms +E: Ad=88(I) Atr=03(Int.) MxPS= 8 Ivl=9ms + +Signed-off-by: Benoît Monin +Cc: stable@vger.kernel.org +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/option.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -251,6 +251,7 @@ static void option_instat_callback(struc + #define QUECTEL_VENDOR_ID 0x2c7c + /* These Quectel products use Quectel's vendor ID */ + #define QUECTEL_PRODUCT_EC21 0x0121 ++#define QUECTEL_PRODUCT_RG650V 0x0122 + #define QUECTEL_PRODUCT_EM061K_LTA 0x0123 + #define QUECTEL_PRODUCT_EM061K_LMS 0x0124 + #define QUECTEL_PRODUCT_EC25 0x0125 +@@ -1273,6 +1274,8 @@ static const struct usb_device_id option + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG912Y, 0xff, 0, 0) }, + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG916Q, 0xff, 0x00, 0x00) }, + { 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(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) }, + { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) }, diff --git a/queue-4.19/usb-serial-qcserial-add-support-for-sierra-wireless-em86xx.patch b/queue-4.19/usb-serial-qcserial-add-support-for-sierra-wireless-em86xx.patch new file mode 100644 index 00000000000..86803037417 --- /dev/null +++ b/queue-4.19/usb-serial-qcserial-add-support-for-sierra-wireless-em86xx.patch @@ -0,0 +1,70 @@ +From 25eb47eed52979c2f5eee3f37e6c67714e02c49c Mon Sep 17 00:00:00 2001 +From: Jack Wu +Date: Wed, 6 Nov 2024 18:50:29 +0800 +Subject: USB: serial: qcserial: add support for Sierra Wireless EM86xx + +From: Jack Wu + +commit 25eb47eed52979c2f5eee3f37e6c67714e02c49c upstream. + +Add support for Sierra Wireless EM86xx with USB-id 0x1199:0x90e5 and +0x1199:0x90e4. + +0x1199:0x90e5 +T: Bus=03 Lev=01 Prnt=01 Port=05 Cnt=01 Dev#= 14 Spd=480 MxCh= 0 +D: Ver= 2.00 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=1199 ProdID=90e5 Rev= 5.15 +S: Manufacturer=Sierra Wireless, Incorporated +S: Product=Semtech EM8695 Mobile Broadband Adapter +S: SerialNumber=004403161882339 +C:* #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=500mA +A: FirstIf#=12 IfCount= 2 Cls=02(comm.) Sub=0e Prot=00 +I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=qcserial +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=42 Prot=01 Driver=usbfs +E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=qcserial +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#= 4 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) +E: Ad=85(I) Atr=03(Int.) MxPS= 64 Ivl=32ms +I:* If#=12 Alt= 0 #EPs= 1 Cls=02(comm.) Sub=0e Prot=00 Driver=cdc_mbim +E: Ad=87(I) Atr=03(Int.) MxPS= 64 Ivl=32ms +I: If#=13 Alt= 0 #EPs= 0 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim +I:* If#=13 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim +E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms + +0x1199:0x90e4 +T: Bus=03 Lev=01 Prnt=01 Port=05 Cnt=01 Dev#= 16 Spd=480 MxCh= 0 +D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 +P: Vendor=1199 ProdID=90e4 Rev= 0.00 +S: Manufacturer=Sierra Wireless, Incorporated +S: SerialNumber=004403161882339 +C:* #Ifs= 1 Cfg#= 1 Atr=a0 MxPwr= 2mA +I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=10 Driver=qcserial +E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms +E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms + +Signed-off-by: Jack Wu +Cc: stable@vger.kernel.org +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman +--- + drivers/usb/serial/qcserial.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/usb/serial/qcserial.c ++++ b/drivers/usb/serial/qcserial.c +@@ -166,6 +166,8 @@ static const struct usb_device_id id_tab + {DEVICE_SWI(0x1199, 0x9090)}, /* Sierra Wireless EM7565 QDL */ + {DEVICE_SWI(0x1199, 0x9091)}, /* Sierra Wireless EM7565 */ + {DEVICE_SWI(0x1199, 0x90d2)}, /* Sierra Wireless EM9191 QDL */ ++ {DEVICE_SWI(0x1199, 0x90e4)}, /* Sierra Wireless EM86xx QDL*/ ++ {DEVICE_SWI(0x1199, 0x90e5)}, /* Sierra Wireless EM86xx */ + {DEVICE_SWI(0x1199, 0xc080)}, /* Sierra Wireless EM7590 QDL */ + {DEVICE_SWI(0x1199, 0xc081)}, /* Sierra Wireless EM7590 */ + {DEVICE_SWI(0x413c, 0x81a2)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */