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

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

alpha: use iommu_is_span_boundary helper function 



iommu_is_span_boundary in lib/iommu-helper.c was exported for PARISC IOMMUs
(commit 3715863a).  Alpha's IOMMU can use it.

This removes the check on the boundary size alignment because
iommu_is_span_boundary does.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Richard Henderson <rth@twiddle.net>
Acked-by: default avatarIvan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9efda797

arch/alpha/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -330,6 +330,9 @@ config PCI_DOMAINS 
config PCI_SYSCALL

	def_bool PCI



config IOMMU_HELPER

	def_bool PCI



config ALPHA_CORE_AGP

	bool

	depends on ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL

arch/alpha/kernel/pci_iommu.c

+2 −10
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/scatterlist.h>

#include <linux/log2.h>

#include <linux/dma-mapping.h>

#include <linux/iommu-helper.h>



#include <asm/io.h>

#include <asm/hwrpb.h>
@@ -125,14 +126,6 @@ iommu_arena_new(struct pci_controller *hose, dma_addr_t base, 
	return iommu_arena_new_node(0, hose, base, window_size, align);

}



static inline int is_span_boundary(unsigned int index, unsigned int nr,

				   unsigned long shift,

				   unsigned long boundary_size)

{

	shift = (shift + index) & (boundary_size - 1);

	return shift + nr > boundary_size;

}



/* Must be called with the arena lock held */

static long

iommu_arena_find_pages(struct device *dev, struct pci_iommu_arena *arena,
@@ -147,7 +140,6 @@ iommu_arena_find_pages(struct device *dev, struct pci_iommu_arena *arena, 
	base = arena->dma_base >> PAGE_SHIFT;

	if (dev) {

		boundary_size = dma_get_seg_boundary(dev) + 1;

		BUG_ON(!is_power_of_2(boundary_size));

		boundary_size >>= PAGE_SHIFT;

	} else {

		boundary_size = 1UL << (32 - PAGE_SHIFT);
@@ -161,7 +153,7 @@ iommu_arena_find_pages(struct device *dev, struct pci_iommu_arena *arena, 


again:

	while (i < n && p+i < nent) {

		if (!i && is_span_boundary(p, n, base, boundary_size)) {

		if (!i && iommu_is_span_boundary(p, n, base, boundary_size)) {

			p = ALIGN(p + 1, mask + 1);

			goto again;

		}