Commit 395624fc authored by Joerg Roedel's avatar Joerg Roedel Committed by Thomas Gleixner

x86 gart: rename iommu.h to gart.h

This patch renames the include file asm-x86/iommu.h to asm-x86/gart.h to make
clear to which IOMMU implementation it belongs. The patch also adds "GART" to
the Kconfig line.
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 e1054b39
...@@ -480,7 +480,7 @@ config HPET_EMULATE_RTC ...@@ -480,7 +480,7 @@ config HPET_EMULATE_RTC
# Mark as embedded because too many people got it wrong. # Mark as embedded because too many people got it wrong.
# The code disables itself when not needed. # The code disables itself when not needed.
config IOMMU config IOMMU
bool "IOMMU support" if EMBEDDED bool "GART IOMMU support" if EMBEDDED
default y default y
select SWIOTLB select SWIOTLB
select AGP select AGP
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <linux/ioport.h> #include <linux/ioport.h>
#include <asm/e820.h> #include <asm/e820.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/iommu.h> #include <asm/gart.h>
#include <asm/pci-direct.h> #include <asm/pci-direct.h>
#include <asm/dma.h> #include <asm/dma.h>
#include <asm/k8.h> #include <asm/k8.h>
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <asm/apic.h> #include <asm/apic.h>
#ifdef CONFIG_IOMMU #ifdef CONFIG_IOMMU
#include <asm/iommu.h> #include <asm/gart.h>
#endif #endif
static void __init via_bugs(void) static void __init via_bugs(void)
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <asm/iommu.h> #include <asm/gart.h>
#include <asm/calgary.h> #include <asm/calgary.h>
#include <asm/tce.h> #include <asm/tce.h>
#include <asm/pci-direct.h> #include <asm/pci-direct.h>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/dmar.h> #include <linux/dmar.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/iommu.h> #include <asm/gart.h>
#include <asm/calgary.h> #include <asm/calgary.h>
int iommu_merge __read_mostly = 1; int iommu_merge __read_mostly = 1;
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <asm/mtrr.h> #include <asm/mtrr.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/proto.h> #include <asm/proto.h>
#include <asm/iommu.h> #include <asm/gart.h>
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/swiotlb.h> #include <asm/swiotlb.h>
#include <asm/dma.h> #include <asm/dma.h>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <asm/iommu.h> #include <asm/gart.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/dma.h> #include <asm/dma.h>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <asm/iommu.h> #include <asm/gart.h>
#include <asm/swiotlb.h> #include <asm/swiotlb.h>
#include <asm/dma.h> #include <asm/dma.h>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/tlbflush.h> #include <asm/tlbflush.h>
#include <asm/apic.h> #include <asm/apic.h>
#include <asm/iommu.h> #include <asm/gart.h>
/* /*
* Power off function, if any * Power off function, if any
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "intel-iommu.h" #include "intel-iommu.h"
#include <asm/proto.h> /* force_iommu in this header in x86-64*/ #include <asm/proto.h> /* force_iommu in this header in x86-64*/
#include <asm/cacheflush.h> #include <asm/cacheflush.h>
#include <asm/iommu.h> #include <asm/gart.h>
#include "pci.h" #include "pci.h"
#define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY) #define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY)
......
#ifndef _ASM_X8664_IOMMU_H
#define _ASM_X8664_IOMMU_H 1
extern void pci_iommu_shutdown(void);
extern void no_iommu_init(void);
extern int force_iommu, no_iommu;
extern int iommu_detected;
#ifdef CONFIG_IOMMU
extern void gart_iommu_init(void);
extern void gart_iommu_shutdown(void);
extern void __init gart_parse_options(char *);
extern void iommu_hole_init(void);
extern int fallback_aper_order;
extern int fallback_aper_force;
extern int iommu_aperture;
extern int iommu_aperture_allowed;
extern int iommu_aperture_disabled;
extern int fix_aperture;
#else
#define iommu_aperture 0
#define iommu_aperture_allowed 0
static inline void gart_iommu_shutdown(void)
{
}
#endif
#endif
#ifndef _ASM_X8664_IOMMU_H #ifndef _ASM_X8664_GART_H
#define _ASM_X8664_IOMMU_H 1 #define _ASM_X8664_GART_H 1
extern void pci_iommu_shutdown(void); extern void pci_iommu_shutdown(void);
extern void no_iommu_init(void); extern void no_iommu_init(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment