* [PATCH 1/2] Bluetooth: btusb: fix up firmware download sequence
@ 2020-06-18 7:17 sean.wang
2020-06-18 7:17 ` [PATCH 2/2] Bluetooth: btmtksdio: " sean.wang
2020-06-19 7:36 ` [PATCH 1/2] Bluetooth: btusb: " Marcel Holtmann
0 siblings, 2 replies; 4+ messages in thread
From: sean.wang @ 2020-06-18 7:17 UTC (permalink / raw)
To: marcel, johan.hedberg
Cc: linux-bluetooth, linux-mediatek, linux-kernel, Sean Wang, Mark Chen
From: Sean Wang <sean.wang@mediatek.com>
Data RAM on the device have to be powered on before starting to download
the firmware.
Fixes: a1c49c434e15 ("Bluetooth: btusb: Add protocol support for MediaTek MT7668U USB devices")
Co-developed-by: Mark Chen <Mark-YW.Chen@mediatek.com>
Signed-off-by: Mark Chen <Mark-YW.Chen@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
---
drivers/bluetooth/btusb.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 5f022e9cf667..61ffe185e0e4 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -2925,7 +2925,7 @@ static int btusb_mtk_setup_firmware(struct hci_dev *hdev, const char *fwname)
const u8 *fw_ptr;
size_t fw_size;
int err, dlen;
- u8 flag;
+ u8 flag, param;
err = request_firmware(&fw, fwname, &hdev->dev);
if (err < 0) {
@@ -2933,6 +2933,20 @@ static int btusb_mtk_setup_firmware(struct hci_dev *hdev, const char *fwname)
return err;
}
+ /* Power on data RAM the firmware relies on. */
+ param = 1;
+ wmt_params.op = BTMTK_WMT_FUNC_CTRL;
+ wmt_params.flag = 3;
+ wmt_params.dlen = sizeof(param);
+ wmt_params.data = ¶m;
+ wmt_params.status = NULL;
+
+ err = btusb_mtk_hci_wmt_sync(hdev, &wmt_params);
+ if (err < 0) {
+ bt_dev_err(hdev, "Failed to power on data RAM (%d)", err);
+ return err;
+ }
+
fw_ptr = fw->data;
fw_size = fw->size;
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] Bluetooth: btmtksdio: fix up firmware download sequence
2020-06-18 7:17 [PATCH 1/2] Bluetooth: btusb: fix up firmware download sequence sean.wang
@ 2020-06-18 7:17 ` sean.wang
2020-06-19 7:35 ` Marcel Holtmann
2020-06-19 7:36 ` [PATCH 1/2] Bluetooth: btusb: " Marcel Holtmann
1 sibling, 1 reply; 4+ messages in thread
From: sean.wang @ 2020-06-18 7:17 UTC (permalink / raw)
To: marcel, johan.hedberg
Cc: linux-bluetooth, linux-mediatek, linux-kernel, Sean Wang, Mark Chen
From: Sean Wang <sean.wang@mediatek.com>
Data RAM on the device have to be powered on before starting to download
the firmware.
Fixes: 9aebfd4a2200 ("Bluetooth: mediatek: add support for MediaTek MT7663S and MT7668S SDIO devices")
Co-developed-by: Mark Chen <Mark-YW.Chen@mediatek.com>
Signed-off-by: Mark Chen <Mark-YW.Chen@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
---
drivers/bluetooth/btmtksdio.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/drivers/bluetooth/btmtksdio.c b/drivers/bluetooth/btmtksdio.c
index 519788c442ca..11494cd2a982 100644
--- a/drivers/bluetooth/btmtksdio.c
+++ b/drivers/bluetooth/btmtksdio.c
@@ -685,7 +685,7 @@ static int mtk_setup_firmware(struct hci_dev *hdev, const char *fwname)
const u8 *fw_ptr;
size_t fw_size;
int err, dlen;
- u8 flag;
+ u8 flag, param;
err = request_firmware(&fw, fwname, &hdev->dev);
if (err < 0) {
@@ -693,6 +693,20 @@ static int mtk_setup_firmware(struct hci_dev *hdev, const char *fwname)
return err;
}
+ /* Power on data RAM the firmware relies on. */
+ param = 1;
+ wmt_params.op = MTK_WMT_FUNC_CTRL;
+ wmt_params.flag = 3;
+ wmt_params.dlen = sizeof(param);
+ wmt_params.data = ¶m;
+ wmt_params.status = NULL;
+
+ err = mtk_hci_wmt_sync(hdev, &wmt_params);
+ if (err < 0) {
+ bt_dev_err(hdev, "Failed to power on data RAM (%d)", err);
+ return err;
+ }
+
fw_ptr = fw->data;
fw_size = fw->size;
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] Bluetooth: btmtksdio: fix up firmware download sequence
2020-06-18 7:17 ` [PATCH 2/2] Bluetooth: btmtksdio: " sean.wang
@ 2020-06-19 7:35 ` Marcel Holtmann
0 siblings, 0 replies; 4+ messages in thread
From: Marcel Holtmann @ 2020-06-19 7:35 UTC (permalink / raw)
To: Sean Wang
Cc: Johan Hedberg, Bluetooth Kernel Mailing List, linux-mediatek,
linux-kernel, Mark Chen
Hi Sean,
> Data RAM on the device have to be powered on before starting to download
> the firmware.
>
> Fixes: 9aebfd4a2200 ("Bluetooth: mediatek: add support for MediaTek MT7663S and MT7668S SDIO devices")
> Co-developed-by: Mark Chen <Mark-YW.Chen@mediatek.com>
> Signed-off-by: Mark Chen <Mark-YW.Chen@mediatek.com>
> Signed-off-by: Sean Wang <sean.wang@mediatek.com>
> ---
> drivers/bluetooth/btmtksdio.c | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
the patch doesn’t apply to bluetooth-next tree.
Regards
Marcel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] Bluetooth: btusb: fix up firmware download sequence
2020-06-18 7:17 [PATCH 1/2] Bluetooth: btusb: fix up firmware download sequence sean.wang
2020-06-18 7:17 ` [PATCH 2/2] Bluetooth: btmtksdio: " sean.wang
@ 2020-06-19 7:36 ` Marcel Holtmann
1 sibling, 0 replies; 4+ messages in thread
From: Marcel Holtmann @ 2020-06-19 7:36 UTC (permalink / raw)
To: Sean Wang
Cc: Johan Hedberg, linux-bluetooth, linux-mediatek, linux-kernel, Mark Chen
Hi Sean,
> Data RAM on the device have to be powered on before starting to download
> the firmware.
>
> Fixes: a1c49c434e15 ("Bluetooth: btusb: Add protocol support for MediaTek MT7668U USB devices")
> Co-developed-by: Mark Chen <Mark-YW.Chen@mediatek.com>
> Signed-off-by: Mark Chen <Mark-YW.Chen@mediatek.com>
> Signed-off-by: Sean Wang <sean.wang@mediatek.com>
> ---
> drivers/bluetooth/btusb.c | 16 +++++++++++++++-
> 1 file changed, 15 insertions(+), 1 deletion(-)
the patch doesn’t apply to bluetooth-next tree.
Regards
Marcel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-19 7:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-18 7:17 [PATCH 1/2] Bluetooth: btusb: fix up firmware download sequence sean.wang
2020-06-18 7:17 ` [PATCH 2/2] Bluetooth: btmtksdio: " sean.wang
2020-06-19 7:35 ` Marcel Holtmann
2020-06-19 7:36 ` [PATCH 1/2] Bluetooth: btusb: " Marcel Holtmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).