sparc: set a default 32-bit dma mask for OF devices
PATCH v3 1/1 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 Meelis Roos <[email protected]>
Signed-off-by Christoph Hellwig <[email protected]>
---
Had to redo this because the platform_device patch that the previous version dependend on had to be dropped.
arch/sparc/kernel/of_device_32.c | 4 ++++ arch/sparc/kernel/of_device_64.c | 3 +++ 2 files changed, 7 insertions(+)
arch/sparc/kernel/of_device_32.c +4 -0
@@ -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
@@ -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",
Signature · 1 line
2.18.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
Guenter Roeck
Tested-byQuoted 6 lines · Christoph Hellwig
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 Meelis Roos <[email protected]>Signed-off-by Christoph Hellwig <[email protected]>
Tested-by Guenter Roeck <[email protected]>
Quoted 53 lines
---
Had to redo this because the
platform_devicepatch that the previous version dependend on had to be dropped.arch/sparc/kernel/of_device_32.c | 4 ++++ arch/sparc/kernel/of_device_64.c | 3 +++ 2 files changed, 7 insertions(+)arch/sparc/kernel/of_device_32.c +4
-0@@ -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@@ -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",