2008-07-21 01:45:08

by Ben Collins

[permalink] [raw]
Subject: [PATCH 3/7] bluetooth: Add quirks for a few hci_usb devices

When the Dell 370 and 410 BT adapters are put into BT radio mode, they
need to be prepared like many other Broadcom adapters.

Also, add quirk Broadcom 2046 devices with HCI_RESET.

CC: [email protected]
Signed-off-by: Michael Frey <[email protected]>
Signed-off-by: Mario Limonciello <[email protected]>
Signed-off-by: Tim Gardner <[email protected]>
Signed-off-by: Ben Collins <[email protected]>
---
drivers/bluetooth/hci_usb.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index 192522e..0254a6b 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -134,6 +134,13 @@ static struct usb_device_id blacklist_ids[] = {

/* Dell laptop with Broadcom chip */
{ USB_DEVICE(0x413c, 0x8126), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
+ /* Dell Wireless 370 */
+ { USB_DEVICE(0x413c, 0x8156), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
+ /* Dell Wireless 410 */
+ { USB_DEVICE(0x413c, 0x8152), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
+
+ /* Broadcom 2046 */
+ { USB_DEVICE(0x0a5c, 0x2151), .driver_info = HCI_RESET },

/* Microsoft Wireless Transceiver for Bluetooth 2.0 */
{ USB_DEVICE(0x045e, 0x009c), .driver_info = HCI_RESET },
--
1.5.4.3



2008-07-21 23:30:14

by Marcel Holtmann

[permalink] [raw]
Subject: Re: [PATCH 3/7] bluetooth: Add quirks for a few hci_usb devices

Hi Ben,

> Preface: The "Broadcom" device is on unreleased hardware, so I can't
> disclose the actual model.

then put on your todo list to update this entry once you can.

> When the Dell 370 and 410 BT adapters are put into BT radio mode, they
> need to be prepared like many other Broadcom adapters.
>
> Also, add quirk Broadcom 2046 devices with HCI_RESET. Reference for
> this
> bug: https://launchpad.net/bugs/249448
>
> CC: [email protected]
> Signed-off-by: Michael Frey <[email protected]>
> Signed-off-by: Mario Limonciello <[email protected]>
> Signed-off-by: Tim Gardner <[email protected]>
> Signed-off-by: Ben Collins <[email protected]>

Acked-by: Marcel Holtmann <[email protected]>

Regards

Marcel


2008-07-21 16:00:14

by Ben Collins

[permalink] [raw]
Subject: Re: [PATCH 3/7] bluetooth: Add quirks for a few hci_usb devices

Preface: The "Broadcom" device is on unreleased hardware, so I can't
disclose the actual model.

When the Dell 370 and 410 BT adapters are put into BT radio mode, they
need to be prepared like many other Broadcom adapters.

Also, add quirk Broadcom 2046 devices with HCI_RESET. Reference for this
bug: https://launchpad.net/bugs/249448

CC: [email protected]
Signed-off-by: Michael Frey <[email protected]>
Signed-off-by: Mario Limonciello <[email protected]>
Signed-off-by: Tim Gardner <[email protected]>
Signed-off-by: Ben Collins <[email protected]>

diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index 192522e..c33bb59 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -134,6 +134,13 @@ static struct usb_device_id blacklist_ids[] = {

/* Dell laptop with Broadcom chip */
{ USB_DEVICE(0x413c, 0x8126), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
+ /* Dell Wireless 370 */
+ { USB_DEVICE(0x413c, 0x8156), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
+ /* Dell Wireless 410 */
+ { USB_DEVICE(0x413c, 0x8152), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
+
+ /* Broadcom 2046 */
+ { USB_DEVICE(0x0a5c, 0x2151), .driver_info = HCI_RESET },

/* Microsoft Wireless Transceiver for Bluetooth 2.0 */
{ USB_DEVICE(0x045e, 0x009c), .driver_info = HCI_RESET },

2008-07-21 05:54:16

by Ben Collins

[permalink] [raw]
Subject: Re: [PATCH 3/7] bluetooth: Add quirks for a few hci_usb devices

On Mon, 2008-07-21 at 07:08 +0200, Marcel Holtmann wrote:
> Hi Ben,
>
> > When the Dell 370 and 410 BT adapters are put into BT radio mode, they
> > need to be prepared like many other Broadcom adapters.
> >
> > Also, add quirk Broadcom 2046 devices with HCI_RESET.
> >
> > CC: [email protected]
> > Signed-off-by: Michael Frey <[email protected]>
> > Signed-off-by: Mario Limonciello <[email protected]>
> > Signed-off-by: Tim Gardner <[email protected]>
> > Signed-off-by: Ben Collins <[email protected]>
> > ---
> > drivers/bluetooth/hci_usb.c | 7 +++++++
> > 1 files changed, 7 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
> > index 192522e..0254a6b 100644
> > --- a/drivers/bluetooth/hci_usb.c
> > +++ b/drivers/bluetooth/hci_usb.c
> > @@ -134,6 +134,13 @@ static struct usb_device_id blacklist_ids[] = {
> >
> > /* Dell laptop with Broadcom chip */
> > { USB_DEVICE(0x413c, 0x8126), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
> > + /* Dell Wireless 370 */
> > + { USB_DEVICE(0x413c, 0x8156), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
> > + /* Dell Wireless 410 */
> > + { USB_DEVICE(0x413c, 0x8152), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
> > +
> > + /* Broadcom 2046 */
> > + { USB_DEVICE(0x0a5c, 0x2151), .driver_info = HCI_RESET },
>
> do me a favor and use tabs and not whitespaces here. And is this the
> latest Apple machine that has a Broadcom instead of a CSR chip in it. If
> so, then let the comment reflect this.

Whoops. That slipped through. I've no idea what system that device
actually came from. I'd have to ask Michael, since he was the one who
reported it. I'll resend a corrected patch in the morning.

Thanks Marcel.

2008-07-21 05:08:11

by Marcel Holtmann

[permalink] [raw]
Subject: Re: [PATCH 3/7] bluetooth: Add quirks for a few hci_usb devices

Hi Ben,

> When the Dell 370 and 410 BT adapters are put into BT radio mode, they
> need to be prepared like many other Broadcom adapters.
>
> Also, add quirk Broadcom 2046 devices with HCI_RESET.
>
> CC: [email protected]
> Signed-off-by: Michael Frey <[email protected]>
> Signed-off-by: Mario Limonciello <[email protected]>
> Signed-off-by: Tim Gardner <[email protected]>
> Signed-off-by: Ben Collins <[email protected]>
> ---
> drivers/bluetooth/hci_usb.c | 7 +++++++
> 1 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
> index 192522e..0254a6b 100644
> --- a/drivers/bluetooth/hci_usb.c
> +++ b/drivers/bluetooth/hci_usb.c
> @@ -134,6 +134,13 @@ static struct usb_device_id blacklist_ids[] = {
>
> /* Dell laptop with Broadcom chip */
> { USB_DEVICE(0x413c, 0x8126), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
> + /* Dell Wireless 370 */
> + { USB_DEVICE(0x413c, 0x8156), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
> + /* Dell Wireless 410 */
> + { USB_DEVICE(0x413c, 0x8152), .driver_info = HCI_RESET | HCI_WRONG_SCO_MTU },
> +
> + /* Broadcom 2046 */
> + { USB_DEVICE(0x0a5c, 0x2151), .driver_info = HCI_RESET },

do me a favor and use tabs and not whitespaces here. And is this the
latest Apple machine that has a Broadcom instead of a CSR chip in it. If
so, then let the comment reflect this.

Regards

Marcel