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

Commit 966396d3 authored by Joerg Roedel's avatar Joerg Roedel Committed by Thomas Gleixner
Browse files

x86 gart: rename CONFIG_IOMMU to CONFIG_GART_IOMMU 



This patch renames the IOMMU config option to GART_IOMMU because in fact it
means the GART and not general support for an IOMMU on x86.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Acked-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 395624fc

arch/x86/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ config DOUBLEFAULT 


config IOMMU_DEBUG

	bool "Enable IOMMU debugging"

	depends on IOMMU && DEBUG_KERNEL

	depends on GART_IOMMU && DEBUG_KERNEL

	depends on X86_64

	help

	  Force the IOMMU to on even when you have less than 4GB of

arch/x86/Kconfig.x86_64

+2 −2
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ config HPET_EMULATE_RTC 


# Mark as embedded because too many people got it wrong.

# The code disables itself when not needed.

config IOMMU

config GART_IOMMU

	bool "GART IOMMU support" if EMBEDDED

	default y

	select SWIOTLB
@@ -687,7 +687,7 @@ source kernel/Kconfig.hz 


config K8_NB

	def_bool y

	depends on AGP_AMD64 || IOMMU || (PCI && NUMA)

	depends on AGP_AMD64 || GART_IOMMU || (PCI && NUMA)



endmenu

arch/x86/configs/x86_64_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ CONFIG_HOTPLUG_CPU=y 
CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y

CONFIG_HPET_TIMER=y

CONFIG_HPET_EMULATE_RTC=y

CONFIG_IOMMU=y

CONFIG_GART_IOMMU=y

# CONFIG_CALGARY_IOMMU is not set

CONFIG_SWIOTLB=y

CONFIG_X86_MCE=y

arch/x86/kernel/Makefile_64

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ obj-$(CONFIG_CRASH_DUMP) += crash_dump_64.o 
obj-$(CONFIG_PM)		+= suspend_64.o

obj-$(CONFIG_HIBERNATION)	+= suspend_asm_64.o

obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o

obj-$(CONFIG_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_SWIOTLB)		+= pci-swiotlb_64.o

obj-$(CONFIG_KPROBES)		+= kprobes_64.o

arch/x86/kernel/early-quirks.c

+2 −2
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
#include <asm/io_apic.h>

#include <asm/apic.h>



#ifdef CONFIG_IOMMU

#ifdef CONFIG_GART_IOMMU

#include <asm/gart.h>

#endif



static void __init via_bugs(void)

{

#ifdef CONFIG_IOMMU

#ifdef CONFIG_GART_IOMMU

	if ((end_pfn > MAX_DMA32_PFN ||  force_iommu) &&

	    !iommu_aperture_allowed) {

		printk(KERN_INFO