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 7B7BE25DD10; Thu, 3 Apr 2025 19:04:01 +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=1743707041; cv=none; b=jS3bBP5RP0V51m1Pxi6K1tK2+YPVlWAa5quymAyiy1m8yQ65DaRz0z7guro8GyPWUQKaGKMyjGAnQHsnYnA6grfECDdlA7V8ibbfEXwR8kxridEF4TYAuTgDm7uMjkcxC9JUcdpp4bGQ5gu/U1UfqccL7R4AQ8lMXBsGuYxWV94= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743707041; c=relaxed/simple; bh=4Jbm/ucPa2vwldSFS/zyAlhJBNz1e0z9zY+nh2nvQA8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ARN7XmlwE5kG50Ub8iaNQznGm2WJJB2RadTIh+AFVJGot/mKTzpEkYPrCXBst3iaZxzhXED3sxRfgkuyBQXpJDCCayTOx2cqKqkncbuy6TFMs999cmszGUaPIUoPxMHGFht24zl6vkI+paNZ9K83zqwg4apNyWuWWaRhNmKFL8g= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=I9oWPq56; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="I9oWPq56" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76D05C4CEE8; Thu, 3 Apr 2025 19:04:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743707041; bh=4Jbm/ucPa2vwldSFS/zyAlhJBNz1e0z9zY+nh2nvQA8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I9oWPq56QjqSUZE5tqOvivoxXm7GH4Ean/zsEjMOomwVJ3BTnDJ4UCGsz5hLn+1Ua cOvD93vlE52OFDSXpJBtjoQsuykyQQ4rppsxcGR/iop0Ekwp4BcD8rXgjJWU6DewkU Ngb1zCKyS/K+FH8DlLwhk/JHAslfaPO0ukRY7KLsiypGZGTpmwvC1kR9xRbISQknQq kAxHSOUwD7QYNsZyIUKqh8+M1uekPuECVDfJ9W3bBxnXrKFkiNyOoyE/TA0QVO5yal cshosIoxscWuypMYJaxbKIwGoema2HvWfS7jdXOc8edH3KlcAHRNd5PY+6xO6ZXIR8 UwP1uscrJ/wFQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Baryshkov , Luiz Augusto von Dentz , Sasha Levin , marcel@holtmann.org, luiz.dentz@gmail.com, linux-bluetooth@vger.kernel.org Subject: [PATCH AUTOSEL 6.14 51/54] Bluetooth: qca: simplify WCN399x NVM loading Date: Thu, 3 Apr 2025 15:02:06 -0400 Message-Id: <20250403190209.2675485-51-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250403190209.2675485-1-sashal@kernel.org> References: <20250403190209.2675485-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-bluetooth@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.14 Content-Transfer-Encoding: 8bit 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