From a21ec36846e6be6aac51e29f0ab8b1b5a52b524a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 19 Nov 2021 14:38:58 +0100 Subject: [PATCH] 5.15-stable patches added patches: bluetooth-btusb-add-support-for-tp-link-ub500-adapter.patch parisc-entry-fix-trace-test-in-syscall-exit-path.patch --- ...dd-support-for-tp-link-ub500-adapter.patch | 63 +++++++++++++++++++ ...-fix-trace-test-in-syscall-exit-path.patch | 42 +++++++++++++ queue-5.15/series | 2 + 3 files changed, 107 insertions(+) create mode 100644 queue-5.15/bluetooth-btusb-add-support-for-tp-link-ub500-adapter.patch create mode 100644 queue-5.15/parisc-entry-fix-trace-test-in-syscall-exit-path.patch diff --git a/queue-5.15/bluetooth-btusb-add-support-for-tp-link-ub500-adapter.patch b/queue-5.15/bluetooth-btusb-add-support-for-tp-link-ub500-adapter.patch new file mode 100644 index 00000000000..073d4085b1a --- /dev/null +++ b/queue-5.15/bluetooth-btusb-add-support-for-tp-link-ub500-adapter.patch @@ -0,0 +1,63 @@ +From 4fd6d490796171bf786090fee782e252186632e4 Mon Sep 17 00:00:00 2001 +From: Nicholas Flintham +Date: Thu, 30 Sep 2021 09:22:39 +0100 +Subject: Bluetooth: btusb: Add support for TP-Link UB500 Adapter + +From: Nicholas Flintham + +commit 4fd6d490796171bf786090fee782e252186632e4 upstream. + +Add support for TP-Link UB500 Adapter (RTL8761B) + +* /sys/kernel/debug/usb/devices +T: Bus=01 Lev=02 Prnt=05 Port=01 Cnt=01 Dev#= 78 Spd=12 MxCh= 0 +D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=2357 ProdID=0604 Rev= 2.00 +S: Manufacturer= +S: Product=TP-Link UB500 Adapter +S: SerialNumber=E848B8C82000 +C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=500mA +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= 64 Ivl=0ms +E: Ad=82(I) Atr=02(Bulk) MxPS= 64 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 + +Signed-off-by: Nicholas Flintham +Signed-off-by: Marcel Holtmann +Cc: Szabolcs Sipos +Signed-off-by: Greg Kroah-Hartman +--- + drivers/bluetooth/btusb.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -433,6 +433,10 @@ static const struct usb_device_id blackl + { USB_DEVICE(0x0bda, 0xb009), .driver_info = BTUSB_REALTEK }, + { USB_DEVICE(0x2ff8, 0xb011), .driver_info = BTUSB_REALTEK }, + ++ /* Additional Realtek 8761B Bluetooth devices */ ++ { USB_DEVICE(0x2357, 0x0604), .driver_info = BTUSB_REALTEK | ++ BTUSB_WIDEBAND_SPEECH }, ++ + /* Additional Realtek 8761BU Bluetooth devices */ + { USB_DEVICE(0x0b05, 0x190e), .driver_info = BTUSB_REALTEK | + BTUSB_WIDEBAND_SPEECH }, diff --git a/queue-5.15/parisc-entry-fix-trace-test-in-syscall-exit-path.patch b/queue-5.15/parisc-entry-fix-trace-test-in-syscall-exit-path.patch new file mode 100644 index 00000000000..e1c67b0762e --- /dev/null +++ b/queue-5.15/parisc-entry-fix-trace-test-in-syscall-exit-path.patch @@ -0,0 +1,42 @@ +From 3ec18fc7831e7d79e2d536dd1f3bc0d3ba425e8a Mon Sep 17 00:00:00 2001 +From: Sven Schnelle +Date: Sat, 13 Nov 2021 20:41:17 +0100 +Subject: parisc/entry: fix trace test in syscall exit path + +From: Sven Schnelle + +commit 3ec18fc7831e7d79e2d536dd1f3bc0d3ba425e8a upstream. + +commit 8779e05ba8aa ("parisc: Fix ptrace check on syscall return") +fixed testing of TI_FLAGS. This uncovered a bug in the test mask. +syscall_restore_rfi is only used when the kernel needs to exit to +usespace with single or block stepping and the recovery counter +enabled. The test however used _TIF_SYSCALL_TRACE_MASK, which +includes a lot of bits that shouldn't be tested here. + +Fix this by using TIF_SINGLESTEP and TIF_BLOCKSTEP directly. + +I encountered this bug by enabling syscall tracepoints. Both in qemu and +on real hardware. As soon as i enabled the tracepoint (sys_exit_read, +but i guess it doesn't really matter which one), i got random page +faults in userspace almost immediately. + +Signed-off-by: Sven Schnelle +Signed-off-by: Helge Deller +Signed-off-by: Greg Kroah-Hartman + +--- + arch/parisc/kernel/entry.S | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/parisc/kernel/entry.S ++++ b/arch/parisc/kernel/entry.S +@@ -1835,7 +1835,7 @@ syscall_restore: + + /* Are we being ptraced? */ + LDREG TI_FLAGS-THREAD_SZ_ALGN-FRAME_SIZE(%r30),%r19 +- ldi _TIF_SYSCALL_TRACE_MASK,%r2 ++ ldi _TIF_SINGLESTEP|_TIF_BLOCKSTEP,%r2 + and,COND(=) %r19,%r2,%r0 + b,n syscall_restore_rfi + diff --git a/queue-5.15/series b/queue-5.15/series index 396a085b960..e746799279f 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -11,3 +11,5 @@ btrfs-zoned-allow-preallocation-for-relocation-inodes.patch fortify-explicitly-disable-clang-support.patch block-add-a-helper-to-validate-the-block-size.patch loop-use-blk_validate_block_size-to-validate-block-size.patch +bluetooth-btusb-add-support-for-tp-link-ub500-adapter.patch +parisc-entry-fix-trace-test-in-syscall-exit-path.patch -- 2.47.2