[PATCH v7 0/1] Bluetooth: btqca: move WCN7850 WA

[PATCH v7 0/1] Bluetooth: btqca: move WCN7850 WA

[Shuai Zhang]

Move WCN7850 workaround to the caller

Changes v7
- Update the if logic for firmware retrieval failure.
- Link to v6:
  https://lore.kernel.org/all/20260105055646.3816296-1-shuai.zhang@oss.qualcomm.com/
Changes v6
- Add WCN7850 workaround details in the commit.
- Reduce the logic nesting level.
- Link to v5:
  https://lore.kernel.org/all/20251231075817.2611848-1-shuai.zhang@oss.qualcomm.com/

Changes v5
- Separate move WCN7850 and add WCN6855 fw name commit.
- remove WCN7850 unuseless condition.
- Link to v4:
  https://lore.kernel.org/all/20251226075621.3223336-1-shuai.zhang@oss.qualcomm.com/

Changed v4:
- move WCN7850 WA to the caller.
  handle cases where the firmware cannot be found.
- Link to v3
  https://lore.kernel.org/all/20251117021645.712753-1-shuai.zhang@oss.qualcomm.com/

changed v3:
- Remove CC satble
- Update commit
- add test steps and log
- Link to v2
  https://lore.kernel.org/all/20251114081751.3940541-2-shuai.zhang@oss.qualcomm.com/

Changes v2:
- Add Fixes tag.
- Add comments in the commit and code to explain the reason for the changes.
- Link to v1
  https://lore.kernel.org/all/20251112074638.1592864-1-quic_shuaz@quicinc.com/

Shuai Zhang (2):
  Bluetooth: btqca: move WCN7850 workaround to the caller
  Bluetooth: btqca: Add WCN6855 firmware priority selection feature

 drivers/bluetooth/btqca.c | 66 ++++++++++++++++++++++++---------------
 1 file changed, 41 insertions(+), 25 deletions(-)

-- 
2.34.1

[PATCH v7 1/1] Bluetooth: btqca: move WCN7850 workaround to the caller

[Shuai Zhang]

WCN7850 will first attempt to use ELF_TYPE_PATCH,
and if that fails, it will fall back to TLV_TYPE_PATCH.

To code uniformity, move WCN7850 workaround to the caller.

Signed-off-by: Shuai Zhang <shuai.zhang@oss.qualcomm.com>
---
 drivers/bluetooth/btqca.c | 37 +++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
index 7c958d606..0af3e2109 100644
--- a/drivers/bluetooth/btqca.c
+++ b/drivers/bluetooth/btqca.c
@@ -581,28 +581,11 @@ static int qca_download_firmware(struct hci_dev *hdev,
 
 	ret = request_firmware(&fw, config->fwname, &hdev->dev);
 	if (ret) {
-		/* For WCN6750, if mbn file is not present then check for
-		 * tlv file.
-		 */
-		if (soc_type == QCA_WCN6750 && config->type == ELF_TYPE_PATCH) {
-			bt_dev_dbg(hdev, "QCA Failed to request file: %s (%d)",
-				   config->fwname, ret);
-			config->type = TLV_TYPE_PATCH;
-			snprintf(config->fwname, sizeof(config->fwname),
-				 "qca/msbtfw%02x.tlv", rom_ver);
-			bt_dev_info(hdev, "QCA Downloading %s", config->fwname);
-			ret = request_firmware(&fw, config->fwname, &hdev->dev);
-			if (ret) {
-				bt_dev_err(hdev, "QCA Failed to request file: %s (%d)",
-					   config->fwname, ret);
-				return ret;
-			}
-		}
 		/* If the board-specific file is missing, try loading the default
 		 * one, unless that was attempted already.
 		 */
-		else if (config->type == TLV_TYPE_NVM &&
-			 qca_get_alt_nvm_file(config->fwname, sizeof(config->fwname))) {
+		if (config->type == TLV_TYPE_NVM &&
+		    qca_get_alt_nvm_file(config->fwname, sizeof(config->fwname))) {
 			bt_dev_info(hdev, "QCA Downloading %s", config->fwname);
 			ret = request_firmware(&fw, config->fwname, &hdev->dev);
 			if (ret) {
@@ -861,8 +844,22 @@ int qca_uart_setup(struct hci_dev *hdev, uint8_t baudrate,
 	}
 
 	err = qca_download_firmware(hdev, &config, soc_type, rom_ver);
+	/* For WCN6750, if mbn file is not present then check for
+	 * tlv file.
+	 */
+	if (err < 0 && soc_type == QCA_WCN6750) {
+		bt_dev_dbg(hdev, "QCA Failed to request file: %s (%d)",
+			   config.fwname, err);
+		config.type = TLV_TYPE_PATCH;
+		snprintf(config.fwname, sizeof(config.fwname),
+			 "qca/msbtfw%02x.tlv", rom_ver);
+		bt_dev_info(hdev, "QCA Downloading %s", config.fwname);
+		err = qca_download_firmware(hdev, &config, soc_type, rom_ver);
+	}
+
 	if (err < 0) {
-		bt_dev_err(hdev, "QCA Failed to download patch (%d)", err);
+		bt_dev_err(hdev, "QCA Failed to request file: %s (%d)",
+			   config.fwname, err);
 		return err;
 	}
 
-- 
2.34.1

Re: [PATCH v7 0/1] Bluetooth: btqca: move WCN7850 WA

[Dmitry Baryshkov]

On Tue, Jan 06, 2026 at 10:07:37AM +0800, Shuai Zhang wrote:
> Move WCN7850 workaround to the caller

Why have you lost the second patch?

> 
> Changes v7
> - Update the if logic for firmware retrieval failure.
> - Link to v6:
>   https://lore.kernel.org/all/20260105055646.3816296-1-shuai.zhang@oss.qualcomm.com/
> Changes v6
> - Add WCN7850 workaround details in the commit.
> - Reduce the logic nesting level.
> - Link to v5:
>   https://lore.kernel.org/all/20251231075817.2611848-1-shuai.zhang@oss.qualcomm.com/
> 
> Changes v5
> - Separate move WCN7850 and add WCN6855 fw name commit.
> - remove WCN7850 unuseless condition.
> - Link to v4:
>   https://lore.kernel.org/all/20251226075621.3223336-1-shuai.zhang@oss.qualcomm.com/
> 
> Changed v4:
> - move WCN7850 WA to the caller.
>   handle cases where the firmware cannot be found.
> - Link to v3
>   https://lore.kernel.org/all/20251117021645.712753-1-shuai.zhang@oss.qualcomm.com/
> 
> changed v3:
> - Remove CC satble
> - Update commit
> - add test steps and log
> - Link to v2
>   https://lore.kernel.org/all/20251114081751.3940541-2-shuai.zhang@oss.qualcomm.com/
> 
> Changes v2:
> - Add Fixes tag.
> - Add comments in the commit and code to explain the reason for the changes.
> - Link to v1
>   https://lore.kernel.org/all/20251112074638.1592864-1-quic_shuaz@quicinc.com/
> 
> Shuai Zhang (2):
>   Bluetooth: btqca: move WCN7850 workaround to the caller
>   Bluetooth: btqca: Add WCN6855 firmware priority selection feature
> 
>  drivers/bluetooth/btqca.c | 66 ++++++++++++++++++++++++---------------
>  1 file changed, 41 insertions(+), 25 deletions(-)
> 
> -- 
> 2.34.1
> 

-- 
With best wishes
Dmitry

Re: [PATCH v7 1/1] Bluetooth: btqca: move WCN7850 workaround to the caller

[Dmitry Baryshkov]

On Tue, Jan 06, 2026 at 10:07:38AM +0800, Shuai Zhang wrote:
> WCN7850 will first attempt to use ELF_TYPE_PATCH,
> and if that fails, it will fall back to TLV_TYPE_PATCH.
> 
> To code uniformity, move WCN7850 workaround to the caller.
> 
> Signed-off-by: Shuai Zhang <shuai.zhang@oss.qualcomm.com>
> ---
>  drivers/bluetooth/btqca.c | 37 +++++++++++++++++--------------------
>  1 file changed, 17 insertions(+), 20 deletions(-)
> 

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>


-- 
With best wishes
Dmitry

Re: [PATCH v7 0/1] Bluetooth: btqca: move WCN7850 WA

[Shuai Zhang]

Hi Dmitry

On 1/6/2026 10:16 AM, Dmitry Baryshkov wrote:
> On Tue, Jan 06, 2026 at 10:07:37AM +0800, Shuai Zhang wrote:
>> Move WCN7850 workaround to the caller
> Why have you lost the second patch?


I thought the second one had already been reviewed, so I didn’t need to 
submit it.

Do I need to submit a new version that includes both patches?


>> Changes v7
>> - Update the if logic for firmware retrieval failure.
>> - Link to v6:
>>    https://lore.kernel.org/all/20260105055646.3816296-1-shuai.zhang@oss.qualcomm.com/
>> Changes v6
>> - Add WCN7850 workaround details in the commit.
>> - Reduce the logic nesting level.
>> - Link to v5:
>>    https://lore.kernel.org/all/20251231075817.2611848-1-shuai.zhang@oss.qualcomm.com/
>>
>> Changes v5
>> - Separate move WCN7850 and add WCN6855 fw name commit.
>> - remove WCN7850 unuseless condition.
>> - Link to v4:
>>    https://lore.kernel.org/all/20251226075621.3223336-1-shuai.zhang@oss.qualcomm.com/
>>
>> Changed v4:
>> - move WCN7850 WA to the caller.
>>    handle cases where the firmware cannot be found.
>> - Link to v3
>>    https://lore.kernel.org/all/20251117021645.712753-1-shuai.zhang@oss.qualcomm.com/
>>
>> changed v3:
>> - Remove CC satble
>> - Update commit
>> - add test steps and log
>> - Link to v2
>>    https://lore.kernel.org/all/20251114081751.3940541-2-shuai.zhang@oss.qualcomm.com/
>>
>> Changes v2:
>> - Add Fixes tag.
>> - Add comments in the commit and code to explain the reason for the changes.
>> - Link to v1
>>    https://lore.kernel.org/all/20251112074638.1592864-1-quic_shuaz@quicinc.com/
>>
>> Shuai Zhang (2):
>>    Bluetooth: btqca: move WCN7850 workaround to the caller
>>    Bluetooth: btqca: Add WCN6855 firmware priority selection feature
>>
>>   drivers/bluetooth/btqca.c | 66 ++++++++++++++++++++++++---------------
>>   1 file changed, 41 insertions(+), 25 deletions(-)
>>
>> -- 
>> 2.34.1
>>

Re: [PATCH v7 0/1] Bluetooth: btqca: move WCN7850 WA

[Dmitry Baryshkov]

On Tue, 6 Jan 2026 at 04:21, Shuai Zhang <shuai.zhang@oss.qualcomm.com> wrote:
>
> Hi Dmitry
>
> On 1/6/2026 10:16 AM, Dmitry Baryshkov wrote:
> > On Tue, Jan 06, 2026 at 10:07:37AM +0800, Shuai Zhang wrote:
> >> Move WCN7850 workaround to the caller
> > Why have you lost the second patch?
>
>
> I thought the second one had already been reviewed, so I didn’t need to
> submit it.
>
> Do I need to submit a new version that includes both patches?

How else would it be merged if it is not submitted in the latest
version of the series?
Have you read Documentation/process/ ? Especially submitting-patches.rst?


-- 
With best wishes
Dmitry

Re: [PATCH v7 0/1] Bluetooth: btqca: move WCN7850 WA

[Shuai Zhang]

On 1/6/2026 10:32 AM, Dmitry Baryshkov wrote:
> On Tue, 6 Jan 2026 at 04:21, Shuai Zhang <shuai.zhang@oss.qualcomm.com> wrote:
>> Hi Dmitry
>>
>> On 1/6/2026 10:16 AM, Dmitry Baryshkov wrote:
>>> On Tue, Jan 06, 2026 at 10:07:37AM +0800, Shuai Zhang wrote:
>>>> Move WCN7850 workaround to the caller
>>> Why have you lost the second patch?
>>
>> I thought the second one had already been reviewed, so I didn’t need to
>> submit it.
>>
>> Do I need to submit a new version that includes both patches?
> How else would it be merged if it is not submitted in the latest
> version of the series?
> Have you read Documentation/process/ ? Especially submitting-patches.rst?


I will update the version, and I will carefully read the documentation 
again.

Thank you.


>

Re: [PATCH v7 0/1] Bluetooth: btqca: move WCN7850 WA

[patchwork-bot+bluetooth]

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

On Tue,  6 Jan 2026 10:07:37 +0800 you wrote:
> Move WCN7850 workaround to the caller
> 
> Changes v7
> - Update the if logic for firmware retrieval failure.
> - Link to v6:
>   https://lore.kernel.org/all/20260105055646.3816296-1-shuai.zhang@oss.qualcomm.com/
> Changes v6
> - Add WCN7850 workaround details in the commit.
> - Reduce the logic nesting level.
> - Link to v5:
>   https://lore.kernel.org/all/20251231075817.2611848-1-shuai.zhang@oss.qualcomm.com/
> 
> [...]

Here is the summary with links:
  - [v7,1/1] Bluetooth: btqca: move WCN7850 workaround to the caller
    https://git.kernel.org/bluetooth/bluetooth-next/c/d6af4afb70c9

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html