Linux v5.10.18

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2021-02-23 10:02:17 -06:00
parent ac8490438f
commit f586bfec61
3 changed files with 5 additions and 63 deletions

View File

@ -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}
@ -855,9 +855,6 @@ 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)
@ -2976,6 +2973,9 @@ fi
#
#
%changelog
* 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)

View File

@ -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

View File

@ -1,2 +1,2 @@
SHA512 (linux-5.10.tar.xz) = c28d52bc0c1e2c99017ceeca0bf2e622427f3416e0692090b01f65e3b3a5bce0e3e52ce3cee15d71e84fcb965bd48bdfcccb818c0105035d712ebd07afde9452
SHA512 (patch-5.10.17.xz) = ca800a311bbe5a3179fb7c097d590991eb80395e240b08bcceae671ca3270a19f87ce3ee76533b2d974b8329b506992dfe2b3f53fd15829e118d75c6e6d8e09b
SHA512 (patch-5.10.18.xz) = 96df42ef1b988415c3b1e48e86d173bdbf3d9a53b9e87ccb7efb01aff1dad9375a68833ea40aa083d94dd530797c2ca29650aab033d731f9ec2d303e47fdbec9