target/linux/bcm27xx/patches-6.1/950-0700-Bluetooth-hci_bcm-Add-more-invalid-BDADDRs.patch

   1 From 0b5ed6065e35da3e27a6ade1682ce0ba0fbc4ec0 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Thu, 6 Apr 2023 10:38:40 +0100
   4 Subject: [PATCH] Bluetooth: hci_bcm: Add more invalid BDADDRs
   5
   6 The kernel needs to recognise the default BDADDRs used by the Bluetooth
   7 modems, so add a few more that we care about.
   8
   9 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  10 ---
  11  drivers/bluetooth/btbcm.c | 8 ++++++++
  12  1 file changed, 8 insertions(+)
  13
  14 --- a/drivers/bluetooth/btbcm.c
  15 +++ b/drivers/bluetooth/btbcm.c
  16 @@ -24,11 +24,15 @@
  17  #define BDADDR_BCM20702A1 (&(bdaddr_t) {{0x00, 0x00, 0xa0, 0x02, 0x70, 0x20}})
  18  #define BDADDR_BCM2076B1 (&(bdaddr_t) {{0x79, 0x56, 0x00, 0xa0, 0x76, 0x20}})
  19  #define BDADDR_BCM43430A0 (&(bdaddr_t) {{0xac, 0x1f, 0x12, 0xa0, 0x43, 0x43}})
  20 +#define BDADDR_BCM43430A1 (&(bdaddr_t) {{0xac, 0x1f, 0x12, 0xa1, 0x43, 0x43}})
  21 +#define BDADDR_BCM43430B0 (&(bdaddr_t) {{0xac, 0x1f, 0x37, 0xb0, 0x43, 0x43}})
  22  #define BDADDR_BCM4324B3 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb3, 0x24, 0x43}})
  23  #define BDADDR_BCM4330B1 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb1, 0x30, 0x43}})
  24  #define BDADDR_BCM4334B0 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb0, 0x34, 0x43}})
  25 +#define BDADDR_BCM4345C0 (&(bdaddr_t) {{0xac, 0x1f, 0x00, 0xc0, 0x45, 0x43}})
  26  #define BDADDR_BCM4345C5 (&(bdaddr_t) {{0xac, 0x1f, 0x00, 0xc5, 0x45, 0x43}})
  27  #define BDADDR_BCM43341B (&(bdaddr_t) {{0xac, 0x1f, 0x00, 0x1b, 0x34, 0x43}})
  28 +#define BDADDR_BCM43438 (&(bdaddr_t) {{0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa}})
  29
  30  #define BCM_FW_NAME_LEN                        64
  31  #define BCM_FW_NAME_COUNT_MAX          4
  32 @@ -122,8 +126,12 @@ int btbcm_check_bdaddr(struct hci_dev *h
  33             !bacmp(&bda->bdaddr, BDADDR_BCM4324B3) ||
  34             !bacmp(&bda->bdaddr, BDADDR_BCM4330B1) ||
  35             !bacmp(&bda->bdaddr, BDADDR_BCM4334B0) ||
  36 +           !bacmp(&bda->bdaddr, BDADDR_BCM4345C0) ||
  37             !bacmp(&bda->bdaddr, BDADDR_BCM4345C5) ||
  38             !bacmp(&bda->bdaddr, BDADDR_BCM43430A0) ||
  39 +           !bacmp(&bda->bdaddr, BDADDR_BCM43430A1) ||
  40 +           !bacmp(&bda->bdaddr, BDADDR_BCM43430B0) ||
  41 +           !bacmp(&bda->bdaddr, BDADDR_BCM43438) ||
  42             !bacmp(&bda->bdaddr, BDADDR_BCM43341B)) {
  43                 /* Try falling back to BDADDR EFI variable */
  44                 if (btbcm_set_bdaddr_from_efi(hdev) != 0) {