Commit aae6b812 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz
Browse files

Bluetooth: HCI: Invert LE State quirk to be opt-out rather then opt-in 

This inverts the LE State quirk so by default we assume the controllers
would report valid states rather than invalid which is how quirks
normally behave, also this would result in HCI command failing it the LE
States are really broken thus exposing the controllers that are really
broken in this respect.

Link: https://github.com/bluez/bluez/issues/584


Fixes: 22091585 ("Bluetooth: Adding driver and quirk defs for multi-role LE")
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 9c5af2d7

drivers/bluetooth/btintel.c

+0 −10
Original line number Diff line number Diff line
@@ -2945,9 +2945,6 @@ static int btintel_setup_combined(struct hci_dev *hdev) 
					       INTEL_ROM_LEGACY_NO_WBS_SUPPORT))

				set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED,

					&hdev->quirks);

			if (ver.hw_variant == 0x08 && ver.fw_variant == 0x22)

				set_bit(HCI_QUIRK_VALID_LE_STATES,

					&hdev->quirks);



			err = btintel_legacy_rom_setup(hdev, &ver);

			break;
@@ -2956,7 +2953,6 @@ static int btintel_setup_combined(struct hci_dev *hdev) 
		case 0x12:      /* ThP */

		case 0x13:      /* HrP */

		case 0x14:      /* CcP */

			set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);

			fallthrough;

		case 0x0c:	/* WsP */

			/* Apply the device specific HCI quirks
@@ -3048,9 +3044,6 @@ static int btintel_setup_combined(struct hci_dev *hdev) 
		/* These variants don't seem to support LE Coded PHY */

		set_bit(HCI_QUIRK_BROKEN_LE_CODED, &hdev->quirks);



		/* Set Valid LE States quirk */

		set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);



		/* Setup MSFT Extension support */

		btintel_set_msft_opcode(hdev, ver.hw_variant);
@@ -3076,9 +3069,6 @@ static int btintel_setup_combined(struct hci_dev *hdev) 
		 */

		set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks);



		/* Apply LE States quirk from solar onwards */

		set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);



		/* Setup MSFT Extension support */

		btintel_set_msft_opcode(hdev,

					INTEL_HW_VARIANT(ver_tlv.cnvi_bt));

drivers/bluetooth/btintel_pcie.c

+0 −3
Original line number Diff line number Diff line
@@ -1180,9 +1180,6 @@ static int btintel_pcie_setup(struct hci_dev *hdev) 
		 */

		set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks);



		/* Apply LE States quirk from solar onwards */

		set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);



		/* Setup MSFT Extension support */

		btintel_set_msft_opcode(hdev,

					INTEL_HW_VARIANT(ver_tlv.cnvi_bt));

drivers/bluetooth/btmtksdio.c

+0 −3
Original line number Diff line number Diff line
@@ -1148,9 +1148,6 @@ static int btmtksdio_setup(struct hci_dev *hdev) 
			}

		}



		/* Valid LE States quirk for MediaTek 7921 */

		set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);



		break;

	case 0x7663:

	case 0x7668:

drivers/bluetooth/btrtl.c

+0 −1
Original line number Diff line number Diff line
@@ -1287,7 +1287,6 @@ void btrtl_set_quirks(struct hci_dev *hdev, struct btrtl_device_info *btrtl_dev) 
	case CHIP_ID_8852C:

	case CHIP_ID_8851B:

	case CHIP_ID_8852BT:

		set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);

		set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks);



		/* RTL8852C needs to transmit mSBC data continuously without

drivers/bluetooth/btusb.c

+2 −2
Original line number Diff line number Diff line
@@ -3956,8 +3956,8 @@ static int btusb_probe(struct usb_interface *intf, 
	if (id->driver_info & BTUSB_WIDEBAND_SPEECH)

		set_bit(HCI_QUIRK_WIDEBAND_SPEECH_SUPPORTED, &hdev->quirks);



	if (id->driver_info & BTUSB_VALID_LE_STATES)

		set_bit(HCI_QUIRK_VALID_LE_STATES, &hdev->quirks);

	if (!(id->driver_info & BTUSB_VALID_LE_STATES))

		set_bit(HCI_QUIRK_BROKEN_LE_STATES, &hdev->quirks);



	if (id->driver_info & BTUSB_DIGIANSWER) {

		data->cmdreq_type = USB_TYPE_VENDOR;