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

Commit baa676fc authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Marek Szyprowski
Browse files

X86 & IA64: adapt for dma_map_ops changes 



Adapt core x86 and IA64 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>
[removed swiotlb related changes and replaced it with wrappers,
 merged with IA64 patch to avoid inter-patch dependences in intel-iommu code]
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
parent 613c4578

arch/ia64/hp/common/sba_iommu.c

+6 −5
Original line number Diff line number Diff line
@@ -1130,7 +1130,8 @@ void sba_unmap_single_attrs(struct device *dev, dma_addr_t iova, size_t size, 
 * See Documentation/DMA-API-HOWTO.txt

 */

static void *

sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags)

sba_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,

		   gfp_t flags, struct dma_attrs *attrs)

{

	struct ioc *ioc;

	void *addr;
@@ -1193,7 +1194,7 @@ sba_alloc_coherent (struct device *dev, size_t size, dma_addr_t *dma_handle, gfp 
 * See Documentation/DMA-API-HOWTO.txt

 */

static void sba_free_coherent(struct device *dev, size_t size, void *vaddr,

			       dma_addr_t dma_handle)

			      dma_addr_t dma_handle, struct dma_attrs *attrs)

{

	sba_unmap_single_attrs(dev, dma_handle, size, 0, NULL);

	free_pages((unsigned long) vaddr, get_order(size));
@@ -2213,8 +2214,8 @@ sba_page_override(char *str) 
__setup("sbapagesize=",sba_page_override);



struct dma_map_ops sba_dma_ops = {

	.alloc_coherent		= sba_alloc_coherent,

	.free_coherent		= sba_free_coherent,

	.alloc			= sba_alloc_coherent,

	.free			= sba_free_coherent,

	.map_page		= sba_map_page,

	.unmap_page		= sba_unmap_page,

	.map_sg			= sba_map_sg_attrs,

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

+12 −6
Original line number Diff line number Diff line
@@ -23,23 +23,29 @@ extern void machvec_dma_sync_single(struct device *, dma_addr_t, size_t, 
extern void machvec_dma_sync_sg(struct device *, struct scatterlist *, int,

				enum dma_data_direction);



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

				       dma_addr_t *daddr, gfp_t gfp)

#define dma_alloc_coherent(d,s,h,f)	dma_alloc_attrs(d,s,h,f,NULL)



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

				    dma_addr_t *daddr, gfp_t gfp,

				    struct dma_attrs *attrs)

{

	struct dma_map_ops *ops = platform_dma_get_ops(dev);

	void *caddr;



	caddr = ops->alloc_coherent(dev, size, daddr, gfp);

	caddr = ops->alloc(dev, size, daddr, gfp, attrs);

	debug_dma_alloc_coherent(dev, size, *daddr, caddr);

	return caddr;

}



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

				     void *caddr, dma_addr_t daddr)

#define dma_free_coherent(d,s,c,h) dma_free_attrs(d,s,c,h,NULL)



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

				  void *caddr, dma_addr_t daddr,

				  struct dma_attrs *attrs)

{

	struct dma_map_ops *ops = platform_dma_get_ops(dev);

	debug_dma_free_coherent(dev, size, caddr, daddr);

	ops->free_coherent(dev, size, caddr, daddr);

	ops->free(dev, size, caddr, daddr, attrs);

}



#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)

arch/ia64/kernel/pci-swiotlb.c

+11 −3
Original line number Diff line number Diff line
@@ -15,16 +15,24 @@ int swiotlb __read_mostly; 
EXPORT_SYMBOL(swiotlb);



static void *ia64_swiotlb_alloc_coherent(struct device *dev, size_t size,

					 dma_addr_t *dma_handle, gfp_t gfp)

					 dma_addr_t *dma_handle, gfp_t gfp,

					 struct dma_attrs *attrs)

{

	if (dev->coherent_dma_mask != DMA_BIT_MASK(64))

		gfp |= GFP_DMA;

	return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);

}



static void ia64_swiotlb_free_coherent(struct device *dev, size_t size,

				       void *vaddr, dma_addr_t dma_addr,

				       struct dma_attrs *attrs)

{

	swiotlb_free_coherent(dev, size, vaddr, dma_addr);

}



struct dma_map_ops swiotlb_dma_ops = {

	.alloc_coherent = ia64_swiotlb_alloc_coherent,

	.free_coherent = swiotlb_free_coherent,

	.alloc = ia64_swiotlb_alloc_coherent,

	.free = ia64_swiotlb_free_coherent,

	.map_page = swiotlb_map_page,

	.unmap_page = swiotlb_unmap_page,

	.map_sg = swiotlb_map_sg_attrs,

arch/ia64/sn/pci/pci_dma.c

+5 −4
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ EXPORT_SYMBOL(sn_dma_set_mask); 
 * more information.

 */

static void *sn_dma_alloc_coherent(struct device *dev, size_t size,

				   dma_addr_t * dma_handle, gfp_t flags)

				   dma_addr_t * dma_handle, gfp_t flags,

				   struct dma_attrs *attrs)

{

	void *cpuaddr;

	unsigned long phys_addr;
@@ -137,7 +138,7 @@ static void *sn_dma_alloc_coherent(struct device *dev, size_t size, 
 * any associated IOMMU mappings.

 */

static void sn_dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,

				 dma_addr_t dma_handle)

				 dma_addr_t dma_handle, struct dma_attrs *attrs)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct sn_pcibus_provider *provider = SN_PCIDEV_BUSPROVIDER(pdev);
@@ -466,8 +467,8 @@ int sn_pci_legacy_write(struct pci_bus *bus, u16 port, u32 val, u8 size) 
}



static struct dma_map_ops sn_dma_ops = {

	.alloc_coherent		= sn_dma_alloc_coherent,

	.free_coherent		= sn_dma_free_coherent,

	.alloc			= sn_dma_alloc_coherent,

	.free			= sn_dma_free_coherent,

	.map_page		= sn_dma_map_page,

	.unmap_page		= sn_dma_unmap_page,

	.map_sg			= sn_dma_map_sg,

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

+16 −10
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ extern int dma_supported(struct device *hwdev, u64 mask); 
extern int dma_set_mask(struct device *dev, u64 mask);



extern void *dma_generic_alloc_coherent(struct device *dev, size_t size,

					dma_addr_t *dma_addr, gfp_t flag);

					dma_addr_t *dma_addr, gfp_t flag,

					struct dma_attrs *attrs);



static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)

{
@@ -111,9 +112,11 @@ static inline gfp_t dma_alloc_coherent_gfp_flags(struct device *dev, gfp_t gfp) 
       return gfp;

}



#define dma_alloc_coherent(d,s,h,f)	dma_alloc_attrs(d,s,h,f,NULL)



static inline void *

dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,

		gfp_t gfp)

dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle,

		gfp_t gfp, struct dma_attrs *attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);

	void *memory;
@@ -129,18 +132,21 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, 
	if (!is_device_dma_capable(dev))

		return NULL;



	if (!ops->alloc_coherent)

	if (!ops->alloc)

		return NULL;



	memory = ops->alloc_coherent(dev, size, dma_handle,

				     dma_alloc_coherent_gfp_flags(dev, gfp));

	memory = ops->alloc(dev, size, dma_handle,

			    dma_alloc_coherent_gfp_flags(dev, gfp), attrs);

	debug_dma_alloc_coherent(dev, size, *dma_handle, memory);



	return memory;

}



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

				     void *vaddr, dma_addr_t bus)

#define dma_free_coherent(d,s,c,h) dma_free_attrs(d,s,c,h,NULL)



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

				  void *vaddr, dma_addr_t bus,

				  struct dma_attrs *attrs)

{

	struct dma_map_ops *ops = get_dma_ops(dev);
@@ -150,8 +156,8 @@ static inline void dma_free_coherent(struct device *dev, size_t size, 
		return;



	debug_dma_free_coherent(dev, size, vaddr, bus);

	if (ops->free_coherent)

		ops->free_coherent(dev, size, vaddr, bus);

	if (ops->free)

		ops->free(dev, size, vaddr, bus, attrs);

}



#endif