| 1 |
commit: 617b247c0eb4261fed5c7d51924f4a7f75b7c1e8 |
| 2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 3 11:52:35 2021 +0000 |
| 4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 3 11:52:35 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=617b247c |
| 7 |
|
| 8 |
Remove redundant patch |
| 9 |
|
| 10 |
Removed: 2700_Bluetooth-usb-alt-3-for-WBS.patch |
| 11 |
|
| 12 |
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> |
| 13 |
|
| 14 |
0000_README | 4 -- |
| 15 |
2700_Bluetooth-usb-alt-3-for-WBS.patch | 84 ---------------------------------- |
| 16 |
2 files changed, 88 deletions(-) |
| 17 |
|
| 18 |
diff --git a/0000_README b/0000_README |
| 19 |
index b8850b4..dc9ab2d 100644 |
| 20 |
--- a/0000_README |
| 21 |
+++ b/0000_README |
| 22 |
@@ -59,10 +59,6 @@ Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch |
| 23 |
From: https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@××××××××.org/raw |
| 24 |
Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758 |
| 25 |
|
| 26 |
-Patch: 2700_Bluetooth-usb-alt-3-for-WBS.patch |
| 27 |
-From: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/commit/?id=55981d3541812234e687062926ff199c83f79a39 |
| 28 |
-Desc: Bluetooth: btusb: check conditions before enabling USB ALT 3 for WBS |
| 29 |
- |
| 30 |
Patch: 2900_tmp513-Fix-build-issue-by-selecting-CONFIG_REG.patch |
| 31 |
From: https://bugs.gentoo.org/710790 |
| 32 |
Desc: tmp513 requies REGMAP_I2C to build. Select it by default in Kconfig. See bug #710790. Thanks to Phil Stracchino |
| 33 |
|
| 34 |
diff --git a/2700_Bluetooth-usb-alt-3-for-WBS.patch b/2700_Bluetooth-usb-alt-3-for-WBS.patch |
| 35 |
deleted file mode 100644 |
| 36 |
index e0a67ea..0000000 |
| 37 |
--- a/2700_Bluetooth-usb-alt-3-for-WBS.patch |
| 38 |
+++ /dev/null |
| 39 |
@@ -1,84 +0,0 @@ |
| 40 |
-From 55981d3541812234e687062926ff199c83f79a39 Mon Sep 17 00:00:00 2001 |
| 41 |
-From: Pauli Virtanen <pav@×××.fi> |
| 42 |
-Date: Mon, 26 Jul 2021 21:02:06 +0300 |
| 43 |
-Subject: Bluetooth: btusb: check conditions before enabling USB ALT 3 for WBS |
| 44 |
-MIME-Version: 1.0 |
| 45 |
-Content-Type: text/plain; charset=UTF-8 |
| 46 |
-Content-Transfer-Encoding: 8bit |
| 47 |
- |
| 48 |
-Some USB BT adapters don't satisfy the MTU requirement mentioned in |
| 49 |
-commit e848dbd364ac ("Bluetooth: btusb: Add support USB ALT 3 for WBS") |
| 50 |
-and have ALT 3 setting that produces no/garbled audio. Some adapters |
| 51 |
-with larger MTU were also reported to have problems with ALT 3. |
| 52 |
- |
| 53 |
-Add a flag and check it and MTU before selecting ALT 3, falling back to |
| 54 |
-ALT 1. Enable the flag for Realtek, restoring the previous behavior for |
| 55 |
-non-Realtek devices. |
| 56 |
- |
| 57 |
-Tested with USB adapters (mtu<72, no/garbled sound with ALT3, ALT1 |
| 58 |
-works) BCM20702A1 0b05:17cb, CSR8510A10 0a12:0001, and (mtu>=72, ALT3 |
| 59 |
-works) RTL8761BU 0bda:8771, Intel AX200 8087:0029 (after disabling |
| 60 |
-ALT6). Also got reports for (mtu>=72, ALT 3 reported to produce bad |
| 61 |
-audio) Intel 8087:0a2b. |
| 62 |
- |
| 63 |
-Signed-off-by: Pauli Virtanen <pav@×××.fi> |
| 64 |
-Fixes: e848dbd364ac ("Bluetooth: btusb: Add support USB ALT 3 for WBS") |
| 65 |
-Tested-by: Michał Kępień <kernel@×××××××.pl> |
| 66 |
-Tested-by: Jonathan Lampérth <jon@×××.dev> |
| 67 |
-Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@×××××.com> |
| 68 |
---- |
| 69 |
- drivers/bluetooth/btusb.c | 22 ++++++++++++++-------- |
| 70 |
- 1 file changed, 14 insertions(+), 8 deletions(-) |
| 71 |
- |
| 72 |
-diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c |
| 73 |
-index 488f110e17e27..2336f731dbc7e 100644 |
| 74 |
---- a/drivers/bluetooth/btusb.c |
| 75 |
-+++ b/drivers/bluetooth/btusb.c |
| 76 |
-@@ -528,6 +528,7 @@ static const struct dmi_system_id btusb_needs_reset_resume_table[] = { |
| 77 |
- #define BTUSB_HW_RESET_ACTIVE 12 |
| 78 |
- #define BTUSB_TX_WAIT_VND_EVT 13 |
| 79 |
- #define BTUSB_WAKEUP_DISABLE 14 |
| 80 |
-+#define BTUSB_USE_ALT3_FOR_WBS 15 |
| 81 |
- |
| 82 |
- struct btusb_data { |
| 83 |
- struct hci_dev *hdev; |
| 84 |
-@@ -1761,16 +1762,20 @@ static void btusb_work(struct work_struct *work) |
| 85 |
- /* Bluetooth USB spec recommends alt 6 (63 bytes), but |
| 86 |
- * many adapters do not support it. Alt 1 appears to |
| 87 |
- * work for all adapters that do not have alt 6, and |
| 88 |
-- * which work with WBS at all. |
| 89 |
-+ * which work with WBS at all. Some devices prefer |
| 90 |
-+ * alt 3 (HCI payload >= 60 Bytes let air packet |
| 91 |
-+ * data satisfy 60 bytes), requiring |
| 92 |
-+ * MTU >= 3 (packets) * 25 (size) - 3 (headers) = 72 |
| 93 |
-+ * see also Core spec 5, vol 4, B 2.1.1 & Table 2.1. |
| 94 |
- */ |
| 95 |
-- new_alts = btusb_find_altsetting(data, 6) ? 6 : 1; |
| 96 |
-- /* Because mSBC frames do not need to be aligned to the |
| 97 |
-- * SCO packet boundary. If support the Alt 3, use the |
| 98 |
-- * Alt 3 for HCI payload >= 60 Bytes let air packet |
| 99 |
-- * data satisfy 60 bytes. |
| 100 |
-- */ |
| 101 |
-- if (new_alts == 1 && btusb_find_altsetting(data, 3)) |
| 102 |
-+ if (btusb_find_altsetting(data, 6)) |
| 103 |
-+ new_alts = 6; |
| 104 |
-+ else if (btusb_find_altsetting(data, 3) && |
| 105 |
-+ hdev->sco_mtu >= 72 && |
| 106 |
-+ test_bit(BTUSB_USE_ALT3_FOR_WBS, &data->flags)) |
| 107 |
- new_alts = 3; |
| 108 |
-+ else |
| 109 |
-+ new_alts = 1; |
| 110 |
- } |
| 111 |
- |
| 112 |
- if (btusb_switch_alt_setting(hdev, new_alts) < 0) |
| 113 |
-@@ -3882,6 +3887,7 @@ static int btusb_probe(struct usb_interface *intf, |
| 114 |
- * (DEVICE_REMOTE_WAKEUP) |
| 115 |
- */ |
| 116 |
- set_bit(BTUSB_WAKEUP_DISABLE, &data->flags); |
| 117 |
-+ set_bit(BTUSB_USE_ALT3_FOR_WBS, &data->flags); |
| 118 |
- } |
| 119 |
- |
| 120 |
- if (!reset) |
| 121 |
--- |
| 122 |
-cgit 1.2.3-1.el7 |
| 123 |
- |
Archives