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

Date: Wed, 9 Mar 2022 08:03:52 +0800

Subject: Bluetooth: btmtkuart: rely on BT_MTK module

Patch-mainline: v5.18-rc1

Git-commit: f5c3f98946e37a1f7ca07a6c6ab33b1223661aec

References: jsc#PED-1407

Rely on btmtk module to reduce duplicated code

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/Kconfig     |    1 

 drivers/bluetooth/btmtk.c     |    1 

 drivers/bluetooth/btmtk.h     |    1 

 drivers/bluetooth/btmtkuart.c |  184 +++++-------------------------------------

 4 files changed, 29 insertions(+), 158 deletions(-)

--- a/drivers/bluetooth/Kconfig

+++ b/drivers/bluetooth/Kconfig

@@ -400,6 +400,7 @@ config BT_MTKSDIO

 config BT_MTKUART

 	tristate "MediaTek HCI UART driver"

 	depends on SERIAL_DEV_BUS

+	select BT_MTK

 	help

 	  MediaTek Bluetooth HCI UART driver.

 	  This driver is required if you want to use MediaTek Bluetooth

--- a/drivers/bluetooth/btmtk.c

+++ b/drivers/bluetooth/btmtk.c

@@ -285,6 +285,7 @@ MODULE_AUTHOR("Mark Chen 

 MODULE_DESCRIPTION("Bluetooth support for MediaTek devices ver " VERSION);

 MODULE_VERSION(VERSION);

 MODULE_LICENSE("GPL");

+MODULE_FIRMWARE(FIRMWARE_MT7622);

 MODULE_FIRMWARE(FIRMWARE_MT7663);

 MODULE_FIRMWARE(FIRMWARE_MT7668);

 MODULE_FIRMWARE(FIRMWARE_MT7961);

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

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

@@ -1,6 +1,7 @@

 /* SPDX-License-Identifier: ISC */

 /* Copyright (C) 2021 MediaTek Inc. */

+#define FIRMWARE_MT7622		"mediatek/mt7622pr2h.bin"

 #define FIRMWARE_MT7663		"mediatek/mt7663pr2h.bin"

 #define FIRMWARE_MT7668		"mediatek/mt7668pr2h.bin"

 #define FIRMWARE_MT7961		"mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin"

--- a/drivers/bluetooth/btmtkuart.c

+++ b/drivers/bluetooth/btmtkuart.c

@@ -28,13 +28,10 @@

 #include <net/bluetooth/hci_core.h>

 #include "h4_recv.h"

+#include "btmtk.h"

 #define VERSION "0.2"

-#define FIRMWARE_MT7622		"mediatek/mt7622pr2h.bin"

-#define FIRMWARE_MT7663		"mediatek/mt7663pr2h.bin"

-#define FIRMWARE_MT7668		"mediatek/mt7668pr2h.bin"

-

 #define MTK_STP_TLR_SIZE	2

 #define BTMTKUART_TX_STATE_ACTIVE	1

@@ -44,25 +41,6 @@

 #define BTMTKUART_FLAG_STANDALONE_HW	 BIT(0)

-enum {

-	MTK_WMT_PATCH_DWNLD = 0x1,

-	MTK_WMT_TEST = 0x2,

-	MTK_WMT_WAKEUP = 0x3,

-	MTK_WMT_HIF = 0x4,

-	MTK_WMT_FUNC_CTRL = 0x6,

-	MTK_WMT_RST = 0x7,

-	MTK_WMT_SEMAPHORE = 0x17,

-};

-

-enum {

-	BTMTK_WMT_INVALID,

-	BTMTK_WMT_PATCH_UNDONE,

-	BTMTK_WMT_PATCH_DONE,

-	BTMTK_WMT_ON_UNDONE,

-	BTMTK_WMT_ON_DONE,

-	BTMTK_WMT_ON_PROGRESS,

-};

-

 struct mtk_stp_hdr {

 	u8	prefix;

 	__be16	dlen;

@@ -74,44 +52,6 @@ struct btmtkuart_data {

 	const char *fwname;

 };

-struct mtk_wmt_hdr {

-	u8	dir;

-	u8	op;

-	__le16	dlen;

-	u8	flag;

-} __packed;

-

-struct mtk_hci_wmt_cmd {

-	struct mtk_wmt_hdr hdr;

-	u8 data[256];

-} __packed;

-

-struct btmtk_hci_wmt_evt {

-	struct hci_event_hdr hhdr;

-	struct mtk_wmt_hdr whdr;

-} __packed;

-

-struct btmtk_hci_wmt_evt_funcc {

-	struct btmtk_hci_wmt_evt hwhdr;

-	__be16 status;

-} __packed;

-

-struct btmtk_tci_sleep {

-	u8 mode;

-	__le16 duration;

-	__le16 host_duration;

-	u8 host_wakeup_pin;

-	u8 time_compensation;

-} __packed;

-

-struct btmtk_hci_wmt_params {

-	u8 op;

-	u8 flag;

-	u16 dlen;

-	const void *data;

-	u32 *status;

-};

-

 struct btmtkuart_dev {

 	struct hci_dev *hdev;

 	struct serdev_device *serdev;

@@ -153,29 +93,34 @@ static int mtk_hci_wmt_sync(struct hci_d

 	struct btmtk_hci_wmt_evt_funcc *wmt_evt_funcc;

 	u32 hlen, status = BTMTK_WMT_INVALID;

 	struct btmtk_hci_wmt_evt *wmt_evt;

-	struct mtk_hci_wmt_cmd wc;

-	struct mtk_wmt_hdr *hdr;

+	struct btmtk_hci_wmt_cmd *wc;

+	struct btmtk_wmt_hdr *hdr;

 	int err;

+	/* Send the WMT command and wait until the WMT event returns */

 	hlen = sizeof(*hdr) + wmt_params->dlen;

 	if (hlen > 255) {

 		err = -EINVAL;

 		goto err_free_skb;

 	}

-	hdr = (struct mtk_wmt_hdr *)&wc;

+	wc = kzalloc(hlen, GFP_KERNEL);

+	if (!wc)

+		return -ENOMEM;

+

+	hdr = &wc->hdr;

 	hdr->dir = 1;

 	hdr->op = wmt_params->op;

 	hdr->dlen = cpu_to_le16(wmt_params->dlen + 1);

 	hdr->flag = wmt_params->flag;

-	memcpy(wc.data, wmt_params->data, wmt_params->dlen);

+	memcpy(wc->data, wmt_params->data, wmt_params->dlen);

 	set_bit(BTMTKUART_TX_WAIT_VND_EVT, &bdev->tx_state);

-	err = __hci_cmd_send(hdev, 0xfc6f, hlen, &wc);

+	err = __hci_cmd_send(hdev, 0xfc6f, hlen, wc);

 	if (err < 0) {

 		clear_bit(BTMTKUART_TX_WAIT_VND_EVT, &bdev->tx_state);

-		goto err_free_skb;

+		goto err_free_wc;

 	}

 	/* The vendor specific WMT commands are all answered by a vendor

@@ -192,14 +137,14 @@ static int mtk_hci_wmt_sync(struct hci_d

 	if (err == -EINTR) {

 		bt_dev_err(hdev, "Execution of wmt command interrupted");

 		clear_bit(BTMTKUART_TX_WAIT_VND_EVT, &bdev->tx_state);

-		goto err_free_skb;

+		goto err_free_wc;

 	}

 	if (err) {

 		bt_dev_err(hdev, "Execution of wmt command timed out");

 		clear_bit(BTMTKUART_TX_WAIT_VND_EVT, &bdev->tx_state);

 		err = -ETIMEDOUT;

-		goto err_free_skb;

+		goto err_free_wc;

 	}

 	/* Parse and handle the return WMT event */

@@ -212,13 +157,13 @@ static int mtk_hci_wmt_sync(struct hci_d

 	}

 	switch (wmt_evt->whdr.op) {

-	case MTK_WMT_SEMAPHORE:

+	case BTMTK_WMT_SEMAPHORE:

 		if (wmt_evt->whdr.flag == 2)

 			status = BTMTK_WMT_PATCH_UNDONE;

 		else

 			status = BTMTK_WMT_PATCH_DONE;

 		break;

-	case MTK_WMT_FUNC_CTRL:

+	case BTMTK_WMT_FUNC_CTRL:

 		wmt_evt_funcc = (struct btmtk_hci_wmt_evt_funcc *)wmt_evt;

 		if (be16_to_cpu(wmt_evt_funcc->status) == 0x404)

 			status = BTMTK_WMT_ON_DONE;

@@ -235,86 +180,12 @@ static int mtk_hci_wmt_sync(struct hci_d

 err_free_skb:

 	kfree_skb(bdev->evt_skb);

 	bdev->evt_skb = NULL;

+err_free_wc:

+	kfree(wc);

 	return err;

 }

-static int mtk_setup_firmware(struct hci_dev *hdev, const char *fwname)

-{

-	struct btmtk_hci_wmt_params wmt_params;

-	const struct firmware *fw;

-	const u8 *fw_ptr;

-	size_t fw_size;

-	int err, dlen;

-	u8 flag;

-

-	err = request_firmware(&fw, fwname, &hdev->dev);

-	if (err < 0) {

-		bt_dev_err(hdev, "Failed to load firmware file (%d)", err);

-		return err;

-	}

-

-	fw_ptr = fw->data;

-	fw_size = fw->size;

-

-	/* The size of patch header is 30 bytes, should be skip */

-	if (fw_size < 30) {

-		err = -EINVAL;

-		goto free_fw;

-	}

-

-	fw_size -= 30;

-	fw_ptr += 30;

-	flag = 1;

-

-	wmt_params.op = MTK_WMT_PATCH_DWNLD;

-	wmt_params.status = NULL;

-

-	while (fw_size > 0) {

-		dlen = min_t(int, 250, fw_size);

-

-		/* Tell device the position in sequence */

-		if (fw_size - dlen <= 0)

-			flag = 3;

-		else if (fw_size < fw->size - 30)

-			flag = 2;

-

-		wmt_params.flag = flag;

-		wmt_params.dlen = dlen;

-		wmt_params.data = fw_ptr;

-

-		err = mtk_hci_wmt_sync(hdev, &wmt_params);

-		if (err < 0) {

-			bt_dev_err(hdev, "Failed to send wmt patch dwnld (%d)",

-				   err);

-			goto free_fw;

-		}

-

-		fw_size -= dlen;

-		fw_ptr += dlen;

-	}

-

-	wmt_params.op = MTK_WMT_RST;

-	wmt_params.flag = 4;

-	wmt_params.dlen = 0;

-	wmt_params.data = NULL;

-	wmt_params.status = NULL;

-

-	/* Activate funciton the firmware providing to */

-	err = mtk_hci_wmt_sync(hdev, &wmt_params);

-	if (err < 0) {

-		bt_dev_err(hdev, "Failed to send wmt rst (%d)", err);

-		goto free_fw;

-	}

-

-	/* Wait a few moments for firmware activation done */

-	usleep_range(10000, 12000);

-

-free_fw:

-	release_firmware(fw);

-	return err;

-}

-

 static int btmtkuart_recv_event(struct hci_dev *hdev, struct sk_buff *skb)

 {

 	struct btmtkuart_dev *bdev = hci_get_drvdata(hdev);

@@ -645,7 +516,7 @@ static int btmtkuart_func_query(struct h

 	u8 param = 0;

 	/* Query whether the function is enabled */

-	wmt_params.op = MTK_WMT_FUNC_CTRL;

+	wmt_params.op = BTMTK_WMT_FUNC_CTRL;

 	wmt_params.flag = 4;

 	wmt_params.dlen = sizeof(param);

 	wmt_params.data = ¶m;

@@ -672,7 +543,7 @@ static int btmtkuart_change_baudrate(str

 	 * ready to change a new baudrate.

 	 */

 	baudrate = cpu_to_le32(bdev->desired_speed);

-	wmt_params.op = MTK_WMT_HIF;

+	wmt_params.op = BTMTK_WMT_HIF;

 	wmt_params.flag = 1;

 	wmt_params.dlen = 4;

 	wmt_params.data = &baudrate;

@@ -706,7 +577,7 @@ static int btmtkuart_change_baudrate(str

 	usleep_range(20000, 22000);

 	/* Test the new baudrate */

-	wmt_params.op = MTK_WMT_TEST;

+	wmt_params.op = BTMTK_WMT_TEST;

 	wmt_params.flag = 7;

 	wmt_params.dlen = 0;

 	wmt_params.data = NULL;

@@ -741,7 +612,7 @@ static int btmtkuart_setup(struct hci_de

 	 * do any setups.

 	 */

 	if (test_bit(BTMTKUART_REQUIRED_WAKEUP, &bdev->tx_state)) {

-		wmt_params.op = MTK_WMT_WAKEUP;

+		wmt_params.op = BTMTK_WMT_WAKEUP;

 		wmt_params.flag = 3;

 		wmt_params.dlen = 0;

 		wmt_params.data = NULL;

@@ -760,7 +631,7 @@ static int btmtkuart_setup(struct hci_de

 		btmtkuart_change_baudrate(hdev);

 	/* Query whether the firmware is already download */

-	wmt_params.op = MTK_WMT_SEMAPHORE;

+	wmt_params.op = BTMTK_WMT_SEMAPHORE;

 	wmt_params.flag = 1;

 	wmt_params.dlen = 0;

 	wmt_params.data = NULL;

@@ -778,7 +649,7 @@ static int btmtkuart_setup(struct hci_de

 	}

 	/* Setup a firmware which the device definitely requires */

-	err = mtk_setup_firmware(hdev, bdev->data->fwname);

+	err = btmtk_setup_firmware(hdev, bdev->data->fwname, mtk_hci_wmt_sync);

 	if (err < 0)

 		return err;

@@ -801,7 +672,7 @@ ignore_setup_fw:

 	}

 	/* Enable Bluetooth protocol */

-	wmt_params.op = MTK_WMT_FUNC_CTRL;

+	wmt_params.op = BTMTK_WMT_FUNC_CTRL;

 	wmt_params.flag = 0;

 	wmt_params.dlen = sizeof(param);

 	wmt_params.data = ¶m;

@@ -846,7 +717,7 @@ static int btmtkuart_shutdown(struct hci

 	int err;

 	/* Disable the device */

-	wmt_params.op = MTK_WMT_FUNC_CTRL;

+	wmt_params.op = BTMTK_WMT_FUNC_CTRL;

 	wmt_params.flag = 0;

 	wmt_params.dlen = sizeof(param);

 	wmt_params.data = ¶m;

@@ -1131,6 +1002,3 @@ MODULE_AUTHOR("Sean Wang 

 MODULE_DESCRIPTION("MediaTek Bluetooth Serial driver ver " VERSION);

 MODULE_VERSION(VERSION);

 MODULE_LICENSE("GPL");

-MODULE_FIRMWARE(FIRMWARE_MT7622);

-MODULE_FIRMWARE(FIRMWARE_MT7663);

-MODULE_FIRMWARE(FIRMWARE_MT7668);