Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55496d3f authored by Michael Schmitz's avatar Michael Schmitz Committed by Geert Uytterhoeven
Browse files

zorro: Set up z->dev.dma_mask for the DMA API 



The generic DMA API uses dev->dma_mask to check the DMA addressable
memory bitmask, and warns if no mask is set or even allocated.

Set z->dev.dma_coherent_mask on Zorro bus scan, and make z->dev.dma_mask
to point to z->dev.dma_coherent_mask so device drivers that need DMA have
everything set up to avoid warnings from dma_alloc_coherent(). Drivers can
still use dma_set_mask_and_coherent() to explicitly set their DMA bit mask.

Signed-off-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
[geert: Handle Zorro II with 24-bit address space]
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 6efe2649

drivers/zorro/zorro.c

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/bitops.h>

#include <linux/string.h>

#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <linux/slab.h>



#include <asm/byteorder.h>
@@ -185,6 +186,17 @@ static int __init amiga_zorro_probe(struct platform_device *pdev) 
		z->dev.parent = &bus->dev;

		z->dev.bus = &zorro_bus_type;

		z->dev.id = i;

		switch (z->rom.er_Type & ERT_TYPEMASK) {

		case ERT_ZORROIII:

			z->dev.coherent_dma_mask = DMA_BIT_MASK(32);

			break;



		case ERT_ZORROII:

		default:

			z->dev.coherent_dma_mask = DMA_BIT_MASK(24);

			break;

		}

		z->dev.dma_mask = &z->dev.coherent_dma_mask;

	}



	/* ... then register them */