You've already forked linux-t2-patches
mirror of
https://github.com/t2linux/linux-t2-patches.git
synced 2026-04-30 13:52:11 -07:00
Remove upstreamed bluetooth patches
This commit is contained in:
Aditya Garg
@@ -80,152 +80,6 @@ index faca701bce2a..ade2628aae0d 100644
|
||||
--
|
||||
2.38.0
|
||||
|
||||
From 0bab5cc74a5756cd0d9f37d0277f98d7a14a3d7b Mon Sep 17 00:00:00 2001
|
||||
From: Sven Peter <sven@svenpeter.dev>
|
||||
Date: Thu, 27 Oct 2022 17:08:20 +0200
|
||||
Subject: [PATCH 5/7] Bluetooth: Add quirk to disable extended scanning
|
||||
|
||||
Broadcom 4377 controllers found in Apple x86 Macs with the T2 chip
|
||||
claim to support extended scanning when querying supported states,
|
||||
|
||||
< HCI Command: LE Read Supported St.. (0x08|0x001c) plen 0
|
||||
> HCI Event: Command Complete (0x0e) plen 12
|
||||
LE Read Supported States (0x08|0x001c) ncmd 1
|
||||
Status: Success (0x00)
|
||||
States: 0x000003ffffffffff
|
||||
[...]
|
||||
LE Set Extended Scan Parameters (Octet 37 - Bit 5)
|
||||
LE Set Extended Scan Enable (Octet 37 - Bit 6)
|
||||
[...]
|
||||
|
||||
, but then fail to actually implement the extended scanning:
|
||||
|
||||
< HCI Command: LE Set Extended Sca.. (0x08|0x0041) plen 8
|
||||
Own address type: Random (0x01)
|
||||
Filter policy: Accept all advertisement (0x00)
|
||||
PHYs: 0x01
|
||||
Entry 0: LE 1M
|
||||
Type: Active (0x01)
|
||||
Interval: 11.250 msec (0x0012)
|
||||
Window: 11.250 msec (0x0012)
|
||||
> HCI Event: Command Complete (0x0e) plen 4
|
||||
LE Set Extended Scan Parameters (0x08|0x0041) ncmd 1
|
||||
Status: Unknown HCI Command (0x01)
|
||||
|
||||
Signed-off-by: Sven Peter <sven@svenpeter.dev>
|
||||
---
|
||||
include/net/bluetooth/hci.h | 10 ++++++++++
|
||||
include/net/bluetooth/hci_core.h | 4 +++-
|
||||
2 files changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
|
||||
index f4aa7b78a844..8cd89948f961 100644
|
||||
--- a/include/net/bluetooth/hci.h
|
||||
+++ b/include/net/bluetooth/hci.h
|
||||
@@ -263,6 +263,16 @@ enum {
|
||||
* during the hdev->setup vendor callback.
|
||||
*/
|
||||
HCI_QUIRK_BROKEN_ENHANCED_SETUP_SYNC_CONN,
|
||||
+
|
||||
+ /*
|
||||
+ * When this quirk is set, the HCI_OP_LE_SET_EXT_SCAN_ENABLE command is
|
||||
+ * disabled. This is required for some Broadcom controllers which
|
||||
+ * erroneously claim to support extended scanning.
|
||||
+ *
|
||||
+ * This quirk can be set before hci_register_dev is called or
|
||||
+ * during the hdev->setup vendor callback.
|
||||
+ */
|
||||
+ HCI_QUIRK_BROKEN_EXT_SCAN,
|
||||
};
|
||||
|
||||
/* HCI device flags */
|
||||
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
|
||||
index c54bc71254af..3cd00be0fcd2 100644
|
||||
--- a/include/net/bluetooth/hci_core.h
|
||||
+++ b/include/net/bluetooth/hci_core.h
|
||||
@@ -1689,7 +1689,9 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
|
||||
|
||||
/* Use ext scanning if set ext scan param and ext scan enable is supported */
|
||||
#define use_ext_scan(dev) (((dev)->commands[37] & 0x20) && \
|
||||
- ((dev)->commands[37] & 0x40))
|
||||
+ ((dev)->commands[37] & 0x40) && \
|
||||
+ !test_bit(HCI_QUIRK_BROKEN_EXT_SCAN, &(dev)->quirks))
|
||||
+
|
||||
/* Use ext create connection if command is supported */
|
||||
#define use_ext_conn(dev) ((dev)->commands[37] & 0x80)
|
||||
|
||||
--
|
||||
2.38.0
|
||||
|
||||
From ef73b7a8bf4b661de4d342537064029ffc208b7e Mon Sep 17 00:00:00 2001
|
||||
From: Sven Peter <sven@svenpeter.dev>
|
||||
Date: Thu, 27 Oct 2022 17:08:21 +0200
|
||||
Subject: [PATCH 6/7] Bluetooth: Add quirk to disable MWS Transport
|
||||
Configuration
|
||||
|
||||
Broadcom 4378/4387 controllers found in Apple Silicon Macs claim to
|
||||
support getting MWS Transport Layer Configuration,
|
||||
|
||||
< HCI Command: Read Local Supported... (0x04|0x0002) plen 0
|
||||
> HCI Event: Command Complete (0x0e) plen 68
|
||||
Read Local Supported Commands (0x04|0x0002) ncmd 1
|
||||
Status: Success (0x00)
|
||||
[...]
|
||||
Get MWS Transport Layer Configuration (Octet 30 - Bit 3)]
|
||||
[...]
|
||||
|
||||
, but then don't actually allow the required command:
|
||||
|
||||
> HCI Event: Command Complete (0x0e) plen 15
|
||||
Get MWS Transport Layer Configuration (0x05|0x000c) ncmd 1
|
||||
Status: Command Disallowed (0x0c)
|
||||
Number of transports: 0
|
||||
Baud rate list: 0 entries
|
||||
00 00 00 00 00 00 00 00 00 00
|
||||
|
||||
Signed-off-by: Sven Peter <sven@svenpeter.dev>
|
||||
---
|
||||
include/net/bluetooth/hci.h | 10 ++++++++++
|
||||
net/bluetooth/hci_sync.c | 2 ++
|
||||
2 files changed, 12 insertions(+)
|
||||
|
||||
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
|
||||
index 8cd89948f961..110d6df1299b 100644
|
||||
--- a/include/net/bluetooth/hci.h
|
||||
+++ b/include/net/bluetooth/hci.h
|
||||
@@ -273,6 +273,16 @@ enum {
|
||||
* during the hdev->setup vendor callback.
|
||||
*/
|
||||
HCI_QUIRK_BROKEN_EXT_SCAN,
|
||||
+
|
||||
+ /*
|
||||
+ * When this quirk is set, the HCI_OP_GET_MWS_TRANSPORT_CONFIG command is
|
||||
+ * disabled. This is required for some Broadcom controllers which
|
||||
+ * erroneously claim to support MWS Transport Layer Configuration.
|
||||
+ *
|
||||
+ * This quirk can be set before hci_register_dev is called or
|
||||
+ * during the hdev->setup vendor callback.
|
||||
+ */
|
||||
+ HCI_QUIRK_BROKEN_MWS_TRANSPORT_CONFIG,
|
||||
};
|
||||
|
||||
/* HCI device flags */
|
||||
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
|
||||
index 76c3107c9f91..91788d356748 100644
|
||||
--- a/net/bluetooth/hci_sync.c
|
||||
+++ b/net/bluetooth/hci_sync.c
|
||||
@@ -4260,6 +4260,8 @@ static int hci_get_mws_transport_config_sync(struct hci_dev *hdev)
|
||||
{
|
||||
if (!(hdev->commands[30] & 0x08))
|
||||
return 0;
|
||||
+ if (test_bit(HCI_QUIRK_BROKEN_MWS_TRANSPORT_CONFIG, &hdev->quirks))
|
||||
+ return 0;
|
||||
|
||||
return __hci_cmd_sync_status(hdev, HCI_OP_GET_MWS_TRANSPORT_CONFIG,
|
||||
0, NULL, HCI_CMD_TIMEOUT);
|
||||
--
|
||||
2.38.0
|
||||
|
||||
From f8a43896f03b18821f978baab29c6d2a4bd750af Mon Sep 17 00:00:00 2001
|
||||
From: Sven Peter <sven@svenpeter.dev>
|
||||
Date: Thu, 27 Oct 2022 17:08:22 +0200
|
||||
|
||||
Reference in New Issue
Block a user