diff options
| -rw-r--r-- | SOURCES/bluetooth-btusb-qca-fix.patch | 51 | ||||
| -rw-r--r-- | SOURCES/media-pwc-fix-the-urb-buffer-allocation.patch | 58 | ||||
| -rw-r--r-- | SPECS/kernel.spec | 20 |
3 files changed, 64 insertions, 65 deletions
diff --git a/SOURCES/bluetooth-btusb-qca-fix.patch b/SOURCES/bluetooth-btusb-qca-fix.patch new file mode 100644 index 0000000..d770639 --- /dev/null +++ b/SOURCES/bluetooth-btusb-qca-fix.patch @@ -0,0 +1,51 @@ +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 + diff --git a/SOURCES/media-pwc-fix-the-urb-buffer-allocation.patch b/SOURCES/media-pwc-fix-the-urb-buffer-allocation.patch deleted file mode 100644 index 413868b..0000000 --- a/SOURCES/media-pwc-fix-the-urb-buffer-allocation.patch +++ /dev/null @@ -1,58 +0,0 @@ -From MAILER-DAEMON Wed Jan 27 14:16:57 2021 -From: Takashi Iwai <tiwai@suse.de> -To: Hans Verkuil <hverkuil@xs4all.nl> -Cc: Mauro Carvalho Chehab <mchehab@kernel.org>, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org -Subject: [PATCH] media: pwc: Fix the URB buffer allocation -Date: Thu, 21 Jan 2021 21:28:55 +0100 -Message-Id: <20210121202855.17400-1-tiwai@suse.de> -List-ID: <linux-media.vger.kernel.org> -X-Mailing-List: linux-media@vger.kernel.org -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 7bit - -The URB buffer allocation of pwc driver involves with the -dma_map_single(), and it needs to pass the right device. Currently it -passes usb_device.dev, but it's no real device that manages the DMA. -Since the passed device has no DMA mask set up, now the pwc driver -hits the WARN_ON_ONCE() check in dma_map_page_attrs() (that was -introduced in 5.10), resulting in an error at URB allocations. -Eventually this ended up with the black output. - -This patch fixes the bug by passing the proper device, the bus -controller, to make the URB allocation and map working again. - -Signed-off-by: Takashi Iwai <tiwai@suse.de> -Reviewed-by: Robert Foss <robert.foss@linaro.org> -Cc: <stable@vger.kernel.org> -BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1181133 ---- - drivers/media/usb/pwc/pwc-if.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c -index 61869636ec61..d771160bb168 100644 ---- a/drivers/media/usb/pwc/pwc-if.c -+++ b/drivers/media/usb/pwc/pwc-if.c -@@ -461,7 +461,7 @@ static int pwc_isoc_init(struct pwc_device *pdev) - urb->pipe = usb_rcvisocpipe(udev, pdev->vendpoint); - urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP; - urb->transfer_buffer_length = ISO_BUFFER_SIZE; -- urb->transfer_buffer = pwc_alloc_urb_buffer(&udev->dev, -+ urb->transfer_buffer = pwc_alloc_urb_buffer(udev->bus->controller, - urb->transfer_buffer_length, - &urb->transfer_dma); - if (urb->transfer_buffer == NULL) { -@@ -524,7 +524,7 @@ static void pwc_iso_free(struct pwc_device *pdev) - if (urb) { - PWC_DEBUG_MEMORY("Freeing URB\n"); - if (urb->transfer_buffer) -- pwc_free_urb_buffer(&urb->dev->dev, -+ pwc_free_urb_buffer(urb->dev->bus->controller, - urb->transfer_buffer_length, - urb->transfer_buffer, - urb->transfer_dma); --- -2.26.2 - - diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index f3beab0..ca7ea45 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -94,7 +94,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 17 +%define stable_update 18 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -206,7 +206,7 @@ Summary: The Linux kernel %if 0%{?fedora} # Kernel headers are being split out into a separate package -%define with_headers 1 +%define with_headers 0 %define with_cross_headers 0 # no selftests for now %define with_selftests 0 @@ -855,11 +855,11 @@ Patch105: arm-dts-rpi-4-disable-wifi-frequencies.patch # Nouveau mDP detection fix Patch107: 0001-drm-nouveau-kms-handle-mDP-connectors.patch -# rhbz 1918778 -Patch108: media-pwc-fix-the-urb-buffer-allocation.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 + # linux-fsync patches Patch200: zen.patch Patch201: futex2.patch @@ -2977,8 +2977,14 @@ fi # # %changelog -* Sun Feb 21 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.10.17-201.fsync -- Linux v5.10.17 futex2 zen +* Sat Feb 27 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.10.18-201.fsync +- Linux v5.10.18 futex2 zen + +* Tue Feb 23 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.18-200 +- Linux v5.10.18 + +* Thu Feb 18 2021 Hans de Goede <hdegoede@redhat.com> +- Fix various QCA bluetooth devices no longer working (rhbz#1916104) * Wed Feb 17 2021 Justin M. Forbes <jforbes@fedoraproject.org> - 5.10.17-200 - Linux v5.10.17 |