Commit c416258a authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Marek Szyprowski

SPARC: adapt for dma_map_ops changes

Adapt core SPARC architecture code for dma_map_ops changes: replace
alloc/free_coherent with generic alloc/free methods.
Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bfbf7d61
...@@ -26,24 +26,30 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) ...@@ -26,24 +26,30 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
#include <asm-generic/dma-mapping-common.h> #include <asm-generic/dma-mapping-common.h>
static inline void *dma_alloc_coherent(struct device *dev, size_t size, #define dma_alloc_coherent(d,s,h,f) dma_alloc_attrs(d,s,h,f,NULL)
dma_addr_t *dma_handle, gfp_t flag)
static inline void *dma_alloc_attrs(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t flag,
struct dma_attrs *attrs)
{ {
struct dma_map_ops *ops = get_dma_ops(dev); struct dma_map_ops *ops = get_dma_ops(dev);
void *cpu_addr; void *cpu_addr;
cpu_addr = ops->alloc_coherent(dev, size, dma_handle, flag); cpu_addr = ops->alloc(dev, size, dma_handle, flag, attrs);
debug_dma_alloc_coherent(dev, size, *dma_handle, cpu_addr); debug_dma_alloc_coherent(dev, size, *dma_handle, cpu_addr);
return cpu_addr; return cpu_addr;
} }
static inline void dma_free_coherent(struct device *dev, size_t size, #define dma_free_coherent(d,s,c,h) dma_free_attrs(d,s,c,h,NULL)
void *cpu_addr, dma_addr_t dma_handle)
static inline void dma_free_attrs(struct device *dev, size_t size,
void *cpu_addr, dma_addr_t dma_handle,
struct dma_attrs *attrs)
{ {
struct dma_map_ops *ops = get_dma_ops(dev); struct dma_map_ops *ops = get_dma_ops(dev);
debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
ops->free_coherent(dev, size, cpu_addr, dma_handle); ops->free(dev, size, cpu_addr, dma_handle, attrs);
} }
static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
......
...@@ -280,7 +280,8 @@ static inline void iommu_free_ctx(struct iommu *iommu, int ctx) ...@@ -280,7 +280,8 @@ static inline void iommu_free_ctx(struct iommu *iommu, int ctx)
} }
static void *dma_4u_alloc_coherent(struct device *dev, size_t size, static void *dma_4u_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_addrp, gfp_t gfp) dma_addr_t *dma_addrp, gfp_t gfp,
struct dma_attrs *attrs)
{ {
unsigned long flags, order, first_page; unsigned long flags, order, first_page;
struct iommu *iommu; struct iommu *iommu;
...@@ -330,7 +331,8 @@ static void *dma_4u_alloc_coherent(struct device *dev, size_t size, ...@@ -330,7 +331,8 @@ static void *dma_4u_alloc_coherent(struct device *dev, size_t size,
} }
static void dma_4u_free_coherent(struct device *dev, size_t size, static void dma_4u_free_coherent(struct device *dev, size_t size,
void *cpu, dma_addr_t dvma) void *cpu, dma_addr_t dvma,
struct dma_attrs *attrs)
{ {
struct iommu *iommu; struct iommu *iommu;
unsigned long flags, order, npages; unsigned long flags, order, npages;
...@@ -825,8 +827,8 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev, ...@@ -825,8 +827,8 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev,
} }
static struct dma_map_ops sun4u_dma_ops = { static struct dma_map_ops sun4u_dma_ops = {
.alloc_coherent = dma_4u_alloc_coherent, .alloc = dma_4u_alloc_coherent,
.free_coherent = dma_4u_free_coherent, .free = dma_4u_free_coherent,
.map_page = dma_4u_map_page, .map_page = dma_4u_map_page,
.unmap_page = dma_4u_unmap_page, .unmap_page = dma_4u_unmap_page,
.map_sg = dma_4u_map_sg, .map_sg = dma_4u_map_sg,
......
...@@ -261,7 +261,8 @@ EXPORT_SYMBOL(sbus_set_sbus64); ...@@ -261,7 +261,8 @@ EXPORT_SYMBOL(sbus_set_sbus64);
* CPU may access them without any explicit flushing. * CPU may access them without any explicit flushing.
*/ */
static void *sbus_alloc_coherent(struct device *dev, size_t len, static void *sbus_alloc_coherent(struct device *dev, size_t len,
dma_addr_t *dma_addrp, gfp_t gfp) dma_addr_t *dma_addrp, gfp_t gfp,
struct dma_attrs *attrs)
{ {
struct platform_device *op = to_platform_device(dev); struct platform_device *op = to_platform_device(dev);
unsigned long len_total = PAGE_ALIGN(len); unsigned long len_total = PAGE_ALIGN(len);
...@@ -315,7 +316,7 @@ err_nopages: ...@@ -315,7 +316,7 @@ err_nopages:
} }
static void sbus_free_coherent(struct device *dev, size_t n, void *p, static void sbus_free_coherent(struct device *dev, size_t n, void *p,
dma_addr_t ba) dma_addr_t ba, struct dma_attrs *attrs)
{ {
struct resource *res; struct resource *res;
struct page *pgv; struct page *pgv;
...@@ -407,8 +408,8 @@ static void sbus_sync_sg_for_device(struct device *dev, struct scatterlist *sg, ...@@ -407,8 +408,8 @@ static void sbus_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
} }
struct dma_map_ops sbus_dma_ops = { struct dma_map_ops sbus_dma_ops = {
.alloc_coherent = sbus_alloc_coherent, .alloc = sbus_alloc_coherent,
.free_coherent = sbus_free_coherent, .free = sbus_free_coherent,
.map_page = sbus_map_page, .map_page = sbus_map_page,
.unmap_page = sbus_unmap_page, .unmap_page = sbus_unmap_page,
.map_sg = sbus_map_sg, .map_sg = sbus_map_sg,
...@@ -436,7 +437,8 @@ arch_initcall(sparc_register_ioport); ...@@ -436,7 +437,8 @@ arch_initcall(sparc_register_ioport);
* hwdev should be valid struct pci_dev pointer for PCI devices. * hwdev should be valid struct pci_dev pointer for PCI devices.
*/ */
static void *pci32_alloc_coherent(struct device *dev, size_t len, static void *pci32_alloc_coherent(struct device *dev, size_t len,
dma_addr_t *pba, gfp_t gfp) dma_addr_t *pba, gfp_t gfp,
struct dma_attrs *attrs)
{ {
unsigned long len_total = PAGE_ALIGN(len); unsigned long len_total = PAGE_ALIGN(len);
void *va; void *va;
...@@ -489,7 +491,7 @@ err_nopages: ...@@ -489,7 +491,7 @@ err_nopages:
* past this call are illegal. * past this call are illegal.
*/ */
static void pci32_free_coherent(struct device *dev, size_t n, void *p, static void pci32_free_coherent(struct device *dev, size_t n, void *p,
dma_addr_t ba) dma_addr_t ba, struct dma_attrs *attrs)
{ {
struct resource *res; struct resource *res;
...@@ -645,8 +647,8 @@ static void pci32_sync_sg_for_device(struct device *device, struct scatterlist * ...@@ -645,8 +647,8 @@ static void pci32_sync_sg_for_device(struct device *device, struct scatterlist *
} }
struct dma_map_ops pci32_dma_ops = { struct dma_map_ops pci32_dma_ops = {
.alloc_coherent = pci32_alloc_coherent, .alloc = pci32_alloc_coherent,
.free_coherent = pci32_free_coherent, .free = pci32_free_coherent,
.map_page = pci32_map_page, .map_page = pci32_map_page,
.unmap_page = pci32_unmap_page, .unmap_page = pci32_unmap_page,
.map_sg = pci32_map_sg, .map_sg = pci32_map_sg,
......
...@@ -128,7 +128,8 @@ static inline long iommu_batch_end(void) ...@@ -128,7 +128,8 @@ static inline long iommu_batch_end(void)
} }
static void *dma_4v_alloc_coherent(struct device *dev, size_t size, static void *dma_4v_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_addrp, gfp_t gfp) dma_addr_t *dma_addrp, gfp_t gfp,
struct dma_attrs *attrs)
{ {
unsigned long flags, order, first_page, npages, n; unsigned long flags, order, first_page, npages, n;
struct iommu *iommu; struct iommu *iommu;
...@@ -198,7 +199,7 @@ range_alloc_fail: ...@@ -198,7 +199,7 @@ range_alloc_fail:
} }
static void dma_4v_free_coherent(struct device *dev, size_t size, void *cpu, static void dma_4v_free_coherent(struct device *dev, size_t size, void *cpu,
dma_addr_t dvma) dma_addr_t dvma, struct dma_attrs *attrs)
{ {
struct pci_pbm_info *pbm; struct pci_pbm_info *pbm;
struct iommu *iommu; struct iommu *iommu;
...@@ -527,8 +528,8 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist, ...@@ -527,8 +528,8 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist,
} }
static struct dma_map_ops sun4v_dma_ops = { static struct dma_map_ops sun4v_dma_ops = {
.alloc_coherent = dma_4v_alloc_coherent, .alloc = dma_4v_alloc_coherent,
.free_coherent = dma_4v_free_coherent, .free = dma_4v_free_coherent,
.map_page = dma_4v_map_page, .map_page = dma_4v_map_page,
.unmap_page = dma_4v_unmap_page, .unmap_page = dma_4v_unmap_page,
.map_sg = dma_4v_map_sg, .map_sg = dma_4v_map_sg,
......
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