Commit 145373cb authored by Miao-chen Chou's avatar Miao-chen Chou Committed by Johan Hedberg
Browse files

Bluetooth: Add framework for Microsoft vendor extension 

Micrsoft defined a set for HCI vendor extensions. Check the following
link for details:

https://docs.microsoft.com/en-us/windows-hardware/drivers/bluetooth/microsoft-defined-bluetooth-hci-commands-and-events



This provides the basic framework to enable the extension and read its
supported features. Drivers still have to declare support for this
extension before it can be utilized by the host stack.

Signed-off-by: default avatarMiao-chen Chou <mcchou@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 3d233604

include/net/bluetooth/hci_core.h

+13 −0
Original line number Diff line number Diff line
@@ -484,6 +484,11 @@ struct hci_dev { 
	struct led_trigger	*power_led;

#endif



#if IS_ENABLED(CONFIG_BT_MSFTEXT)

	__u16			msft_opcode;

	void			*msft_data;

#endif



	int (*open)(struct hci_dev *hdev);

	int (*close)(struct hci_dev *hdev);

	int (*flush)(struct hci_dev *hdev);
@@ -1116,6 +1121,14 @@ int hci_recv_frame(struct hci_dev *hdev, struct sk_buff *skb); 
int hci_recv_diag(struct hci_dev *hdev, struct sk_buff *skb);

__printf(2, 3) void hci_set_hw_info(struct hci_dev *hdev, const char *fmt, ...);

__printf(2, 3) void hci_set_fw_info(struct hci_dev *hdev, const char *fmt, ...);



static inline void hci_set_msft_opcode(struct hci_dev *hdev, __u16 opcode)

{

#if IS_ENABLED(CONFIG_BT_MSFTEXT)

	hdev->msft_opcode = opcode;

#endif

}



int hci_dev_open(__u16 dev);

int hci_dev_close(__u16 dev);

int hci_dev_do_close(struct hci_dev *hdev);

net/bluetooth/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -93,6 +93,13 @@ config BT_LEDS 
	  This option selects a few LED triggers for different

	  Bluetooth events.



config BT_MSFTEXT

	bool "Enable Microsoft extensions"

	depends on BT

	help

	  This options enables support for the Microsoft defined HCI

	  vendor extensions.



config BT_DEBUGFS

	bool "Export Bluetooth internals in debugfs"

	depends on BT && DEBUG_FS

net/bluetooth/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,5 +19,6 @@ bluetooth-y := af_bluetooth.o hci_core.o hci_conn.o hci_event.o mgmt.o \ 
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_DEBUGFS) += hci_debugfs.o

bluetooth-$(CONFIG_BT_SELFTEST) += selftest.o

net/bluetooth/hci_core.c

+5 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "hci_debugfs.h"

#include "smp.h"

#include "leds.h"

#include "msft.h"



static void hci_rx_work(struct work_struct *work);

static void hci_cmd_work(struct work_struct *work);
@@ -1563,6 +1564,8 @@ setup_failed: 
	    hci_dev_test_flag(hdev, HCI_VENDOR_DIAG) && hdev->set_diag)

		ret = hdev->set_diag(hdev, true);



	msft_do_open(hdev);



	clear_bit(HCI_INIT, &hdev->flags);



	if (!ret) {
@@ -1758,6 +1761,8 @@ int hci_dev_do_close(struct hci_dev *hdev) 


	hci_sock_dev_event(hdev, HCI_DEV_DOWN);



	msft_do_close(hdev);



	if (hdev->flush)

		hdev->flush(hdev);

net/bluetooth/hci_event.c

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "a2mp.h"

#include "amp.h"

#include "smp.h"

#include "msft.h"



#define ZERO_KEY "\x00\x00\x00\x00\x00\x00\x00\x00" \

		 "\x00\x00\x00\x00\x00\x00\x00\x00"
@@ -6166,6 +6167,10 @@ void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb) 
		hci_num_comp_blocks_evt(hdev, skb);

		break;



	case HCI_EV_VENDOR:

		msft_vendor_evt(hdev, skb);

		break;



	default:

		BT_DBG("%s event 0x%2.2x", hdev->name, event);

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE