diff options
author | Yangbo Lu <yangbo.lu@nxp.com> | 2020-04-10 10:47:05 +0800 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2020-05-07 12:53:06 +0200 |
commit | cddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch) | |
tree | 392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/809-jailhouse-0010-ivshmem-net-Switch-to-relative-descriptor-addresses.patch | |
parent | d1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff) | |
download | upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2 upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip |
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 <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/809-jailhouse-0010-ivshmem-net-Switch-to-relative-descriptor-addresses.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/809-jailhouse-0010-ivshmem-net-Switch-to-relative-descriptor-addresses.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/809-jailhouse-0010-ivshmem-net-Switch-to-relative-descriptor-addresses.patch b/target/linux/layerscape/patches-5.4/809-jailhouse-0010-ivshmem-net-Switch-to-relative-descriptor-addresses.patch new file mode 100644 index 0000000000..a2554c7166 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/809-jailhouse-0010-ivshmem-net-Switch-to-relative-descriptor-addresses.patch @@ -0,0 +1,45 @@ +From dd462c6eb2ba6af01ae38644183216c4d5603d90 Mon Sep 17 00:00:00 2001 +From: Jan Kiszka <jan.kiszka@siemens.com> +Date: Tue, 3 Jan 2017 08:50:01 +0100 +Subject: [PATCH] ivshmem-net: Switch to relative descriptor addresses + +Make sure that we do not depend on identity-mapped shared memory +regions. + +This also fixes an off-by-one in the range check of ivshm_net_desc_data. + +Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> +(cherry picked from commit fe9c9dd6373892591a7d6b165c3c43045eb349c1) +--- + drivers/net/ivshmem-net.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/net/ivshmem-net.c ++++ b/drivers/net/ivshmem-net.c +@@ -123,14 +123,14 @@ static void *ivshm_net_desc_data(struct + struct vring_desc *desc, + u32 *len) + { +- u64 addr = READ_ONCE(desc->addr); ++ u64 offs = READ_ONCE(desc->addr); + u32 dlen = READ_ONCE(desc->len); + void *data; + +- if (addr < in->shmaddr || desc->addr > in->shmaddr + in->shmlen) ++ if (offs >= in->shmlen) + return NULL; + +- data = in->shm + (addr - in->shmaddr); ++ data = in->shm + offs; + + if (data < q->data || data >= q->end) + return NULL; +@@ -317,7 +317,7 @@ static int ivshm_net_tx_frame(struct net + buf = tx->data + head; + skb_copy_and_csum_dev(skb, buf); + +- desc->addr = in->shmaddr + (buf - in->shm); ++ desc->addr = buf - in->shm; + desc->len = skb->len; + + avail = tx->last_avail_idx++ & (vr->num - 1); |