From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74693C3A59F for ; Thu, 29 Aug 2019 18:21:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 40A622173E for ; Thu, 29 Aug 2019 18:21:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567102860; bh=JxVNULd1CA1rsypPdOENJE1D+WISPcOAWfG98oKxSiI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xG8pIZ+e6cXo/fmigR5e/cp2UUSSFJgCiTmdV3R5yrskW68YP5i4a7QYJEyWEFltN xwsdSUy+Dy5QGAx9t+3IWqr/oTzeF0MscMB0rl5hoKB/rWwecntcv0Ts6Y4ocMYKDg 8CtynMXbGmAdxLbrQ+INOmmpBE2qGSmulq+pjucs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730063AbfH2SRn (ORCPT ); Thu, 29 Aug 2019 14:17:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:59924 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729311AbfH2SRn (ORCPT ); Thu, 29 Aug 2019 14:17:43 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C17692189D; Thu, 29 Aug 2019 18:17:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567102662; bh=JxVNULd1CA1rsypPdOENJE1D+WISPcOAWfG98oKxSiI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XV5WrA99l3Sb8+QkK2Xpsh5qGf7FAzhW9EOH8zZGowNtOeQW+LDf8/33evY1CxsG/ 3QG9H3FErYjaix8LKU4fcHd1sYgloex0VPEDP08yc/PnwlM06WqCyrj+j8lORexOxi ZadDlSBIVtMHChchfQmwWvp8sj1pt7J1T1vrTViY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Matthias Kaehlcke , Marcel Holtmann , Sasha Levin , linux-bluetooth@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 03/16] Bluetooth: btqca: Add a short delay before downloading the NVM Date: Thu, 29 Aug 2019 14:17:21 -0400 Message-Id: <20190829181736.9040-3-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190829181736.9040-1-sashal@kernel.org> References: <20190829181736.9040-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Matthias Kaehlcke [ 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 Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- drivers/bluetooth/btqca.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index 28afd5d585f95..b7dfa4afd5169 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -363,6 +363,9 @@ int qca_uart_setup_rome(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; snprintf(config.fwname, sizeof(config.fwname), "qca/nvm_%08x.bin", -- 2.20.1