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

Commit 395e51f1 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next 

Conflicts:
	drivers/iommu/iommu.c
	include/linux/iommu.h
parents 28a33cbc 2c9195e9 2c0ae172 7d43c2e4 8ce44a21 3177bb76

Documentation/ABI/testing/sysfs-kernel-iommu_groups

0 → 100644
+14 −0
Original line number Diff line number Diff line 
What:		/sys/kernel/iommu_groups/

Date:		May 2012

KernelVersion:	v3.5

Contact:	Alex Williamson <alex.williamson@redhat.com>

Description:	/sys/kernel/iommu_groups/ contains a number of sub-

		directories, each representing an IOMMU group.  The

		name of the sub-directory matches the iommu_group_id()

		for the group, which is an integer value.  Within each

		subdirectory is another directory named "devices" with

		links to the sysfs devices contained in this group.

		The group directory also optionally contains a "name"

		file if the IOMMU driver has chosen to register a more

		common name for the group.

Users:

Documentation/devicetree/bindings/iommu/nvidia,tegra30-smmu.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
NVIDIA Tegra 30 IOMMU H/W, SMMU (System Memory Management Unit)



Required properties:

- compatible : "nvidia,tegra30-smmu"

- reg : Should contain 3 register banks(address and length) for each

  of the SMMU register blocks.

- interrupts : Should contain MC General interrupt.

- nvidia,#asids : # of ASIDs

- dma-window : IOVA start address and length.

- nvidia,ahb : phandle to the ahb bus connected to SMMU.



Example:

	smmu {

		compatible = "nvidia,tegra30-smmu";

		reg = <0x7000f010 0x02c

		       0x7000f1f0 0x010

		       0x7000f228 0x05c>;

		nvidia,#asids = <4>;		/* # of ASIDs */

		dma-window = <0 0x40000000>;	/* IOVA start & length */

		nvidia,ahb = <&ahb>;

	};

Documentation/kernel-parameters.txt

+0 −1
Original line number Diff line number Diff line
@@ -1134,7 +1134,6 @@ 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

arch/ia64/include/asm/iommu.h

+0 −2
Original line number Diff line number Diff line
@@ -11,12 +11,10 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 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