* [PATCH v2] Bluetooth: btrtl: Fix an issue that failing to download the FW which size is over 32K bytes
@ 2019-09-05 5:21 max.chou
2019-09-05 15:29 ` Marcel Holtmann
0 siblings, 1 reply; 2+ messages in thread
From: max.chou @ 2019-09-05 5:21 UTC (permalink / raw)
To: marcel, johan.hedberg, linux-bluetooth, linux-kernel; +Cc: alex_lu, max.chou
From: Max Chou <max.chou@realtek.com>
Fix the issue that when the FW size is 32K+, it will fail for the download
process because of the incorrect index.
When firmware patch length is over 32K, "dl_cmd->index" may >= 0x80. It
will be thought as "data end" that download process will not complete.
However, driver should recount the index from 1.
Signed-off-by: Max Chou <max.chou@realtek.com>
---
Changes in v2:
- Added the comment for commit message
- Remove the extra variable
drivers/bluetooth/btrtl.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
index 0354e93e7a7c..bf3c02be6930 100644
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -401,7 +401,11 @@ static int rtl_download_firmware(struct hci_dev *hdev,
BT_DBG("download fw (%d/%d)", i, frag_num);
- dl_cmd->index = i;
+ if (i > 0x7f)
+ dl_cmd->index = (i & 0x7f) + 1;
+ else
+ dl_cmd->index = i;
+
if (i == (frag_num - 1)) {
dl_cmd->index |= 0x80; /* data end */
frag_len = fw_len % RTL_FRAG_LEN;
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] Bluetooth: btrtl: Fix an issue that failing to download the FW which size is over 32K bytes
2019-09-05 5:21 [PATCH v2] Bluetooth: btrtl: Fix an issue that failing to download the FW which size is over 32K bytes max.chou
@ 2019-09-05 15:29 ` Marcel Holtmann
0 siblings, 0 replies; 2+ messages in thread
From: Marcel Holtmann @ 2019-09-05 15:29 UTC (permalink / raw)
To: Max Chou; +Cc: Johan Hedberg, linux-bluetooth, LKML, alex_lu
Hi Max,
> Fix the issue that when the FW size is 32K+, it will fail for the download
> process because of the incorrect index.
>
> When firmware patch length is over 32K, "dl_cmd->index" may >= 0x80. It
> will be thought as "data end" that download process will not complete.
> However, driver should recount the index from 1.
>
> Signed-off-by: Max Chou <max.chou@realtek.com>
> ---
> Changes in v2:
> - Added the comment for commit message
> - Remove the extra variable
>
> drivers/bluetooth/btrtl.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-05 15:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-05 5:21 [PATCH v2] Bluetooth: btrtl: Fix an issue that failing to download the FW which size is over 32K bytes max.chou
2019-09-05 15:29 ` 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).