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

Commit 8978b742 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Ingo Molnar
Browse files

generic, x86: fix add iommu_num_pages helper function 

This IOMMU helper function doesn't work for some architectures:

  http://marc.info/?l=linux-kernel&m=121699304403202&w=2

It also breaks POWER and SPARC builds:

  http://marc.info/?l=linux-kernel&m=121730388001890&w=2



Currently, only x86 IOMMUs use this so let's move it to x86 for
now.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 35780c8e

arch/x86/kernel/pci-dma.c

+8 −0
Original line number Diff line number Diff line
@@ -123,6 +123,14 @@ void __init pci_iommu_alloc(void) 


	pci_swiotlb_init();

}



unsigned long iommu_num_pages(unsigned long addr, unsigned long len)

{

	unsigned long size = roundup((addr & ~PAGE_MASK) + len, PAGE_SIZE);



	return size >> PAGE_SHIFT;

}

EXPORT_SYMBOL(iommu_num_pages);

#endif



/*

include/asm-x86/iommu.h

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ extern struct dma_mapping_ops nommu_dma_ops; 
extern int force_iommu, no_iommu;

extern int iommu_detected;



extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len);



#ifdef CONFIG_GART_IOMMU

extern int gart_iommu_aperture;

extern int gart_iommu_aperture_allowed;

include/linux/iommu-helper.h

+0 −1
Original line number Diff line number Diff line
@@ -8,4 +8,3 @@ extern unsigned long iommu_area_alloc(unsigned long *map, unsigned long size, 
				      unsigned long align_mask);

extern void iommu_area_free(unsigned long *map, unsigned long start,

			    unsigned int nr);
 
extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len);

lib/iommu-helper.c

+0 −8
Original line number Diff line number Diff line
@@ -80,11 +80,3 @@ void iommu_area_free(unsigned long *map, unsigned long start, unsigned int nr) 
	}

}

EXPORT_SYMBOL(iommu_area_free);
 


unsigned long iommu_num_pages(unsigned long addr, unsigned long len)

{

	unsigned long size = roundup((addr & ~PAGE_MASK) + len, PAGE_SIZE);



	return size >> PAGE_SHIFT;

}

EXPORT_SYMBOL(iommu_num_pages);