mbox series

[v4,0/7] Broadcom/Apple Bluetooth driver for Apple Silicon

Message ID 20221027150822.26120-1-sven@svenpeter.dev
Headers show
Series Broadcom/Apple Bluetooth driver for Apple Silicon | expand

Message

Sven Peter Oct. 27, 2022, 3:08 p.m. UTC 
Hi,

v1: https://lore.kernel.org/asahi/20220801103633.27772-1-sven@svenpeter.dev/
v2: https://lore.kernel.org/asahi/20220907170935.11757-1-sven@svenpeter.dev/
v3: https://lore.kernel.org/asahi/20220919164834.62739-1-sven@svenpeter.dev/

Here's v4 of the Apple/Broadcom Bluetooth series. Not many changes this
time: I rebased on 6.1, added Rob's r-b tags and fixed bcm4377_send_ptb
for newer firmware versions where that command claims to fail but is
still sent by macOS.


Best,


Sven

Sven Peter (7):
  dt-bindings: net: Add generic Bluetooth controller
  dt-bindings: net: Add Broadcom BCM4377 family PCIe Bluetooth
  arm64: dts: apple: t8103: Add Bluetooth controller
  Bluetooth: hci_event: Ignore reserved bits in LE Extended Adv Report
  Bluetooth: Add quirk to disable extended scanning
  Bluetooth: Add quirk to disable MWS Transport Configuration
  Bluetooth: hci_bcm4377: Add new driver for BCM4377 PCIe boards

 .../devicetree/bindings/net/bluetooth.txt     |    5 -
 .../net/bluetooth/bluetooth-controller.yaml   |   29 +
 .../net/bluetooth/brcm,bcm4377-bluetooth.yaml |   81 +
 .../{ => bluetooth}/qualcomm-bluetooth.yaml   |    6 +-
 .../bindings/soc/qcom/qcom,wcnss.yaml         |    8 +-
 MAINTAINERS                                   |    2 +
 arch/arm64/boot/dts/apple/t8103-j274.dts      |    4 +
 arch/arm64/boot/dts/apple/t8103-j293.dts      |    4 +
 arch/arm64/boot/dts/apple/t8103-j313.dts      |    4 +
 arch/arm64/boot/dts/apple/t8103-j456.dts      |    4 +
 arch/arm64/boot/dts/apple/t8103-j457.dts      |    4 +
 arch/arm64/boot/dts/apple/t8103-jxxx.dtsi     |    8 +
 drivers/bluetooth/Kconfig                     |   12 +
 drivers/bluetooth/Makefile                    |    1 +
 drivers/bluetooth/hci_bcm4377.c               | 2514 +++++++++++++++++
 include/net/bluetooth/hci.h                   |   21 +
 include/net/bluetooth/hci_core.h              |    4 +-
 net/bluetooth/hci_event.c                     |    2 +-
 net/bluetooth/hci_sync.c                      |    2 +
 19 files changed, 2700 insertions(+), 15 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/net/bluetooth.txt
 create mode 100644 Documentation/devicetree/bindings/net/bluetooth/bluetooth-controller.yaml
 create mode 100644 Documentation/devicetree/bindings/net/bluetooth/brcm,bcm4377-bluetooth.yaml
 rename Documentation/devicetree/bindings/net/{ => bluetooth}/qualcomm-bluetooth.yaml (96%)
 create mode 100644 drivers/bluetooth/hci_bcm4377.c

Comments

Luiz Augusto von Dentz Oct. 27, 2022, 6:59 p.m. UTC | #1 
Hi Sven,

On Thu, Oct 27, 2022 at 8:09 AM Sven Peter <sven@svenpeter.dev> wrote:
>
> 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;

Let's add a macro that tests both the command and the quirk so we
don't have to test them separately.

>         return __hci_cmd_sync_status(hdev, HCI_OP_GET_MWS_TRANSPORT_CONFIG,
>                                      0, NULL, HCI_CMD_TIMEOUT);
> --
> 2.25.1
>
Sven Peter Oct. 28, 2022, 3:08 p.m. UTC | #2 
Hi Luiz,

On Thu, Oct 27, 2022, at 20:59, Luiz Augusto von Dentz wrote:
> Hi Sven,
>
> On Thu, Oct 27, 2022 at 8:09 AM Sven Peter <sven@svenpeter.dev> wrote:
>>
>> 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;
>
> Let's add a macro that tests both the command and the quirk so we
> don't have to test them separately.

Sure, I'll add a macro for v5.


Best,


Sven