Bluetooth: qca: Fix poor RF performance for WCN6855

[ Upstream commit a2fad248947d702ed3dcb52b8377c1a3ae201e44 ]

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 <quic_zijuhu@quicinc.com>
Tested-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Tested-by: Steev Klimaszewski <steev@kali.org> #Thinkpad X13s
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index 484a860785fdef2585e2d9492d7c4fb4a6fd913f..892e2540f008aec993a2f7ca946754c701f56fad 100644 (file)
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -927,8 +927,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),