Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc0a14f1 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Ingo Molnar
Browse files

sparc: Use dma_map_ops struct 



Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Tested-by: default avatarRobert Reif <reif@earthlink.net>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: tony.luck@intel.com
Cc: fenghua.yu@intel.com
LKML-Reference: <1249872797-1314-4-git-send-email-fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent be02ff99

arch/sparc/include/asm/dma-mapping.h

+7 −36
Original line number Diff line number Diff line
@@ -13,36 +13,7 @@ extern int dma_set_mask(struct device *dev, u64 dma_mask); 
#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)

#define dma_is_consistent(d, h)	(1)



struct dma_ops {

	void *(*alloc_coherent)(struct device *dev, size_t size,

				dma_addr_t *dma_handle, gfp_t flag);

	void (*free_coherent)(struct device *dev, size_t size,

			      void *cpu_addr, dma_addr_t dma_handle);

	dma_addr_t (*map_page)(struct device *dev, struct page *page,

			       unsigned long offset, size_t size,

			       enum dma_data_direction direction);

	void (*unmap_page)(struct device *dev, dma_addr_t dma_addr,

			   size_t size,

			   enum dma_data_direction direction);

	int (*map_sg)(struct device *dev, struct scatterlist *sg, int nents,

		      enum dma_data_direction direction);

	void (*unmap_sg)(struct device *dev, struct scatterlist *sg,

			 int nhwentries,

			 enum dma_data_direction direction);

	void (*sync_single_for_cpu)(struct device *dev,

				    dma_addr_t dma_handle, size_t size,

				    enum dma_data_direction direction);

	void (*sync_single_for_device)(struct device *dev,

				       dma_addr_t dma_handle, size_t size,

				       enum dma_data_direction direction);

	void (*sync_sg_for_cpu)(struct device *dev, struct scatterlist *sg,

				int nelems,

				enum dma_data_direction direction);

	void (*sync_sg_for_device)(struct device *dev,

				   struct scatterlist *sg, int nents,

				   enum dma_data_direction dir);

};

extern const struct dma_ops *dma_ops;

extern const struct dma_map_ops *dma_ops;



static inline void *dma_alloc_coherent(struct device *dev, size_t size,

				       dma_addr_t *dma_handle, gfp_t flag)
@@ -62,40 +33,40 @@ static inline dma_addr_t dma_map_single(struct device *dev, void *cpu_addr, 
{

	return dma_ops->map_page(dev, virt_to_page(cpu_addr),

				 (unsigned long)cpu_addr & ~PAGE_MASK, size,

				 direction);

				 direction, NULL);

}



static inline void dma_unmap_single(struct device *dev, dma_addr_t dma_addr,

				    size_t size,

				    enum dma_data_direction direction)

{

	dma_ops->unmap_page(dev, dma_addr, size, direction);

	dma_ops->unmap_page(dev, dma_addr, size, direction, NULL);

}



static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,

				      unsigned long offset, size_t size,

				      enum dma_data_direction direction)

{

	return dma_ops->map_page(dev, page, offset, size, direction);

	return dma_ops->map_page(dev, page, offset, size, direction, NULL);

}



static inline void dma_unmap_page(struct device *dev, dma_addr_t dma_address,

				  size_t size,

				  enum dma_data_direction direction)

{

	dma_ops->unmap_page(dev, dma_address, size, direction);

	dma_ops->unmap_page(dev, dma_address, size, direction, NULL);

}



static inline int dma_map_sg(struct device *dev, struct scatterlist *sg,

			     int nents, enum dma_data_direction direction)

{

	return dma_ops->map_sg(dev, sg, nents, direction);

	return dma_ops->map_sg(dev, sg, nents, direction, NULL);

}



static inline void dma_unmap_sg(struct device *dev, struct scatterlist *sg,

				int nents, enum dma_data_direction direction)

{

	dma_ops->unmap_sg(dev, sg, nents, direction);

	dma_ops->unmap_sg(dev, sg, nents, direction, NULL);

}



static inline void dma_sync_single_for_cpu(struct device *dev,

arch/sparc/kernel/dma.c

+10 −6
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ static void dma32_free_coherent(struct device *dev, size_t size, 


static dma_addr_t dma32_map_page(struct device *dev, struct page *page,

				 unsigned long offset, size_t size,

				 enum dma_data_direction direction)

				 enum dma_data_direction direction,

				 struct dma_attrs *attrs)

{

#ifdef CONFIG_PCI

	if (dev->bus == &pci_bus_type)
@@ -72,7 +73,8 @@ static dma_addr_t dma32_map_page(struct device *dev, struct page *page, 
}



static void dma32_unmap_page(struct device *dev, dma_addr_t dma_address,

			     size_t size, enum dma_data_direction direction)

			     size_t size, enum dma_data_direction direction,

			     struct dma_attrs *attrs)

{

#ifdef CONFIG_PCI

	if (dev->bus == &pci_bus_type) {
@@ -85,7 +87,8 @@ static void dma32_unmap_page(struct device *dev, dma_addr_t dma_address, 
}



static int dma32_map_sg(struct device *dev, struct scatterlist *sg,

			int nents, enum dma_data_direction direction)

			int nents, enum dma_data_direction direction,

			struct dma_attrs *attrs)

{

#ifdef CONFIG_PCI

	if (dev->bus == &pci_bus_type)
@@ -95,7 +98,8 @@ static int dma32_map_sg(struct device *dev, struct scatterlist *sg, 
}



void dma32_unmap_sg(struct device *dev, struct scatterlist *sg,

		    int nents, enum dma_data_direction direction)

		    int nents, enum dma_data_direction direction,

		    struct dma_attrs *attrs)

{

#ifdef CONFIG_PCI

	if (dev->bus == &pci_bus_type) {
@@ -161,7 +165,7 @@ static void dma32_sync_sg_for_device(struct device *dev, 
	BUG();

}



static const struct dma_ops dma32_dma_ops = {

static const struct dma_map_ops dma32_dma_ops = {

	.alloc_coherent		= dma32_alloc_coherent,

	.free_coherent		= dma32_free_coherent,

	.map_page		= dma32_map_page,
@@ -174,5 +178,5 @@ static const struct dma_ops dma32_dma_ops = { 
	.sync_sg_for_device	= dma32_sync_sg_for_device,

};



const struct dma_ops *dma_ops = &dma32_dma_ops;

const struct dma_map_ops *dma_ops = &dma32_dma_ops;

EXPORT_SYMBOL(dma_ops);

arch/sparc/kernel/iommu.c

+10 −6
Original line number Diff line number Diff line
@@ -353,7 +353,8 @@ static void dma_4u_free_coherent(struct device *dev, size_t size, 


static dma_addr_t dma_4u_map_page(struct device *dev, struct page *page,

				  unsigned long offset, size_t sz,

				  enum dma_data_direction direction)

				  enum dma_data_direction direction,

				  struct dma_attrs *attrs)

{

	struct iommu *iommu;

	struct strbuf *strbuf;
@@ -474,7 +475,8 @@ static void strbuf_flush(struct strbuf *strbuf, struct iommu *iommu, 
}



static void dma_4u_unmap_page(struct device *dev, dma_addr_t bus_addr,

			      size_t sz, enum dma_data_direction direction)

			      size_t sz, enum dma_data_direction direction,

			      struct dma_attrs *attrs)

{

	struct iommu *iommu;

	struct strbuf *strbuf;
@@ -520,7 +522,8 @@ static void dma_4u_unmap_page(struct device *dev, dma_addr_t bus_addr, 
}



static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,

			 int nelems, enum dma_data_direction direction)

			 int nelems, enum dma_data_direction direction,

			 struct dma_attrs *attrs)

{

	struct scatterlist *s, *outs, *segstart;

	unsigned long flags, handle, prot, ctx;
@@ -691,7 +694,8 @@ static unsigned long fetch_sg_ctx(struct iommu *iommu, struct scatterlist *sg) 
}



static void dma_4u_unmap_sg(struct device *dev, struct scatterlist *sglist,

			    int nelems, enum dma_data_direction direction)

			    int nelems, enum dma_data_direction direction,

			    struct dma_attrs *attrs)

{

	unsigned long flags, ctx;

	struct scatterlist *sg;
@@ -822,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev, 
	spin_unlock_irqrestore(&iommu->lock, flags);

}



static const struct dma_ops sun4u_dma_ops = {

static const struct dma_map_ops sun4u_dma_ops = {

	.alloc_coherent		= dma_4u_alloc_coherent,

	.free_coherent		= dma_4u_free_coherent,

	.map_page		= dma_4u_map_page,
@@ -833,7 +837,7 @@ static const struct dma_ops sun4u_dma_ops = { 
	.sync_sg_for_cpu	= dma_4u_sync_sg_for_cpu,

};



const struct dma_ops *dma_ops = &sun4u_dma_ops;

const struct dma_map_ops *dma_ops = &sun4u_dma_ops;

EXPORT_SYMBOL(dma_ops);



int dma_supported(struct device *dev, u64 device_mask)

arch/sparc/kernel/pci_sun4v.c

+9 −5
Original line number Diff line number Diff line
@@ -232,7 +232,8 @@ static void dma_4v_free_coherent(struct device *dev, size_t size, void *cpu, 


static dma_addr_t dma_4v_map_page(struct device *dev, struct page *page,

				  unsigned long offset, size_t sz,

				  enum dma_data_direction direction)

				  enum dma_data_direction direction,

				  struct dma_attrs *attrs)

{

	struct iommu *iommu;

	unsigned long flags, npages, oaddr;
@@ -296,7 +297,8 @@ static dma_addr_t dma_4v_map_page(struct device *dev, struct page *page, 
}



static void dma_4v_unmap_page(struct device *dev, dma_addr_t bus_addr,

			      size_t sz, enum dma_data_direction direction)

			      size_t sz, enum dma_data_direction direction,

			      struct dma_attrs *attrs)

{

	struct pci_pbm_info *pbm;

	struct iommu *iommu;
@@ -336,7 +338,8 @@ static void dma_4v_unmap_page(struct device *dev, dma_addr_t bus_addr, 
}



static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist,

			 int nelems, enum dma_data_direction direction)

			 int nelems, enum dma_data_direction direction,

			 struct dma_attrs *attrs)

{

	struct scatterlist *s, *outs, *segstart;

	unsigned long flags, handle, prot;
@@ -478,7 +481,8 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist, 
}



static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist,

			    int nelems, enum dma_data_direction direction)

			    int nelems, enum dma_data_direction direction,

			    struct dma_attrs *attrs)

{

	struct pci_pbm_info *pbm;

	struct scatterlist *sg;
@@ -535,7 +539,7 @@ static void dma_4v_sync_sg_for_cpu(struct device *dev, 
	/* Nothing to do... */

}



static const struct dma_ops sun4v_dma_ops = {

static const struct dma_map_ops sun4v_dma_ops = {

	.alloc_coherent			= dma_4v_alloc_coherent,

	.free_coherent			= dma_4v_free_coherent,

	.map_page			= dma_4v_map_page,