diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2018-05-17 20:07:13 +1000 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2018-05-31 09:02:21 +0200 |
| commit | b12c8a70643ffe2598c572cd206e4f68c524eb6f (patch) | |
| tree | 551cc2b429bc08d3827de079239a91ca6a5a49e1 /arch/m68k | |
| parent | 3f90f9ef2dda316d64e420d5d51ba369587ccc55 (diff) | |
| download | linux-rpi3-b12c8a70643ffe2598c572cd206e4f68c524eb6f.tar.gz linux-rpi3-b12c8a70643ffe2598c572cd206e4f68c524eb6f.tar.bz2 linux-rpi3-b12c8a70643ffe2598c572cd206e4f68c524eb6f.zip | |
m68k: Set default dma mask for platform devices
This avoids a WARNING splat when loading the macsonic or macmace driver.
Please see commit 205e1b7f51e4 ("dma-mapping: warn when there is no
coherent_dma_mask").
This implementation of arch_setup_pdev_archdata() differs from the
powerpc one, in that this one avoids clobbering a device dma mask
which has already been initialized.
Cc: Christoph Hellwig <hch@lst.de>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Greg Ungerer <gerg@linux-m68k.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/kernel/dma.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/m68k/kernel/dma.c b/arch/m68k/kernel/dma.c index c01b9b8f97bf..463572c4943f 100644 --- a/arch/m68k/kernel/dma.c +++ b/arch/m68k/kernel/dma.c @@ -9,6 +9,7 @@ #include <linux/dma-mapping.h> #include <linux/device.h> #include <linux/kernel.h> +#include <linux/platform_device.h> #include <linux/scatterlist.h> #include <linux/slab.h> #include <linux/vmalloc.h> @@ -165,3 +166,12 @@ const struct dma_map_ops m68k_dma_ops = { .sync_sg_for_device = m68k_dma_sync_sg_for_device, }; EXPORT_SYMBOL(m68k_dma_ops); + +void arch_setup_pdev_archdata(struct platform_device *pdev) +{ + if (pdev->dev.coherent_dma_mask == DMA_MASK_NONE && + pdev->dev.dma_mask == NULL) { + pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32); + pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; + } +} |