This patch sets up vendor_get_prefix and vendor_evt in btintel
to surface Intel telemetry events.
Signed-off-by: Joseph Hwang <josephsih@xxxxxxxxxxxx>
---
(no changes since v5)
Changes in v5:
- This is a new patch that holds the Intel specifics in the driver.
- This patch sets up vendor_get_ext_prefix and vendor_evt.
- INTEL_PREFIX is defined in little endian for convenience.
- Define intel_ext_prefix to contain Intel prefix and the telemetry
subcode which will be returned by btintel_get_ext_prefix().
- Remove the unnecessary "void *data" portion and the double space
from btintel_vendor_evt.
- Remove some unnecessary checking in btintel_vendor_evt.
- As to stripping off the prefix, that was what was done in
"Series-version: 1". Previous comment about the AOSP function in
pulling off the prefix header from the skb was "just do a basic
length check and then move on. The kernel has no interest in this
data." So that is why the whole skb->data is sent to the user space
for further handling. This is to be consistent with what AOSP does
there.
drivers/bluetooth/btintel.c | 50 +++++++++++++++++++++++++++++++++++++
drivers/bluetooth/btintel.h | 13 ++++++++++
2 files changed, 63 insertions(+)
diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
index 818681c89db8..7c39cb7352fd 100644
--- a/drivers/bluetooth/btintel.c
+++ b/drivers/bluetooth/btintel.c
@@ -2404,6 +2404,10 @@ static int btintel_setup_combined(struct hci_dev *hdev)
/* Set up the quality report callback for Intel devices */
hdev->set_quality_report = btintel_set_quality_report;
+ /* Set up the vendor event callbacks for Intel devices */
+ hdev->vendor_get_ext_prefix = btintel_get_ext_prefix;
+ hdev->vendor_evt = btintel_vendor_evt;
+
/* For Legacy device, check the HW platform value and size */
if (skb->len == sizeof(ver) && skb->data[1] == 0x37) {
bt_dev_dbg(hdev, "Read the legacy Intel version information");
@@ -2650,6 +2654,52 @@ void btintel_secure_send_result(struct hci_dev *hdev,
}
EXPORT_SYMBOL_GPL(btintel_secure_send_result);
+/* INTEL_PREFIX below is defined in little endian. */
+static unsigned char INTEL_PREFIX[] = { 0x87, 0x80 };
+
+/* Define any Intel sub-opcodes here. */
+#define TELEMETRY_CODE 0x03
+static unsigned char INTEL_SUBCODES[] = { TELEMETRY_CODE };
+
+static struct ext_vendor_prefix intel_ext_prefix = {
+ .prefix = INTEL_PREFIX,
+ .prefix_len = sizeof(INTEL_PREFIX),
+ .subcodes = INTEL_SUBCODES,
+ .subcodes_len = sizeof(INTEL_SUBCODES),
+};
+
+struct ext_vendor_prefix *btintel_get_ext_prefix(struct hci_dev *hdev)
+{
+ return &intel_ext_prefix;
+}
+EXPORT_SYMBOL_GPL(btintel_get_ext_prefix);
+
+/* An Intel vendor event with prefix has the following structure. */
+struct intel_prefix_evt_data {
+ __le16 prefix; /* INTEL_PREFIX */
+ __u8 subcode;
+ __u8 data[]; /* a number of struct intel_tlv subevents */
+} __packed;
+
+void btintel_vendor_evt(struct hci_dev *hdev, struct sk_buff *skb)
+{
+ struct intel_prefix_evt_data *ev;
+
+ if (skb->len < sizeof(struct intel_prefix_evt_data))
+ return;
+
+ if (memcmp(skb->data, INTEL_PREFIX, sizeof(INTEL_PREFIX)))
+ return;
+
+ /* Only interested in the telemetry event for now. */
+ ev = (struct intel_prefix_evt_data *)skb->data;
+ if (ev->subcode == TELEMETRY_CODE) {
+ hdev->hci_recv_quality_report(hdev, skb->data, skb->len,
+ QUALITY_SPEC_INTEL_TELEMETRY);
+ }
+}
+EXPORT_SYMBOL_GPL(btintel_vendor_evt);
+
MODULE_AUTHOR("Marcel Holtmann <marcel@xxxxxxxxxxxx>");
MODULE_DESCRIPTION("Bluetooth support for Intel devices ver " VERSION);
MODULE_VERSION(VERSION);
diff --git a/drivers/bluetooth/btintel.h b/drivers/bluetooth/btintel.h
index e0060e58573c..040c41f11e91 100644
--- a/drivers/bluetooth/btintel.h
+++ b/drivers/bluetooth/btintel.h
@@ -211,6 +211,8 @@ void btintel_bootup(struct hci_dev *hdev, const void *ptr, unsigned int len);
void btintel_secure_send_result(struct hci_dev *hdev,
const void *ptr, unsigned int len);
int btintel_set_quality_report(struct hci_dev *hdev, bool enable);
+struct ext_vendor_prefix *btintel_get_ext_prefix(struct hci_dev *hdev);
+void btintel_vendor_evt(struct hci_dev *hdev, struct sk_buff *skb);
#else
static inline int btintel_check_bdaddr(struct hci_dev *hdev)
@@ -306,4 +308,15 @@ static inline int btintel_set_quality_report(struct hci_dev *hdev, bool enable)
{
return -ENODEV;
}
+
+static inline struct ext_vendor_prefix *btintel_get_ext_prefix(
+ struct hci_dev *hdev)
+{
+ return NULL;
+}
+
+static inline void btintel_vendor_evt(struct hci_dev *hdev, struct sk_buff *skb)
+{
+}
+
#endif
--
2.36.1.124.g0e6072fb45-goog
