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/806-dma-0016-MLK-19931-1-dmaengine-fsl-edma-v3-fix-potential-kern.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/806-dma-0016-MLK-19931-1-dmaengine-fsl-edma-v3-fix-potential-kern.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/806-dma-0016-MLK-19931-1-dmaengine-fsl-edma-v3-fix-potential-kern.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/806-dma-0016-MLK-19931-1-dmaengine-fsl-edma-v3-fix-potential-kern.patch b/target/linux/layerscape/patches-5.4/806-dma-0016-MLK-19931-1-dmaengine-fsl-edma-v3-fix-potential-kern.patch new file mode 100644 index 0000000000..28a59d4db2 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/806-dma-0016-MLK-19931-1-dmaengine-fsl-edma-v3-fix-potential-kern.patch @@ -0,0 +1,33 @@ +From 4967ec844a52498af050b1176fedeca37aca111e Mon Sep 17 00:00:00 2001 +From: Robin Gong <yibin.gong@nxp.com> +Date: Tue, 16 Oct 2018 01:06:29 +0800 +Subject: [PATCH] MLK-19931-1: dmaengine: fsl-edma-v3: fix potential kernel + crash in cyclic + + There is one potential race condition in virt-dma framework as below: +terminate dma channel after the last dma done interrupt, but before +vchan_complete tasklet scheduled, thus the free-ed 'vd' (free in +fsl_edma3_terminate_all) maybe still be touched in vchan_complete() +which cause NULL pointer crash. + Kernel community noticed this issue and fix it at virt-dma level: +https://patchwork.kernel.org/patch/10057791/. To avoid backport too +much patches, set 'vc->cyclic = NULL' in terminate dma channel +interfaces to fix such issue easily. + +Signed-off-by: Robin Gong <yibin.gong@nxp.com> +Acked-by: Fugang Duan <fugang.duan@nxp.com> +(cherry picked from commit 18c9083826400a2ef731496391a0b5e71d461a5f) +--- + drivers/dma/fsl-edma-v3.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/dma/fsl-edma-v3.c ++++ b/drivers/dma/fsl-edma-v3.c +@@ -285,6 +285,7 @@ static int fsl_edma3_terminate_all(struc + fsl_chan->edesc = NULL; + fsl_chan->idle = true; + fsl_chan->used = false; ++ fsl_chan->vchan.cyclic = NULL; + vchan_get_all_descriptors(&fsl_chan->vchan, &head); + spin_unlock_irqrestore(&fsl_chan->vchan.lock, flags); + vchan_dma_desc_free_list(&fsl_chan->vchan, &head); |