Skip to content

L
linux-davinci
Commit 9ac6d4a4 authored by David S. Miller's avatar David S. Miller
Browse files
Options

[SPARC64]: Accept ebus_bus_type for generic DMA ops. 

Based upon a bug report by Meelis Roos.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 17f34f0e
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 14 deletions
include/asm-sparc64/dma-mapping.h
View file @ 9ac6d4a4
...@@ -10,10 +10,13 @@ ...@@ -10,10 +10,13 @@
/* need struct page definitions */ /* need struct page definitions */
#include <linux/mm.h> #include <linux/mm.h>
#include <asm/of_device.h>
static inline int static inline int
dma_supported(struct device *dev, u64 mask) dma_supported(struct device *dev, u64 mask)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
return pci_dma_supported(to_pci_dev(dev), mask); return pci_dma_supported(to_pci_dev(dev), mask);
} }
...@@ -21,7 +24,8 @@ dma_supported(struct device *dev, u64 mask) ...@@ -21,7 +24,8 @@ dma_supported(struct device *dev, u64 mask)
static inline int static inline int
dma_set_mask(struct device *dev, u64 dma_mask) dma_set_mask(struct device *dev, u64 dma_mask)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
return pci_set_dma_mask(to_pci_dev(dev), dma_mask); return pci_set_dma_mask(to_pci_dev(dev), dma_mask);
} }
...@@ -30,7 +34,8 @@ static inline void * ...@@ -30,7 +34,8 @@ static inline void *
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
gfp_t flag) gfp_t flag)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
return pci_iommu_ops->alloc_consistent(to_pci_dev(dev), size, dma_handle, flag); return pci_iommu_ops->alloc_consistent(to_pci_dev(dev), size, dma_handle, flag);
} }
...@@ -39,7 +44,8 @@ static inline void ...@@ -39,7 +44,8 @@ static inline void
dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
dma_addr_t dma_handle) dma_addr_t dma_handle)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
pci_free_consistent(to_pci_dev(dev), size, cpu_addr, dma_handle); pci_free_consistent(to_pci_dev(dev), size, cpu_addr, dma_handle);
} }
...@@ -48,7 +54,8 @@ static inline dma_addr_t ...@@ -48,7 +54,8 @@ static inline dma_addr_t
dma_map_single(struct device *dev, void *cpu_addr, size_t size, dma_map_single(struct device *dev, void *cpu_addr, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
return pci_map_single(to_pci_dev(dev), cpu_addr, size, (int)direction); return pci_map_single(to_pci_dev(dev), cpu_addr, size, (int)direction);
} }
...@@ -57,7 +64,8 @@ static inline void ...@@ -57,7 +64,8 @@ static inline void
dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size, dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
pci_unmap_single(to_pci_dev(dev), dma_addr, size, (int)direction); pci_unmap_single(to_pci_dev(dev), dma_addr, size, (int)direction);
} }
...@@ -67,7 +75,8 @@ dma_map_page(struct device *dev, struct page *page, ...@@ -67,7 +75,8 @@ dma_map_page(struct device *dev, struct page *page,
unsigned long offset, size_t size, unsigned long offset, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
return pci_map_page(to_pci_dev(dev), page, offset, size, (int)direction); return pci_map_page(to_pci_dev(dev), page, offset, size, (int)direction);
} }
...@@ -76,7 +85,8 @@ static inline void ...@@ -76,7 +85,8 @@ static inline void
dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
pci_unmap_page(to_pci_dev(dev), dma_address, size, (int)direction); pci_unmap_page(to_pci_dev(dev), dma_address, size, (int)direction);
} }
...@@ -85,7 +95,8 @@ static inline int ...@@ -85,7 +95,8 @@ static inline int
dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
return pci_map_sg(to_pci_dev(dev), sg, nents, (int)direction); return pci_map_sg(to_pci_dev(dev), sg, nents, (int)direction);
} }
...@@ -94,7 +105,8 @@ static inline void ...@@ -94,7 +105,8 @@ static inline void
dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries, dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nhwentries,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
pci_unmap_sg(to_pci_dev(dev), sg, nhwentries, (int)direction); pci_unmap_sg(to_pci_dev(dev), sg, nhwentries, (int)direction);
} }
...@@ -103,7 +115,8 @@ static inline void ...@@ -103,7 +115,8 @@ static inline void
dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size, dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
pci_dma_sync_single_for_cpu(to_pci_dev(dev), dma_handle, pci_dma_sync_single_for_cpu(to_pci_dev(dev), dma_handle,
size, (int)direction); size, (int)direction);
...@@ -113,7 +126,8 @@ static inline void ...@@ -113,7 +126,8 @@ static inline void
dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size, dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
pci_dma_sync_single_for_device(to_pci_dev(dev), dma_handle, pci_dma_sync_single_for_device(to_pci_dev(dev), dma_handle,
size, (int)direction); size, (int)direction);
...@@ -123,7 +137,8 @@ static inline void ...@@ -123,7 +137,8 @@ static inline void
dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems, dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
pci_dma_sync_sg_for_cpu(to_pci_dev(dev), sg, nelems, (int)direction); pci_dma_sync_sg_for_cpu(to_pci_dev(dev), sg, nelems, (int)direction);
} }
...@@ -132,7 +147,8 @@ static inline void ...@@ -132,7 +147,8 @@ static inline void
dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems, dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
BUG_ON(dev->bus != &pci_bus_type); BUG_ON(dev->bus != &pci_bus_type &&
dev->bus != &ebus_bus_type);
pci_dma_sync_sg_for_device(to_pci_dev(dev), sg, nelems, (int)direction); pci_dma_sync_sg_for_device(to_pci_dev(dev), sg, nelems, (int)direction);
} }
......
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