diff mbox series

[v1,2/2] Bluetooth: Support the vendor specific debug events

Message ID 20210412072734.2567956-2-josephsih@chromium.org
State New
Headers show
Series [v1,1/2] Bluetooth: btusb: support link statistics telemetry events | expand

Commit Message

Joseph Hwang April 12, 2021, 7:27 a.m. UTC 
This patch allows a user space process to enable/disable the vendor
specific (vs) debug events dynamically through the set experimental
feature mgmt interface if CONFIG_BT_FEATURE_VS_DBG_EVT is enabled.

Since the debug event feature needs to invoke the callback function
provided by the driver, i.e., hdev->set_vs_dbg_evt, a valid controller
index is required.

For generic Linux machines, the vendor specific debug events are
disabled by default.

Reviewed-by: Chethan Tumkur Narayan <chethan.tumkur.narayan@intel.corp-partner.google.com>
Reviewed-by: Kiran Krishnappa <kiran.k@intel.corp-partner.google.com>
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
Signed-off-by: Joseph Hwang <josephsih@chromium.org>
---

 drivers/bluetooth/btintel.c      |  73 ++++++++++++++++++++-
 drivers/bluetooth/btintel.h      |  13 ++++
 drivers/bluetooth/btusb.c        |   8 +++
 include/net/bluetooth/hci.h      |   4 ++
 include/net/bluetooth/hci_core.h |  10 +++
 net/bluetooth/Kconfig            |  10 +++
 net/bluetooth/mgmt.c             | 107 ++++++++++++++++++++++++++++++-
 7 files changed, 223 insertions(+), 2 deletions(-)

Comments

kernel test robot April 12, 2021, 10:12 a.m. UTC | #1 
Hi Joseph,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on bluetooth-next/master]
[also build test ERROR on v5.12-rc7 next-20210409]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Joseph-Hwang/Bluetooth-btusb-support-link-statistics-telemetry-events/20210412-152954
base:   https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git master
config: alpha-randconfig-s031-20210412 (attached as .config)
compiler: alpha-linux-gcc (GCC) 9.3.0
reproduce:
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # apt-get install sparse
        # sparse version: v0.6.3-280-g2cd6d34e-dirty
        # https://github.com/0day-ci/linux/commit/d3bd96f611be6b3248ca68c2bc628c29e5419b92
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Joseph-Hwang/Bluetooth-btusb-support-link-statistics-telemetry-events/20210412-152954
        git checkout d3bd96f611be6b3248ca68c2bc628c29e5419b92
        # save the attached .config to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=alpha 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   drivers/bluetooth/btusb.c: In function 'btusb_setup_intel_newgen':
>> drivers/bluetooth/btusb.c:2963:2: error: implicit declaration of function 'btintel_read_debug_features' [-Werror=implicit-function-declaration]
    2963 |  btintel_read_debug_features(hdev, &features);
         |  ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/bluetooth/btusb.c:2966:2: error: implicit declaration of function 'btintel_set_debug_features' [-Werror=implicit-function-declaration]
    2966 |  btintel_set_debug_features(hdev, &features);
         |  ^~~~~~~~~~~~~~~~~~~~~~~~~~
   cc1: some warnings being treated as errors


vim +/btintel_read_debug_features +2963 drivers/bluetooth/btusb.c

cda0dd7809f89e Marcel Holtmann        2015-01-26  2903  
0a3c1d45eca09c Kiran K                2020-11-19  2904  static int btusb_setup_intel_newgen(struct hci_dev *hdev)
0a3c1d45eca09c Kiran K                2020-11-19  2905  {
0a3c1d45eca09c Kiran K                2020-11-19  2906  	struct btusb_data *data = hci_get_drvdata(hdev);
0a3c1d45eca09c Kiran K                2020-11-19  2907  	u32 boot_param;
0a3c1d45eca09c Kiran K                2020-11-19  2908  	char ddcname[64];
0a3c1d45eca09c Kiran K                2020-11-19  2909  	int err;
0a3c1d45eca09c Kiran K                2020-11-19  2910  	struct intel_debug_features features;
0a3c1d45eca09c Kiran K                2020-11-19  2911  	struct intel_version_tlv version;
0a3c1d45eca09c Kiran K                2020-11-19  2912  
0a3c1d45eca09c Kiran K                2020-11-19  2913  	bt_dev_dbg(hdev, "");
0a3c1d45eca09c Kiran K                2020-11-19  2914  
0a3c1d45eca09c Kiran K                2020-11-19  2915  	/* Set the default boot parameter to 0x0 and it is updated to
0a3c1d45eca09c Kiran K                2020-11-19  2916  	 * SKU specific boot parameter after reading Intel_Write_Boot_Params
0a3c1d45eca09c Kiran K                2020-11-19  2917  	 * command while downloading the firmware.
0a3c1d45eca09c Kiran K                2020-11-19  2918  	 */
0a3c1d45eca09c Kiran K                2020-11-19  2919  	boot_param = 0x00000000;
0a3c1d45eca09c Kiran K                2020-11-19  2920  
0a3c1d45eca09c Kiran K                2020-11-19  2921  	/* Read the Intel version information to determine if the device
0a3c1d45eca09c Kiran K                2020-11-19  2922  	 * is in bootloader mode or if it already has operational firmware
0a3c1d45eca09c Kiran K                2020-11-19  2923  	 * loaded.
0a3c1d45eca09c Kiran K                2020-11-19  2924  	 */
0a3c1d45eca09c Kiran K                2020-11-19  2925  	err = btintel_read_version_tlv(hdev, &version);
0a3c1d45eca09c Kiran K                2020-11-19  2926  	if (err) {
0a3c1d45eca09c Kiran K                2020-11-19  2927  		bt_dev_err(hdev, "Intel Read version failed (%d)", err);
0a3c1d45eca09c Kiran K                2020-11-19  2928  		btintel_reset_to_bootloader(hdev);
0a3c1d45eca09c Kiran K                2020-11-19  2929  		return err;
0a3c1d45eca09c Kiran K                2020-11-19  2930  	}
0a3c1d45eca09c Kiran K                2020-11-19  2931  
0a460d8fe2db68 Luiz Augusto von Dentz 2021-03-23  2932  	err = btintel_version_info_tlv(hdev, &version);
0a460d8fe2db68 Luiz Augusto von Dentz 2021-03-23  2933  	if (err)
0a460d8fe2db68 Luiz Augusto von Dentz 2021-03-23  2934  		return err;
0a3c1d45eca09c Kiran K                2020-11-19  2935  
3f43a37838d5b5 Kiran K                2020-11-19  2936  	err = btusb_intel_download_firmware_newgen(hdev, &version, &boot_param);
3f43a37838d5b5 Kiran K                2020-11-19  2937  	if (err)
3f43a37838d5b5 Kiran K                2020-11-19  2938  		return err;
3f43a37838d5b5 Kiran K                2020-11-19  2939  
0a3c1d45eca09c Kiran K                2020-11-19  2940  	/* check if controller is already having an operational firmware */
0a3c1d45eca09c Kiran K                2020-11-19  2941  	if (version.img_type == 0x03)
0a3c1d45eca09c Kiran K                2020-11-19  2942  		goto finish;
0a3c1d45eca09c Kiran K                2020-11-19  2943  
604b3cf87fd217 Luiz Augusto von Dentz 2021-03-23  2944  	err = btusb_intel_boot(hdev, boot_param);
604b3cf87fd217 Luiz Augusto von Dentz 2021-03-23  2945  	if (err)
0a3c1d45eca09c Kiran K                2020-11-19  2946  		return err;
0a3c1d45eca09c Kiran K                2020-11-19  2947  
0a3c1d45eca09c Kiran K                2020-11-19  2948  	clear_bit(BTUSB_BOOTLOADER, &data->flags);
0a3c1d45eca09c Kiran K                2020-11-19  2949  
9a93b8b8eee4ac Kiran K                2020-11-19  2950  	btusb_setup_intel_newgen_get_fw_name(&version, ddcname, sizeof(ddcname),
9a93b8b8eee4ac Kiran K                2020-11-19  2951  					     "ddc");
0a3c1d45eca09c Kiran K                2020-11-19  2952  	/* Once the device is running in operational mode, it needs to
0a3c1d45eca09c Kiran K                2020-11-19  2953  	 * apply the device configuration (DDC) parameters.
0a3c1d45eca09c Kiran K                2020-11-19  2954  	 *
0a3c1d45eca09c Kiran K                2020-11-19  2955  	 * The device can work without DDC parameters, so even if it
0a3c1d45eca09c Kiran K                2020-11-19  2956  	 * fails to load the file, no need to fail the setup.
0a3c1d45eca09c Kiran K                2020-11-19  2957  	 */
0a3c1d45eca09c Kiran K                2020-11-19  2958  	btintel_load_ddc_config(hdev, ddcname);
0a3c1d45eca09c Kiran K                2020-11-19  2959  
0a3c1d45eca09c Kiran K                2020-11-19  2960  	/* Read the Intel supported features and if new exception formats
0a3c1d45eca09c Kiran K                2020-11-19  2961  	 * supported, need to load the additional DDC config to enable.
0a3c1d45eca09c Kiran K                2020-11-19  2962  	 */
0a3c1d45eca09c Kiran K                2020-11-19 @2963  	btintel_read_debug_features(hdev, &features);
0a3c1d45eca09c Kiran K                2020-11-19  2964  
0a3c1d45eca09c Kiran K                2020-11-19  2965  	/* Set DDC mask for available debug features */
0a3c1d45eca09c Kiran K                2020-11-19 @2966  	btintel_set_debug_features(hdev, &features);
0a3c1d45eca09c Kiran K                2020-11-19  2967  
0a3c1d45eca09c Kiran K                2020-11-19  2968  	/* Read the Intel version information after loading the FW  */
0a3c1d45eca09c Kiran K                2020-11-19  2969  	err = btintel_read_version_tlv(hdev, &version);
0a3c1d45eca09c Kiran K                2020-11-19  2970  	if (err)
0a3c1d45eca09c Kiran K                2020-11-19  2971  		return err;
0a3c1d45eca09c Kiran K                2020-11-19  2972  
0a3c1d45eca09c Kiran K                2020-11-19  2973  	btintel_version_info_tlv(hdev, &version);
0a3c1d45eca09c Kiran K                2020-11-19  2974  
0a3c1d45eca09c Kiran K                2020-11-19  2975  finish:
0a3c1d45eca09c Kiran K                2020-11-19  2976  	/* Set the event mask for Intel specific vendor events. This enables
0a3c1d45eca09c Kiran K                2020-11-19  2977  	 * a few extra events that are useful during general operation. It
0a3c1d45eca09c Kiran K                2020-11-19  2978  	 * does not enable any debugging related events.
0a3c1d45eca09c Kiran K                2020-11-19  2979  	 *
0a3c1d45eca09c Kiran K                2020-11-19  2980  	 * The device will function correctly without these events enabled
0a3c1d45eca09c Kiran K                2020-11-19  2981  	 * and thus no need to fail the setup.
0a3c1d45eca09c Kiran K                2020-11-19  2982  	 */
0a3c1d45eca09c Kiran K                2020-11-19  2983  	btintel_set_event_mask(hdev, false);
0a3c1d45eca09c Kiran K                2020-11-19  2984  
0a3c1d45eca09c Kiran K                2020-11-19  2985  	return 0;
0a3c1d45eca09c Kiran K                2020-11-19  2986  }
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  2987  static int btusb_shutdown_intel(struct hci_dev *hdev)
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  2988  {
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  2989  	struct sk_buff *skb;
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  2990  	long ret;
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  2991  
1313bccf00f6df Amit K Bag             2018-08-03  2992  	/* In the shutdown sequence where Bluetooth is turned off followed
1313bccf00f6df Amit K Bag             2018-08-03  2993  	 * by WiFi being turned off, turning WiFi back on causes issue with
1313bccf00f6df Amit K Bag             2018-08-03  2994  	 * the RF calibration.
1313bccf00f6df Amit K Bag             2018-08-03  2995  	 *
1313bccf00f6df Amit K Bag             2018-08-03  2996  	 * To ensure that any RF activity has been stopped, issue HCI Reset
1313bccf00f6df Amit K Bag             2018-08-03  2997  	 * command to clear all ongoing activity including advertising,
1313bccf00f6df Amit K Bag             2018-08-03  2998  	 * scanning etc.
1313bccf00f6df Amit K Bag             2018-08-03  2999  	 */
1313bccf00f6df Amit K Bag             2018-08-03  3000  	skb = __hci_cmd_sync(hdev, HCI_OP_RESET, 0, NULL, HCI_INIT_TIMEOUT);
1313bccf00f6df Amit K Bag             2018-08-03  3001  	if (IS_ERR(skb)) {
1313bccf00f6df Amit K Bag             2018-08-03  3002  		ret = PTR_ERR(skb);
1313bccf00f6df Amit K Bag             2018-08-03  3003  		bt_dev_err(hdev, "HCI reset during shutdown failed");
1313bccf00f6df Amit K Bag             2018-08-03  3004  		return ret;
1313bccf00f6df Amit K Bag             2018-08-03  3005  	}
1313bccf00f6df Amit K Bag             2018-08-03  3006  	kfree_skb(skb);
1313bccf00f6df Amit K Bag             2018-08-03  3007  
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  3008  	/* Some platforms have an issue with BT LED when the interface is
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  3009  	 * down or BT radio is turned off, which takes 5 seconds to BT LED
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  3010  	 * goes off. This command turns off the BT LED immediately.
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  3011  	 */
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  3012  	skb = __hci_cmd_sync(hdev, 0xfc3f, 0, NULL, HCI_INIT_TIMEOUT);
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  3013  	if (IS_ERR(skb)) {
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  3014  		ret = PTR_ERR(skb);
85418feff6faa9 Marcel Holtmann        2018-08-03  3015  		bt_dev_err(hdev, "turning off Intel device LED failed");
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  3016  		return ret;
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  3017  	}
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  3018  	kfree_skb(skb);
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  3019  
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  3020  	return 0;
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  3021  }
bfbd45e9acd2ef Tedd Ho-Jeong An       2015-02-13  3022  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff mbox series

Patch

diff --git a/drivers/bluetooth/btintel.c b/drivers/bluetooth/btintel.c
index de1dbdc01e5a..c0f81d29aa5f 100644
--- a/drivers/bluetooth/btintel.c
+++ b/drivers/bluetooth/btintel.c
@@ -1213,6 +1213,7 @@  void btintel_reset_to_bootloader(struct hci_dev *hdev)
 }
 EXPORT_SYMBOL_GPL(btintel_reset_to_bootloader);
 
+#ifdef CONFIG_BT_FEATURE_VS_DBG_EVT
 int btintel_read_debug_features(struct hci_dev *hdev,
 				struct intel_debug_features *features)
 {
@@ -1254,14 +1255,18 @@  int btintel_set_debug_features(struct hci_dev *hdev,
 	u8 trace_enable = 0x02;
 	struct sk_buff *skb;
 
-	if (!features)
+	if (!features) {
+		bt_dev_warn(hdev, "Debug features not read");
 		return -EINVAL;
+	}
 
 	if (!(features->page1[0] & 0x3f)) {
 		bt_dev_info(hdev, "Telemetry exception format not supported");
 		return 0;
 	}
 
+	bt_dev_info(hdev, "trace_enable %d mask %d", trace_enable, mask[3]);
+
 	skb = __hci_cmd_sync(hdev, 0xfc8b, 11, mask, HCI_INIT_TIMEOUT);
 	if (IS_ERR(skb)) {
 		bt_dev_err(hdev, "Setting Intel telemetry ddc write event mask failed (%ld)",
@@ -1290,6 +1295,72 @@  int btintel_set_debug_features(struct hci_dev *hdev,
 }
 EXPORT_SYMBOL_GPL(btintel_set_debug_features);
 
+int btintel_reset_debug_features(struct hci_dev *hdev,
+				 const struct intel_debug_features *features)
+{
+	u8 mask[11] = { 0x0a, 0x92, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00 };
+	u8 trace_enable = 0x00;
+	struct sk_buff *skb;
+
+	if (!features) {
+		bt_dev_warn(hdev, "Debug features not read");
+		return -EINVAL;
+	}
+
+	if (!(features->page1[0] & 0x3f)) {
+		bt_dev_info(hdev, "Telemetry exception format not supported");
+		return 0;
+	}
+
+	bt_dev_info(hdev, "trace_enable %d mask %d", trace_enable, mask[3]);
+
+	/* Should stop the trace before writing ddc event mask. */
+	skb = __hci_cmd_sync(hdev, 0xfca1, 1, &trace_enable, HCI_INIT_TIMEOUT);
+	if (IS_ERR(skb)) {
+		bt_dev_err(hdev, "Stop tracing of link statistics events failed (%ld)",
+			   PTR_ERR(skb));
+		return PTR_ERR(skb);
+	}
+	kfree_skb(skb);
+
+	skb = __hci_cmd_sync(hdev, 0xfc8b, 11, mask, HCI_INIT_TIMEOUT);
+	if (IS_ERR(skb)) {
+		bt_dev_err(hdev, "Setting Intel telemetry ddc write event mask failed (%ld)",
+			   PTR_ERR(skb));
+		return PTR_ERR(skb);
+	}
+	kfree_skb(skb);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(btintel_reset_debug_features);
+
+int btintel_set_vs_dbg_evt(struct hci_dev *hdev, bool enable)
+{
+	struct intel_debug_features features;
+	int err;
+
+	bt_dev_dbg(hdev, "enable %d", enable);
+
+	/* Read the Intel supported features and if new exception formats
+	 * supported, need to load the additional DDC config to enable.
+	 */
+	err = btintel_read_debug_features(hdev, &features);
+	if (err)
+		return err;
+
+	/* Set or reset the debug features. */
+	if (enable)
+		err = btintel_set_debug_features(hdev, &features);
+	else
+		err = btintel_reset_debug_features(hdev, &features);
+
+	return err;
+}
+EXPORT_SYMBOL_GPL(btintel_set_vs_dbg_evt);
+#endif
+
 MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
 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 d184064a5e7c..0b35b0248b91 100644
--- a/drivers/bluetooth/btintel.h
+++ b/drivers/bluetooth/btintel.h
@@ -171,10 +171,15 @@  int btintel_download_firmware_newgen(struct hci_dev *hdev,
 				     u32 *boot_param, u8 hw_variant,
 				     u8 sbe_type);
 void btintel_reset_to_bootloader(struct hci_dev *hdev);
+#ifdef CONFIG_BT_FEATURE_VS_DBG_EVT
 int btintel_read_debug_features(struct hci_dev *hdev,
 				struct intel_debug_features *features);
 int btintel_set_debug_features(struct hci_dev *hdev,
 			       const struct intel_debug_features *features);
+int btintel_reset_debug_features(struct hci_dev *hdev,
+			       const struct intel_debug_features *features);
+int btintel_set_vs_dbg_evt(struct hci_dev *hdev, bool enable);
+#endif
 #else
 
 static inline int btintel_check_bdaddr(struct hci_dev *hdev)
@@ -301,10 +306,18 @@  static inline int btintel_read_debug_features(struct hci_dev *hdev,
 	return -EOPNOTSUPP;
 }
 
+#ifdef CONFIG_BT_FEATURE_VS_DBG_EVT
 static inline int btintel_set_debug_features(struct hci_dev *hdev,
 					     const struct intel_debug_features *features)
 {
 	return -EOPNOTSUPP;
 }
 
+static inline int btintel_reset_debug_features(struct hci_dev *hdev,
+					       const struct intel_debug_features *features)
+{
+	return -EOPNOTSUPP;
+}
+#endif
+
 #endif
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 096b743977a7..cc4cc920a713 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2864,6 +2864,11 @@  static int btusb_setup_intel_new(struct hci_dev *hdev)
 		btintel_load_ddc_config(hdev, ddcname);
 	}
 
+#ifdef CONFIG_BT_FEATURE_VS_DBG_EVT
+	hci_dev_clear_flag(hdev, HCI_VS_DBG_EVT);
+	bt_dev_dbg(hdev, "HCI_VS_DBG_EVT cleared");
+#endif
+
 	/* Read the Intel version information after loading the FW  */
 	err = btintel_read_version(hdev, &ver);
 	if (err)
@@ -4596,6 +4601,9 @@  static int btusb_probe(struct usb_interface *intf,
 		hdev->set_diag = btintel_set_diag;
 		hdev->set_bdaddr = btintel_set_bdaddr;
 		hdev->cmd_timeout = btusb_intel_cmd_timeout;
+#ifdef CONFIG_BT_FEATURE_VS_DBG_EVT
+		hdev->set_vs_dbg_evt = btintel_set_vs_dbg_evt;
+#endif
 		set_bit(HCI_QUIRK_STRICT_DUPLICATE_FILTER, &hdev->quirks);
 		set_bit(HCI_QUIRK_SIMULTANEOUS_DISCOVERY, &hdev->quirks);
 		set_bit(HCI_QUIRK_NON_PERSISTENT_DIAG, &hdev->quirks);
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index ea4ae551c426..0c1eba73844a 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -331,6 +331,10 @@  enum {
 	HCI_CMD_PENDING,
 	HCI_FORCE_NO_MITM,
 
+#ifdef CONFIG_BT_FEATURE_VS_DBG_EVT
+	HCI_VS_DBG_EVT,
+#endif
+
 	__HCI_NUM_FLAGS,
 };
 
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index c73ac52af186..d68e06be51c7 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -604,6 +604,9 @@  struct hci_dev {
 	int (*set_bdaddr)(struct hci_dev *hdev, const bdaddr_t *bdaddr);
 	void (*cmd_timeout)(struct hci_dev *hdev);
 	bool (*prevent_wake)(struct hci_dev *hdev);
+#ifdef CONFIG_BT_FEATURE_VS_DBG_EVT
+	int (*set_vs_dbg_evt)(struct hci_dev *hdev, bool enable);
+#endif
 };
 
 #define HCI_PHY_HANDLE(handle)	(handle & 0xff)
@@ -751,12 +754,19 @@  extern struct mutex hci_cb_list_lock;
 #define hci_dev_test_and_clear_flag(hdev, nr)  test_and_clear_bit((nr), (hdev)->dev_flags)
 #define hci_dev_test_and_change_flag(hdev, nr) test_and_change_bit((nr), (hdev)->dev_flags)
 
+#ifdef CONFIG_BT_FEATURE_VS_DBG_EVT
+#define hci_dev_clear_flag_vs_dbg_evt(x) { hci_dev_clear_flag(hdev, x); }
+#else
+#define hci_dev_clear_flag_vs_dbg_evt(x) {}
+#endif
+
 #define hci_dev_clear_volatile_flags(hdev)			\
 	do {							\
 		hci_dev_clear_flag(hdev, HCI_LE_SCAN);		\
 		hci_dev_clear_flag(hdev, HCI_LE_ADV);		\
 		hci_dev_clear_flag(hdev, HCI_LL_RPA_RESOLUTION);\
 		hci_dev_clear_flag(hdev, HCI_PERIODIC_INQ);	\
+		hci_dev_clear_flag_vs_dbg_evt(HCI_VS_DBG_EVT)	\
 	} while (0)
 
 /* ----- HCI interface to upper protocols ----- */
diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
index e0ab4cd7afc3..4930ec495f60 100644
--- a/net/bluetooth/Kconfig
+++ b/net/bluetooth/Kconfig
@@ -148,4 +148,14 @@  config BT_FEATURE_DEBUG
 	  This provides an option to enable/disable debugging statements
 	  at runtime via the experimental features interface.
 
+config BT_FEATURE_VS_DBG_EVT
+	bool "Enable runtime option for logging vendor specific debug events"
+	depends on BT && !DYNAMIC_DEBUG
+	default n
+	help
+	  This provides an option to enable/disable vendor specific debug
+	  events logging at runtime via the experimental features interface.
+	  The debug events may include the categories of system exceptions,
+	  connections/disconnection, the link quality statistics, etc.
+
 source "drivers/bluetooth/Kconfig"
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index f9be7f9084d6..d220917e2b8e 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -3788,6 +3788,14 @@  static const u8 debug_uuid[16] = {
 };
 #endif
 
+#ifdef CONFIG_BT_FEATURE_VS_DBG_EVT
+/* 330859bc-7506-492d-9370-9a6f0614037f */
+static const u8 vs_dbg_evt_uuid[16] = {
+	0x7f, 0x03, 0x14, 0x06, 0x6f, 0x9a, 0x70, 0x93,
+	0x2d, 0x49, 0x06, 0x75, 0xbc, 0x59, 0x08, 0x33,
+};
+#endif
+
 /* 671b10b5-42c0-4696-9227-eb28d1b049d6 */
 static const u8 simult_central_periph_uuid[16] = {
 	0xd6, 0x49, 0xb0, 0xd1, 0x28, 0xeb, 0x27, 0x92,
@@ -3803,7 +3811,7 @@  static const u8 rpa_resolution_uuid[16] = {
 static int read_exp_features_info(struct sock *sk, struct hci_dev *hdev,
 				  void *data, u16 data_len)
 {
-	char buf[62];	/* Enough space for 3 features */
+	char buf[82];   /* Enough space for 4 features: 2 + 20 * 4 */
 	struct mgmt_rp_read_exp_features_info *rp = (void *)buf;
 	u16 idx = 0;
 	u32 flags;
@@ -3847,6 +3855,15 @@  static int read_exp_features_info(struct sock *sk, struct hci_dev *hdev,
 		idx++;
 	}
 
+#ifdef CONFIG_BT_FEATURE_VS_DBG_EVT
+	if (hdev) {
+		flags = hci_dev_test_flag(hdev, HCI_VS_DBG_EVT) ? BIT(0) : 0;
+		memcpy(rp->features[idx].uuid, vs_dbg_evt_uuid, 16);
+		rp->features[idx].flags = cpu_to_le32(flags);
+		idx++;
+	}
+#endif
+
 	rp->feature_count = cpu_to_le16(idx);
 
 	/* After reading the experimental features information, enable
@@ -3889,6 +3906,23 @@  static int exp_debug_feature_changed(bool enabled, struct sock *skip)
 }
 #endif
 
+#ifdef CONFIG_BT_FEATURE_VS_DBG_EVT
+static int exp_vs_dbg_evt_feature_changed(bool enabled, struct sock *skip)
+{
+	struct mgmt_ev_exp_feature_changed ev;
+
+	BT_INFO("enabled %d", enabled);
+
+	memset(&ev, 0, sizeof(ev));
+	memcpy(ev.uuid, vs_dbg_evt_uuid, 16);
+	ev.flags = cpu_to_le32(enabled ? BIT(0) : 0);
+
+	return mgmt_limited_event(MGMT_EV_EXP_FEATURE_CHANGED, NULL,
+				  &ev, sizeof(ev),
+				  HCI_MGMT_EXP_FEATURE_EVENTS, skip);
+}
+#endif
+
 static int set_exp_feature(struct sock *sk, struct hci_dev *hdev,
 			   void *data, u16 data_len)
 {
@@ -4035,6 +4069,77 @@  static int set_exp_feature(struct sock *sk, struct hci_dev *hdev,
 		return err;
 	}
 
+#ifdef CONFIG_BT_FEATURE_VS_DBG_EVT
+	if (!memcmp(cp->uuid, vs_dbg_evt_uuid, 16)) {
+		bool val, changed;
+		int err;
+		u16 mgmt_index = hdev ? hdev->id : MGMT_INDEX_NONE;
+
+		/* Command requires to use a valid controller index */
+		if (!hdev)
+			return mgmt_cmd_status(sk, hdev->id,
+					       MGMT_OP_SET_EXP_FEATURE,
+					       MGMT_STATUS_INVALID_INDEX);
+
+		/* Parameters are limited to a single octet */
+		if (data_len != MGMT_SET_EXP_FEATURE_SIZE + 1)
+			return mgmt_cmd_status(sk, mgmt_index,
+					       MGMT_OP_SET_EXP_FEATURE,
+					       MGMT_STATUS_INVALID_PARAMS);
+
+		/* Only boolean on/off is supported */
+		if (cp->param[0] != 0x00 && cp->param[0] != 0x01)
+			return mgmt_cmd_status(sk, mgmt_index,
+					       MGMT_OP_SET_EXP_FEATURE,
+					       MGMT_STATUS_INVALID_PARAMS);
+
+		hci_req_sync_lock(hdev);
+
+		val = !!cp->param[0];
+		changed = (val != hci_dev_test_flag(hdev, HCI_VS_DBG_EVT));
+
+		if (hdev->set_vs_dbg_evt) {
+			BT_INFO("vendor specific debug event %d changed %d",
+				val, changed);
+			if (changed) {
+				err = hdev->set_vs_dbg_evt(hdev, val);
+				if (err) {
+					BT_ERR("set_vs_dbg_evt value %d err %d",
+					       val, err);
+					err = mgmt_cmd_status(sk, mgmt_index,
+							      MGMT_OP_SET_EXP_FEATURE,
+							      MGMT_STATUS_FAILED);
+					goto unlock_vs_dbg_evt;
+				}
+			}
+
+			if (val)
+				hci_dev_set_flag(hdev, HCI_VS_DBG_EVT);
+			else
+				hci_dev_clear_flag(hdev, HCI_VS_DBG_EVT);
+
+			memcpy(rp.uuid, vs_dbg_evt_uuid, 16);
+			rp.flags = cpu_to_le32(val ? BIT(0) : 0);
+			hci_sock_set_flag(sk, HCI_MGMT_EXP_FEATURE_EVENTS);
+			err = mgmt_cmd_complete(sk, mgmt_index,
+						MGMT_OP_SET_EXP_FEATURE, 0,
+						&rp, sizeof(rp));
+
+			if (changed)
+				exp_vs_dbg_evt_feature_changed(val, sk);
+		} else {
+			BT_INFO("vendor specific debug event not supported");
+			err = mgmt_cmd_status(sk, mgmt_index,
+					      MGMT_OP_SET_EXP_FEATURE,
+					      MGMT_STATUS_NOT_SUPPORTED);
+		}
+
+unlock_vs_dbg_evt:
+		hci_req_sync_unlock(hdev);
+		return err;
+	}
+#endif
+
 	return mgmt_cmd_status(sk, hdev ? hdev->id : MGMT_INDEX_NONE,
 			       MGMT_OP_SET_EXP_FEATURE,
 			       MGMT_STATUS_NOT_SUPPORTED);