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

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

swiotlb: replace architecture-specific swiotlb.h with linux/swiotlb.h 



Impact: cleanup

This replaces architecture-specific swiotlb.h (X86 and IA64) with
linux/swiotlb.h.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent fb05a379

arch/ia64/include/asm/swiotlb.h

+1 −38
Original line number Diff line number Diff line
@@ -2,44 +2,7 @@ 
#define ASM_IA64__SWIOTLB_H



#include <linux/dma-mapping.h>



/* SWIOTLB interface */



extern dma_addr_t swiotlb_map_single(struct device *hwdev, void *ptr,

				     size_t size, int dir);

extern void *swiotlb_alloc_coherent(struct device *hwdev, size_t size,

				    dma_addr_t *dma_handle, gfp_t flags);

extern void swiotlb_unmap_single(struct device *hwdev, dma_addr_t dev_addr,

				 size_t size, int dir);

extern void swiotlb_sync_single_for_cpu(struct device *hwdev,

					dma_addr_t dev_addr,

					size_t size, int dir);

extern void swiotlb_sync_single_for_device(struct device *hwdev,

					   dma_addr_t dev_addr,

					   size_t size, int dir);

extern void swiotlb_sync_single_range_for_cpu(struct device *hwdev,

					      dma_addr_t dev_addr,

					      unsigned long offset,

					      size_t size, int dir);

extern void swiotlb_sync_single_range_for_device(struct device *hwdev,

						 dma_addr_t dev_addr,

						 unsigned long offset,

						 size_t size, int dir);

extern void swiotlb_sync_sg_for_cpu(struct device *hwdev,

				    struct scatterlist *sg, int nelems,

				    int dir);

extern void swiotlb_sync_sg_for_device(struct device *hwdev,

				       struct scatterlist *sg, int nelems,

				       int dir);

extern int swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg,

			  int nents, int direction);

extern void swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg,

			     int nents, int direction);

extern int swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr);

extern void swiotlb_free_coherent(struct device *hwdev, size_t size,

				  void *vaddr, dma_addr_t dma_handle);

extern int swiotlb_dma_supported(struct device *hwdev, u64 mask);

extern void swiotlb_init(void);

#include <linux/swiotlb.h>



extern int swiotlb_force;

arch/x86/include/asm/swiotlb.h

+1 −37
Original line number Diff line number Diff line 
#ifndef _ASM_X86_SWIOTLB_H

#define _ASM_X86_SWIOTLB_H



#include <asm/dma-mapping.h>

#include <linux/swiotlb.h>



/* SWIOTLB interface */



extern dma_addr_t swiotlb_map_single(struct device *hwdev, void *ptr,

				     size_t size, int dir);

extern void *swiotlb_alloc_coherent(struct device *hwdev, size_t size,

				    dma_addr_t *dma_handle, gfp_t flags);

extern void swiotlb_unmap_single(struct device *hwdev, dma_addr_t dev_addr,

				 size_t size, int dir);

extern void swiotlb_sync_single_for_cpu(struct device *hwdev,

					dma_addr_t dev_addr,

					size_t size, int dir);

extern void swiotlb_sync_single_for_device(struct device *hwdev,

					   dma_addr_t dev_addr,

					   size_t size, int dir);

extern void swiotlb_sync_single_range_for_cpu(struct device *hwdev,

					      dma_addr_t dev_addr,

					      unsigned long offset,

					      size_t size, int dir);

extern void swiotlb_sync_single_range_for_device(struct device *hwdev,

						 dma_addr_t dev_addr,

						 unsigned long offset,

						 size_t size, int dir);

extern void swiotlb_sync_sg_for_cpu(struct device *hwdev,

				    struct scatterlist *sg, int nelems,

				    int dir);

extern void swiotlb_sync_sg_for_device(struct device *hwdev,

				       struct scatterlist *sg, int nelems,

				       int dir);

extern int swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg,

			  int nents, int direction);

extern void swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg,

			     int nents, int direction);

extern int swiotlb_dma_mapping_error(struct device *hwdev, dma_addr_t dma_addr);

extern void swiotlb_free_coherent(struct device *hwdev, size_t size,

				  void *vaddr, dma_addr_t dma_handle);

extern int swiotlb_dma_supported(struct device *hwdev, u64 mask);

extern void swiotlb_init(void);



extern int swiotlb_force;



#ifdef CONFIG_SWIOTLB