[PATCH 4/5] dma-mapping: consolidate dma_supported
Most architectures just call into ->dma_supported, but some also return 1
if the method is not present, or 0 if no dma ops are present (although
that should never happeb). Consolidate this more broad version into
common code.
Also fix h8300 which inorrectly always returned 0, which would have been
a problem if it's dma_set_mask implementation wasn't a similarly buggy
noop.
As a few architectures have much more elaborate implementations, we
still allow for arch overrides.
Signed-off-by: Christoph Hellwig
---
arch/alpha/include/asm/dma-mapping.h | 5 -
arch/arm/include/asm/dma-mapping.h| 6 +++---
arch/arm64/include/asm/dma-mapping.h | 6 --
arch/h8300/include/asm/dma-mapping.h | 5 -
arch/hexagon/include/asm/dma-mapping.h| 1 +
arch/ia64/include/asm/dma-mapping.h | 6 --
arch/microblaze/include/asm/dma-mapping.h | 13 +
arch/mips/include/asm/dma-mapping.h | 6 --
arch/openrisc/include/asm/dma-mapping.h | 5 +++--
arch/powerpc/include/asm/dma-mapping.h| 11 ---
arch/s390/include/asm/dma-mapping.h | 9 -
arch/sh/include/asm/dma-mapping.h | 10 --
arch/sparc/include/asm/dma-mapping.h | 1 +
arch/tile/include/asm/dma-mapping.h | 6 --
arch/unicore32/include/asm/dma-mapping.h | 10 --
arch/x86/include/asm/dma-mapping.h| 4 +++-
include/asm-generic/dma-mapping-common.h | 13 +
17 files changed, 25 insertions(+), 92 deletions(-)
diff --git a/arch/alpha/include/asm/dma-mapping.h
b/arch/alpha/include/asm/dma-mapping.h
index 80ac3e8..9d763e5 100644
--- a/arch/alpha/include/asm/dma-mapping.h
+++ b/arch/alpha/include/asm/dma-mapping.h
@@ -12,11 +12,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device
*dev)
#include
-static inline int dma_supported(struct device *dev, u64 mask)
-{
- return get_dma_ops(dev)->dma_supported(dev, mask);
-}
-
static inline int dma_set_mask(struct device *dev, u64 mask)
{
return get_dma_ops(dev)->set_dma_mask(dev, mask);
diff --git a/arch/arm/include/asm/dma-mapping.h
b/arch/arm/include/asm/dma-mapping.h
index b4f1b6b..199b080 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -38,12 +38,14 @@ static inline void set_dma_ops(struct device *dev, struct
dma_map_ops *ops)
dev->archdata.dma_ops = ops;
}
+#define HAVE_ARCH_DMA_SUPPORTED 1
+extern int dma_supported(struct device *dev, u64 mask);
+
/*
* Note that while the generic code provides dummy dma_{alloc,free}_noncoherent
* implementations, we don't provide a dma_cache_sync function so drivers using
* this API are highlighted with build warnings.
*/
-
#include
static inline int dma_set_mask(struct device *dev, u64 mask)
@@ -172,8 +174,6 @@ static inline bool dma_capable(struct device *dev,
dma_addr_t addr, size_t size)
static inline void dma_mark_clean(void *addr, size_t size) { }
-extern int dma_supported(struct device *dev, u64 mask);
-
extern int arm_dma_set_mask(struct device *dev, u64 dma_mask);
/**
diff --git a/arch/arm64/include/asm/dma-mapping.h
b/arch/arm64/include/asm/dma-mapping.h
index f45f444..f519a58 100644
--- a/arch/arm64/include/asm/dma-mapping.h
+++ b/arch/arm64/include/asm/dma-mapping.h
@@ -84,12 +84,6 @@ static inline phys_addr_t dma_to_phys(struct device *dev,
dma_addr_t dev_addr)
return (phys_addr_t)dev_addr;
}
-static inline int dma_supported(struct device *dev, u64 mask)
-{
- struct dma_map_ops *ops = get_dma_ops(dev);
- return ops->dma_supported(dev, mask);
-}
-
static inline int dma_set_mask(struct device *dev, u64 mask)
{
if (!dev->dma_mask || !dma_supported(dev, mask))
diff --git a/arch/h8300/include/asm/dma-mapping.h
b/arch/h8300/include/asm/dma-mapping.h
index 5eef053..48d652e 100644
--- a/arch/h8300/include/asm/dma-mapping.h
+++ b/arch/h8300/include/asm/dma-mapping.h
@@ -10,11 +10,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device
*dev)
#include
-static inline int dma_supported(struct device *dev, u64 mask)
-{
- return 0;
-}
-
static inline int dma_set_mask(struct device *dev, u64 mask)
{
return 0;
diff --git a/arch/hexagon/include/asm/dma-mapping.h
b/arch/hexagon/include/asm/dma-mapping.h
index e661192..36e8de7 100644
--- a/arch/hexagon/include/asm/dma-mapping.h
+++ b/arch/hexagon/include/asm/dma-mapping.h
@@ -43,6 +43,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device
*dev)
return dma_ops;
}
+#define HAVE_ARCH_DMA_SUPPORTED 1
extern int dma_supported(struct device *dev, u64 mask);
extern int dma_set_mask(struct device *dev, u64 mask);
extern int dma_is_consistent(struct device *dev, dma_addr_t dma_handle);
diff --git a/arch/ia64/include/asm/dma-mapping.h
b/arch/ia64/include/asm/dma-mapping.h
index 27b713d..7982caa 100644
--- a/arch/ia64/include/asm/dma-mapping.h
+++ b/arch/ia64/include/asm/dma-mapping.h
@@ -27,12 +27,6
[PATCH 4/5] dma-mapping: consolidate dma_supported
Most architectures just call into -dma_supported, but some also return 1
if the method is not present, or 0 if no dma ops are present (although
that should never happeb). Consolidate this more broad version into
common code.
Also fix h8300 which inorrectly always returned 0, which would have been
a problem if it's dma_set_mask implementation wasn't a similarly buggy
noop.
As a few architectures have much more elaborate implementations, we
still allow for arch overrides.
Signed-off-by: Christoph Hellwig h...@lst.de
---
arch/alpha/include/asm/dma-mapping.h | 5 -
arch/arm/include/asm/dma-mapping.h| 6 +++---
arch/arm64/include/asm/dma-mapping.h | 6 --
arch/h8300/include/asm/dma-mapping.h | 5 -
arch/hexagon/include/asm/dma-mapping.h| 1 +
arch/ia64/include/asm/dma-mapping.h | 6 --
arch/microblaze/include/asm/dma-mapping.h | 13 +
arch/mips/include/asm/dma-mapping.h | 6 --
arch/openrisc/include/asm/dma-mapping.h | 5 +++--
arch/powerpc/include/asm/dma-mapping.h| 11 ---
arch/s390/include/asm/dma-mapping.h | 9 -
arch/sh/include/asm/dma-mapping.h | 10 --
arch/sparc/include/asm/dma-mapping.h | 1 +
arch/tile/include/asm/dma-mapping.h | 6 --
arch/unicore32/include/asm/dma-mapping.h | 10 --
arch/x86/include/asm/dma-mapping.h| 4 +++-
include/asm-generic/dma-mapping-common.h | 13 +
17 files changed, 25 insertions(+), 92 deletions(-)
diff --git a/arch/alpha/include/asm/dma-mapping.h
b/arch/alpha/include/asm/dma-mapping.h
index 80ac3e8..9d763e5 100644
--- a/arch/alpha/include/asm/dma-mapping.h
+++ b/arch/alpha/include/asm/dma-mapping.h
@@ -12,11 +12,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device
*dev)
#include asm-generic/dma-mapping-common.h
-static inline int dma_supported(struct device *dev, u64 mask)
-{
- return get_dma_ops(dev)-dma_supported(dev, mask);
-}
-
static inline int dma_set_mask(struct device *dev, u64 mask)
{
return get_dma_ops(dev)-set_dma_mask(dev, mask);
diff --git a/arch/arm/include/asm/dma-mapping.h
b/arch/arm/include/asm/dma-mapping.h
index b4f1b6b..199b080 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -38,12 +38,14 @@ static inline void set_dma_ops(struct device *dev, struct
dma_map_ops *ops)
dev-archdata.dma_ops = ops;
}
+#define HAVE_ARCH_DMA_SUPPORTED 1
+extern int dma_supported(struct device *dev, u64 mask);
+
/*
* Note that while the generic code provides dummy dma_{alloc,free}_noncoherent
* implementations, we don't provide a dma_cache_sync function so drivers using
* this API are highlighted with build warnings.
*/
-
#include asm-generic/dma-mapping-common.h
static inline int dma_set_mask(struct device *dev, u64 mask)
@@ -172,8 +174,6 @@ static inline bool dma_capable(struct device *dev,
dma_addr_t addr, size_t size)
static inline void dma_mark_clean(void *addr, size_t size) { }
-extern int dma_supported(struct device *dev, u64 mask);
-
extern int arm_dma_set_mask(struct device *dev, u64 dma_mask);
/**
diff --git a/arch/arm64/include/asm/dma-mapping.h
b/arch/arm64/include/asm/dma-mapping.h
index f45f444..f519a58 100644
--- a/arch/arm64/include/asm/dma-mapping.h
+++ b/arch/arm64/include/asm/dma-mapping.h
@@ -84,12 +84,6 @@ static inline phys_addr_t dma_to_phys(struct device *dev,
dma_addr_t dev_addr)
return (phys_addr_t)dev_addr;
}
-static inline int dma_supported(struct device *dev, u64 mask)
-{
- struct dma_map_ops *ops = get_dma_ops(dev);
- return ops-dma_supported(dev, mask);
-}
-
static inline int dma_set_mask(struct device *dev, u64 mask)
{
if (!dev-dma_mask || !dma_supported(dev, mask))
diff --git a/arch/h8300/include/asm/dma-mapping.h
b/arch/h8300/include/asm/dma-mapping.h
index 5eef053..48d652e 100644
--- a/arch/h8300/include/asm/dma-mapping.h
+++ b/arch/h8300/include/asm/dma-mapping.h
@@ -10,11 +10,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device
*dev)
#include asm-generic/dma-mapping-common.h
-static inline int dma_supported(struct device *dev, u64 mask)
-{
- return 0;
-}
-
static inline int dma_set_mask(struct device *dev, u64 mask)
{
return 0;
diff --git a/arch/hexagon/include/asm/dma-mapping.h
b/arch/hexagon/include/asm/dma-mapping.h
index e661192..36e8de7 100644
--- a/arch/hexagon/include/asm/dma-mapping.h
+++ b/arch/hexagon/include/asm/dma-mapping.h
@@ -43,6 +43,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device
*dev)
return dma_ops;
}
+#define HAVE_ARCH_DMA_SUPPORTED 1
extern int dma_supported(struct device *dev, u64 mask);
extern int dma_set_mask(struct device *dev, u64 mask);
extern int dma_is_consistent(struct device *dev, dma_addr_t dma_handle);
diff --git a/arch/ia64/include/asm/dma-mapping.h
b/arch/ia64/include/asm/dma-mapping.h
index 27b713d..7982caa 100644
[PATCH 4/5] dma-mapping: consolidate dma_supported
Most architectures just call into ->dma_supported, but some also return 1
if the method is not present, or 0 if no dma ops are present (although
that should never happeb). Consolidate this more broad version into
common code.
Also fix h8300 which inorrectly always returned 0, which would have been
a problem if it's dma_set_mask implementation wasn't a similarly buggy
noop.
As a few architectures have much more elaborate implementations, we
still allow for arch overrides.
Signed-off-by: Christoph Hellwig
---
arch/alpha/include/asm/dma-mapping.h | 5 -
arch/arm/include/asm/dma-mapping.h| 5 +++--
arch/arm64/include/asm/dma-mapping.h | 6 --
arch/h8300/include/asm/dma-mapping.h | 5 -
arch/hexagon/include/asm/dma-mapping.h| 1 +
arch/ia64/include/asm/dma-mapping.h | 6 --
arch/microblaze/include/asm/dma-mapping.h | 11 ---
arch/mips/include/asm/dma-mapping.h | 6 --
arch/openrisc/include/asm/dma-mapping.h | 5 +++--
arch/powerpc/include/asm/dma-mapping.h| 11 ---
arch/s390/include/asm/dma-mapping.h | 9 -
arch/sh/include/asm/dma-mapping.h | 10 --
arch/sparc/include/asm/dma-mapping.h | 1 +
arch/tile/include/asm/dma-mapping.h | 6 --
arch/unicore32/include/asm/dma-mapping.h | 10 --
arch/x86/include/asm/dma-mapping.h| 4 +++-
include/asm-generic/dma-mapping-common.h | 13 +
17 files changed, 24 insertions(+), 90 deletions(-)
diff --git a/arch/alpha/include/asm/dma-mapping.h
b/arch/alpha/include/asm/dma-mapping.h
index 80ac3e8..9d763e5 100644
--- a/arch/alpha/include/asm/dma-mapping.h
+++ b/arch/alpha/include/asm/dma-mapping.h
@@ -12,11 +12,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device
*dev)
#include
-static inline int dma_supported(struct device *dev, u64 mask)
-{
- return get_dma_ops(dev)->dma_supported(dev, mask);
-}
-
static inline int dma_set_mask(struct device *dev, u64 mask)
{
return get_dma_ops(dev)->set_dma_mask(dev, mask);
diff --git a/arch/arm/include/asm/dma-mapping.h
b/arch/arm/include/asm/dma-mapping.h
index 2fa33d7..b90d247 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -38,6 +38,9 @@ static inline void set_dma_ops(struct device *dev, struct
dma_map_ops *ops)
dev->archdata.dma_ops = ops;
}
+#define HAVE_ARCH_DMA_SUPPORTED 1
+extern int dma_supported(struct device *dev, u64 mask);
+
#include
static inline int dma_set_mask(struct device *dev, u64 mask)
@@ -166,8 +169,6 @@ static inline bool dma_capable(struct device *dev,
dma_addr_t addr, size_t size)
static inline void dma_mark_clean(void *addr, size_t size) { }
-extern int dma_supported(struct device *dev, u64 mask);
-
extern int arm_dma_set_mask(struct device *dev, u64 dma_mask);
/**
diff --git a/arch/arm64/include/asm/dma-mapping.h
b/arch/arm64/include/asm/dma-mapping.h
index f45f444..f519a58 100644
--- a/arch/arm64/include/asm/dma-mapping.h
+++ b/arch/arm64/include/asm/dma-mapping.h
@@ -84,12 +84,6 @@ static inline phys_addr_t dma_to_phys(struct device *dev,
dma_addr_t dev_addr)
return (phys_addr_t)dev_addr;
}
-static inline int dma_supported(struct device *dev, u64 mask)
-{
- struct dma_map_ops *ops = get_dma_ops(dev);
- return ops->dma_supported(dev, mask);
-}
-
static inline int dma_set_mask(struct device *dev, u64 mask)
{
if (!dev->dma_mask || !dma_supported(dev, mask))
diff --git a/arch/h8300/include/asm/dma-mapping.h
b/arch/h8300/include/asm/dma-mapping.h
index 5eef053..48d652e 100644
--- a/arch/h8300/include/asm/dma-mapping.h
+++ b/arch/h8300/include/asm/dma-mapping.h
@@ -10,11 +10,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device
*dev)
#include
-static inline int dma_supported(struct device *dev, u64 mask)
-{
- return 0;
-}
-
static inline int dma_set_mask(struct device *dev, u64 mask)
{
return 0;
diff --git a/arch/hexagon/include/asm/dma-mapping.h
b/arch/hexagon/include/asm/dma-mapping.h
index e661192..36e8de7 100644
--- a/arch/hexagon/include/asm/dma-mapping.h
+++ b/arch/hexagon/include/asm/dma-mapping.h
@@ -43,6 +43,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device
*dev)
return dma_ops;
}
+#define HAVE_ARCH_DMA_SUPPORTED 1
extern int dma_supported(struct device *dev, u64 mask);
extern int dma_set_mask(struct device *dev, u64 mask);
extern int dma_is_consistent(struct device *dev, dma_addr_t dma_handle);
diff --git a/arch/ia64/include/asm/dma-mapping.h
b/arch/ia64/include/asm/dma-mapping.h
index 27b713d..7982caa 100644
--- a/arch/ia64/include/asm/dma-mapping.h
+++ b/arch/ia64/include/asm/dma-mapping.h
@@ -27,12 +27,6 @@ extern void machvec_dma_sync_sg(struct device *, struct
scatterlist *, int,
#include
-static inline int dma_supported(struct device *dev, u64 mask)
-{
- struct dma_map_ops *ops = platform_dma_get_ops(dev);
-
[PATCH 4/5] dma-mapping: consolidate dma_supported
Most architectures just call into -dma_supported, but some also return 1
if the method is not present, or 0 if no dma ops are present (although
that should never happeb). Consolidate this more broad version into
common code.
Also fix h8300 which inorrectly always returned 0, which would have been
a problem if it's dma_set_mask implementation wasn't a similarly buggy
noop.
As a few architectures have much more elaborate implementations, we
still allow for arch overrides.
Signed-off-by: Christoph Hellwig h...@lst.de
---
arch/alpha/include/asm/dma-mapping.h | 5 -
arch/arm/include/asm/dma-mapping.h| 5 +++--
arch/arm64/include/asm/dma-mapping.h | 6 --
arch/h8300/include/asm/dma-mapping.h | 5 -
arch/hexagon/include/asm/dma-mapping.h| 1 +
arch/ia64/include/asm/dma-mapping.h | 6 --
arch/microblaze/include/asm/dma-mapping.h | 11 ---
arch/mips/include/asm/dma-mapping.h | 6 --
arch/openrisc/include/asm/dma-mapping.h | 5 +++--
arch/powerpc/include/asm/dma-mapping.h| 11 ---
arch/s390/include/asm/dma-mapping.h | 9 -
arch/sh/include/asm/dma-mapping.h | 10 --
arch/sparc/include/asm/dma-mapping.h | 1 +
arch/tile/include/asm/dma-mapping.h | 6 --
arch/unicore32/include/asm/dma-mapping.h | 10 --
arch/x86/include/asm/dma-mapping.h| 4 +++-
include/asm-generic/dma-mapping-common.h | 13 +
17 files changed, 24 insertions(+), 90 deletions(-)
diff --git a/arch/alpha/include/asm/dma-mapping.h
b/arch/alpha/include/asm/dma-mapping.h
index 80ac3e8..9d763e5 100644
--- a/arch/alpha/include/asm/dma-mapping.h
+++ b/arch/alpha/include/asm/dma-mapping.h
@@ -12,11 +12,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device
*dev)
#include asm-generic/dma-mapping-common.h
-static inline int dma_supported(struct device *dev, u64 mask)
-{
- return get_dma_ops(dev)-dma_supported(dev, mask);
-}
-
static inline int dma_set_mask(struct device *dev, u64 mask)
{
return get_dma_ops(dev)-set_dma_mask(dev, mask);
diff --git a/arch/arm/include/asm/dma-mapping.h
b/arch/arm/include/asm/dma-mapping.h
index 2fa33d7..b90d247 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -38,6 +38,9 @@ static inline void set_dma_ops(struct device *dev, struct
dma_map_ops *ops)
dev-archdata.dma_ops = ops;
}
+#define HAVE_ARCH_DMA_SUPPORTED 1
+extern int dma_supported(struct device *dev, u64 mask);
+
#include asm-generic/dma-mapping-common.h
static inline int dma_set_mask(struct device *dev, u64 mask)
@@ -166,8 +169,6 @@ static inline bool dma_capable(struct device *dev,
dma_addr_t addr, size_t size)
static inline void dma_mark_clean(void *addr, size_t size) { }
-extern int dma_supported(struct device *dev, u64 mask);
-
extern int arm_dma_set_mask(struct device *dev, u64 dma_mask);
/**
diff --git a/arch/arm64/include/asm/dma-mapping.h
b/arch/arm64/include/asm/dma-mapping.h
index f45f444..f519a58 100644
--- a/arch/arm64/include/asm/dma-mapping.h
+++ b/arch/arm64/include/asm/dma-mapping.h
@@ -84,12 +84,6 @@ static inline phys_addr_t dma_to_phys(struct device *dev,
dma_addr_t dev_addr)
return (phys_addr_t)dev_addr;
}
-static inline int dma_supported(struct device *dev, u64 mask)
-{
- struct dma_map_ops *ops = get_dma_ops(dev);
- return ops-dma_supported(dev, mask);
-}
-
static inline int dma_set_mask(struct device *dev, u64 mask)
{
if (!dev-dma_mask || !dma_supported(dev, mask))
diff --git a/arch/h8300/include/asm/dma-mapping.h
b/arch/h8300/include/asm/dma-mapping.h
index 5eef053..48d652e 100644
--- a/arch/h8300/include/asm/dma-mapping.h
+++ b/arch/h8300/include/asm/dma-mapping.h
@@ -10,11 +10,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device
*dev)
#include asm-generic/dma-mapping-common.h
-static inline int dma_supported(struct device *dev, u64 mask)
-{
- return 0;
-}
-
static inline int dma_set_mask(struct device *dev, u64 mask)
{
return 0;
diff --git a/arch/hexagon/include/asm/dma-mapping.h
b/arch/hexagon/include/asm/dma-mapping.h
index e661192..36e8de7 100644
--- a/arch/hexagon/include/asm/dma-mapping.h
+++ b/arch/hexagon/include/asm/dma-mapping.h
@@ -43,6 +43,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device
*dev)
return dma_ops;
}
+#define HAVE_ARCH_DMA_SUPPORTED 1
extern int dma_supported(struct device *dev, u64 mask);
extern int dma_set_mask(struct device *dev, u64 mask);
extern int dma_is_consistent(struct device *dev, dma_addr_t dma_handle);
diff --git a/arch/ia64/include/asm/dma-mapping.h
b/arch/ia64/include/asm/dma-mapping.h
index 27b713d..7982caa 100644
--- a/arch/ia64/include/asm/dma-mapping.h
+++ b/arch/ia64/include/asm/dma-mapping.h
@@ -27,12 +27,6 @@ extern void machvec_dma_sync_sg(struct device *, struct
scatterlist *, int,
#include asm-generic/dma-mapping-common.h
