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

Commit a8522509 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds
Browse files

swiotlb: use iommu_is_span_boundary helper function 



iommu_is_span_boundary in lib/iommu-helper.c was exported for PARISC IOMMUs
(commit 3715863a).  SWIOTLB can use it instead
of the homegrown function.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a7133a15

arch/ia64/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ config MMU 
config SWIOTLB

       bool



config IOMMU_HELPER

       bool



config GENERIC_LOCKBREAK

	bool

	default y
@@ -615,7 +618,7 @@ config IRQ_PER_CPU 
	default y



config IOMMU_HELPER

	def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC)

	def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)



source "arch/ia64/hp/sim/Kconfig"

arch/x86/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -537,9 +537,6 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT 
	  Calgary anyway, pass 'iommu=calgary' on the kernel command line.

	  If unsure, say Y.



config IOMMU_HELPER

	def_bool (CALGARY_IOMMU || GART_IOMMU)



# need this always selected by IOMMU for the VIA workaround

config SWIOTLB

	bool
@@ -550,6 +547,8 @@ config SWIOTLB 
	  access 32-bits of memory can be used on systems with more than

	  3 GB of memory. If unsure, say Y.



config IOMMU_HELPER

	def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB)



config NR_CPUS

	int "Maximum number of CPUs (2-255)"

lib/swiotlb.c

+3 −11
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 


#include <linux/init.h>

#include <linux/bootmem.h>

#include <linux/iommu-helper.h>



#define OFFSET(val,align) ((unsigned long)	\

	                   ( (val) & ( (align) - 1)))
@@ -282,15 +283,6 @@ address_needs_mapping(struct device *hwdev, dma_addr_t addr) 
	return (addr & ~mask) != 0;

}



static inline unsigned int is_span_boundary(unsigned int index,

					    unsigned int nslots,

					    unsigned long offset_slots,

					    unsigned long max_slots)

{

	unsigned long offset = (offset_slots + index) & (max_slots - 1);

	return offset + nslots > max_slots;

}



/*

 * Allocates bounce buffer and returns its kernel virtual address.

 */
@@ -337,7 +329,7 @@ map_single(struct device *hwdev, char *buffer, size_t size, int dir) 
	wrap = index;



	do {

		while (is_span_boundary(index, nslots, offset_slots,

		while (iommu_is_span_boundary(index, nslots, offset_slots,

					      max_slots)) {

			index += stride;

			if (index >= io_tlb_nslabs)