From 8abea2250236f896fe07b9773d9d938f739b39eb Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 13 Feb 2021 19:20:26 +0000 Subject: [PATCH] core/linux-aarch64 to 5.10.16-1 closes #1852 --- ...ow-mac-address-to-be-set-as-a-parame.patch | 4 +- ...kchip-disable-pwm0-on-rk3399-firefly.patch | 4 +- ...ip-add-usb3-controller-node-for-RK33.patch | 4 +- ...ip-enable-usb3-nodes-on-rk3328-rock6.patch | 4 +- ...EADs-that-start-at-non-page-aligned-.patch | 52 ------------------- core/linux-aarch64/PKGBUILD | 17 +++--- core/linux-aarch64/config | 20 +++---- 7 files changed, 25 insertions(+), 80 deletions(-) delete mode 100644 core/linux-aarch64/0005-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch diff --git a/core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch index 57db693f9..75d6973f2 100644 --- a/core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch +++ b/core/linux-aarch64/0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch @@ -1,7 +1,7 @@ -From 719f6957c15bc157f5f9c9008f65dd2e1c1c4a4c Mon Sep 17 00:00:00 2001 +From 4b574ebf0b2740a10a8720fdbdc9d657bd70a723 Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Feb 2014 01:43:50 -0300 -Subject: [PATCH 1/5] net/smsc95xx: Allow mac address to be set as a parameter +Subject: [PATCH 1/4] net/smsc95xx: Allow mac address to be set as a parameter --- drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++ diff --git a/core/linux-aarch64/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch b/core/linux-aarch64/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch index 4960449bc..0c56f9126 100644 --- a/core/linux-aarch64/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch +++ b/core/linux-aarch64/0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch @@ -1,7 +1,7 @@ -From 3bb4e6195174c95571be71628a0d1933186c1939 Mon Sep 17 00:00:00 2001 +From c8cf599302082d2b963e62bf820844e52f98014c Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Mon, 7 Aug 2017 19:34:57 -0600 -Subject: [PATCH 2/5] arm64: dts: rockchip: disable pwm0 on rk3399-firefly +Subject: [PATCH 2/4] arm64: dts: rockchip: disable pwm0 on rk3399-firefly Workaround for intermittent boot hangs due to pwm0 probe disabling the PWM clock. --- diff --git a/core/linux-aarch64/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch b/core/linux-aarch64/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch index 5a258bfa4..b4f376d03 100644 --- a/core/linux-aarch64/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch +++ b/core/linux-aarch64/0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch @@ -1,7 +1,7 @@ -From e081295d2c1920bf5a358e54eeeb7a64106298c2 Mon Sep 17 00:00:00 2001 +From 9b632167c5d62dccbb1cd62a609652a44477c0c6 Mon Sep 17 00:00:00 2001 From: William Wu Date: Mon, 4 Dec 2017 10:40:39 +0100 -Subject: [PATCH 3/5] arm64: dts: rockchip: add usb3 controller node for RK3328 +Subject: [PATCH 3/4] arm64: dts: rockchip: add usb3 controller node for RK3328 SoCs RK3328 has one USB 3.0 OTG controller which uses DWC_USB3 diff --git a/core/linux-aarch64/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch b/core/linux-aarch64/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch index 987e4adbe..3d2989247 100644 --- a/core/linux-aarch64/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch +++ b/core/linux-aarch64/0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch @@ -1,7 +1,7 @@ -From 6db831f5625aa64fd451ec55722d057b9e3b4592 Mon Sep 17 00:00:00 2001 +From 34bc056764e50e9ee97730c9356dc0d0e052e738 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Mon, 4 Dec 2017 10:40:41 +0100 -Subject: [PATCH 4/5] arm64: dts: rockchip: enable usb3 nodes on rk3328-rock64 +Subject: [PATCH 4/4] arm64: dts: rockchip: enable usb3 nodes on rk3328-rock64 Enable the nodes to make the usb3 port usable on that board. diff --git a/core/linux-aarch64/0005-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch b/core/linux-aarch64/0005-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch deleted file mode 100644 index bc023583d..000000000 --- a/core/linux-aarch64/0005-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b9b847f63866bd1243e39ba3c91188a78e8eb29b Mon Sep 17 00:00:00 2001 -From: Chuck Lever -Date: Sun, 31 Jan 2021 16:16:23 -0500 -Subject: [PATCH 5/5] SUNRPC: Fix NFS READs that start at non-page-aligned - offsets - -Anj Duvnjak reports that the Kodi.tv NFS client is not able to read -video files from a v5.10.11 Linux NFS server. - -The new sendpage-based TCP sendto logic was not attentive to non- -zero page_base values. nfsd_splice_read() sets that field when a -READ payload starts in the middle of a page. - -The Linux NFS client rarely emits an NFS READ that is not page- -aligned. All of my testing so far has been with Linux clients, so I -missed this one. - -Reported-by: A. Duvnjak -BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=211471 -Fixes: 4a85a6a3320b ("SUNRPC: Handle TCP socket sends with kernel_sendpage() again") -Signed-off-by: Chuck Lever -Tested-by: A. Duvnjak ---- - net/sunrpc/svcsock.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c -index 4404c491eb38..fa7b7ae2c2c5 100644 ---- a/net/sunrpc/svcsock.c -+++ b/net/sunrpc/svcsock.c -@@ -1113,14 +1113,15 @@ static int svc_tcp_sendmsg(struct socket *sock, struct msghdr *msg, - unsigned int offset, len, remaining; - struct bio_vec *bvec; - -- bvec = xdr->bvec; -- offset = xdr->page_base; -+ bvec = xdr->bvec + (xdr->page_base >> PAGE_SHIFT); -+ offset = offset_in_page(xdr->page_base); - remaining = xdr->page_len; - flags = MSG_MORE | MSG_SENDPAGE_NOTLAST; - while (remaining > 0) { - if (remaining <= PAGE_SIZE && tail->iov_len == 0) - flags = 0; -- len = min(remaining, bvec->bv_len); -+ -+ len = min(remaining, bvec->bv_len - offset); - ret = kernel_sendpage(sock, bvec->bv_page, - bvec->bv_offset + offset, - len, flags); --- -2.30.0 - diff --git a/core/linux-aarch64/PKGBUILD b/core/linux-aarch64/PKGBUILD index c9b299c12..921cd9ca4 100644 --- a/core/linux-aarch64/PKGBUILD +++ b/core/linux-aarch64/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=linux-aarch64 _srcname=linux-5.10 _kernelname=${pkgbase#linux} _desc="AArch64 multi-platform" -pkgver=5.10.14 +pkgver=5.10.16 pkgrel=1 arch=('aarch64') url="http://www.kernel.org/" @@ -20,7 +20,6 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" '0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch' '0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch' '0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch' - '0005-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch' 'config' 'kernel.its' 'kernel.keyblock' @@ -29,13 +28,12 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" '60-linux.hook' '90-linux.hook') md5sums=('753adc474bf799d569dec4f165ed92c3' - 'd928049c6149ed507afbb72c90cb2dc2' - 'fbfba70a9530fe94fa2e4054c239e9b5' - '80c74384ff32418453ebe2afe545217c' - '0fd5ae1152c26f10843ba1dfcb940adc' - '046c2cb1c6c6e9e09d1428f3cabe6c79' - 'dfc8b7a3bd94c4ab8560944b76e4130f' - 'e27a16b8cb7d1abfb9921baa1451ec72' + '6eb3cfa9872f7c0cbc59e5c17eca854c' + 'ca6d37359e12aadec3ff3c13fbe7cc6c' + '9834da938723cde2f09b80ee9c2db88d' + 'a29581bb41d263dd1fce4b98b7ac77b2' + '78b533d939dd429057d3388e6d49c627' + 'f39e3a4e6e7ee88b79621e9711459bbb' '7f1a96e24f5150f790df94398e9525a3' '61c5ff73c136ed07a7aadbf58db3d96a' '584777ae88bce2c5659960151b64c7d8' @@ -54,7 +52,6 @@ prepare() { git apply ../0002-arm64-dts-rockchip-disable-pwm0-on-rk3399-firefly.patch git apply ../0003-arm64-dts-rockchip-add-usb3-controller-node-for-RK33.patch git apply ../0004-arm64-dts-rockchip-enable-usb3-nodes-on-rk3328-rock6.patch - git apply ../0005-SUNRPC-Fix-NFS-READs-that-start-at-non-page-aligned-.patch cat "${srcdir}/config" > ./.config diff --git a/core/linux-aarch64/config b/core/linux-aarch64/config index 7877560e3..108bef809 100644 --- a/core/linux-aarch64/config +++ b/core/linux-aarch64/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.12-1 Kernel Configuration +# Linux/arm64 5.10.16-1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -1606,26 +1606,26 @@ CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TEQL=m CONFIG_NET_SCH_TBF=m CONFIG_NET_SCH_CBS=m -# CONFIG_NET_SCH_ETF is not set -# CONFIG_NET_SCH_TAPRIO is not set +CONFIG_NET_SCH_ETF=m +CONFIG_NET_SCH_TAPRIO=m CONFIG_NET_SCH_GRED=m CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_DRR=m CONFIG_NET_SCH_MQPRIO=m -# CONFIG_NET_SCH_SKBPRIO is not set +CONFIG_NET_SCH_SKBPRIO=m CONFIG_NET_SCH_CHOKE=m CONFIG_NET_SCH_QFQ=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_FQ_CODEL=y -# CONFIG_NET_SCH_CAKE is not set +CONFIG_NET_SCH_CAKE=m CONFIG_NET_SCH_FQ=m CONFIG_NET_SCH_HHF=m CONFIG_NET_SCH_PIE=m -# CONFIG_NET_SCH_FQ_PIE is not set +CONFIG_NET_SCH_FQ_PIE=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_PLUG=m -# CONFIG_NET_SCH_ETS is not set +CONFIG_NET_SCH_ETS=m # CONFIG_NET_SCH_DEFAULT is not set # @@ -1672,12 +1672,12 @@ CONFIG_NET_ACT_CSUM=m CONFIG_NET_ACT_VLAN=m CONFIG_NET_ACT_BPF=m CONFIG_NET_ACT_CONNMARK=m -# CONFIG_NET_ACT_CTINFO is not set +CONFIG_NET_ACT_CTINFO=m CONFIG_NET_ACT_SKBMOD=m CONFIG_NET_ACT_IFE=m CONFIG_NET_ACT_TUNNEL_KEY=m -# CONFIG_NET_ACT_CT is not set -# CONFIG_NET_ACT_GATE is not set +CONFIG_NET_ACT_CT=m +CONFIG_NET_ACT_GATE=m CONFIG_NET_IFE_SKBMARK=m CONFIG_NET_IFE_SKBPRIO=m CONFIG_NET_IFE_SKBTCINDEX=m