Bluetooth: Add support for reading AOSP vendor capabilities

When drivers indicate support for AOSP vendor extension, initialize them
and read its capabilities.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index ca4ac6603b9a0fd8859cf7eb6c19b3dc45872560..aa2879a3b0ddac2511afe2a74e855b7d52941ddd 100644 (file)
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -586,6 +586,10 @@ struct hci_dev {
        void                    *msft_data;
 #endif
 
+#if IS_ENABLED(CONFIG_BT_AOSPEXT)
+       bool                    aosp_capable;
+#endif
+
        int (*open)(struct hci_dev *hdev);
        int (*close)(struct hci_dev *hdev);
        int (*flush)(struct hci_dev *hdev);
@@ -1239,6 +1243,13 @@ static inline void hci_set_msft_opcode(struct hci_dev *hdev, __u16 opcode)
 #endif
 }
 
+static inline void hci_set_aosp_capable(struct hci_dev *hdev)
+{
+#if IS_ENABLED(CONFIG_BT_AOSPEXT)
+       hdev->aosp_capable = true;
+#endif
+}
+
 int hci_dev_open(__u16 dev);
 int hci_dev_close(__u16 dev);
 int hci_dev_do_close(struct hci_dev *hdev);

diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index 400c5130dc0a069ceea675f5ee714c86e0b54ff9..e0ab4cd7afc3de1e0431d7e488efb3b873febfd5 100644 (file)
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -99,6 +99,13 @@ config BT_MSFTEXT
          This options enables support for the Microsoft defined HCI
          vendor extensions.
 
+config BT_AOSPEXT
+       bool "Enable Android Open Source Project extensions"
+       depends on BT
+       help
+         This options enables support for the Android Open Source
+         Project defined HCI vendor extensions.
+
 config BT_DEBUGFS
        bool "Export Bluetooth internals in debugfs"
        depends on BT && DEBUG_FS

diff --git a/net/bluetooth/Makefile b/net/bluetooth/Makefile
index 1c645fba8c493ddd638ba1c4a5c9f7c972f0fd54..cc0995301f93f07d13d0444aba405ddf398926ba 100644 (file)
--- a/net/bluetooth/Makefile
+++ b/net/bluetooth/Makefile
@@ -20,5 +20,6 @@ bluetooth-$(CONFIG_BT_BREDR) += sco.o
 bluetooth-$(CONFIG_BT_HS) += a2mp.o amp.o
 bluetooth-$(CONFIG_BT_LEDS) += leds.o
 bluetooth-$(CONFIG_BT_MSFTEXT) += msft.o
+bluetooth-$(CONFIG_BT_AOSPEXT) += aosp.o
 bluetooth-$(CONFIG_BT_DEBUGFS) += hci_debugfs.o
 bluetooth-$(CONFIG_BT_SELFTEST) += selftest.o

diff --git a/net/bluetooth/aosp.c b/net/bluetooth/aosp.c
new file mode 100644 (file)
index 0000000..a1b7762
--- /dev/null
+++ b/net/bluetooth/aosp.c
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2021 Intel Corporation
+ */
+
+#include <net/bluetooth/bluetooth.h>
+#include <net/bluetooth/hci_core.h>
+
+#include "aosp.h"
+
+void aosp_do_open(struct hci_dev *hdev)
+{
+       struct sk_buff *skb;
+
+       if (!hdev->aosp_capable)
+               return;
+
+       bt_dev_dbg(hdev, "Initialize AOSP extension");
+
+       /* LE Get Vendor Capabilities Command */
+       skb = __hci_cmd_sync(hdev, hci_opcode_pack(0x3f, 0x153), 0, NULL,
+                            HCI_CMD_TIMEOUT);
+       if (IS_ERR(skb))
+               return;
+
+       kfree_skb(skb);
+}
+
+void aosp_do_close(struct hci_dev *hdev)
+{
+       if (!hdev->aosp_capable)
+               return;
+
+       bt_dev_dbg(hdev, "Cleanup of AOSP extension");
+}

diff --git a/net/bluetooth/aosp.h b/net/bluetooth/aosp.h
new file mode 100644 (file)
index 0000000..328fc6d
--- /dev/null
+++ b/net/bluetooth/aosp.h
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright (C) 2021 Intel Corporation
+ */
+
+#if IS_ENABLED(CONFIG_BT_AOSPEXT)
+
+void aosp_do_open(struct hci_dev *hdev);
+void aosp_do_close(struct hci_dev *hdev);
+
+#else
+
+static inline void aosp_do_open(struct hci_dev *hdev) {}
+static inline void aosp_do_close(struct hci_dev *hdev) {}
+
+#endif

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index b0d9c36acc033740308259075125b7ee192dc7fe..0da9b32749868c9e0a81678c2647e4fb1f34ea61 100644 (file)
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -44,6 +44,7 @@
 #include "smp.h"
 #include "leds.h"
 #include "msft.h"
+#include "aosp.h"
 
 static void hci_rx_work(struct work_struct *work);
 static void hci_cmd_work(struct work_struct *work);
@@ -1586,6 +1587,7 @@ setup_failed:
                ret = hdev->set_diag(hdev, true);
 
        msft_do_open(hdev);
+       aosp_do_open(hdev);
 
        clear_bit(HCI_INIT, &hdev->flags);
 
@@ -1782,6 +1784,7 @@ int hci_dev_do_close(struct hci_dev *hdev)
 
        hci_sock_dev_event(hdev, HCI_DEV_DOWN);
 
+       aosp_do_close(hdev);
        msft_do_close(hdev);
 
        if (hdev->flush)