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

Commit 5a7faef7 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

sparc: set a default 32-bit dma mask for OF devices 



This keeps the historic default behavior for devices without a DMA mask,
but removes the warning about a lacking DMA mask for doing DMA without
a mask.

Reported-by: default avatarMeelis Roos <mroos@linux.ee>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent c1d0af1a

arch/sparc/kernel/of_device_32.c

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/irq.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>

#include <linux/dma-mapping.h>

#include <asm/leon.h>

#include <asm/leon_amba.h>
@@ -381,6 +382,9 @@ static struct platform_device * __init scan_one_device(struct device_node *dp, 
	else

		dev_set_name(&op->dev, "%08x", dp->phandle);



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

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



	if (of_device_register(op)) {

		printk("%s: Could not register of device.\n",

		       dp->full_name);

arch/sparc/kernel/of_device_64.c

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <linux/string.h>

#include <linux/kernel.h>

#include <linux/of.h>

#include <linux/dma-mapping.h>

#include <linux/init.h>

#include <linux/export.h>

#include <linux/mod_devicetable.h>
@@ -675,6 +676,8 @@ static struct platform_device * __init scan_one_device(struct device_node *dp, 
		dev_set_name(&op->dev, "root");

	else

		dev_set_name(&op->dev, "%08x", dp->phandle);

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

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



	if (of_device_register(op)) {

		printk("%s: Could not register of device.\n",