OSDN Git Service

ARM: riscpc: fix DMA
authorRussell King <rmk+kernel@armlinux.org.uk>
Thu, 2 May 2019 16:19:18 +0000 (17:19 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 6 Aug 2019 16:28:24 +0000 (18:28 +0200)
commit38d122a96cca089d70166f37667e75eda00bf6bd
tree39eed6c1216e7cb14e20c9a7f1380ee07c5219b3
parentdc16a7e5f36d65b25a1b66ade14356773ed52875
ARM: riscpc: fix DMA

[ Upstream commit ffd9a1ba9fdb7f2bd1d1ad9b9243d34e96756ba2 ]

DMA got broken a while back in two different ways:
1) a change in the behaviour of disable_irq() to wait for the interrupt
   to finish executing causes us to deadlock at the end of DMA.
2) a change to avoid modifying the scatterlist left the first transfer
   uninitialised.

DMA is only used with expansion cards, so has gone unnoticed.

Fixes: fa4e99899932 ("[ARM] dma: RiscPC: don't modify DMA SG entries")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/mach-rpc/dma.c