[PATCH stable 0/1] Bluetooth: btusb: Some Qualcomm Bluetooth adapters stop working

[PATCH stable 0/1] Bluetooth: btusb: Some Qualcomm Bluetooth adapters stop working

[Hans de Goede]

Hi Greg,

Here is a cherry-pick of a bluetooth fix which just landed in Linus' tree.

A lot of users are complaining about this:

https://bugzilla.kernel.org/show_bug.cgi?id=210681

It would be good if we can get this added to the 5.10.y and 5.11.y series.
Older kernels are not affected unless the commit mentioned by the Fixes
tag was backported.

I've based this cherry-pick on top of 5.10.y, it should also apply cleanly
to 5.11.y.

Regards,

Hans


Hui Wang (1):
  Bluetooth: btusb: Some Qualcomm Bluetooth adapters stop working

 drivers/bluetooth/btusb.c | 7 +++++++
 1 file changed, 7 insertions(+)

-- 
2.30.1

[PATCH stable 1/1] Bluetooth: btusb: Some Qualcomm Bluetooth adapters stop working

[Hans de Goede]

From: Hui Wang <hui.wang@canonical.com>

commit 234f414efd1164786269849b4fbb533d6c9cdbbf upstream.

This issue starts from linux-5.10-rc1, I reproduced this issue on my
Dell Inspiron 7447 with BT adapter 0cf3:e005, the kernel will print
out: "Bluetooth: hci0: don't support firmware rome 0x31010000", and
someone else also reported the similar issue to bugzilla #211571.

I found this is a regression introduced by 'commit b40f58b97386
("Bluetooth: btusb: Add Qualcomm Bluetooth SoC WCN6855 support"), the
patch assumed that if high ROM version is not zero, it is an adapter
on WCN6855, but many old adapters don't need to load rampatch or nvm,
and they have non-zero high ROM version.

To fix it, let the driver match the rom_version in the
qca_devices_table first, if there is no entry matched, check the
high ROM version, if it is not zero, we assume this adapter is ready
to work and no need to load rampatch and nvm like previously.

BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=211571
Fixes: b40f58b97386 ("Bluetooth: btusb: Add Qualcomm Bluetooth SoC WCN6855 support")
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---
 drivers/bluetooth/btusb.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 9f958699141e..1c942869baac 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3689,6 +3689,13 @@ static int btusb_setup_qca(struct hci_dev *hdev)
 			info = &qca_devices_table[i];
 	}
 	if (!info) {
+		/* If the rom_version is not matched in the qca_devices_table
+		 * and the high ROM version is not zero, we assume this chip no
+		 * need to load the rampatch and nvm.
+		 */
+		if (ver_rom & ~0xffffU)
+			return 0;
+
 		bt_dev_err(hdev, "don't support firmware rome 0x%x", ver_rom);
 		return -ENODEV;
 	}
-- 
2.30.1

Re: [PATCH stable 0/1] Bluetooth: btusb: Some Qualcomm Bluetooth adapters stop working

[Greg Kroah-Hartman]

On Thu, Feb 25, 2021 at 02:35:44PM +0100, Hans de Goede wrote:
> Hi Greg,
> 
> Here is a cherry-pick of a bluetooth fix which just landed in Linus' tree.
> 
> A lot of users are complaining about this:
> 
> https://bugzilla.kernel.org/show_bug.cgi?id=210681
> 
> It would be good if we can get this added to the 5.10.y and 5.11.y series.
> Older kernels are not affected unless the commit mentioned by the Fixes
> tag was backported.
> 
> I've based this cherry-pick on top of 5.10.y, it should also apply cleanly
> to 5.11.y.


This is already in the 5.10 and 5.11 -rc1 kernels I released a few hours
ago :)

thanks,

greg k-h

Re: [PATCH stable 0/1] Bluetooth: btusb: Some Qualcomm Bluetooth adapters stop working

[Hans de Goede]

Hi,

On 2/25/21 2:44 PM, Greg Kroah-Hartman wrote:
> On Thu, Feb 25, 2021 at 02:35:44PM +0100, Hans de Goede wrote:
>> Hi Greg,
>>
>> Here is a cherry-pick of a bluetooth fix which just landed in Linus' tree.
>>
>> A lot of users are complaining about this:
>>
>> https://bugzilla.kernel.org/show_bug.cgi?id=210681
>>
>> It would be good if we can get this added to the 5.10.y and 5.11.y series.
>> Older kernels are not affected unless the commit mentioned by the Fixes
>> tag was backported.
>>
>> I've based this cherry-pick on top of 5.10.y, it should also apply cleanly
>> to 5.11.y.
> 
> 
> This is already in the 5.10 and 5.11 -rc1 kernels I released a few hours
> ago :)

Ah, until now I had missed that there is a separate rc stable tree:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/

Well live and and learn I guess :)

Regards,

Hans