Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-3753-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Message-ID: <362984a6-7567-4d06-920f-18a6fc8a4908@quicinc.com>
Date: Fri, 19 Apr 2024 15:04:11 +0800
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] Bluetooth: qca: Support downloading board id specific NVM
 for WCN7850
To: <luiz.dentz@gmail.com>, <luiz.von.dentz@intel.com>, <marcel@holtmann.org>
CC: <linux-bluetooth@vger.kernel.org>
References: <1713340174-1304-1-git-send-email-quic_zijuhu@quicinc.com>
Content-Language: en-US
From: quic_zijuhu <quic_zijuhu@quicinc.com>
In-Reply-To: <1713340174-1304-1-git-send-email-quic_zijuhu@quicinc.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit

On 4/17/2024 3:49 PM, Zijun Hu wrote:
> Download board id specific NVM instead of default for WCN7850 if board id
> is available.
> 
> Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>
> ---
>  drivers/bluetooth/btqca.c | 18 +++++++++++++++---
>  1 file changed, 15 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
> index 19cfc342fc7b..3ff1d3f99d7b 100644
> --- a/drivers/bluetooth/btqca.c
> +++ b/drivers/bluetooth/btqca.c
> @@ -629,6 +629,19 @@ static void qca_generate_hsp_nvm_name(char *fwname, size_t max_size,
>  		snprintf(fwname, max_size, "qca/hpnv%02x%s.%x", rom_ver, variant, bid);
>  }
>  
> +static inline void qca_get_nvm_name_generic(struct qca_fw_config *cfg,
> +					    const char *stem, u8 rom_ver, u16 bid)
> +{
> +	if (bid == 0x0)
> +		snprintf(cfg->fwname, sizeof(cfg->fwname), "qca/%snv%02x.bin", stem, rom_ver);
> +	else if (bid & 0xff00)
> +		snprintf(cfg->fwname, sizeof(cfg->fwname),
> +			 "qca/%snv%02x.b%x", stem, rom_ver, bid);
> +	else
> +		snprintf(cfg->fwname, sizeof(cfg->fwname),
> +			 "qca/%snv%02x.b%02x", stem, rom_ver, bid);
> +}
> +
>  int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
>  		   enum qca_btsoc_type soc_type, struct qca_btsoc_version ver,
>  		   const char *firmware_name)
> @@ -709,7 +722,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
>  	/* Give the controller some time to get ready to receive the NVM */
>  	msleep(10);
>  
> -	if (soc_type == QCA_QCA2066)
> +	if (soc_type == QCA_QCA2066 || soc_type == QCA_WCN7850)
>  		qca_read_fw_board_id(hdev, &boardid);
>  
>  	/* Download NVM configuration */
> @@ -751,8 +764,7 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
>  				 "qca/hpnv%02x.bin", rom_ver);
>  			break;
>  		case QCA_WCN7850:
> -			snprintf(config.fwname, sizeof(config.fwname),
> -				 "qca/hmtnv%02x.bin", rom_ver);
> +			qca_get_nvm_name_generic(&config, "hmt", rom_ver, boardid);
>  			break;
>  
>  		default:

Hi luiz, marcel,
could you code review for this change since a new product needs this
change ?