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-0006-MLK-15014-dma-fsl-edma-v3-clear-DONE-before-E_SG-ena.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-0006-MLK-15014-dma-fsl-edma-v3-clear-DONE-before-E_SG-ena.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/806-dma-0006-MLK-15014-dma-fsl-edma-v3-clear-DONE-before-E_SG-ena.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/806-dma-0006-MLK-15014-dma-fsl-edma-v3-clear-DONE-before-E_SG-ena.patch b/target/linux/layerscape/patches-5.4/806-dma-0006-MLK-15014-dma-fsl-edma-v3-clear-DONE-before-E_SG-ena.patch new file mode 100644 index 0000000000..bb4a83ccc7 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/806-dma-0006-MLK-15014-dma-fsl-edma-v3-clear-DONE-before-E_SG-ena.patch @@ -0,0 +1,30 @@ +From 03691bf3038250def574c78576a8be39133923fd Mon Sep 17 00:00:00 2001 +From: Robin Gong <yibin.gong@nxp.com> +Date: Tue, 6 Jun 2017 16:56:49 +0800 +Subject: [PATCH] MLK-15014 dma: fsl-edma-v3: clear DONE before E_SG enabled + +Below described in RM, otherwise, channel error status(CHa_ES) +may be triggered: +The user must clear the CHa_CSR[DONE] bit before writing the +TCDa_CSR[MAJORELINK] or TCDa_CSR[ESG] bits. + +Signed-off-by: Robin Gong <yibin.gong@nxp.com> +(cherry picked from commit c4164d0a15306174056c6ff423ba2408dd901fcf) +--- + drivers/dma/fsl-edma-v3.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/dma/fsl-edma-v3.c ++++ b/drivers/dma/fsl-edma-v3.c +@@ -421,6 +421,11 @@ static void fsl_edma3_set_tcd_regs(struc + + writel(le32_to_cpu(tcd->dlast_sga), addr + EDMA_TCD_DLAST_SGA); + ++ /* Must clear CHa_CSR[DONE] bit before enable TCDa_CSR[ESG] */ ++ if ((EDMA_TCD_CSR_E_SG | le16_to_cpu(tcd->csr)) && ++ EDMA_CH_CSR_DONE | readl(addr + EDMA_CH_CSR)) ++ writel(EDMA_CH_CSR_DONE, addr + EDMA_CH_CSR); ++ + writew(le16_to_cpu(tcd->csr), addr + EDMA_TCD_CSR); + } + |