From: Nobuaki Tsunashima <Nobuaki.Tsunashima@xxxxxxxxxxxx>
CYW4373 ROM FW has an issue that it claims LE_Read_Transmit_Power command
as supported in a response of Read_Local_Supported_Command command but
rejects the LE_Read_Transmit_Power command with "Unknown HCI Command"
status. Because Bluetooth driver of kernel 5.11 added sending the
LE_Read_Transmit_Power command in initialize phase, hci up fails due to the
issue.
Especially in USB i/f case, it would be difficult to download patch FW that
includes its fix unless hci is up.
The driver already contains infrastructure to apply the quirk for the
issue, but currently it only supports DMI based matching. Add support to
match by chip id and baseline FW version to detect CYW4373 ROM FW build
in generic system.
Fixes: 7c395ea521e6 ("Bluetooth: Query LE tx power on startup")
Signed-off-by: Nobuaki Tsunashima <Nobuaki.Tsunashima@xxxxxxxxxxxx>
---
V5 -> V6: Change two table names as simpler.
V4 -> V5: Use skb_pull_data() to access skb->data as safer manner.
V3 -> V4: Fix a few coding style warnings and refine comments for clarify.
V2 -> V3: Fix a few coding style warnings and change the subject as more specific.
V1 -> V2: Fix several coding style warnings.
drivers/bluetooth/btbcm.c | 45 +++++++++++++++++++++++++++++++++++----
drivers/bluetooth/btusb.c | 4 ++++
2 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
index 0a5445ac5e1b..154e5f4a26a8 100644
--- a/drivers/bluetooth/btbcm.c
+++ b/drivers/bluetooth/btbcm.c
@@ -391,7 +391,7 @@ static struct sk_buff *btbcm_read_usb_product(struct hci_dev *hdev)
return skb;
}
-static const struct dmi_system_id disable_broken_read_transmit_power[] = {
+static const struct dmi_system_id broken_read_tx_power_dmi[] = {
{
.matches = {
DMI_MATCH(DMI_BOARD_VENDOR, "Apple Inc."),
@@ -437,16 +437,53 @@ static const struct dmi_system_id disable_broken_read_transmit_power[] = {
{ }
};
+struct bcm_chip_version_table {
+ u8 chip_id; /* Chip ID */
+ u16 baseline; /* Baseline version of patch FW */
+};
+#define BCM_ROMFW_BASELINE_NUM 0xFFFF
+static const struct bcm_chip_version_table broken_read_tx_power_chip_ver[] = {
+ { 0x87, BCM_ROMFW_BASELINE_NUM } /* CYW4373/4373E */
+};
+static bool btbcm_is_disable_broken_read_tx_power_by_chip_ver(u8 chip_id, u16 baseline)
+{
+ int i;
+ size_t table_size = ARRAY_SIZE(broken_read_tx_power_chip_ver);
+ const struct bcm_chip_version_table *entry =
+ &broken_read_tx_power_chip_ver[0];
+
+ for (i = 0 ; i < table_size ; i++, entry++) {
+ if ((chip_id == entry->chip_id) && (baseline == entry->baseline))
+ return true;
+ }
+
+ return false;
+}
+
static int btbcm_read_info(struct hci_dev *hdev)
{
struct sk_buff *skb;
+ u8 *chip_id;
+ u16 *baseline;
/* Read Verbose Config Version Info */
skb = btbcm_read_verbose_config(hdev);
if (IS_ERR(skb))
return PTR_ERR(skb);
-
- bt_dev_info(hdev, "BCM: chip id %u", skb->data[1]);
+ skb_pull_data(skb, 1);
+ chip_id = skb_pull_data(skb, sizeof(*chip_id));
+ skb_pull_data(skb, 1);
+ baseline = skb_pull_data(skb, sizeof(*baseline));
+
+ if (chip_id) {
+ bt_dev_info(hdev, "BCM: chip id %u", *chip_id);
+
+ if (baseline) {
+ /* Check Chip ID and disable broken Read LE Min/Max Tx Power */
+ if (btbcm_is_disable_broken_read_tx_power_by_chip_ver(*chip_id, *baseline))
+ set_bit(HCI_QUIRK_BROKEN_READ_TRANSMIT_POWER, &hdev->quirks);
+ }
+ }
kfree_skb(skb);
return 0;
@@ -465,7 +502,7 @@ static int btbcm_print_controller_features(struct hci_dev *hdev)
kfree_skb(skb);
/* Read DMI and disable broken Read LE Min/Max Tx Power */
- if (dmi_first_match(disable_broken_read_transmit_power))
+ if (dmi_first_match(broken_read_tx_power_dmi))
set_bit(HCI_QUIRK_BROKEN_READ_TRANSMIT_POWER, &hdev->quirks);
return 0;
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index d31edad7a056..52561c8d8828 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -142,6 +142,10 @@ static const struct usb_device_id btusb_table[] = {
{ USB_VENDOR_AND_INTERFACE_INFO(0x04ca, 0xff, 0x01, 0x01),
.driver_info = BTUSB_BCM_PATCHRAM },
+ /* Cypress devices with vendor specific id */
+ { USB_VENDOR_AND_INTERFACE_INFO(0x04b4, 0xff, 0x01, 0x01),
+ .driver_info = BTUSB_BCM_PATCHRAM },
+
/* Broadcom devices with vendor specific id */
{ USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01),
.driver_info = BTUSB_BCM_PATCHRAM },
--
2.34.1
