[E/OEM-OSP1-B] [PATCH 1/1] Bluetooth: btrtl: Fix an issue that failing to download the FW which size is over 32K bytes

Kai-Heng Feng kai.heng.feng at canonical.com
Thu Dec 12 07:10:50 UTC 2019


From: Max Chou <max.chou at realtek.com>

BugLink: https://bugs.launchpad.net/bugs/1856079

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 at realtek.com>
Signed-off-by: Marcel Holtmann <marcel at holtmann.org>
(cherry picked from commit cf0d9a705d81a0f581865cefe0880f29589dd06f)
Signed-off-by: Kai-Heng Feng <kai.heng.feng at canonical.com>
---
 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 16a03882b687..d927af5ea9ab 100644
--- a/drivers/bluetooth/btrtl.c
+++ b/drivers/bluetooth/btrtl.c
@@ -380,7 +380,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




More information about the kernel-team mailing list