Linux v5.10.19
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
parent
d787235acb
commit
3aecce4192
|
@ -1,51 +0,0 @@
|
||||||
From 28ddef379ecc0ab1ae646f6442cfa839ab9a15b2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Hui Wang <hui.wang@canonical.com>
|
|
||||||
Date: Mon, 8 Feb 2021 13:02:37 +0800
|
|
||||||
Subject: [PATCH 5.12 regression fix] Bluetooth: btusb: Some Qualcomm Bluetooth
|
|
||||||
adapters stop working
|
|
||||||
|
|
||||||
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 80468745d5c5..1c128de99abd 100644
|
|
||||||
--- a/drivers/bluetooth/btusb.c
|
|
||||||
+++ b/drivers/bluetooth/btusb.c
|
|
||||||
@@ -3693,6 +3693,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
|
|
||||||
|
|
|
@ -94,7 +94,7 @@ Summary: The Linux kernel
|
||||||
%if 0%{?released_kernel}
|
%if 0%{?released_kernel}
|
||||||
|
|
||||||
# Do we have a -stable update to apply?
|
# Do we have a -stable update to apply?
|
||||||
%define stable_update 18
|
%define stable_update 19
|
||||||
# Set rpm version accordingly
|
# Set rpm version accordingly
|
||||||
%if 0%{?stable_update}
|
%if 0%{?stable_update}
|
||||||
%define stablerev %{stable_update}
|
%define stablerev %{stable_update}
|
||||||
|
@ -857,9 +857,6 @@ Patch107: 0001-drm-nouveau-kms-handle-mDP-connectors.patch
|
||||||
|
|
||||||
Patch109: 0001-Revert-drm-amd-display-Update-NV1x-SR-latency-values.patch
|
Patch109: 0001-Revert-drm-amd-display-Update-NV1x-SR-latency-values.patch
|
||||||
|
|
||||||
# rhbz 1916104 (patch from bluetooth-next)
|
|
||||||
Patch110: bluetooth-btusb-qca-fix.patch
|
|
||||||
|
|
||||||
# rhbz 1925346
|
# rhbz 1925346
|
||||||
Patch111: i915-fixes.patch
|
Patch111: i915-fixes.patch
|
||||||
|
|
||||||
|
@ -2976,6 +2973,9 @@ fi
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 26 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.19-200
|
||||||
|
- Linux v5.10.19
|
||||||
|
|
||||||
* Thu Feb 25 2021 Justin M. Forbes <jforbes@fedoraproject.org>
|
* Thu Feb 25 2021 Justin M. Forbes <jforbes@fedoraproject.org>
|
||||||
- Some i915 fixes for 5.10 (rhbz 1925346)
|
- Some i915 fixes for 5.10 (rhbz 1925346)
|
||||||
|
|
||||||
|
|
2
sources
2
sources
|
@ -1,2 +1,2 @@
|
||||||
SHA512 (linux-5.10.tar.xz) = c28d52bc0c1e2c99017ceeca0bf2e622427f3416e0692090b01f65e3b3a5bce0e3e52ce3cee15d71e84fcb965bd48bdfcccb818c0105035d712ebd07afde9452
|
SHA512 (linux-5.10.tar.xz) = c28d52bc0c1e2c99017ceeca0bf2e622427f3416e0692090b01f65e3b3a5bce0e3e52ce3cee15d71e84fcb965bd48bdfcccb818c0105035d712ebd07afde9452
|
||||||
SHA512 (patch-5.10.18.xz) = 96df42ef1b988415c3b1e48e86d173bdbf3d9a53b9e87ccb7efb01aff1dad9375a68833ea40aa083d94dd530797c2ca29650aab033d731f9ec2d303e47fdbec9
|
SHA512 (patch-5.10.19.xz) = 9637f8dac379ffa6d376afcce8da87250eb48a6a2ffac0e5732884cca2cc2f0a85811fc326f006d2d297680ff7dcf726665360d9c7d5d34307bc3e7169ce6a7a
|
||||||
|
|
Loading…
Reference in New Issue