Merge branch 'x86/iommu' into x86/core (3e5621ed) · Commits · e / devices / android_kernel_fairphone_FP5

arch/x86/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -563,7 +563,7 @@ config AMD_IOMMU

		# need this always selected by IOMMU for the VIA workaround
		config SWIOTLB
		bool
		def_bool y if X86_64
		help
		Support for software bounce buffers used on x86-64 systems
		which don't have a hardware IOMMU (e.g. the current generation

+0 −2

Original line number	Diff line number	Diff line
		@@ -71,12 +71,10 @@ static inline struct dma_mapping_ops get_dma_ops(struct device dev)
		/* Make sure we keep the same behaviour */
		static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
		{
		#ifdef CONFIG_X86_64
		struct dma_mapping_ops *ops = get_dma_ops(dev);
		if (ops->mapping_error)
		return ops->mapping_error(dev, dma_addr);

		#endif
		return (dma_addr == bad_dma_address);
		}

+33 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,39 @@ extern int fix_aperture;
		#define AMD64_GARTCACHECTL 0x9c
		#define AMD64_GARTEN (1<<0)

		#ifdef CONFIG_GART_IOMMU
		extern int gart_iommu_aperture;
		extern int gart_iommu_aperture_allowed;
		extern int gart_iommu_aperture_disabled;

		extern void early_gart_iommu_check(void);
		extern void gart_iommu_init(void);
		extern void gart_iommu_shutdown(void);
		extern void __init gart_parse_options(char *);
		extern void gart_iommu_hole_init(void);

		#else
		#define gart_iommu_aperture 0
		#define gart_iommu_aperture_allowed 0
		#define gart_iommu_aperture_disabled 1

		static inline void early_gart_iommu_check(void)
		{
		}
		static inline void gart_iommu_init(void)
		{
		}
		static inline void gart_iommu_shutdown(void)
		{
		}
		static inline void gart_parse_options(char *options)
		{
		}
		static inline void gart_iommu_hole_init(void)
		{
		}
		#endif

		extern int agp_amd64_init(void);

		static inline void enable_gart_translation(struct pci_dev *dev, u64 addr)

+0 −2

Original line number	Diff line number	Diff line
		@@ -80,8 +80,6 @@ static inline void writeq(__u64 val, volatile void __iomem *addr)
		#define readq readq
		#define writeq writeq

		extern int iommu_bio_merge;

		#ifdef CONFIG_X86_32
		# include "io_32.h"
		#else

+0 −2

Original line number	Diff line number	Diff line
		@@ -232,8 +232,6 @@ void memset_io(volatile void __iomem *a, int b, size_t c);

		#define flush_write_buffers()

		#define BIO_VMERGE_BOUNDARY iommu_bio_merge

		/*
		* Convert a virtual cached pointer to an uncached pointer
		*/