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 214932571B4; Thu, 17 Apr 2025 18:00:39 +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=1744912839; cv=none; b=ANlxdpsEpKn8vcSsgXT/rFDsHpnN8UqzLjJDpCsQNhwkv3pIBw7DL0AcX8LxQDC0K8lYQ+IpCiKVLjXTIIcblC0tv+djYfE67FIMX9x1iR/wVoZgPchPLbOHEGWCeZfwKrlqutv/VFg3vtccpYt4yG103yLJJb0KOLGcGKhiC8g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744912839; c=relaxed/simple; bh=5xq1dAsaxmQNJRZG3+uQ9SDd12F4wbnWNusNvqzW/h0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fst0c/AYMvFOczfIg+I0VcGSVNyJbtL2ae1oCrw+QjhYdPOOggLJuvq49F/B7jZ7npuuzoDFYD6+RFDpgbXJZnsKHmCKrSeoOBvEpoTRJZ757Hew/Rg+qYUo5CXc3fjIHjoNUvTnKm2gxvRu2cfolI8eleMiLwrcUHfnxy7SKtY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WzsrwdGZ; 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="WzsrwdGZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AAB25C4CEE4; Thu, 17 Apr 2025 18:00:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744912839; bh=5xq1dAsaxmQNJRZG3+uQ9SDd12F4wbnWNusNvqzW/h0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WzsrwdGZi45Dj2cdrqP69Z4Fs+fNoubw2UXPFiSpqNvw3n13S9T/B9tV9qhFVCL/w /CmLm2yGwFvtxzWX7TNnlLqyxLIKpjC9GH8WihVHN8Oxwv0cP1qgDysY7e/COQVDCL HpIv2rzZDNH6h88iH4cC5nZgWukZt9Co51I2aLMU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dmitry Baryshkov , Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.14 142/449] Bluetooth: qca: simplify WCN399x NVM loading Date: Thu, 17 Apr 2025 19:47:10 +0200 Message-ID: <20250417175123.681574299@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250417175117.964400335@linuxfoundation.org> References: <20250417175117.964400335@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dmitry Baryshkov [ Upstream commit 1cc41b5092e3aa511454ec882c525af311bee631 ] The WCN399x code has two separate cases for loading the NVM data. In preparation to adding support for WCN3950, which also requires similar quirk, split the "variant" to be specified explicitly and merge two snprintfs into a single one. Signed-off-by: Dmitry Baryshkov Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- drivers/bluetooth/btqca.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index cdf09d9a9ad27..7d6b02fe2040f 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -785,6 +785,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, const char *firmware_name, const char *rampatch_name) { struct qca_fw_config config = {}; + const char *variant = ""; int err; u8 rom_ver = 0; u32 soc_ver; @@ -883,13 +884,11 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate, case QCA_WCN3990: case QCA_WCN3991: case QCA_WCN3998: - if (le32_to_cpu(ver.soc_id) == QCA_WCN3991_SOC_ID) { - snprintf(config.fwname, sizeof(config.fwname), - "qca/crnv%02xu.bin", rom_ver); - } else { - snprintf(config.fwname, sizeof(config.fwname), - "qca/crnv%02x.bin", rom_ver); - } + if (le32_to_cpu(ver.soc_id) == QCA_WCN3991_SOC_ID) + variant = "u"; + + snprintf(config.fwname, sizeof(config.fwname), + "qca/crnv%02x%s.bin", rom_ver, variant); break; case QCA_WCN3988: snprintf(config.fwname, sizeof(config.fwname), -- 2.39.5