Commit 60c1f892 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'dma-mapping-4.19-2' of git://git.infradead.org/users/hch/dma-mapping

Pull dma-mapping fixes from Christoph Hellwig:
 "A few fixes for the fallout of being a little more pedantic about dma
  masks"

* tag 'dma-mapping-4.19-2' of git://git.infradead.org/users/hch/dma-mapping:
  of/platform: initialise AMBA default DMA masks
  sparc: set a default 32-bit dma mask for OF devices
  kernel/dma/direct: take DMA offset into account in dma_direct_supported
parents 57361846 8c89ef7b
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/dma-mapping.h>
#include <asm/leon.h> #include <asm/leon.h>
#include <asm/leon_amba.h> #include <asm/leon_amba.h>
...@@ -381,6 +382,9 @@ static struct platform_device * __init scan_one_device(struct device_node *dp, ...@@ -381,6 +382,9 @@ static struct platform_device * __init scan_one_device(struct device_node *dp,
else else
dev_set_name(&op->dev, "%08x", dp->phandle); 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)) { if (of_device_register(op)) {
printk("%s: Could not register of device.\n", printk("%s: Could not register of device.\n",
dp->full_name); dp->full_name);
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/dma-mapping.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
...@@ -675,6 +676,8 @@ static struct platform_device * __init scan_one_device(struct device_node *dp, ...@@ -675,6 +676,8 @@ static struct platform_device * __init scan_one_device(struct device_node *dp,
dev_set_name(&op->dev, "root"); dev_set_name(&op->dev, "root");
else else
dev_set_name(&op->dev, "%08x", dp->phandle); 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)) { if (of_device_register(op)) {
printk("%s: Could not register of device.\n", printk("%s: Could not register of device.\n",
......
...@@ -241,6 +241,10 @@ static struct amba_device *of_amba_device_create(struct device_node *node, ...@@ -241,6 +241,10 @@ static struct amba_device *of_amba_device_create(struct device_node *node,
if (!dev) if (!dev)
goto err_clear_flag; goto err_clear_flag;
/* AMBA devices only support a single DMA mask */
dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
dev->dev.dma_mask = &dev->dev.coherent_dma_mask;
/* setup generic device info */ /* setup generic device info */
dev->dev.of_node = of_node_get(node); dev->dev.of_node = of_node_get(node);
dev->dev.fwnode = &node->fwnode; dev->dev.fwnode = &node->fwnode;
......
...@@ -168,7 +168,7 @@ int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents, ...@@ -168,7 +168,7 @@ int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents,
int dma_direct_supported(struct device *dev, u64 mask) int dma_direct_supported(struct device *dev, u64 mask)
{ {
#ifdef CONFIG_ZONE_DMA #ifdef CONFIG_ZONE_DMA
if (mask < DMA_BIT_MASK(ARCH_ZONE_DMA_BITS)) if (mask < phys_to_dma(dev, DMA_BIT_MASK(ARCH_ZONE_DMA_BITS)))
return 0; return 0;
#else #else
/* /*
...@@ -177,7 +177,7 @@ int dma_direct_supported(struct device *dev, u64 mask) ...@@ -177,7 +177,7 @@ int dma_direct_supported(struct device *dev, u64 mask)
* memory, or by providing a ZONE_DMA32. If neither is the case, the * memory, or by providing a ZONE_DMA32. If neither is the case, the
* architecture needs to use an IOMMU instead of the direct mapping. * architecture needs to use an IOMMU instead of the direct mapping.
*/ */
if (mask < DMA_BIT_MASK(32)) if (mask < phys_to_dma(dev, DMA_BIT_MASK(32)))
return 0; return 0;
#endif #endif
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment