This reverts commit 97f26702bc95b5c3a72671d5c6675e4d6ee0a2f4. Here is the story behind this revert. Mainline commit [0] landed in the stable tree as commit [1], from where it reached us in the form of regular stable update. After that, Michael started to report occasional (30-50%) freezes of serial console on booting M3-ES1.1-Salvator-XS. Same happened on M3-ES1.1-Salvator-X. Every time the issue occurs, the serial console outputs below [2] before becoming totally unresponsive and printing nothing else: rcar-dmac e7300000.dma-controller: Channel Address Error Git bisecting shows that the problem is contributed by commits [0-1]. While we can't be 100% certain (since we don't have the SCIF design docs revealing its internal implementation detail) we think there is plenty of evidence to assume that DMA is not supported on SCIF2, hence should stay disabled on this specific channel: - Excerpt from Chapter 17. Direct Memory Access Controller for System (SYS-DMAC) of R19UH0105EJ0150 Rev.1.50: ---------8<--------- [H3, H3-N, M3-W, V3M, V3H, D3, M3-N, E3] The following modules can issue on-chip peripheral module requests. [..] HSCIF0/1/2/3/4, [..] SCIF0/1/3/4/5, ---------8<--------- - Excerpt from RENESAS_RCH3M3M3NE3_SCIF_UME_v2.00.pdf (Yocto v3.15.0): ---------8<--------- DMA Transfer: - Support: SCIF0, SCIF1, SCIF3, SCIF4, SCIF5 - Not support: SCIF2 ---------8<--------- - Disabled SCIF2 DMA in official Renesas v4.9/v4.14 kernels, e.g. see: https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-bsp.git/commit/?id=e79c418fda8c Based on the issues generated by [0-1] (reproduced on H3, M3 and M3N) and the doc statements presented above, we think it makes sense to disable DMA on SCIF2 for most/all R-Car3 SoCs. [0] v5.0-rc6 commit 97f26702bc95b5 ("arm64: dts: renesas: r8a7796: Enable DMA for SCIF2") [1] v4.14.106 commit 703db5d1b1759f ("arm64: dts: renesas: r8a7796: Enable DMA for SCIF2") [2] scif (DEBUG) and rcar-dmac logs: https://gist.github.com/erosca/132cce76a619724a9e4fa61d1db88c66 Fixes: 97f26702bc95b5 ("arm64: dts: renesas: r8a7796: Enable DMA for SCIF2") Reported-by: Michael Rodin <mrodin@xxxxxxxxxxxxxx> Signed-off-by: Eugeniu Rosca <erosca@xxxxxxxxxxxxxx> --- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi index cdf784899cf8..23de63f3d6c3 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi @@ -1262,9 +1262,6 @@ <&cpg CPG_CORE R8A7796_CLK_S3D1>, <&scif_clk>; clock-names = "fck", "brg_int", "scif_clk"; - dmas = <&dmac1 0x13>, <&dmac1 0x12>, - <&dmac2 0x13>, <&dmac2 0x12>; - dma-names = "tx", "rx", "tx", "rx"; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; resets = <&cpg 310>; status = "disabled"; -- 2.21.0
