From cddd4591404fb4c53dc0b3c0b15b942cdbed4356 Mon Sep 17 00:00:00 2001 From: Yangbo Lu Date: Fri, 10 Apr 2020 10:47:05 +0800 Subject: layerscape: add patches-5.4 Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu --- ...vshmem-net-set-and-check-descriptor-flags.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 target/linux/layerscape/patches-5.4/809-jailhouse-0014-ivshmem-net-set-and-check-descriptor-flags.patch (limited to 'target/linux/layerscape/patches-5.4/809-jailhouse-0014-ivshmem-net-set-and-check-descriptor-flags.patch') diff --git a/target/linux/layerscape/patches-5.4/809-jailhouse-0014-ivshmem-net-set-and-check-descriptor-flags.patch b/target/linux/layerscape/patches-5.4/809-jailhouse-0014-ivshmem-net-set-and-check-descriptor-flags.patch new file mode 100644 index 0000000000..b33975b306 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/809-jailhouse-0014-ivshmem-net-set-and-check-descriptor-flags.patch @@ -0,0 +1,39 @@ +From 3661172f5786a3d2ebe1d2244f1f08a95e1cfd09 Mon Sep 17 00:00:00 2001 +From: Henning Schild +Date: Mon, 18 Sep 2017 18:02:11 +0200 +Subject: [PATCH] ivshmem-net: set and check descriptor flags + +We do not support the use of any flags. Make sure the remote does not +confuse us using flags. + +Signed-off-by: Henning Schild +[Jan: Remove wrong removal of next field initialization] +Signed-off-by: Jan Kiszka +(cherry picked from commit 986d58d84245e023a1a66ab6495b354b6b8cd2f0) +--- + drivers/net/ivshmem-net.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/net/ivshmem-net.c ++++ b/drivers/net/ivshmem-net.c +@@ -123,8 +123,12 @@ static void *ivshm_net_desc_data(struct + { + u64 offs = READ_ONCE(desc->addr); + u32 dlen = READ_ONCE(desc->len); ++ u16 flags = READ_ONCE(desc->flags); + void *data; + ++ if (flags) ++ return NULL; ++ + if (offs >= in->shmlen) + return NULL; + +@@ -317,6 +321,7 @@ static int ivshm_net_tx_frame(struct net + + desc->addr = buf - in->shm; + desc->len = skb->len; ++ desc->flags = 0; + + avail = tx->last_avail_idx++ & (vr->num - 1); + vr->avail->ring[avail] = desc_idx; -- cgit v1.2.3