archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-08 22:45:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/linux-rpi to 5.15.30-2

Browse source 
Closes #1911

Upstream bug report: https://github.com/raspberrypi/linux/issues/4930
This commit is contained in:
graysky 2022-03-22 07:36:21 -04:00
parent b8c256e75d
commit b7d429b342
2 changed files with 68 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
core/linux-rpi/0002-Revert-usb-xhci-expand-the-scope-of-XHCI_VLI_SS_BULK.patch Normal file
View file

@ -0,0 +1,60 @@
From fcd5dced618c4e0931544e98a02bfe4a3814194b Mon Sep 17 00:00:00 2001
From: graysky <graysky@archlinux.us>
Date: Tue, 22 Mar 2022 07:30:52 -0400
Subject: [PATCH] Revert "usb: xhci: expand the scope of
XHCI_VLI_SS_BULK_OUT_BUG"
This reverts commit 40686d87f87a46b3abf48a8dcaee5e0a031deafb.
See: https://github.com/raspberrypi/linux/issues/4930
---
drivers/usb/host/xhci.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index dc0651828f97..45dfdcdc9f30 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1395,12 +1395,9 @@ static void xhci_unmap_temp_buf(struct usb_hcd *hcd, struct urb *urb)
static int xhci_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,
gfp_t mem_flags)
{
- unsigned int i, maxpacket;
- struct scatterlist *sg;
struct xhci_hcd *xhci;
xhci = hcd_to_xhci(hcd);
- maxpacket = usb_endpoint_maxp(&urb->ep->desc);
if (xhci_urb_suitable_for_idt(urb))
return 0;
@@ -1409,16 +1406,6 @@ static int xhci_map_urb_for_dma(struct usb_hcd *hcd, struct urb *urb,
if (xhci_urb_temp_buffer_required(hcd, urb))
return xhci_map_temp_buffer(hcd, urb);
}
-
- if (xhci->quirks & XHCI_VLI_SS_BULK_OUT_BUG &&
- usb_endpoint_is_bulk_out(&urb->ep->desc) &&
- urb->dev->speed >= USB_SPEED_SUPER &&
- urb->transfer_buffer_length != 0) {
- for_each_sg(urb->sg, sg, urb->num_sgs, i) {
- if (sg->length % maxpacket)
- return xhci_map_temp_buffer(hcd, urb);
- }
- }
return usb_hcd_map_urb_for_dma(hcd, urb, mem_flags);
}
@@ -1432,8 +1419,7 @@ static void xhci_unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb)
if (urb->num_sgs && (urb->transfer_flags & URB_DMA_MAP_SINGLE))
unmap_temp_buf = true;
- if ((xhci->quirks & (XHCI_SG_TRB_CACHE_SIZE_QUIRK | XHCI_VLI_SS_BULK_OUT_BUG))
- && unmap_temp_buf)
+ if ((xhci->quirks & XHCI_SG_TRB_CACHE_SIZE_QUIRK) && unmap_temp_buf)
xhci_unmap_temp_buf(hcd, urb);
else
usb_hcd_unmap_urb_for_dma(hcd, urb);
--
2.35.1

11
core/linux-rpi/PKGBUILD
View file

@ -5,11 +5,11 @@
# Contributer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
pkgbase=linux-rpi
_commit=87ed6172fdf2f5502b7c9372d9402ecbb6d78178
_commit=19eba34ac7cbf8af662fa8b01d8dcaf96c5f651c
_srcname=linux-${_commit}
_kernelname=${pkgbase#linux}
pkgver=5.15.30
pkgrel=1
pkgrel=2
pkgdesc='Linux'
url="http://www.kernel.org/"
arch=(armv7h aarch64)
@ -23,13 +23,15 @@ source_aarch64=('config8' 'config8.txt')
source=("linux-$pkgver-${_commit:0:10}.tar.gz::https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz"
cmdline.txt
0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch
0002-Revert-usb-xhci-expand-the-scope-of-XHCI_VLI_SS_BULK.patch
linux.preset
60-linux.hook
90-linux.hook
)
md5sums=('da2fa0b2f924898311af80b49abcec30'
md5sums=('0537db3b6e46e892d31e8344fda05c86'
'31c02f4518d46deb5f0c2ad1f8b083cd'
'f66a7ea3feb708d398ef57e4da4815e9'
'd4d4cd91d24ffcd44ea3065621a98f73'
'86d4a35722b5410e3b29fc92dae15d4b'
'0a5f16bfec6ad982a2f6782724cca8ba'
'441ec084c47cddc53e592fb0cbce4edf')
@ -51,6 +53,9 @@ prepare() {
# consistent behavior of lscpu on arm/arm64
patch -Np1 -i ../0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch
# https://github.com/raspberrypi/linux/issues/4930
patch -Np1 -i ../0002-Revert-usb-xhci-expand-the-scope-of-XHCI_VLI_SS_BULK.patch
echo "Setting version..."
scripts/setlocalversion --save-scmversion
echo "-$pkgrel" > localversion.10-pkgrel