From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 09EBF17557 for ; Mon, 10 Feb 2025 13:15:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739193354; cv=none; b=jd81EQ7oaJim3Glar6kmF6fzblT7LsnrY+0p0m783HHH1mS8V/fQCXTgVbIccY7jHdLn22Pb8qRX5tmYXFsbwWKqz2u+1fMADcUU/NA8xhlfoQCGaUsuoU6bOWHnmLTeAgwgyGkvxFz3SiyVqielAFNXnwXA47xdbfKVwjIaDNI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739193354; c=relaxed/simple; bh=dfF75A3jBxiZ+llgL1TRhX0Iu1/9R/GFCP2DKjyz0Mg=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=f172jYLoRfD6K920kmdY0Yo3m3uh6H4O+TL4QbJmrobnFu37pL4e3WQo4gpkHawlBiYkJUPV1TlI0M7JjOv5rNfN0TOJ9LeRgE1lufaT/6e7S+6L/zjoHffuSuUJWPKaLXWna9WEfOJ7xxkY/h0WahoSZhERfMlpiG6oASEVy3E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TOx0NCIt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TOx0NCIt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDA87C4CED1; Mon, 10 Feb 2025 13:15:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1739193352; bh=dfF75A3jBxiZ+llgL1TRhX0Iu1/9R/GFCP2DKjyz0Mg=; h=Subject:To:Cc:From:Date:From; b=TOx0NCItPxoFpo/2oHcpk+qKdUORVBL+SQMRmp/yzfhvgQCekery8TLpbwbYJVhFH +mNYVkvxoa9I3w5n/d9jqhHIK2noPm4XpmasRcxtOv8N7zXUtVObY+XwWhPoAp59p5 /gwmrh0XyT3j+SuKvyvCxET1Ckoo9roGGc7ii6sI= Subject: FAILED: patch "[PATCH] Bluetooth: qca: Fix poor RF performance for WCN6855" failed to apply to 6.13-stable tree To: quic_zijuhu@quicinc.com,johan+linaro@kernel.org,luiz.von.dentz@intel.com,steev@kali.org Cc: From: Date: Mon, 10 Feb 2025 14:15:49 +0100 Message-ID: <2025021049-during-buddhist-0ffa@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.13-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.13.y git checkout FETCH_HEAD git cherry-pick -x a2fad248947d702ed3dcb52b8377c1a3ae201e44 # git commit -s git send-email --to '' --in-reply-to '2025021049-during-buddhist-0ffa@gregkh' --subject-prefix 'PATCH 6.13.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From a2fad248947d702ed3dcb52b8377c1a3ae201e44 Mon Sep 17 00:00:00 2001 From: Zijun Hu Date: Mon, 13 Jan 2025 22:43:23 +0800 Subject: [PATCH] Bluetooth: qca: Fix poor RF performance for WCN6855 For WCN6855, board ID specific NVM needs to be downloaded once board ID is available, but the default NVM is always downloaded currently. The wrong NVM causes poor RF performance, and effects user experience for several types of laptop with WCN6855 on the market. Fix by downloading board ID specific NVM if board ID is available. Fixes: 095327fede00 ("Bluetooth: hci_qca: Add support for QTI Bluetooth chip wcn6855") Cc: stable@vger.kernel.org # 6.4 Signed-off-by: Zijun Hu Tested-by: Johan Hovold Reviewed-by: Johan Hovold Tested-by: Steev Klimaszewski #Thinkpad X13s Signed-off-by: Luiz Augusto von Dentz diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index a6b53d1f23db..cdf09d9a9ad2 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -909,8 +909,9 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, "qca/msnv%02x.bin", rom_ver); break; case QCA_WCN6855: - snprintf(config.fwname, sizeof(config.fwname), - "qca/hpnv%02x.bin", rom_ver); + qca_read_fw_board_id(hdev, &boardid); + qca_get_nvm_name_by_board(config.fwname, sizeof(config.fwname), + "hpnv", soc_type, ver, rom_ver, boardid); break; case QCA_WCN7850: qca_get_nvm_name_by_board(config.fwname, sizeof(config.fwname),