summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Kaehlcke <mka@chromium.org>2019-07-09 15:44:50 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-09-10 10:35:14 +0100
commit113d5ca748661634a7ce02773a1e5dc552d8c62f (patch)
tree6e89572c611293ef97802aaa2d6b1c4b48897592
parentab0f749707eadafe0b8ad9e3efb53f4aaf956599 (diff)
downloadlinux-stable-113d5ca748661634a7ce02773a1e5dc552d8c62f.tar.gz
linux-stable-113d5ca748661634a7ce02773a1e5dc552d8c62f.tar.bz2
linux-stable-113d5ca748661634a7ce02773a1e5dc552d8c62f.zip
Bluetooth: btqca: Add a short delay before downloading the NVM
[ Upstream commit 8059ba0bd0e4694e51c2ee6438a77b325f06c0d5 ] On WCN3990 downloading the NVM sometimes fails with a "TLV response size mismatch" error: [ 174.949955] Bluetooth: btqca.c:qca_download_firmware() hci0: QCA Downloading qca/crnv21.bin [ 174.958718] Bluetooth: btqca.c:qca_tlv_send_segment() hci0: QCA TLV response size mismatch It seems the controller needs a short time after downloading the firmware before it is ready for the NVM. A delay as short as 1 ms seems sufficient, make it 10 ms just in case. No event is received during the delay, hence we don't just silently drop an extra event. Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/bluetooth/btqca.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index aff1d22223bd..0ee5acb685a1 100644
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -350,6 +350,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
return err;
}
+ /* Give the controller some time to get ready to receive the NVM */
+ msleep(10);
+
/* Download NVM configuration */
config.type = TLV_TYPE_NVM;
if (qca_is_wcn399x(soc_type))