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 1684830e3..abade4c0c 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 4c4a7f5be455b62eab03af8d664b790a6453c999 Mon Sep 17 00:00:00 2001 +From 3dd39d5ab6b9c8e7bae488d7e9402838ade0d0dd Mon Sep 17 00:00:00 2001 From: popcornmix Date: Tue, 18 Feb 2014 01:43:50 -0300 -Subject: [PATCH 1/4] net/smsc95xx: Allow mac address to be set as a parameter +Subject: [PATCH 1/5] 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 4dcbf65a6..6e2438d84 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 fda1e1c741e44548eb6ef93f34d8e35487302c2e Mon Sep 17 00:00:00 2001 +From 080b8eca291350090c8a3e6f0d18ec42288606f0 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Mon, 7 Aug 2017 19:34:57 -0600 -Subject: [PATCH 2/4] arm64: dts: rockchip: disable pwm0 on rk3399-firefly +Subject: [PATCH 2/5] 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 081a2c042..abc784cef 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 049261c33ab0f5cb4156f5b9a894f30dcc50e2ab Mon Sep 17 00:00:00 2001 +From 3841c87af9043c6cacb22f571492b264124adc70 Mon Sep 17 00:00:00 2001 From: William Wu Date: Mon, 4 Dec 2017 10:40:39 +0100 -Subject: [PATCH 3/4] arm64: dts: rockchip: add usb3 controller node for RK3328 +Subject: [PATCH 3/5] 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 68c1a860b..10bcbcf8e 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 10446b4ecaee72bb5cdc437fcd73f1aea012e7cc Mon Sep 17 00:00:00 2001 +From eef9bbbcf5751718b6b310b7dfe742015a66ea03 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Mon, 4 Dec 2017 10:40:41 +0100 -Subject: [PATCH 4/4] arm64: dts: rockchip: enable usb3 nodes on rk3328-rock64 +Subject: [PATCH 4/5] 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-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch b/core/linux-aarch64/0005-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch new file mode 100644 index 000000000..a527d3adc --- /dev/null +++ b/core/linux-aarch64/0005-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch @@ -0,0 +1,118 @@ +From 4e7ac3b7bd1155f8c4b753706a8f65b673d87ef8 Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich +Date: Mon, 1 Feb 2021 17:10:32 -0700 +Subject: [PATCH 5/5] Revert "SUNRPC: Handle TCP socket sends with + kernel_sendpage() again" + +This reverts commit 00ee972739fb2526d3936f1e7ccfc8c91d250c60. +--- + net/sunrpc/svcsock.c | 86 +------------------------------------------- + 1 file changed, 1 insertion(+), 85 deletions(-) + +diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c +index 4404c491eb38..c2752e2b9ce3 100644 +--- a/net/sunrpc/svcsock.c ++++ b/net/sunrpc/svcsock.c +@@ -1062,90 +1062,6 @@ static int svc_tcp_recvfrom(struct svc_rqst *rqstp) + return 0; /* record not complete */ + } + +-static int svc_tcp_send_kvec(struct socket *sock, const struct kvec *vec, +- int flags) +-{ +- return kernel_sendpage(sock, virt_to_page(vec->iov_base), +- offset_in_page(vec->iov_base), +- vec->iov_len, flags); +-} +- +-/* +- * kernel_sendpage() is used exclusively to reduce the number of +- * copy operations in this path. Therefore the caller must ensure +- * that the pages backing @xdr are unchanging. +- * +- * In addition, the logic assumes that * .bv_len is never larger +- * than PAGE_SIZE. +- */ +-static int svc_tcp_sendmsg(struct socket *sock, struct msghdr *msg, +- struct xdr_buf *xdr, rpc_fraghdr marker, +- unsigned int *sentp) +-{ +- const struct kvec *head = xdr->head; +- const struct kvec *tail = xdr->tail; +- struct kvec rm = { +- .iov_base = &marker, +- .iov_len = sizeof(marker), +- }; +- int flags, ret; +- +- *sentp = 0; +- xdr_alloc_bvec(xdr, GFP_KERNEL); +- +- msg->msg_flags = MSG_MORE; +- ret = kernel_sendmsg(sock, msg, &rm, 1, rm.iov_len); +- if (ret < 0) +- return ret; +- *sentp += ret; +- if (ret != rm.iov_len) +- return -EAGAIN; +- +- flags = head->iov_len < xdr->len ? MSG_MORE | MSG_SENDPAGE_NOTLAST : 0; +- ret = svc_tcp_send_kvec(sock, head, flags); +- if (ret < 0) +- return ret; +- *sentp += ret; +- if (ret != head->iov_len) +- goto out; +- +- if (xdr->page_len) { +- unsigned int offset, len, remaining; +- struct bio_vec *bvec; +- +- bvec = xdr->bvec; +- offset = 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); +- ret = kernel_sendpage(sock, bvec->bv_page, +- bvec->bv_offset + offset, +- len, flags); +- if (ret < 0) +- return ret; +- *sentp += ret; +- if (ret != len) +- goto out; +- remaining -= len; +- offset = 0; +- bvec++; +- } +- } +- +- if (tail->iov_len) { +- ret = svc_tcp_send_kvec(sock, tail, 0); +- if (ret < 0) +- return ret; +- *sentp += ret; +- } +- +-out: +- return 0; +-} +- + /** + * svc_tcp_sendto - Send out a reply on a TCP socket + * @rqstp: completed svc_rqst +@@ -1173,7 +1089,7 @@ static int svc_tcp_sendto(struct svc_rqst *rqstp) + mutex_lock(&xprt->xpt_mutex); + if (svc_xprt_is_dead(xprt)) + goto out_notconn; +- err = svc_tcp_sendmsg(svsk->sk_sock, &msg, xdr, marker, &sent); ++ err = xprt_sock_sendmsg(svsk->sk_sock, &msg, xdr, 0, marker, &sent); + xdr_free_bvec(xdr); + trace_svcsock_tcp_send(xprt, err < 0 ? err : sent); + if (err < 0 || sent != (xdr->len + sizeof(marker))) +-- +2.30.0 + diff --git a/core/linux-aarch64/PKGBUILD b/core/linux-aarch64/PKGBUILD index 4e4744d0b..435522c24 100644 --- a/core/linux-aarch64/PKGBUILD +++ b/core/linux-aarch64/PKGBUILD @@ -8,7 +8,7 @@ _srcname=linux-5.10 _kernelname=${pkgbase#linux} _desc="AArch64 multi-platform" pkgver=5.10.12 -pkgrel=1 +pkgrel=2 arch=('aarch64') url="http://www.kernel.org/" license=('GPL2') @@ -20,6 +20,7 @@ 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-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch' 'config' 'kernel.its' 'kernel.keyblock' @@ -29,10 +30,11 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" '90-linux.hook') md5sums=('753adc474bf799d569dec4f165ed92c3' 'd08e416054060a5a61f75c6a711a756c' - 'f9b6f367eef351eaa89b23a9b1ffc5a2' - '369fb1dd626c4e0a4a7e068d27dd51c8' - '1553fe4abbe675ed8abd4644561d8e8c' - '9844db3484f4d4fa3e63c7e083f656f7' + '998a9695fc1f087bdf36235be76c2a00' + 'e59ef0ca63069a6b225ba3657ad17dfb' + '9515506fd25e5497cf9164058d4766b1' + '0cf880d04f4e28cc34721681088b7842' + 'e7f18ff5afd6bf512154f725eac99021' 'e27a16b8cb7d1abfb9921baa1451ec72' '7f1a96e24f5150f790df94398e9525a3' '61c5ff73c136ed07a7aadbf58db3d96a' @@ -52,6 +54,7 @@ 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-Revert-SUNRPC-Handle-TCP-socket-sends-with-kernel_se.patch cat "${srcdir}/config" > ./.config