OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: mediatek: pass a pointer to mtk_hci_wmt_sync 

Pass a structure pointer to mtk_hci_wmt_sync rather than several arguments
to avoid take up additional stack area and be better to read the code.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Sean Wang 2019-02-15 07:19:36 +08:00 committed by Marcel Holtmann
parent 77f328dbc6
commit 88e5f366a1
1 changed files with 48 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
drivers/bluetooth/btmtkuart.c
View File

@ -58,6 +58,14 @@ struct mtk_hci_wmt_cmd {
u8 data[256]; u8 data[256];
} __packed; } __packed;
struct btmtk_hci_wmt_params {
u8 op;
u8 flag;
u16 dlen;
const void *data;
u32 *status;
};
struct btmtkuart_dev { struct btmtkuart_dev {
struct hci_dev *hdev; struct hci_dev *hdev;
struct serdev_device *serdev; struct serdev_device *serdev;
@ -74,8 +82,8 @@ struct btmtkuart_dev {
u16 stp_dlen; u16 stp_dlen;
}; };
static int mtk_hci_wmt_sync(struct hci_dev *hdev, u8 op, u8 flag, u16 plen, static int mtk_hci_wmt_sync(struct hci_dev *hdev,
const void *param) struct btmtk_hci_wmt_params *wmt_params)
{ {
struct btmtkuart_dev *bdev = hci_get_drvdata(hdev); struct btmtkuart_dev *bdev = hci_get_drvdata(hdev);
struct mtk_hci_wmt_cmd wc; struct mtk_hci_wmt_cmd wc;
@ -83,16 +91,16 @@ static int mtk_hci_wmt_sync(struct hci_dev *hdev, u8 op, u8 flag, u16 plen,
u32 hlen; u32 hlen;
int err; int err;
hlen = sizeof(*hdr) + plen; hlen = sizeof(*hdr) + wmt_params->dlen;
if (hlen > 255) if (hlen > 255)
return -EINVAL; return -EINVAL;
hdr = (struct mtk_wmt_hdr *)&wc; hdr = (struct mtk_wmt_hdr *)&wc;
hdr->dir = 1; hdr->dir = 1;
hdr->op = op; hdr->op = wmt_params->op;
hdr->dlen = cpu_to_le16(plen + 1); hdr->dlen = cpu_to_le16(wmt_params->dlen + 1);
hdr->flag = flag; hdr->flag = wmt_params->flag;
memcpy(wc.data, param, plen); memcpy(wc.data, wmt_params->data, wmt_params->dlen);
set_bit(BTMTKUART_TX_WAIT_VND_EVT, &bdev->tx_state); set_bit(BTMTKUART_TX_WAIT_VND_EVT, &bdev->tx_state);
@ -130,6 +138,7 @@ static int mtk_hci_wmt_sync(struct hci_dev *hdev, u8 op, u8 flag, u16 plen,
static int mtk_setup_fw(struct hci_dev *hdev) static int mtk_setup_fw(struct hci_dev *hdev)
{ {
struct btmtk_hci_wmt_params wmt_params;
const struct firmware *fw; const struct firmware *fw;
const u8 *fw_ptr; const u8 *fw_ptr;
size_t fw_size; size_t fw_size;
@ -155,6 +164,9 @@ static int mtk_setup_fw(struct hci_dev *hdev)
fw_ptr += 30; fw_ptr += 30;
flag = 1; flag = 1;
wmt_params.op = MTK_WMT_PATCH_DWNLD;
wmt_params.status = NULL;
while (fw_size > 0) { while (fw_size > 0) {
dlen = min_t(int, 250, fw_size); dlen = min_t(int, 250, fw_size);
@ -164,8 +176,11 @@ static int mtk_setup_fw(struct hci_dev *hdev)
else if (fw_size < fw->size - 30) else if (fw_size < fw->size - 30)
flag = 2; flag = 2;
err = mtk_hci_wmt_sync(hdev, MTK_WMT_PATCH_DWNLD, flag, dlen, wmt_params.flag = flag;
fw_ptr); wmt_params.dlen = dlen;
wmt_params.data = fw_ptr;
err = mtk_hci_wmt_sync(hdev, &wmt_params);
if (err < 0) { if (err < 0) {
bt_dev_err(hdev, "Failed to send wmt patch dwnld (%d)", bt_dev_err(hdev, "Failed to send wmt patch dwnld (%d)",
err); err);
@ -469,6 +484,7 @@ static int btmtkuart_flush(struct hci_dev *hdev)
static int btmtkuart_setup(struct hci_dev *hdev) static int btmtkuart_setup(struct hci_dev *hdev)
{ {
struct btmtk_hci_wmt_params wmt_params;
u8 param = 0x1; u8 param = 0x1;
int err = 0; int err = 0;
@ -477,16 +493,27 @@ static int btmtkuart_setup(struct hci_dev *hdev)
if (err < 0) if (err < 0)
return err; return err;
/* Activate function the firmware providing to */ wmt_params.op = MTK_WMT_RST;
err = mtk_hci_wmt_sync(hdev, MTK_WMT_RST, 0x4, 0, 0); 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) { if (err < 0) {
bt_dev_err(hdev, "Failed to send wmt rst (%d)", err); bt_dev_err(hdev, "Failed to send wmt rst (%d)", err);
return err; return err;
} }
/* Enable Bluetooth protocol */ /* Enable Bluetooth protocol */
err = mtk_hci_wmt_sync(hdev, MTK_WMT_FUNC_CTRL, 0x0, sizeof(param), wmt_params.op = MTK_WMT_FUNC_CTRL;
&param); wmt_params.flag = 0;
wmt_params.dlen = sizeof(param);
wmt_params.data = &param;
wmt_params.status = NULL;
err = mtk_hci_wmt_sync(hdev, &wmt_params);
if (err < 0) { if (err < 0) {
bt_dev_err(hdev, "Failed to send wmt func ctrl (%d)", err); bt_dev_err(hdev, "Failed to send wmt func ctrl (%d)", err);
return err; return err;
@ -497,12 +524,18 @@ static int btmtkuart_setup(struct hci_dev *hdev)
static int btmtkuart_shutdown(struct hci_dev *hdev) static int btmtkuart_shutdown(struct hci_dev *hdev)
{ {
struct btmtk_hci_wmt_params wmt_params;
u8 param = 0x0; u8 param = 0x0;
int err; int err;
/* Disable the device */ /* Disable the device */
err = mtk_hci_wmt_sync(hdev, MTK_WMT_FUNC_CTRL, 0x0, sizeof(param), wmt_params.op = MTK_WMT_FUNC_CTRL;
&param); wmt_params.flag = 0;
wmt_params.dlen = sizeof(param);
wmt_params.data = &param;
wmt_params.status = NULL;
err = mtk_hci_wmt_sync(hdev, &wmt_params);
if (err < 0) { if (err < 0) {
bt_dev_err(hdev, "Failed to send wmt func ctrl (%d)", err); bt_dev_err(hdev, "Failed to send wmt func ctrl (%d)", err);
return err; return err;