leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

alpha: use iommu_is_span_boundary helper function

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

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

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Richard Henderson <rth@twiddle.net>
Acked-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
FUJITA Tomonori 2008-03-13 12:32:40 -07:00 committed by Linus Torvalds
parent 9efda797d6
commit fd28841d2d
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/alpha/Kconfig
View File

@ -330,6 +330,9 @@ config PCI_DOMAINS
config PCI_SYSCALL config PCI_SYSCALL
def_bool PCI def_bool PCI
config IOMMU_HELPER
def_bool PCI
config ALPHA_CORE_AGP config ALPHA_CORE_AGP
bool bool
depends on ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL depends on ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL

12
arch/alpha/kernel/pci_iommu.c
View File

@ -10,6 +10,7 @@
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/log2.h> #include <linux/log2.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/iommu-helper.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/hwrpb.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); 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 */ /* Must be called with the arena lock held */
static long static long
iommu_arena_find_pages(struct device *dev, struct pci_iommu_arena *arena, 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; base = arena->dma_base >> PAGE_SHIFT;
if (dev) { if (dev) {
boundary_size = dma_get_seg_boundary(dev) + 1; boundary_size = dma_get_seg_boundary(dev) + 1;
BUG_ON(!is_power_of_2(boundary_size));
boundary_size >>= PAGE_SHIFT; boundary_size >>= PAGE_SHIFT;
} else { } else {
boundary_size = 1UL << (32 - PAGE_SHIFT); boundary_size = 1UL << (32 - PAGE_SHIFT);
@ -161,7 +153,7 @@ iommu_arena_find_pages(struct device *dev, struct pci_iommu_arena *arena,
again: again:
while (i < n && p+i < nent) { 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); p = ALIGN(p + 1, mask + 1);
goto again; goto again;
} }