Merge branches 'x86/mmio', 'x86/delay', 'x86/idle', 'x86/oprofile',... (58cf3522) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/kernel-parameters.txt

+11 −0

Original line number	Original line	Diff line number	Diff line
	@@ -271,6 +271,17 @@ and is between 256 and 4096 characters. It is defined in the file
	aic79xx= [HW,SCSI]		aic79xx= [HW,SCSI]
	See Documentation/scsi/aic79xx.txt.		See Documentation/scsi/aic79xx.txt.

			amd_iommu= [HW,X86-84]
			Pass parameters to the AMD IOMMU driver in the system.
			Possible values are:
			isolate - enable device isolation (each device, as far
			as possible, will get its own protection
			domain)
			amd_iommu_size= [HW,X86-64]
			Define the size of the aperture for the AMD IOMMU
			driver. Possible values are:
			'32M', '64M' (default), '128M', '256M', '512M', '1G'

	amijoy.map= [HW,JOY] Amiga joystick support		amijoy.map= [HW,JOY] Amiga joystick support
	Map of devices attached to JOY0DAT and JOY1DAT		Map of devices attached to JOY0DAT and JOY1DAT
	Format: <a>,<b>		Format: <a>,<b>

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -376,6 +376,12 @@ L: linux-geode@lists.infradead.org (moderated for non-subscribers)
	W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html		W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
	S: Supported		S: Supported

			AMD IOMMU (AMD-VI)
			P: Joerg Roedel
			M: joerg.roedel@amd.com
			L: iommu@lists.linux-foundation.org
			S: Supported

	AMS (Apple Motion Sensor) DRIVER		AMS (Apple Motion Sensor) DRIVER
	P: Stelian Pop		P: Stelian Pop
	M: stelian@popies.net		M: stelian@popies.net

+15 −0

Original line number	Original line	Diff line number	Diff line
	@@ -533,6 +533,21 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT
	Calgary anyway, pass 'iommu=calgary' on the kernel command line.		Calgary anyway, pass 'iommu=calgary' on the kernel command line.
	If unsure, say Y.		If unsure, say Y.

			config AMD_IOMMU
			bool "AMD IOMMU support"
			select SWIOTLB
			depends on X86_64 && PCI && ACPI
			help
			With this option you can enable support for AMD IOMMU hardware in
			your system. An IOMMU is a hardware component which provides
			remapping of DMA memory accesses from devices. With an AMD IOMMU you
			can isolate the the DMA memory of different devices and protect the
			system from misbehaving device drivers or hardware.

			You can find out if your system has an AMD IOMMU if you look into
			your BIOS for an option to enable it or if you have an IVRS ACPI
			table.

	# need this always selected by IOMMU for the VIA workaround		# need this always selected by IOMMU for the VIA workaround
	config SWIOTLB		config SWIOTLB
	bool		bool

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -99,6 +99,7 @@ ifeq ($(CONFIG_X86_64),y)

	obj-$(CONFIG_GART_IOMMU) += pci-gart_64.o aperture_64.o		obj-$(CONFIG_GART_IOMMU) += pci-gart_64.o aperture_64.o
	obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o		obj-$(CONFIG_CALGARY_IOMMU) += pci-calgary_64.o tce_64.o
			obj-$(CONFIG_AMD_IOMMU) += amd_iommu_init.o amd_iommu.o
	obj-$(CONFIG_SWIOTLB) += pci-swiotlb_64.o		obj-$(CONFIG_SWIOTLB) += pci-swiotlb_64.o

	obj-$(CONFIG_PCI_MMCONFIG) += mmconf-fam10h_64.o		obj-$(CONFIG_PCI_MMCONFIG) += mmconf-fam10h_64.o

0 → 100644

+962 −0

File added.

Preview size limit exceeded, changes collapsed.