From: Masahiro Yamada Date: Wed, 19 Dec 2018 11:03:19 +0000 (+0900) Subject: mtd: rawnand: denali: fix a race condition when DMA is kicked X-Git-Tag: v2019.01-rc3~13^2~2 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9d43649a7740cf715c750929d19661a35144e7d1;p=oweals%2Fu-boot.git mtd: rawnand: denali: fix a race condition when DMA is kicked Based on Linux commit cf51e4b9c34407bf0c3d9b582b7837e047e1df47 Add the register read-back, commenting why this is necessary. Signed-off-by: Masahiro Yamada --- diff --git a/drivers/mtd/nand/raw/denali.c b/drivers/mtd/nand/raw/denali.c index bbfa3b6112..e0eb1339ec 100644 --- a/drivers/mtd/nand/raw/denali.c +++ b/drivers/mtd/nand/raw/denali.c @@ -587,6 +587,12 @@ static int denali_dma_xfer(struct denali_nand_info *denali, void *buf, } iowrite32(DMA_ENABLE__FLAG, denali->reg + DMA_ENABLE); + /* + * The ->setup_dma() hook kicks DMA by using the data/command + * interface, which belongs to a different AXI port from the + * register interface. Read back the register to avoid a race. + */ + ioread32(denali->reg + DMA_ENABLE); denali_reset_irq(denali); denali->setup_dma(denali, dma_addr, page, write);