linux-kernel - Re: [PATCH AUTOSEL 6.6 26/26] Bluetooth: qca: simplify WCN399x NVM loading

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <aAKGCb+rzIWJjMBb@duo.ucw.cz>
Date: Fri, 18 Apr 2025 19:04:09 +0200
From: Pavel Machek <pavel@...x.de>
To: Sasha Levin <sashal@...nel.org>
Cc: linux-kernel@...r.kernel.org, stable@...r.kernel.org,
	Dmitry Baryshkov <dmitry.baryshkov@...aro.org>,
	Luiz Augusto von Dentz <luiz.von.dentz@...el.com>,
	marcel@...tmann.org, luiz.dentz@...il.com,
	linux-bluetooth@...r.kernel.org
Subject: Re: [PATCH AUTOSEL 6.6 26/26] Bluetooth: qca: simplify WCN399x NVM
 loading

Hi!

> 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.

This is a cleanup, so we should not need it in -stable.

Best reagrds,
								Pavel
								
> +++ b/drivers/bluetooth/btqca.c
> @@ -807,6 +807,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
>  		   const char *firmware_name)
>  {
>  	struct qca_fw_config config = {};
> +	const char *variant = "";
>  	int err;
>  	u8 rom_ver = 0;
>  	u32 soc_ver;
> @@ -901,13 +902,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),

-- 
DENX Software Engineering GmbH,        Managing Director: Erika Unter
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Download attachment "signature.asc" of type "application/pgp-signature" (196 bytes)