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 --- ...maengine-fsl-edma-v3-clear-interrupt-comi.patch | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 target/linux/layerscape/patches-5.4/806-dma-0025-MLK-22909-dmaengine-fsl-edma-v3-clear-interrupt-comi.patch (limited to 'target/linux/layerscape/patches-5.4/806-dma-0025-MLK-22909-dmaengine-fsl-edma-v3-clear-interrupt-comi.patch') diff --git a/target/linux/layerscape/patches-5.4/806-dma-0025-MLK-22909-dmaengine-fsl-edma-v3-clear-interrupt-comi.patch b/target/linux/layerscape/patches-5.4/806-dma-0025-MLK-22909-dmaengine-fsl-edma-v3-clear-interrupt-comi.patch new file mode 100644 index 0000000000..42f151f3f7 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/806-dma-0025-MLK-22909-dmaengine-fsl-edma-v3-clear-interrupt-comi.patch @@ -0,0 +1,43 @@ +From 7021361c27946c60885b3f031ddde342f9a5432f Mon Sep 17 00:00:00 2001 +From: Robin Gong +Date: Tue, 5 Nov 2019 21:32:22 +0800 +Subject: [PATCH] MLK-22909 dmaengine: fsl-edma-v3: clear interrupt coming + after channel terminated + +Clear EDMA_CH_INT in case dma done interrupt comes after channel terminated +instead of channel free-ed, otherwise, RCU maybe caught because it's +ignored without interrupt status cleared as Android team report in Monkey +test. + +Signed-off-by: Robin Gong +Acked-by: Fugang Duan +(cherry picked from commit ef91ff6ed465cebe2fe6483a480351abba36e237) +(cherry picked from commit 56ee55c71c5f3ef254acb4dee581e68f79ef13a5) +--- + drivers/dma/fsl-edma-v3.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/drivers/dma/fsl-edma-v3.c ++++ b/drivers/dma/fsl-edma-v3.c +@@ -710,8 +710,8 @@ static irqreturn_t fsl_edma3_tx_handler( + + spin_lock(&fsl_chan->vchan.lock); + +- /* Ignore this interrupt since channel has been disabled already */ +- if (!fsl_chan->edesc) ++ /* Ignore this interrupt since channel has been freeed with power off */ ++ if (!fsl_chan->edesc && !fsl_chan->tcd_pool) + goto irq_handled; + + base_addr = fsl_chan->membase; +@@ -722,6 +722,10 @@ static irqreturn_t fsl_edma3_tx_handler( + + writel(1, base_addr + EDMA_CH_INT); + ++ /* Ignore this interrupt since channel has been disabled already */ ++ if (!fsl_chan->edesc) ++ goto irq_handled; ++ + if (!fsl_chan->edesc->iscyclic) { + fsl_edma3_get_realcnt(fsl_chan); + list_del(&fsl_chan->edesc->vdesc.node); -- cgit v1.2.3