Commit ffcb0a44 authored by Sven Peter's avatar Sven Peter Committed by Luiz Augusto von Dentz
Browse files

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: default avatarSven Peter <sven@svenpeter.dev>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 392fca35

include/net/bluetooth/hci.h

+10 −0
Original line number Diff line number Diff line
@@ -284,6 +284,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 */

include/net/bluetooth/hci_core.h

+3 −0
Original line number Diff line number Diff line
@@ -1720,6 +1720,9 @@ void hci_conn_del_sysfs(struct hci_conn *conn); 
	((dev)->le_features[3] & HCI_LE_CIS_PERIPHERAL)

#define bis_capable(dev) ((dev)->le_features[3] & HCI_LE_ISO_BROADCASTER)



#define mws_transport_config_capable(dev) (((dev)->commands[30] & 0x08) && \

	(!test_bit(HCI_QUIRK_BROKEN_MWS_TRANSPORT_CONFIG, &(dev)->quirks)))



/* ----- HCI protocols ----- */

#define HCI_PROTO_DEFER             0x01

net/bluetooth/hci_sync.c

+1 −1
Original line number Diff line number Diff line
@@ -4279,7 +4279,7 @@ static int hci_read_local_pairing_opts_sync(struct hci_dev *hdev) 
/* Get MWS transport configuration if the HCI command is supported */

static int hci_get_mws_transport_config_sync(struct hci_dev *hdev)

{

	if (!(hdev->commands[30] & 0x08))

	if (!mws_transport_config_capable(hdev))

		return 0;



	return __hci_cmd_sync_status(hdev, HCI_OP_GET_MWS_TRANSPORT_CONFIG,