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

Commit ae8df494 authored by Amitkumar Karwar's avatar Amitkumar Karwar Committed by Marcel Holtmann
Browse files

Bluetooth: add public address configuration for Marvell USB devices 



Implemented .set_bdaddr handler provided by bluetooth stack for
Marvell devices for public address configuration.
A reboot restores the bdaddr to its original address.

Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent beb19e4c

drivers/bluetooth/btusb.c

+31 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ static struct usb_driver btusb_driver; 
#define BTUSB_INTEL		0x100

#define BTUSB_INTEL_BOOT	0x200

#define BTUSB_BCM_PATCHRAM	0x400

#define BTUSB_MARVELL		0x800



static const struct usb_device_id btusb_table[] = {

	/* Generic Bluetooth USB device */
@@ -242,6 +243,10 @@ static const struct usb_device_id blacklist_table[] = { 
	{ USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL },

	{ USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL },



	/* Marvell device */

	{ USB_DEVICE(0x1286, 0x2044), .driver_info = BTUSB_MARVELL },

	{ USB_DEVICE(0x1286, 0x2046), .driver_info = BTUSB_MARVELL },



	{ }	/* Terminating entry */

};
@@ -1455,6 +1460,29 @@ static int btusb_set_bdaddr_intel(struct hci_dev *hdev, const bdaddr_t *bdaddr) 
	return 0;

}



static int btusb_set_bdaddr_marvell(struct hci_dev *hdev,

				    const bdaddr_t *bdaddr)

{

	struct sk_buff *skb;

	u8 buf[8];

	long ret;



	buf[0] = 0xfe;

	buf[1] = sizeof(bdaddr_t);

	memcpy(buf + 2, bdaddr, sizeof(bdaddr_t));



	skb = __hci_cmd_sync(hdev, 0xfc22, sizeof(buf), buf, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		ret = PTR_ERR(skb);

		BT_ERR("%s: changing Marvell device address failed (%ld)",

		       hdev->name, ret);

		return ret;

	}

	kfree_skb(skb);



	return 0;

}



#define BDADDR_BCM20702A0 (&(bdaddr_t) {{0x00, 0xa0, 0x02, 0x70, 0x20, 0x00}})



static int btusb_setup_bcm_patchram(struct hci_dev *hdev)
@@ -1766,6 +1794,9 @@ static int btusb_probe(struct usb_interface *intf, 
		hdev->set_bdaddr = btusb_set_bdaddr_intel;

	}



	if (id->driver_info & BTUSB_MARVELL)

		hdev->set_bdaddr = btusb_set_bdaddr_marvell;



	if (id->driver_info & BTUSB_INTEL_BOOT)

		set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks);