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

Commit f93ea733 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next 

Conflicts:
	drivers/iommu/amd_iommu.c
	drivers/iommu/intel-iommu.c
	include/linux/iommu.h
parents 00fb5430 95bdaf71

Documentation/kernel-parameters.txt

+3 −1
Original line number Diff line number Diff line
@@ -1065,6 +1065,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
		forcesac

		soft

		pt		[x86, IA-64]

		group_mf	[x86, IA-64]





	io7=		[HW] IO7 for Marvel based alpha systems

			See comment before marvel_specify_io7 in

arch/ia64/include/asm/iommu.h

+2 −0
Original line number Diff line number Diff line
@@ -11,10 +11,12 @@ extern void no_iommu_init(void); 
extern int force_iommu, no_iommu;

extern int iommu_pass_through;

extern int iommu_detected;

extern int iommu_group_mf;

#else

#define iommu_pass_through	(0)

#define no_iommu		(1)

#define iommu_detected		(0)

#define iommu_group_mf		(0)

#endif

extern void iommu_dma_init(void);

extern void machvec_init(const char *name);

arch/ia64/kernel/pci-dma.c

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ int force_iommu __read_mostly; 
#endif



int iommu_pass_through;

int iommu_group_mf;



/* Dummy device used for NULL arguments (normally ISA). Better would

   be probably a smaller DMA mask, but this is bug-to-bug compatible

arch/x86/include/asm/iommu.h

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ extern struct dma_map_ops nommu_dma_ops; 
extern int force_iommu, no_iommu;

extern int iommu_detected;

extern int iommu_pass_through;

extern int iommu_group_mf;



/* 10 seconds */

#define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000)

arch/x86/kernel/pci-dma.c

+11 −0
Original line number Diff line number Diff line
@@ -45,6 +45,15 @@ int iommu_detected __read_mostly = 0; 
 */

int iommu_pass_through __read_mostly;



/*

 * Group multi-function PCI devices into a single device-group for the

 * iommu_device_group interface.  This tells the iommu driver to pretend

 * it cannot distinguish between functions of a device, exposing only one

 * group for the device.  Useful for disallowing use of individual PCI

 * functions from userspace drivers.

 */

int iommu_group_mf __read_mostly;



extern struct iommu_table_entry __iommu_table[], __iommu_table_end[];



/* Dummy device used for NULL arguments (normally ISA). */
@@ -169,6 +178,8 @@ static __init int iommu_setup(char *p) 
#endif

		if (!strncmp(p, "pt", 2))

			iommu_pass_through = 1;

		if (!strncmp(p, "group_mf", 8))

			iommu_group_mf = 1;



		gart_parse_options(p);