diff options
Diffstat (limited to 'drivers/bluetooth/btusb.c')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 909 | 
1 files changed, 779 insertions, 130 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index ab3894f742c..6250fc2fb93 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -21,29 +21,22 @@   *   */ -#include <linux/kernel.h>  #include <linux/module.h> -#include <linux/init.h> -#include <linux/slab.h> -#include <linux/types.h> -#include <linux/sched.h> -#include <linux/errno.h> -#include <linux/skbuff.h> -  #include <linux/usb.h> +#include <linux/firmware.h>  #include <net/bluetooth/bluetooth.h>  #include <net/bluetooth/hci_core.h>  #define VERSION "0.6" -static int ignore_dga; -static int ignore_csr; -static int ignore_sniffer; -static int disable_scofix; -static int force_scofix; +static bool ignore_dga; +static bool ignore_csr; +static bool ignore_sniffer; +static bool disable_scofix; +static bool force_scofix; -static int reset = 1; +static bool reset = 1;  static struct usb_driver btusb_driver; @@ -54,11 +47,23 @@ static struct usb_driver btusb_driver;  #define BTUSB_BCM92035		0x10  #define BTUSB_BROKEN_ISOC	0x20  #define BTUSB_WRONG_SCO_MTU	0x40 +#define BTUSB_ATH3012		0x80 +#define BTUSB_INTEL		0x100 +#define BTUSB_BCM_PATCHRAM	0x200 -static struct usb_device_id btusb_table[] = { +static const struct usb_device_id btusb_table[] = {  	/* Generic Bluetooth USB device */  	{ USB_DEVICE_INFO(0xe0, 0x01, 0x01) }, +	/* Apple-specific (Broadcom) devices */ +	{ USB_VENDOR_AND_INTERFACE_INFO(0x05ac, 0xff, 0x01, 0x01) }, + +	/* MediaTek MT76x0E */ +	{ USB_DEVICE(0x0e8d, 0x763f) }, + +	/* Broadcom SoftSailing reporting vendor specific */ +	{ USB_DEVICE(0x0a5c, 0x21e1) }, +  	/* Apple MacBookPro 7,1 */  	{ USB_DEVICE(0x05ac, 0x8213) }, @@ -71,6 +76,15 @@ static struct usb_device_id btusb_table[] = {  	/* Apple MacBookAir3,1, MacBookAir3,2 */  	{ USB_DEVICE(0x05ac, 0x821b) }, +	/* Apple MacBookAir4,1 */ +	{ USB_DEVICE(0x05ac, 0x821f) }, + +	/* Apple MacBookPro8,2 */ +	{ USB_DEVICE(0x05ac, 0x821a) }, + +	/* Apple MacMini5,1 */ +	{ USB_DEVICE(0x05ac, 0x8281) }, +  	/* AVM BlueFRITZ! USB v2.0 */  	{ USB_DEVICE(0x057c, 0x3800) }, @@ -87,22 +101,92 @@ static struct usb_device_id btusb_table[] = {  	/* Canyon CN-BTU1 with HID interfaces */  	{ USB_DEVICE(0x0c10, 0x0000) }, +	/* Broadcom BCM20702A0 */ +	{ USB_DEVICE(0x0489, 0xe042) }, +	{ USB_DEVICE(0x04ca, 0x2003) }, +	{ USB_DEVICE(0x0b05, 0x17b5) }, +	{ USB_DEVICE(0x0b05, 0x17cb) }, +	{ USB_DEVICE(0x413c, 0x8197) }, + +	/* Foxconn - Hon Hai */ +	{ USB_VENDOR_AND_INTERFACE_INFO(0x0489, 0xff, 0x01, 0x01) }, + +	/* Broadcom devices with vendor specific id */ +	{ USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01), +	  .driver_info = BTUSB_BCM_PATCHRAM }, + +	/* Belkin F8065bf - Broadcom based */ +	{ USB_VENDOR_AND_INTERFACE_INFO(0x050d, 0xff, 0x01, 0x01) }, + +	/* IMC Networks - Broadcom based */ +	{ USB_VENDOR_AND_INTERFACE_INFO(0x13d3, 0xff, 0x01, 0x01) }, +  	{ }	/* Terminating entry */  };  MODULE_DEVICE_TABLE(usb, btusb_table); -static struct usb_device_id blacklist_table[] = { +static const struct usb_device_id blacklist_table[] = {  	/* CSR BlueCore devices */  	{ USB_DEVICE(0x0a12, 0x0001), .driver_info = BTUSB_CSR },  	/* Broadcom BCM2033 without firmware */  	{ USB_DEVICE(0x0a5c, 0x2033), .driver_info = BTUSB_IGNORE }, +	/* Atheros 3011 with sflash firmware */ +	{ USB_DEVICE(0x0489, 0xe027), .driver_info = BTUSB_IGNORE }, +	{ USB_DEVICE(0x0489, 0xe03d), .driver_info = BTUSB_IGNORE }, +	{ USB_DEVICE(0x0930, 0x0215), .driver_info = BTUSB_IGNORE }, +	{ USB_DEVICE(0x0cf3, 0x3002), .driver_info = BTUSB_IGNORE }, +	{ USB_DEVICE(0x0cf3, 0xe019), .driver_info = BTUSB_IGNORE }, +	{ USB_DEVICE(0x13d3, 0x3304), .driver_info = BTUSB_IGNORE }, + +	/* Atheros AR9285 Malbec with sflash firmware */ +	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE }, + +	/* Atheros 3012 with sflash firmware */ +	{ USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0489, 0xe056), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0489, 0xe057), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x04ca, 0x3006), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x04ca, 0x3007), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x04ca, 0x3008), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x04ca, 0x300b), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0930, 0x0219), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0cf3, 0x311e), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0cf3, 0x311f), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0cf3, 0x3121), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0cf3, 0x817a), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0cf3, 0xe003), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0cf3, 0xe004), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0cf3, 0xe005), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x13d3, 0x3362), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x13d3, 0x3393), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x13d3, 0x3402), .driver_info = BTUSB_ATH3012 }, + +	/* Atheros AR5BBU12 with sflash firmware */ +	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE }, + +	/* Atheros AR5BBU12 with sflash firmware */ +	{ USB_DEVICE(0x0489, 0xe036), .driver_info = BTUSB_ATH3012 }, +	{ USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 }, +  	/* Broadcom BCM2035 */ -	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU }, -	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },  	{ USB_DEVICE(0x0a5c, 0x2009), .driver_info = BTUSB_BCM92035 }, +	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU }, +	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },  	/* Broadcom BCM2045 */  	{ USB_DEVICE(0x0a5c, 0x2039), .driver_info = BTUSB_WRONG_SCO_MTU }, @@ -149,6 +233,10 @@ static struct usb_device_id blacklist_table[] = {  	/* Frontline ComProbe Bluetooth Sniffer */  	{ USB_DEVICE(0x16d3, 0x0002), .driver_info = BTUSB_SNIFFER }, +	/* Intel Bluetooth device */ +	{ USB_DEVICE(0x8087, 0x07dc), .driver_info = BTUSB_INTEL }, +	{ USB_DEVICE(0x8087, 0x0a2a), .driver_info = BTUSB_INTEL }, +  	{ }	/* Terminating entry */  }; @@ -211,7 +299,7 @@ static int inc_tx(struct btusb_data *data)  static void btusb_intr_complete(struct urb *urb)  {  	struct hci_dev *hdev = urb->context; -	struct btusb_data *data = hdev->driver_data; +	struct btusb_data *data = hci_get_drvdata(hdev);  	int err;  	BT_DBG("%s urb %p status %d count %d", hdev->name, @@ -239,7 +327,10 @@ static void btusb_intr_complete(struct urb *urb)  	err = usb_submit_urb(urb, GFP_ATOMIC);  	if (err < 0) { -		BT_ERR("%s urb %p failed to resubmit (%d)", +		/* -EPERM: urb is being killed; +		 * -ENODEV: device got disconnected */ +		if (err != -EPERM && err != -ENODEV) +			BT_ERR("%s urb %p failed to resubmit (%d)",  						hdev->name, urb, -err);  		usb_unanchor_urb(urb);  	} @@ -247,7 +338,7 @@ static void btusb_intr_complete(struct urb *urb)  static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags)  { -	struct btusb_data *data = hdev->driver_data; +	struct btusb_data *data = hci_get_drvdata(hdev);  	struct urb *urb;  	unsigned char *buf;  	unsigned int pipe; @@ -282,7 +373,8 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags)  	err = usb_submit_urb(urb, mem_flags);  	if (err < 0) { -		BT_ERR("%s urb %p submission failed (%d)", +		if (err != -EPERM && err != -ENODEV) +			BT_ERR("%s urb %p submission failed (%d)",  						hdev->name, urb, -err);  		usb_unanchor_urb(urb);  	} @@ -295,7 +387,7 @@ static int btusb_submit_intr_urb(struct hci_dev *hdev, gfp_t mem_flags)  static void btusb_bulk_complete(struct urb *urb)  {  	struct hci_dev *hdev = urb->context; -	struct btusb_data *data = hdev->driver_data; +	struct btusb_data *data = hci_get_drvdata(hdev);  	int err;  	BT_DBG("%s urb %p status %d count %d", hdev->name, @@ -323,7 +415,10 @@ static void btusb_bulk_complete(struct urb *urb)  	err = usb_submit_urb(urb, GFP_ATOMIC);  	if (err < 0) { -		BT_ERR("%s urb %p failed to resubmit (%d)", +		/* -EPERM: urb is being killed; +		 * -ENODEV: device got disconnected */ +		if (err != -EPERM && err != -ENODEV) +			BT_ERR("%s urb %p failed to resubmit (%d)",  						hdev->name, urb, -err);  		usb_unanchor_urb(urb);  	} @@ -331,7 +426,7 @@ static void btusb_bulk_complete(struct urb *urb)  static int btusb_submit_bulk_urb(struct hci_dev *hdev, gfp_t mem_flags)  { -	struct btusb_data *data = hdev->driver_data; +	struct btusb_data *data = hci_get_drvdata(hdev);  	struct urb *urb;  	unsigned char *buf;  	unsigned int pipe; @@ -364,7 +459,8 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev, gfp_t mem_flags)  	err = usb_submit_urb(urb, mem_flags);  	if (err < 0) { -		BT_ERR("%s urb %p submission failed (%d)", +		if (err != -EPERM && err != -ENODEV) +			BT_ERR("%s urb %p submission failed (%d)",  						hdev->name, urb, -err);  		usb_unanchor_urb(urb);  	} @@ -377,7 +473,7 @@ static int btusb_submit_bulk_urb(struct hci_dev *hdev, gfp_t mem_flags)  static void btusb_isoc_complete(struct urb *urb)  {  	struct hci_dev *hdev = urb->context; -	struct btusb_data *data = hdev->driver_data; +	struct btusb_data *data = hci_get_drvdata(hdev);  	int i, err;  	BT_DBG("%s urb %p status %d count %d", hdev->name, @@ -412,13 +508,16 @@ static void btusb_isoc_complete(struct urb *urb)  	err = usb_submit_urb(urb, GFP_ATOMIC);  	if (err < 0) { -		BT_ERR("%s urb %p failed to resubmit (%d)", +		/* -EPERM: urb is being killed; +		 * -ENODEV: device got disconnected */ +		if (err != -EPERM && err != -ENODEV) +			BT_ERR("%s urb %p failed to resubmit (%d)",  						hdev->name, urb, -err);  		usb_unanchor_urb(urb);  	}  } -static void inline __fill_isoc_descriptor(struct urb *urb, int len, int mtu) +static inline void __fill_isoc_descriptor(struct urb *urb, int len, int mtu)  {  	int i, offset = 0; @@ -441,7 +540,7 @@ static void inline __fill_isoc_descriptor(struct urb *urb, int len, int mtu)  static int btusb_submit_isoc_urb(struct hci_dev *hdev, gfp_t mem_flags)  { -	struct btusb_data *data = hdev->driver_data; +	struct btusb_data *data = hci_get_drvdata(hdev);  	struct urb *urb;  	unsigned char *buf;  	unsigned int pipe; @@ -467,15 +566,10 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev, gfp_t mem_flags)  	pipe = usb_rcvisocpipe(data->udev, data->isoc_rx_ep->bEndpointAddress); -	urb->dev      = data->udev; -	urb->pipe     = pipe; -	urb->context  = hdev; -	urb->complete = btusb_isoc_complete; -	urb->interval = data->isoc_rx_ep->bInterval; +	usb_fill_int_urb(urb, data->udev, pipe, buf, size, btusb_isoc_complete, +				hdev, data->isoc_rx_ep->bInterval);  	urb->transfer_flags  = URB_FREE_BUFFER | URB_ISO_ASAP; -	urb->transfer_buffer = buf; -	urb->transfer_buffer_length = size;  	__fill_isoc_descriptor(urb, size,  			le16_to_cpu(data->isoc_rx_ep->wMaxPacketSize)); @@ -484,7 +578,8 @@ static int btusb_submit_isoc_urb(struct hci_dev *hdev, gfp_t mem_flags)  	err = usb_submit_urb(urb, mem_flags);  	if (err < 0) { -		BT_ERR("%s urb %p submission failed (%d)", +		if (err != -EPERM && err != -ENODEV) +			BT_ERR("%s urb %p submission failed (%d)",  						hdev->name, urb, -err);  		usb_unanchor_urb(urb);  	} @@ -498,7 +593,7 @@ static void btusb_tx_complete(struct urb *urb)  {  	struct sk_buff *skb = urb->context;  	struct hci_dev *hdev = (struct hci_dev *) skb->dev; -	struct btusb_data *data = hdev->driver_data; +	struct btusb_data *data = hci_get_drvdata(hdev);  	BT_DBG("%s urb %p status %d count %d", hdev->name,  					urb, urb->status, urb->actual_length); @@ -545,7 +640,7 @@ done:  static int btusb_open(struct hci_dev *hdev)  { -	struct btusb_data *data = hdev->driver_data; +	struct btusb_data *data = hci_get_drvdata(hdev);  	int err;  	BT_DBG("%s", hdev->name); @@ -595,7 +690,7 @@ static void btusb_stop_traffic(struct btusb_data *data)  static int btusb_close(struct hci_dev *hdev)  { -	struct btusb_data *data = hdev->driver_data; +	struct btusb_data *data = hci_get_drvdata(hdev);  	int err;  	BT_DBG("%s", hdev->name); @@ -625,7 +720,7 @@ failed:  static int btusb_flush(struct hci_dev *hdev)  { -	struct btusb_data *data = hdev->driver_data; +	struct btusb_data *data = hci_get_drvdata(hdev);  	BT_DBG("%s", hdev->name); @@ -634,10 +729,9 @@ static int btusb_flush(struct hci_dev *hdev)  	return 0;  } -static int btusb_send_frame(struct sk_buff *skb) +static int btusb_send_frame(struct hci_dev *hdev, struct sk_buff *skb)  { -	struct hci_dev *hdev = (struct hci_dev *) skb->dev; -	struct btusb_data *data = hdev->driver_data; +	struct btusb_data *data = hci_get_drvdata(hdev);  	struct usb_ctrlrequest *dr;  	struct urb *urb;  	unsigned int pipe; @@ -648,6 +742,8 @@ static int btusb_send_frame(struct sk_buff *skb)  	if (!test_bit(HCI_RUNNING, &hdev->flags))  		return -EBUSY; +	skb->dev = (void *) hdev; +  	switch (bt_cb(skb)->pkt_type) {  	case HCI_COMMAND_PKT:  		urb = usb_alloc_urb(0, GFP_ATOMIC); @@ -675,7 +771,7 @@ static int btusb_send_frame(struct sk_buff *skb)  		break;  	case HCI_ACLDATA_PKT: -		if (!data->bulk_tx_ep || hdev->conn_hash.acl_num < 1) +		if (!data->bulk_tx_ep)  			return -ENODEV;  		urb = usb_alloc_urb(0, GFP_ATOMIC); @@ -692,7 +788,7 @@ static int btusb_send_frame(struct sk_buff *skb)  		break;  	case HCI_SCODATA_PKT: -		if (!data->isoc_tx_ep || hdev->conn_hash.sco_num < 1) +		if (!data->isoc_tx_ep || hci_conn_num(hdev, SCO_LINK) < 1)  			return -ENODEV;  		urb = usb_alloc_urb(BTUSB_MAX_ISOC_FRAMES, GFP_ATOMIC); @@ -702,15 +798,11 @@ static int btusb_send_frame(struct sk_buff *skb)  		pipe = usb_sndisocpipe(data->udev,  					data->isoc_tx_ep->bEndpointAddress); -		urb->dev      = data->udev; -		urb->pipe     = pipe; -		urb->context  = skb; -		urb->complete = btusb_isoc_tx_complete; -		urb->interval = data->isoc_tx_ep->bInterval; +		usb_fill_int_urb(urb, data->udev, pipe, +				skb->data, skb->len, btusb_isoc_tx_complete, +				skb, data->isoc_tx_ep->bInterval);  		urb->transfer_flags  = URB_ISO_ASAP; -		urb->transfer_buffer = skb->data; -		urb->transfer_buffer_length = skb->len;  		__fill_isoc_descriptor(urb, skb->len,  				le16_to_cpu(data->isoc_tx_ep->wMaxPacketSize)); @@ -735,43 +827,35 @@ skip_waking:  	err = usb_submit_urb(urb, GFP_ATOMIC);  	if (err < 0) { -		BT_ERR("%s urb %p submission failed", hdev->name, urb); +		if (err != -EPERM && err != -ENODEV) +			BT_ERR("%s urb %p submission failed (%d)", +						hdev->name, urb, -err);  		kfree(urb->setup_packet);  		usb_unanchor_urb(urb);  	} else {  		usb_mark_last_busy(data->udev);  	} -	usb_free_urb(urb); -  done: +	usb_free_urb(urb);  	return err;  } -static void btusb_destruct(struct hci_dev *hdev) -{ -	struct btusb_data *data = hdev->driver_data; - -	BT_DBG("%s", hdev->name); - -	kfree(data); -} -  static void btusb_notify(struct hci_dev *hdev, unsigned int evt)  { -	struct btusb_data *data = hdev->driver_data; +	struct btusb_data *data = hci_get_drvdata(hdev);  	BT_DBG("%s evt %d", hdev->name, evt); -	if (hdev->conn_hash.sco_num != data->sco_num) { -		data->sco_num = hdev->conn_hash.sco_num; +	if (hci_conn_num(hdev, SCO_LINK) != data->sco_num) { +		data->sco_num = hci_conn_num(hdev, SCO_LINK);  		schedule_work(&data->work);  	}  } -static int inline __set_isoc_interface(struct hci_dev *hdev, int altsetting) +static inline int __set_isoc_interface(struct hci_dev *hdev, int altsetting)  { -	struct btusb_data *data = hdev->driver_data; +	struct btusb_data *data = hci_get_drvdata(hdev);  	struct usb_interface *intf = data->isoc;  	struct usb_endpoint_descriptor *ep_desc;  	int i, err; @@ -816,11 +900,12 @@ static void btusb_work(struct work_struct *work)  {  	struct btusb_data *data = container_of(work, struct btusb_data, work);  	struct hci_dev *hdev = data->hdev; +	int new_alts;  	int err; -	if (hdev->conn_hash.sco_num > 0) { +	if (data->sco_num > 0) {  		if (!test_bit(BTUSB_DID_ISO_RESUME, &data->flags)) { -			err = usb_autopm_get_interface(data->isoc); +			err = usb_autopm_get_interface(data->isoc ? data->isoc : data->intf);  			if (err < 0) {  				clear_bit(BTUSB_ISOC_RUNNING, &data->flags);  				usb_kill_anchored_urbs(&data->isoc_anchor); @@ -829,11 +914,19 @@ static void btusb_work(struct work_struct *work)  			set_bit(BTUSB_DID_ISO_RESUME, &data->flags);  		} -		if (data->isoc_altsetting != 2) { + +		if (hdev->voice_setting & 0x0020) { +			static const int alts[3] = { 2, 4, 5 }; +			new_alts = alts[data->sco_num - 1]; +		} else { +			new_alts = data->sco_num; +		} + +		if (data->isoc_altsetting != new_alts) {  			clear_bit(BTUSB_ISOC_RUNNING, &data->flags);  			usb_kill_anchored_urbs(&data->isoc_anchor); -			if (__set_isoc_interface(hdev, 2) < 0) +			if (__set_isoc_interface(hdev, new_alts) < 0)  				return;  		} @@ -849,7 +942,7 @@ static void btusb_work(struct work_struct *work)  		__set_isoc_interface(hdev, 0);  		if (test_and_clear_bit(BTUSB_DID_ISO_RESUME, &data->flags)) -			usb_autopm_put_interface(data->isoc); +			usb_autopm_put_interface(data->isoc ? data->isoc : data->intf);  	}  } @@ -865,6 +958,578 @@ static void btusb_waker(struct work_struct *work)  	usb_autopm_put_interface(data->intf);  } +static int btusb_setup_bcm92035(struct hci_dev *hdev) +{ +	struct sk_buff *skb; +	u8 val = 0x00; + +	BT_DBG("%s", hdev->name); + +	skb = __hci_cmd_sync(hdev, 0xfc3b, 1, &val, HCI_INIT_TIMEOUT); +	if (IS_ERR(skb)) +		BT_ERR("BCM92035 command failed (%ld)", -PTR_ERR(skb)); +	else +		kfree_skb(skb); + +	return 0; +} + +static int btusb_setup_csr(struct hci_dev *hdev) +{ +	struct hci_rp_read_local_version *rp; +	struct sk_buff *skb; +	int ret; + +	BT_DBG("%s", hdev->name); + +	skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL, +			     HCI_INIT_TIMEOUT); +	if (IS_ERR(skb)) { +		BT_ERR("Reading local version failed (%ld)", -PTR_ERR(skb)); +		return -PTR_ERR(skb); +	} + +	rp = (struct hci_rp_read_local_version *) skb->data; + +	if (!rp->status) { +		if (le16_to_cpu(rp->manufacturer) != 10) { +			/* Clear the reset quirk since this is not an actual +			 * early Bluetooth 1.1 device from CSR. +			 */ +			clear_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks); + +			/* These fake CSR controllers have all a broken +			 * stored link key handling and so just disable it. +			 */ +			set_bit(HCI_QUIRK_BROKEN_STORED_LINK_KEY, +				&hdev->quirks); +		} +	} + +	ret = -bt_to_errno(rp->status); + +	kfree_skb(skb); + +	return ret; +} + +struct intel_version { +	u8 status; +	u8 hw_platform; +	u8 hw_variant; +	u8 hw_revision; +	u8 fw_variant; +	u8 fw_revision; +	u8 fw_build_num; +	u8 fw_build_ww; +	u8 fw_build_yy; +	u8 fw_patch_num; +} __packed; + +static const struct firmware *btusb_setup_intel_get_fw(struct hci_dev *hdev, +						struct intel_version *ver) +{ +	const struct firmware *fw; +	char fwname[64]; +	int ret; + +	snprintf(fwname, sizeof(fwname), +		 "intel/ibt-hw-%x.%x.%x-fw-%x.%x.%x.%x.%x.bseq", +		 ver->hw_platform, ver->hw_variant, ver->hw_revision, +		 ver->fw_variant,  ver->fw_revision, ver->fw_build_num, +		 ver->fw_build_ww, ver->fw_build_yy); + +	ret = request_firmware(&fw, fwname, &hdev->dev); +	if (ret < 0) { +		if (ret == -EINVAL) { +			BT_ERR("%s Intel firmware file request failed (%d)", +			       hdev->name, ret); +			return NULL; +		} + +		BT_ERR("%s failed to open Intel firmware file: %s(%d)", +		       hdev->name, fwname, ret); + +		/* If the correct firmware patch file is not found, use the +		 * default firmware patch file instead +		 */ +		snprintf(fwname, sizeof(fwname), "intel/ibt-hw-%x.%x.bseq", +			 ver->hw_platform, ver->hw_variant); +		if (request_firmware(&fw, fwname, &hdev->dev) < 0) { +			BT_ERR("%s failed to open default Intel fw file: %s", +			       hdev->name, fwname); +			return NULL; +		} +	} + +	BT_INFO("%s: Intel Bluetooth firmware file: %s", hdev->name, fwname); + +	return fw; +} + +static int btusb_setup_intel_patching(struct hci_dev *hdev, +				      const struct firmware *fw, +				      const u8 **fw_ptr, int *disable_patch) +{ +	struct sk_buff *skb; +	struct hci_command_hdr *cmd; +	const u8 *cmd_param; +	struct hci_event_hdr *evt = NULL; +	const u8 *evt_param = NULL; +	int remain = fw->size - (*fw_ptr - fw->data); + +	/* The first byte indicates the types of the patch command or event. +	 * 0x01 means HCI command and 0x02 is HCI event. If the first bytes +	 * in the current firmware buffer doesn't start with 0x01 or +	 * the size of remain buffer is smaller than HCI command header, +	 * the firmware file is corrupted and it should stop the patching +	 * process. +	 */ +	if (remain > HCI_COMMAND_HDR_SIZE && *fw_ptr[0] != 0x01) { +		BT_ERR("%s Intel fw corrupted: invalid cmd read", hdev->name); +		return -EINVAL; +	} +	(*fw_ptr)++; +	remain--; + +	cmd = (struct hci_command_hdr *)(*fw_ptr); +	*fw_ptr += sizeof(*cmd); +	remain -= sizeof(*cmd); + +	/* Ensure that the remain firmware data is long enough than the length +	 * of command parameter. If not, the firmware file is corrupted. +	 */ +	if (remain < cmd->plen) { +		BT_ERR("%s Intel fw corrupted: invalid cmd len", hdev->name); +		return -EFAULT; +	} + +	/* If there is a command that loads a patch in the firmware +	 * file, then enable the patch upon success, otherwise just +	 * disable the manufacturer mode, for example patch activation +	 * is not required when the default firmware patch file is used +	 * because there are no patch data to load. +	 */ +	if (*disable_patch && le16_to_cpu(cmd->opcode) == 0xfc8e) +		*disable_patch = 0; + +	cmd_param = *fw_ptr; +	*fw_ptr += cmd->plen; +	remain -= cmd->plen; + +	/* This reads the expected events when the above command is sent to the +	 * device. Some vendor commands expects more than one events, for +	 * example command status event followed by vendor specific event. +	 * For this case, it only keeps the last expected event. so the command +	 * can be sent with __hci_cmd_sync_ev() which returns the sk_buff of +	 * last expected event. +	 */ +	while (remain > HCI_EVENT_HDR_SIZE && *fw_ptr[0] == 0x02) { +		(*fw_ptr)++; +		remain--; + +		evt = (struct hci_event_hdr *)(*fw_ptr); +		*fw_ptr += sizeof(*evt); +		remain -= sizeof(*evt); + +		if (remain < evt->plen) { +			BT_ERR("%s Intel fw corrupted: invalid evt len", +			       hdev->name); +			return -EFAULT; +		} + +		evt_param = *fw_ptr; +		*fw_ptr += evt->plen; +		remain -= evt->plen; +	} + +	/* Every HCI commands in the firmware file has its correspond event. +	 * If event is not found or remain is smaller than zero, the firmware +	 * file is corrupted. +	 */ +	if (!evt || !evt_param || remain < 0) { +		BT_ERR("%s Intel fw corrupted: invalid evt read", hdev->name); +		return -EFAULT; +	} + +	skb = __hci_cmd_sync_ev(hdev, le16_to_cpu(cmd->opcode), cmd->plen, +				cmd_param, evt->evt, HCI_INIT_TIMEOUT); +	if (IS_ERR(skb)) { +		BT_ERR("%s sending Intel patch command (0x%4.4x) failed (%ld)", +		       hdev->name, cmd->opcode, PTR_ERR(skb)); +		return PTR_ERR(skb); +	} + +	/* It ensures that the returned event matches the event data read from +	 * the firmware file. At fist, it checks the length and then +	 * the contents of the event. +	 */ +	if (skb->len != evt->plen) { +		BT_ERR("%s mismatch event length (opcode 0x%4.4x)", hdev->name, +		       le16_to_cpu(cmd->opcode)); +		kfree_skb(skb); +		return -EFAULT; +	} + +	if (memcmp(skb->data, evt_param, evt->plen)) { +		BT_ERR("%s mismatch event parameter (opcode 0x%4.4x)", +		       hdev->name, le16_to_cpu(cmd->opcode)); +		kfree_skb(skb); +		return -EFAULT; +	} +	kfree_skb(skb); + +	return 0; +} + +static int btusb_setup_intel(struct hci_dev *hdev) +{ +	struct sk_buff *skb; +	const struct firmware *fw; +	const u8 *fw_ptr; +	int disable_patch; +	struct intel_version *ver; + +	const u8 mfg_enable[] = { 0x01, 0x00 }; +	const u8 mfg_disable[] = { 0x00, 0x00 }; +	const u8 mfg_reset_deactivate[] = { 0x00, 0x01 }; +	const u8 mfg_reset_activate[] = { 0x00, 0x02 }; + +	BT_DBG("%s", hdev->name); + +	/* The controller has a bug with the first HCI command sent to it +	 * returning number of completed commands as zero. This would stall the +	 * command processing in the Bluetooth core. +	 * +	 * As a workaround, send HCI Reset command first which will reset the +	 * number of completed commands and allow normal command processing +	 * from now on. +	 */ +	skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL, HCI_INIT_TIMEOUT); +	if (IS_ERR(skb)) { +		BT_ERR("%s sending initial HCI reset command failed (%ld)", +		       hdev->name, PTR_ERR(skb)); +		return PTR_ERR(skb); +	} +	kfree_skb(skb); + +	/* Read Intel specific controller version first to allow selection of +	 * which firmware file to load. +	 * +	 * The returned information are hardware variant and revision plus +	 * firmware variant, revision and build number. +	 */ +	skb = __hci_cmd_sync(hdev, 0xfc05, 0, NULL, HCI_INIT_TIMEOUT); +	if (IS_ERR(skb)) { +		BT_ERR("%s reading Intel fw version command failed (%ld)", +		       hdev->name, PTR_ERR(skb)); +		return PTR_ERR(skb); +	} + +	if (skb->len != sizeof(*ver)) { +		BT_ERR("%s Intel version event length mismatch", hdev->name); +		kfree_skb(skb); +		return -EIO; +	} + +	ver = (struct intel_version *)skb->data; +	if (ver->status) { +		BT_ERR("%s Intel fw version event failed (%02x)", hdev->name, +		       ver->status); +		kfree_skb(skb); +		return -bt_to_errno(ver->status); +	} + +	BT_INFO("%s: read Intel version: %02x%02x%02x%02x%02x%02x%02x%02x%02x", +		hdev->name, ver->hw_platform, ver->hw_variant, +		ver->hw_revision, ver->fw_variant,  ver->fw_revision, +		ver->fw_build_num, ver->fw_build_ww, ver->fw_build_yy, +		ver->fw_patch_num); + +	/* fw_patch_num indicates the version of patch the device currently +	 * have. If there is no patch data in the device, it is always 0x00. +	 * So, if it is other than 0x00, no need to patch the deivce again. +	 */ +	if (ver->fw_patch_num) { +		BT_INFO("%s: Intel device is already patched. patch num: %02x", +			hdev->name, ver->fw_patch_num); +		kfree_skb(skb); +		return 0; +	} + +	/* Opens the firmware patch file based on the firmware version read +	 * from the controller. If it fails to open the matching firmware +	 * patch file, it tries to open the default firmware patch file. +	 * If no patch file is found, allow the device to operate without +	 * a patch. +	 */ +	fw = btusb_setup_intel_get_fw(hdev, ver); +	if (!fw) { +		kfree_skb(skb); +		return 0; +	} +	fw_ptr = fw->data; + +	/* This Intel specific command enables the manufacturer mode of the +	 * controller. +	 * +	 * Only while this mode is enabled, the driver can download the +	 * firmware patch data and configuration parameters. +	 */ +	skb = __hci_cmd_sync(hdev, 0xfc11, 2, mfg_enable, HCI_INIT_TIMEOUT); +	if (IS_ERR(skb)) { +		BT_ERR("%s entering Intel manufacturer mode failed (%ld)", +		       hdev->name, PTR_ERR(skb)); +		release_firmware(fw); +		return PTR_ERR(skb); +	} + +	if (skb->data[0]) { +		u8 evt_status = skb->data[0]; +		BT_ERR("%s enable Intel manufacturer mode event failed (%02x)", +		       hdev->name, evt_status); +		kfree_skb(skb); +		release_firmware(fw); +		return -bt_to_errno(evt_status); +	} +	kfree_skb(skb); + +	disable_patch = 1; + +	/* The firmware data file consists of list of Intel specific HCI +	 * commands and its expected events. The first byte indicates the +	 * type of the message, either HCI command or HCI event. +	 * +	 * It reads the command and its expected event from the firmware file, +	 * and send to the controller. Once __hci_cmd_sync_ev() returns, +	 * the returned event is compared with the event read from the firmware +	 * file and it will continue until all the messages are downloaded to +	 * the controller. +	 * +	 * Once the firmware patching is completed successfully, +	 * the manufacturer mode is disabled with reset and activating the +	 * downloaded patch. +	 * +	 * If the firmware patching fails, the manufacturer mode is +	 * disabled with reset and deactivating the patch. +	 * +	 * If the default patch file is used, no reset is done when disabling +	 * the manufacturer. +	 */ +	while (fw->size > fw_ptr - fw->data) { +		int ret; + +		ret = btusb_setup_intel_patching(hdev, fw, &fw_ptr, +						 &disable_patch); +		if (ret < 0) +			goto exit_mfg_deactivate; +	} + +	release_firmware(fw); + +	if (disable_patch) +		goto exit_mfg_disable; + +	/* Patching completed successfully and disable the manufacturer mode +	 * with reset and activate the downloaded firmware patches. +	 */ +	skb = __hci_cmd_sync(hdev, 0xfc11, sizeof(mfg_reset_activate), +			     mfg_reset_activate, HCI_INIT_TIMEOUT); +	if (IS_ERR(skb)) { +		BT_ERR("%s exiting Intel manufacturer mode failed (%ld)", +		       hdev->name, PTR_ERR(skb)); +		return PTR_ERR(skb); +	} +	kfree_skb(skb); + +	BT_INFO("%s: Intel Bluetooth firmware patch completed and activated", +		hdev->name); + +	return 0; + +exit_mfg_disable: +	/* Disable the manufacturer mode without reset */ +	skb = __hci_cmd_sync(hdev, 0xfc11, sizeof(mfg_disable), mfg_disable, +			     HCI_INIT_TIMEOUT); +	if (IS_ERR(skb)) { +		BT_ERR("%s exiting Intel manufacturer mode failed (%ld)", +		       hdev->name, PTR_ERR(skb)); +		return PTR_ERR(skb); +	} +	kfree_skb(skb); + +	BT_INFO("%s: Intel Bluetooth firmware patch completed", hdev->name); +	return 0; + +exit_mfg_deactivate: +	release_firmware(fw); + +	/* Patching failed. Disable the manufacturer mode with reset and +	 * deactivate the downloaded firmware patches. +	 */ +	skb = __hci_cmd_sync(hdev, 0xfc11, sizeof(mfg_reset_deactivate), +			     mfg_reset_deactivate, HCI_INIT_TIMEOUT); +	if (IS_ERR(skb)) { +		BT_ERR("%s exiting Intel manufacturer mode failed (%ld)", +		       hdev->name, PTR_ERR(skb)); +		return PTR_ERR(skb); +	} +	kfree_skb(skb); + +	BT_INFO("%s: Intel Bluetooth firmware patch completed and deactivated", +		hdev->name); + +	return 0; +} + +static int btusb_setup_bcm_patchram(struct hci_dev *hdev) +{ +	struct btusb_data *data = hci_get_drvdata(hdev); +	struct usb_device *udev = data->udev; +	char fw_name[64]; +	const struct firmware *fw; +	const u8 *fw_ptr; +	size_t fw_size; +	const struct hci_command_hdr *cmd; +	const u8 *cmd_param; +	u16 opcode; +	struct sk_buff *skb; +	struct hci_rp_read_local_version *ver; +	long ret; + +	snprintf(fw_name, sizeof(fw_name), "brcm/%s-%04x-%04x.hcd", +		 udev->product ? udev->product : "BCM", +		 le16_to_cpu(udev->descriptor.idVendor), +		 le16_to_cpu(udev->descriptor.idProduct)); + +	ret = request_firmware(&fw, fw_name, &hdev->dev); +	if (ret < 0) { +		BT_INFO("%s: BCM: patch %s not found", hdev->name, +			fw_name); +		return 0; +	} + +	/* Reset */ +	skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL, HCI_INIT_TIMEOUT); +	if (IS_ERR(skb)) { +		ret = PTR_ERR(skb); +		BT_ERR("%s: HCI_OP_RESET failed (%ld)", hdev->name, ret); +		goto done; +	} +	kfree_skb(skb); + +	/* Read Local Version Info */ +	skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL, +			     HCI_INIT_TIMEOUT); +	if (IS_ERR(skb)) { +		ret = PTR_ERR(skb); +		BT_ERR("%s: HCI_OP_READ_LOCAL_VERSION failed (%ld)", +			hdev->name, ret); +		goto done; +	} + +	if (skb->len != sizeof(*ver)) { +		BT_ERR("%s: HCI_OP_READ_LOCAL_VERSION event length mismatch", +			hdev->name); +		kfree_skb(skb); +		ret = -EIO; +		goto done; +	} + +	ver = (struct hci_rp_read_local_version *) skb->data; +	BT_INFO("%s: BCM: patching hci_ver=%02x hci_rev=%04x lmp_ver=%02x " +		"lmp_subver=%04x", hdev->name, ver->hci_ver, ver->hci_rev, +		ver->lmp_ver, ver->lmp_subver); +	kfree_skb(skb); + +	/* Start Download */ +	skb = __hci_cmd_sync(hdev, 0xfc2e, 0, NULL, HCI_INIT_TIMEOUT); +	if (IS_ERR(skb)) { +		ret = PTR_ERR(skb); +		BT_ERR("%s: BCM: Download Minidrv command failed (%ld)", +			hdev->name, ret); +		goto reset_fw; +	} +	kfree_skb(skb); + +	/* 50 msec delay after Download Minidrv completes */ +	msleep(50); + +	fw_ptr = fw->data; +	fw_size = fw->size; + +	while (fw_size >= sizeof(*cmd)) { +		cmd = (struct hci_command_hdr *) fw_ptr; +		fw_ptr += sizeof(*cmd); +		fw_size -= sizeof(*cmd); + +		if (fw_size < cmd->plen) { +			BT_ERR("%s: BCM: patch %s is corrupted", +				hdev->name, fw_name); +			ret = -EINVAL; +			goto reset_fw; +		} + +		cmd_param = fw_ptr; +		fw_ptr += cmd->plen; +		fw_size -= cmd->plen; + +		opcode = le16_to_cpu(cmd->opcode); + +		skb = __hci_cmd_sync(hdev, opcode, cmd->plen, cmd_param, +				     HCI_INIT_TIMEOUT); +		if (IS_ERR(skb)) { +			ret = PTR_ERR(skb); +			BT_ERR("%s: BCM: patch command %04x failed (%ld)", +				hdev->name, opcode, ret); +			goto reset_fw; +		} +		kfree_skb(skb); +	} + +	/* 250 msec delay after Launch Ram completes */ +	msleep(250); + +reset_fw: +	/* Reset */ +	skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL, HCI_INIT_TIMEOUT); +	if (IS_ERR(skb)) { +		ret = PTR_ERR(skb); +		BT_ERR("%s: HCI_OP_RESET failed (%ld)", hdev->name, ret); +		goto done; +	} +	kfree_skb(skb); + +	/* Read Local Version Info */ +	skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL, +			     HCI_INIT_TIMEOUT); +	if (IS_ERR(skb)) { +		ret = PTR_ERR(skb); +		BT_ERR("%s: HCI_OP_READ_LOCAL_VERSION failed (%ld)", +			hdev->name, ret); +		goto done; +	} + +	if (skb->len != sizeof(*ver)) { +		BT_ERR("%s: HCI_OP_READ_LOCAL_VERSION event length mismatch", +			hdev->name); +		kfree_skb(skb); +		ret = -EIO; +		goto done; +	} + +	ver = (struct hci_rp_read_local_version *) skb->data; +	BT_INFO("%s: BCM: firmware hci_ver=%02x hci_rev=%04x lmp_ver=%02x " +		"lmp_subver=%04x", hdev->name, ver->hci_ver, ver->hci_rev, +		ver->lmp_ver, ver->lmp_subver); +	kfree_skb(skb); + +done: +	release_firmware(fw); + +	return ret; +} +  static int btusb_probe(struct usb_interface *intf,  				const struct usb_device_id *id)  { @@ -898,7 +1563,16 @@ static int btusb_probe(struct usb_interface *intf,  	if (ignore_sniffer && id->driver_info & BTUSB_SNIFFER)  		return -ENODEV; -	data = kzalloc(sizeof(*data), GFP_KERNEL); +	if (id->driver_info & BTUSB_ATH3012) { +		struct usb_device *udev = interface_to_usbdev(intf); + +		/* Old firmware would otherwise let ath3k driver load +		 * patch and sysconfig files */ +		if (le16_to_cpu(udev->descriptor.bcdDevice) <= 0x0001) +			return -ENODEV; +	} + +	data = devm_kzalloc(&intf->dev, sizeof(*data), GFP_KERNEL);  	if (!data)  		return -ENOMEM; @@ -921,10 +1595,8 @@ static int btusb_probe(struct usb_interface *intf,  		}  	} -	if (!data->intr_ep || !data->bulk_tx_ep || !data->bulk_rx_ep) { -		kfree(data); +	if (!data->intr_ep || !data->bulk_tx_ep || !data->bulk_rx_ep)  		return -ENODEV; -	}  	data->cmdreq_type = USB_TYPE_CLASS; @@ -944,32 +1616,36 @@ static int btusb_probe(struct usb_interface *intf,  	init_usb_anchor(&data->deferred);  	hdev = hci_alloc_dev(); -	if (!hdev) { -		kfree(data); +	if (!hdev)  		return -ENOMEM; -	}  	hdev->bus = HCI_USB; -	hdev->driver_data = data; +	hci_set_drvdata(hdev, data);  	data->hdev = hdev;  	SET_HCIDEV_DEV(hdev, &intf->dev); -	hdev->open     = btusb_open; -	hdev->close    = btusb_close; -	hdev->flush    = btusb_flush; -	hdev->send     = btusb_send_frame; -	hdev->destruct = btusb_destruct; -	hdev->notify   = btusb_notify; +	hdev->open   = btusb_open; +	hdev->close  = btusb_close; +	hdev->flush  = btusb_flush; +	hdev->send   = btusb_send_frame; +	hdev->notify = btusb_notify; -	hdev->owner = THIS_MODULE; +	if (id->driver_info & BTUSB_BCM92035) +		hdev->setup = btusb_setup_bcm92035; + +	if (id->driver_info & BTUSB_BCM_PATCHRAM) +		hdev->setup = btusb_setup_bcm_patchram; + +	if (id->driver_info & BTUSB_INTEL) +		hdev->setup = btusb_setup_intel;  	/* Interface numbers are hardcoded in the specification */  	data->isoc = usb_ifnum_to_if(data->udev, 1);  	if (!reset) -		set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks); +		set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);  	if (force_scofix || id->driver_info & BTUSB_WRONG_SCO_MTU) {  		if (!disable_scofix) @@ -981,15 +1657,20 @@ static int btusb_probe(struct usb_interface *intf,  	if (id->driver_info & BTUSB_DIGIANSWER) {  		data->cmdreq_type = USB_TYPE_VENDOR; -		set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks); +		set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks);  	}  	if (id->driver_info & BTUSB_CSR) {  		struct usb_device *udev = data->udev; +		u16 bcdDevice = le16_to_cpu(udev->descriptor.bcdDevice);  		/* Old firmware would otherwise execute USB reset */ -		if (le16_to_cpu(udev->descriptor.bcdDevice) < 0x117) -			set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks); +		if (bcdDevice < 0x117) +			set_bit(HCI_QUIRK_RESET_ON_CLOSE, &hdev->quirks); + +		/* Fake CSR devices with broken commands */ +		if (bcdDevice <= 0x100) +			hdev->setup = btusb_setup_csr;  	}  	if (id->driver_info & BTUSB_SNIFFER) { @@ -1002,23 +1683,11 @@ static int btusb_probe(struct usb_interface *intf,  		data->isoc = NULL;  	} -	if (id->driver_info & BTUSB_BCM92035) { -		unsigned char cmd[] = { 0x3b, 0xfc, 0x01, 0x00 }; -		struct sk_buff *skb; - -		skb = bt_skb_alloc(sizeof(cmd), GFP_KERNEL); -		if (skb) { -			memcpy(skb_put(skb, sizeof(cmd)), cmd, sizeof(cmd)); -			skb_queue_tail(&hdev->driver_init, skb); -		} -	} -  	if (data->isoc) {  		err = usb_driver_claim_interface(&btusb_driver,  							data->isoc, data);  		if (err < 0) {  			hci_free_dev(hdev); -			kfree(data);  			return err;  		}  	} @@ -1026,14 +1695,11 @@ static int btusb_probe(struct usb_interface *intf,  	err = hci_register_dev(hdev);  	if (err < 0) {  		hci_free_dev(hdev); -		kfree(data);  		return err;  	}  	usb_set_intfdata(intf, data); -	usb_enable_autosuspend(interface_to_usbdev(intf)); -  	return 0;  } @@ -1048,9 +1714,6 @@ static void btusb_disconnect(struct usb_interface *intf)  		return;  	hdev = data->hdev; - -	__hci_dev_hold(hdev); -  	usb_set_intfdata(data->intf, NULL);  	if (data->isoc) @@ -1063,8 +1726,6 @@ static void btusb_disconnect(struct usb_interface *intf)  	else if (data->isoc)  		usb_driver_release_interface(&btusb_driver, data->isoc); -	__hci_dev_put(hdev); -  	hci_free_dev(hdev);  } @@ -1079,7 +1740,7 @@ static int btusb_suspend(struct usb_interface *intf, pm_message_t message)  		return 0;  	spin_lock_irq(&data->txlock); -	if (!((message.event & PM_EVENT_AUTO) && data->tx_in_flight)) { +	if (!(PMSG_IS_AUTO(message) && data->tx_in_flight)) {  		set_bit(BTUSB_SUSPENDING, &data->flags);  		spin_unlock_irq(&data->txlock);  	} else { @@ -1179,22 +1840,10 @@ static struct usb_driver btusb_driver = {  #endif  	.id_table	= btusb_table,  	.supports_autosuspend = 1, +	.disable_hub_initiated_lpm = 1,  }; -static int __init btusb_init(void) -{ -	BT_INFO("Generic Bluetooth USB driver ver %s", VERSION); - -	return usb_register(&btusb_driver); -} - -static void __exit btusb_exit(void) -{ -	usb_deregister(&btusb_driver); -} - -module_init(btusb_init); -module_exit(btusb_exit); +module_usb_driver(btusb_driver);  module_param(ignore_dga, bool, 0644);  MODULE_PARM_DESC(ignore_dga, "Ignore devices with id 08fd:0001");  | 
