| Message ID | 20191218005635.31636-1-f.fainelli@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | mtd: nand: brcmnand: Set appropriate DMA mask | expand |
On Wed, 2019-12-18 at 00:56:35 UTC, Florian Fainelli wrote: > NAND controllers >= 7.0 with FLASH_DMA support physical addresses up to > 40-bit, set an appropriate DMA mask for that purpose. > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks. Miquel
Hello, Miquel Raynal <miquel.raynal@bootlin.com> wrote on Tue, 14 Jan 2020 18:07:10 +0100: > On Wed, 2019-12-18 at 00:56:35 UTC, Florian Fainelli wrote: > > NAND controllers >= 7.0 with FLASH_DMA support physical addresses up to > > 40-bit, set an appropriate DMA mask for that purpose. > > > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/next, thanks. As an FYI, the subject prefix should have been "mtd: rawnand: brcmnand:". I changed it before applying. Thanks, Miquèl
diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c index 1a66b1cd51c0..44518dada75b 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c @@ -2635,6 +2635,16 @@ int brcmnand_probe(struct platform_device *pdev, struct brcmnand_soc *soc) /* initialize the dma version */ brcmnand_flash_dma_revision_init(ctrl); + ret = -EIO; + if (ctrl->nand_version >= 0x0700) + ret = dma_set_mask_and_coherent(&pdev->dev, + DMA_BIT_MASK(40)); + if (ret) + ret = dma_set_mask_and_coherent(&pdev->dev, + DMA_BIT_MASK(32)); + if (ret) + goto err; + /* linked-list and stop on error */ flash_dma_writel(ctrl, FLASH_DMA_MODE, FLASH_DMA_MODE_MASK); flash_dma_writel(ctrl, FLASH_DMA_ERROR_STATUS, 0);
NAND controllers >= 7.0 with FLASH_DMA support physical addresses up to 40-bit, set an appropriate DMA mask for that purpose. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 10 ++++++++++ 1 file changed, 10 insertions(+)