Bluetooth: hci_uart: Add support for vendor detection flag

PATCH In review Marcel Holtmann 2 participants 2 messages Apr 4, 2015 – Apr 5, 2015 Bluetooth drivers

Share & tools

Marcel Holtmann

author maintainer

2015-04-04 23:13 UTC #0 lore raw

PATCH 1/3 Bluetooth: hci_uart: Add support for vendor detection flag

This adds a new HCI_UART_VND_DETECT flag to allow automatic vendor detection. This allows to enable known vendor commands (for example for setting the public device address) when using a standard H:4 UART protocol or when running in virtual machines.

When this new flag is configured and no vendor specific setup routine is provided, then the local version information are read and the provided manufacturer information can be evaluated to configure extra vendor callbacks.

Signed-off-by Marcel Holtmann <[email protected]>

---
 drivers/bluetooth/hci_ldisc.c | 29 ++++++++++++++++++++++++++++-
 drivers/bluetooth/hci_uart.h  |  1 +
 2 files changed, 29 insertions(+), 1 deletion(-)

drivers/bluetooth/hci_ldisc.c +28 -1

index 1363dc616ace..b1e8083044ce 100644
@@ -264,10 +264,36 @@ static int hci_uart_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
 static int hci_uart_setup(struct hci_dev *hdev)
 {
 	struct hci_uart *hu = hci_get_drvdata(hdev);
+	struct hci_rp_read_local_version *ver;
+	struct sk_buff *skb;
 
 	if (hu->proto->setup)
 		return hu->proto->setup(hu);
 
+	if (!test_bit(HCI_UART_VND_DETECT, &hu->hdev_flags))
+		return 0;
+
+	skb = __hci_cmd_sync(hdev, HCI_OP_READ_LOCAL_VERSION, 0, NULL,
+			     HCI_INIT_TIMEOUT);
+	if (IS_ERR(skb)) {
+		BT_ERR("%s: Reading local version information failed (%ld)",
+		       hdev->name, PTR_ERR(skb));
+		return 0;
+	}
+
+	if (skb->len != sizeof(*ver)) {
+		BT_ERR("%s: Event length mismatch for version information",
+		       hdev->name);
+		goto done;
+	}
+
+	ver = (struct hci_rp_read_local_version *)skb->data;
+
+	switch (le16_to_cpu(ver->manufacturer)) {
+	}
+
+done:
+	kfree_skb(skb);
 	return 0;
 }

@@ -497,7 +523,8 @@ static int hci_uart_set_flags(struct hci_uart *hu, unsigned long flags)
 				    BIT(HCI_UART_RESET_ON_INIT) |
 				    BIT(HCI_UART_CREATE_AMP) |
 				    BIT(HCI_UART_INIT_PENDING) |
-				    BIT(HCI_UART_EXT_CONFIG);
+				    BIT(HCI_UART_EXT_CONFIG) |
+				    BIT(HCI_UART_VND_DETECT);
 
 	if (flags & ~valid_flags)
 		return -EINVAL;

drivers/bluetooth/hci_uart.h +1 -0

index 074ed29092b4..22a5f7c74266 100644
@@ -49,6 +49,7 @@
 #define HCI_UART_CREATE_AMP	2
 #define HCI_UART_INIT_PENDING	3
 #define HCI_UART_EXT_CONFIG	4
+#define HCI_UART_VND_DETECT	5
 
 struct hci_uart;

Signature · 1 line

2.1.0

Johan Hedberg

2015-04-05 06:19 UTC #1 lore raw

Hi Marcel,

Quoted 10 lines · Marcel Holtmann

This adds a new HCI_UART_VND_DETECT flag to allow automatic vendor detection. This allows to enable known vendor commands (for example for setting the public device address) when using a standard H:4 UART protocol or when running in virtual machines.
When this new flag is configured and no vendor specific setup routine is provided, then the local version information are read and the provided manufacturer information can be evaluated to configure extra vendor callbacks.

Quoted 5 lines

Signed-off-by Marcel Holtmann <[email protected]>

---
 drivers/bluetooth/hci_ldisc.c | 29 ++++++++++++++++++++++++++++-
 drivers/bluetooth/hci_uart.h  |  1 +
 2 files changed, 29 insertions(+), 1 deletion(-)

All three patches in this set have been applied to bluetooth-next. Thanks.

Johan