2014-12-12 18:58:05

by Toshi Kikuchi

Subject: [PATCH v2] Bluetooth: btusb: support public address configuration for ath3012

Set hdev->set_bdaddr handler for ath3012. It sends the vendor specific HCI
command to change the public address. The change doesn't persist across
power cycle.

Signed-off-by: Toshi Kikuchi <[email protected]>
---
drivers/bluetooth/btusb.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index edfc17b..2b84392 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -1935,6 +1935,31 @@ static int btusb_set_bdaddr_bcm(struct hci_dev *hdev, const bdaddr_t *bdaddr)
return 0;
}

+static int btusb_set_bdaddr_ath3012(struct hci_dev *hdev,
+ const bdaddr_t *bdaddr)
+{
+ struct sk_buff *skb;
+ u8 buf[10];
+ long ret;
+
+ buf[0] = 0x01;
+ buf[1] = 0x01;
+ buf[2] = 0x00;
+ buf[3] = sizeof(bdaddr_t);
+ memcpy(buf + 4, bdaddr, sizeof(bdaddr_t));
+
+ skb = __hci_cmd_sync(hdev, 0xfc0b, sizeof(buf), buf, HCI_INIT_TIMEOUT);
+ if (IS_ERR(skb)) {
+ ret = PTR_ERR(skb);
+ BT_ERR("%s: Change address command failed (%ld)",
+ hdev->name, ret);
+ return ret;
+ }
+ kfree_skb(skb);
+
+ return 0;
+}
+
static int btusb_probe(struct usb_interface *intf,
const struct usb_device_id *id)
{
@@ -2047,6 +2072,9 @@ static int btusb_probe(struct usb_interface *intf,
if (id->driver_info & BTUSB_INTEL_BOOT)
set_bit(HCI_QUIRK_RAW_DEVICE, &hdev->quirks);

+ if (id->driver_info & BTUSB_ATH3012)
+ hdev->set_bdaddr = btusb_set_bdaddr_ath3012;
+
/* Interface numbers are hardcoded in the specification */
data->isoc = usb_ifnum_to_if(data->udev, 1);

--
2.2.0.rc0.207.ga3a616c

2014-12-13 18:58:50

by Johan Hedberg

Subject: Re: [PATCH v2] Bluetooth: btusb: support public address configuration for ath3012

Hi,

On Sat, Dec 13, 2014, Johan Hedberg wrote:
> On Fri, Dec 12, 2014, Toshi Kikuchi wrote:
> > + skb = __hci_cmd_sync(hdev, 0xfc0b, sizeof(buf), buf, HCI_INIT_TIMEOUT);
> > + if (IS_ERR(skb)) {
> > + ret = PTR_ERR(skb);
> > + BT_ERR("%s: Change address command failed (%ld)",
> > + hdev->name, ret);
> > + return ret;
> > + }
> > + kfree_skb(skb);
>
> Don't you need to peek into the received skb to get the command status
> as well? Or this command can never fail?

Nevermind, I just realized that __hci_cmd_sync() has an extra
"convenience" feature where it should check for the status in standard
cmd_complete events and return it as a direct error (i.e. your IS_ERR
branch should take care of it).

Johan

2014-12-13 18:35:18

by Johan Hedberg

Subject: Re: [PATCH v2] Bluetooth: btusb: support public address configuration for ath3012

Hi Toshi,

On Fri, Dec 12, 2014, Toshi Kikuchi wrote:
> + skb = __hci_cmd_sync(hdev, 0xfc0b, sizeof(buf), buf, HCI_INIT_TIMEOUT);
> + if (IS_ERR(skb)) {
> + ret = PTR_ERR(skb);
> + BT_ERR("%s: Change address command failed (%ld)",
> + hdev->name, ret);
> + return ret;
> + }
> + kfree_skb(skb);

Don't you need to peek into the received skb to get the command status
as well? Or this command can never fail?

Johan

2014-12-12 22:34:54

by Marcel Holtmann

Subject: Re: [PATCH v2] Bluetooth: btusb: support public address configuration for ath3012

Hi Toshi,

> Set hdev->set_bdaddr handler for ath3012. It sends the vendor specific HCI
> command to change the public address. The change doesn't persist across
> power cycle.
>
> Signed-off-by: Toshi Kikuchi <[email protected]>
> ---
> drivers/bluetooth/btusb.c | 28 ++++++++++++++++++++++++++++
> 1 file changed, 28 insertions(+)

patch has been applied to bluetooth-next tree.

Regards

Marcel