Bluetooth: btintel: Add support for enabling tracing functionality

holtmann · holtmann · commit 6d2e50d24098 · 2015-10-21T00:49:21.000+02:00
For Intel controllers with firmware that allows tracing of baseband
functionality this allows enabling it via set_diag driver callback.

Signed-off-by: Marcel Holtmann &lt;marcel@holtmann.org&gt;
Signed-off-by: Johan Hedberg &lt;johan.hedberg@intel.com&gt;
diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
@@ -91,6 +91,38 @@ int btintel_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr)
 }
 EXPORT_SYMBOL_GPL(btintel_set_bdaddr);
 
+int btintel_set_diag(struct hci_dev *hdev, bool enable)
+{
+	struct sk_buff *skb;
+	u8 param[3];
+	int err;
+
+	if (!test_bit(HCI_RUNNING, &hdev->flags))
+		return -ENETDOWN;
+
+	if (enable) {
+		param[0] = 0x03;
+		param[1] = 0x03;
+		param[2] = 0x03;
+	} else {
+		param[0] = 0x00;
+		param[1] = 0x00;
+		param[2] = 0x00;
+	}
+
+	skb = __hci_cmd_sync(hdev, 0xfc43, 3, param, HCI_INIT_TIMEOUT);
+	if (IS_ERR(skb)) {
+		err = PTR_ERR(skb);
+		BT_ERR("%s: Changing Intel diagnostic mode failed (%d)",
+		       hdev->name, err);
+		return err;
+	}
+	kfree_skb(skb);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(btintel_set_diag);
+
 void btintel_hw_error(struct hci_dev *hdev, u8 code)
 {
 	struct sk_buff *skb;
diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h
@@ -73,6 +73,7 @@ struct intel_secure_send_result {
 
 int btintel_check_bdaddr(struct hci_dev *hdev);
 int btintel_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);
+int btintel_set_diag(struct hci_dev *hdev, bool enable);
 void btintel_hw_error(struct hci_dev *hdev, u8 code);
 
 void btintel_version_info(struct hci_dev *hdev, struct intel_version *ver);
@@ -95,6 +96,11 @@ static inline int btintel_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdadd
 	return -EOPNOTSUPP;
 }
 
+static inline int btintel_set_diag(struct hci_dev *hdev, bool enable)
+{
+	return -EOPNOTSUPP;
+}
+
 static inline void btintel_hw_error(struct hci_dev *hdev, u8 code)
 {
 }
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
@@ -2882,6 +2882,7 @@ static int btusb_probe(struct usb_interface *intf,
 		hdev->send = btusb_send_frame_intel;
 		hdev->setup = btusb_setup_intel_new;
 		hdev->hw_error = btintel_hw_error;
+		hdev->set_diag = btintel_set_diag;
 		hdev->set_bdaddr = btintel_set_bdaddr;
 		set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
 	}
diff --git a/drivers/bluetooth/hci_intel.c b/drivers/bluetooth/hci_intel.c
@@ -557,6 +557,7 @@ static int intel_setup(struct hci_uart *hu)
 
 	bt_dev_dbg(hdev, "start intel_setup");
 
+	hu->hdev->set_diag = btintel_set_diag;
 	hu->hdev->set_bdaddr = btintel_set_bdaddr;
 
 	calltime = ktime_get();

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ struct intel_secure_send_result {`
`73`	`73`
`74`	`74`	`int btintel_check_bdaddr(struct hci_dev *hdev);`
`75`	`75`	`int btintel_set_bdaddr(struct hci_dev hdev, const bdaddr_t bdaddr);`
	`76`	`+int btintel_set_diag(struct hci_dev *hdev, bool enable);`
`76`	`77`	`void btintel_hw_error(struct hci_dev *hdev, u8 code);`
`77`	`78`
`78`	`79`	`void btintel_version_info(struct hci_dev hdev, struct intel_version ver);`
`@@ -95,6 +96,11 @@ static inline int btintel_set_bdaddr(struct hci_dev hdev, const bdaddr_t bdadd`
`95`	`96`	`return -EOPNOTSUPP;`
`96`	`97`	`}`
`97`	`98`
	`99`	`+static inline int btintel_set_diag(struct hci_dev *hdev, bool enable)`
	`100`	`+{`
	`101`	`+ return -EOPNOTSUPP;`
	`102`	`+}`
	`103`	`+`
`98`	`104`	`static inline void btintel_hw_error(struct hci_dev *hdev, u8 code)`
`99`	`105`	`{`
`100`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2882,6 +2882,7 @@ static int btusb_probe(struct usb_interface *intf,`
`2882`	`2882`	`hdev->send = btusb_send_frame_intel;`
`2883`	`2883`	`hdev->setup = btusb_setup_intel_new;`
`2884`	`2884`	`hdev->hw_error = btintel_hw_error;`
	`2885`	`+ hdev->set_diag = btintel_set_diag;`
`2885`	`2886`	`hdev->set_bdaddr = btintel_set_bdaddr;`
`2886`	`2887`	`set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);`
`2887`	`2888`	`}`