linux-kernel - [PATCH] Bluetooth: Fix Bluetooth for BCM4377 on T2 Intel MacBooks

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <c9dd2a5e99e032dc181344fd0359aac9@mrman314.tech>
Date: Sun, 24 Dec 2023 15:29:59 -0500
From: Felix Zhang <mrman@...an314.tech>
To: linux-bluetooth@...r.kernel.org
Cc: marcan@...can.st, bagasdotme@...il.com, sven@...npeter.dev,
 alyssa@...enzweig.io, marcel@...tmann.org, johan.hedberg@...il.com,
 luiz.dentz@...il.com, orlandoch.dev@...il.com, kekrby@...il.com,
 admin@...eit.net, j@...nau.net, gargaditya08@...e.com,
 asahi@...ts.linux.dev, linux-kernel@...r.kernel.org
Subject: [PATCH] Bluetooth: Fix Bluetooth for BCM4377 on T2 Intel MacBooks

Starting v6.5, Bluetooth does not work at all on my T2 MacBookAir9,1 
with
the BCM4377 chip.  When I boot up the computer, go into bluetoothctl, 
and
then try to run commands like scan on, show, list, it returns "No 
default
controller available."  I have tried reloading the kernel module, in 
which
the log outputs "{Added,Removed} hci0 (unconfigured)."  With this patch, 
I
am able to use Bluetooth as normal without any errors regarding hci0 
being
unconfigured.  However, an issue is still present where sometimes
hci_bcm4377 will have to be reloaded in order to get bluetooth to work.  
I
believe this was still present before the previously mentioned commit.

Due to the bit HCI_QUIRK_USE_BDADDR_PROPERTY being always set in
drivers/bluetooth/hci_bcm4377.c(line 2371), the chip would be left
unconfigured on kernels compiled after commit 6945795bc81a ("Bluetooth:
fix use-bdaddr-property quirk") due to a change in its logic.  On the M1
Macs, the device would be configured in the devicetree.  However, that 
is
not the case on T2 Macs.  Because the bluetooth adapter is left
unconfigured, it is not usable in the operating system.  In order to
circumvent this issue, a flag is added to prevent the bit from being set 
on
the BCM4377, while setting it on the other devices.

Because I do not have an M1 device to test this patch on, I am not sure
whether the patch breaks anything for said devices.  I would be very
grateful if anyone is willing to test this patch on their M1 device.

I would also like to thank Kerem Karabay <kekrby@...il.com> for 
assisting
me with this patch.

Fixes: 6945795bc81a ("Bluetooth: fix use-bdaddr-property quirk")
Signed-off-by: Felix Zhang <mrman@...an314.tech>
---
  drivers/bluetooth/hci_bcm4377.c | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/bluetooth/hci_bcm4377.c 
b/drivers/bluetooth/hci_bcm4377.c
index a61757835695..5c6fef1aa0f6 100644
--- a/drivers/bluetooth/hci_bcm4377.c
+++ b/drivers/bluetooth/hci_bcm4377.c
@@ -513,6 +513,7 @@ struct bcm4377_hw {
  	unsigned long broken_ext_scan : 1;
  	unsigned long broken_mws_transport_config : 1;
  	unsigned long broken_le_coded : 1;
+	unsigned long use_bdaddr_property : 1;

  	int (*send_calibration)(struct bcm4377_data *bcm4377);
  	int (*send_ptb)(struct bcm4377_data *bcm4377,
@@ -2368,7 +2369,8 @@ static int bcm4377_probe(struct pci_dev *pdev, 
const struct pci_device_id *id)
  	hdev->set_bdaddr = bcm4377_hci_set_bdaddr;
  	hdev->setup = bcm4377_hci_setup;

-	set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
+	if (bcm4377->hw->use_bdaddr_property)
+		set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
  	if (bcm4377->hw->broken_mws_transport_config)
  		set_bit(HCI_QUIRK_BROKEN_MWS_TRANSPORT_CONFIG, &hdev->quirks);
  	if (bcm4377->hw->broken_ext_scan)
@@ -2465,6 +2467,7 @@ static const struct bcm4377_hw 
bcm4377_hw_variants[] = {
  		.has_bar0_core2_window2 = true,
  		.broken_mws_transport_config = true,
  		.broken_le_coded = true,
+		.use_bdaddr_property = true,
  		.send_calibration = bcm4378_send_calibration,
  		.send_ptb = bcm4378_send_ptb,
  	},
@@ -2479,6 +2482,7 @@ static const struct bcm4377_hw 
bcm4377_hw_variants[] = {
  		.clear_pciecfg_subsystem_ctrl_bit19 = true,
  		.broken_mws_transport_config = true,
  		.broken_le_coded = true,
+		.use_bdaddr_property = true,
  		.send_calibration = bcm4387_send_calibration,
  		.send_ptb = bcm4378_send_ptb,
  	},
--
2.43.0