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

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

alpha: IOMMU had better access to the free space bitmap at only one place 



iommu_arena_find_pages duplicates the code to access to the bitmap for free
space management.  This patch convert the IOMMU code to have only one place to
access the bitmap, in the popular way that other IOMMUs (e.g.  POWER and
SPARC) do.

This patch is preparation for modifications to fix the IOMMU segment boundary
problem.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan 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 3c5f1def

arch/alpha/kernel/pci_iommu.c

+15 −13
Original line number Diff line number Diff line
@@ -132,12 +132,15 @@ iommu_arena_find_pages(struct pci_iommu_arena *arena, long n, long mask) 
{

	unsigned long *ptes;

	long i, p, nent;

	int pass = 0;



	/* Search forward for the first mask-aligned sequence of N free ptes */

	ptes = arena->ptes;

	nent = arena->size >> PAGE_SHIFT;

	p = ALIGN(arena->next_entry, mask + 1);

	i = 0;



again:

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

		if (ptes[p+i])

			p = ALIGN(p + i + 1, mask + 1), i = 0;
@@ -146,19 +149,18 @@ iommu_arena_find_pages(struct pci_iommu_arena *arena, long n, long mask) 
	}



	if (i < n) {

                /* Reached the end.  Flush the TLB and restart the

                   search from the beginning.  */

		if (pass < 1) {

			/*

			 * Reached the end.  Flush the TLB and restart

			 * the search from the beginning.

			*/

			alpha_mv.mv_pci_tbi(arena->hose, 0, -1);



		p = 0, i = 0;

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

			if (ptes[p+i])

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

			else

				i = i + 1;

		}



		if (i < n)

			pass++;

			p = 0;

			i = 0;

			goto again;

		} else

			return -1;

	}