From: Sean Wang <sean.wang@mediatek.com>

Date: Wed, 9 Feb 2022 02:17:41 +0800

Subject: Bluetooth: mediatek: fix the conflict between mtk and msft vendor

 event

Patch-mainline: v5.18-rc1

Git-commit: e4412654e260842e1a94ffe0d4026e8a6fd34246

References: jsc#PED-1407

There is a conflict between MediaTek wmt event and msft vendor extension

logic in the core layer since 145373cb1b1f ("Bluetooth: Add framework for

Microsoft vendor extension") was introduced because we changed the type of

mediatek wmt event to the type of msft vendor event in the driver.

But the purpose we reported mediatek event to the core layer is for the

diagnostic purpose with that we are able to see the full packet trace via

monitoring socket with btmon. Thus, it is harmless we keep the original

type of mediatek vendor event here to avoid breaking the msft extension

function especially they can be supported by Mediatek chipset like MT7921

, MT7922 devices and future devices.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

Acked-by: Lee, Chun-Yi <jlee@suse.com>

---

 drivers/bluetooth/btmtk.h     |    1 +

 drivers/bluetooth/btmtksdio.c |    9 +--------

 drivers/bluetooth/btusb.c     |    8 --------

 3 files changed, 2 insertions(+), 16 deletions(-)

--- a/drivers/bluetooth/btmtk.h

+++ b/drivers/bluetooth/btmtk.h

@@ -5,6 +5,7 @@

 #define FIRMWARE_MT7668		"mediatek/mt7668pr2h.bin"

 #define FIRMWARE_MT7961		"mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin"

+#define HCI_EV_WMT 0xe4

 #define HCI_WMT_MAX_EVENT_SIZE		64

 #define BTMTK_WMT_REG_WRITE 0x1

--- a/drivers/bluetooth/btmtksdio.c

+++ b/drivers/bluetooth/btmtksdio.c

@@ -381,13 +381,6 @@ static int btmtksdio_recv_event(struct h

 	struct hci_event_hdr *hdr = (void *)skb->data;

 	int err;

-	/* Fix up the vendor event id with 0xff for vendor specific instead

-	 * of 0xe4 so that event send via monitoring socket can be parsed

-	 * properly.

-	 */

-	if (hdr->evt == 0xe4)

-		hdr->evt = HCI_EV_VENDOR;

-

 	/* When someone waits for the WMT event, the skb is being cloned

 	 * and being processed the events from there then.

 	 */

@@ -403,7 +396,7 @@ static int btmtksdio_recv_event(struct h

 	if (err < 0)

 		goto err_free_skb;

-	if (hdr->evt == HCI_EV_VENDOR) {

+	if (hdr->evt == HCI_EV_WMT) {

 		if (test_and_clear_bit(BTMTKSDIO_TX_WAIT_VND_EVT,

 				       &bdev->tx_state)) {

 			/* Barrier to sync with other CPUs */

--- a/drivers/bluetooth/btusb.c

+++ b/drivers/bluetooth/btusb.c

@@ -2256,7 +2256,6 @@ static void btusb_mtk_wmt_recv(struct ur

 {

 	struct hci_dev *hdev = urb->context;

 	struct btusb_data *data = hci_get_drvdata(hdev);

-	struct hci_event_hdr *hdr;

 	struct sk_buff *skb;

 	int err;

@@ -2276,13 +2275,6 @@ static void btusb_mtk_wmt_recv(struct ur

 		hci_skb_pkt_type(skb) = HCI_EVENT_PKT;

 		skb_put_data(skb, urb->transfer_buffer, urb->actual_length);

-		hdr = (void *)skb->data;

-		/* Fix up the vendor event id with 0xff for vendor specific

-		 * instead of 0xe4 so that event send via monitoring socket can

-		 * be parsed properly.

-		 */

-		hdr->evt = 0xff;

-

 		/* When someone waits for the WMT event, the skb is being cloned

 		 * and being processed the events from there then.

 		 */