Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccd6da2a authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: btusb: Use proper data structures for Intel vendor events 



The Intel vendors events indicating firmware loading result and the
bootup of the operational firmware are currently hardcoded byte
comparisons. So intead of doing that, provide proper data structures
and actually use them.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 94910d41

drivers/bluetooth/btintel.h

+15 −0
Original line number Diff line number Diff line
@@ -54,6 +54,21 @@ struct intel_boot_params { 
	__u8     unlocked_state;

} __packed;



struct intel_bootup {

	__u8     zero;

	__u8     num_cmds;

	__u8     source;

	__u8     reset_type;

	__u8     reset_reason;

	__u8     ddc_status;

} __packed;



struct intel_secure_send_result {

	__u8     result;

	__le16   opcode;

	__u8     status;

} __packed;



#if IS_ENABLED(CONFIG_BT_INTEL)



int btintel_check_bdaddr(struct hci_dev *hdev);

drivers/bluetooth/btusb.c

+53 −26
Original line number Diff line number Diff line
@@ -1746,39 +1746,66 @@ static int btusb_recv_bulk_intel(struct btusb_data *data, void *buffer, 
	return btusb_recv_bulk(data, buffer, count);

}



static int btusb_recv_event_intel(struct hci_dev *hdev, struct sk_buff *skb)

static void btusb_intel_bootup(struct btusb_data *data, const void *ptr,

			       unsigned int len)

{

	struct btusb_data *data = hci_get_drvdata(hdev);

	const struct intel_bootup *evt = ptr;



	if (test_bit(BTUSB_BOOTLOADER, &data->flags)) {

		struct hci_event_hdr *hdr = (void *)skb->data;

	if (len != sizeof(*evt))

		return;



		/* When the firmware loading completes the device sends

		 * out a vendor specific event indicating the result of

		 * the firmware loading.

		 */

		if (skb->len == 7 && hdr->evt == 0xff && hdr->plen == 0x05 &&

		    skb->data[2] == 0x06) {

			if (skb->data[3] != 0x00)

				test_bit(BTUSB_FIRMWARE_FAILED, &data->flags);

	if (test_and_clear_bit(BTUSB_BOOTING, &data->flags)) {

		smp_mb__after_atomic();

		wake_up_bit(&data->flags, BTUSB_BOOTING);

	}

}



static void btusb_intel_secure_send_result(struct btusb_data *data,

					   const void *ptr, unsigned int len)

{

	const struct intel_secure_send_result *evt = ptr;



	if (len != sizeof(*evt))

		return;



	if (evt->result)

		set_bit(BTUSB_FIRMWARE_FAILED, &data->flags);



			if (test_and_clear_bit(BTUSB_DOWNLOADING,

					       &data->flags) &&

	if (test_and_clear_bit(BTUSB_DOWNLOADING, &data->flags) &&

	    test_bit(BTUSB_FIRMWARE_LOADED, &data->flags)) {

		smp_mb__after_atomic();

		wake_up_bit(&data->flags, BTUSB_DOWNLOADING);

	}

}



		/* When switching to the operational firmware the device

		 * sends a vendor specific event indicating that the bootup

		 * completed.

static int btusb_recv_event_intel(struct hci_dev *hdev, struct sk_buff *skb)

{

	struct btusb_data *data = hci_get_drvdata(hdev);



	if (test_bit(BTUSB_BOOTLOADER, &data->flags)) {

		struct hci_event_hdr *hdr = (void *)skb->data;



		if (skb->len > HCI_EVENT_HDR_SIZE && hdr->evt == 0xff &&

		    hdr->plen > 0) {

			const void *ptr = skb->data + HCI_EVENT_HDR_SIZE + 1;

			unsigned int len = skb->len - HCI_EVENT_HDR_SIZE - 1;



			switch (skb->data[2]) {

			case 0x02:

				/* When switching to the operational firmware

				 * the device sends a vendor specific event

				 * indicating that the bootup completed.

				 */

		if (skb->len == 9 && hdr->evt == 0xff && hdr->plen == 0x07 &&

		    skb->data[2] == 0x02) {

			if (test_and_clear_bit(BTUSB_BOOTING, &data->flags)) {

				smp_mb__after_atomic();

				wake_up_bit(&data->flags, BTUSB_BOOTING);

				btusb_intel_bootup(data, ptr, len);

				break;

			case 0x06:

				/* When the firmware loading completes the

				 * device sends out a vendor specific event

				 * indicating the result of the firmware

				 * loading.

				 */

				btusb_intel_secure_send_result(data, ptr, len);

				break;

			}

		}

	}