x86: move GART specific stuff from iommu.h to gart.h
PATCH 1/1 x86: move GART specific stuff from iommu.h to gart.h
Impact: cleanup
Signed-off-by Joerg Roedel <[email protected]>
--- arch/x86/include/asm/gart.h | 33 +++++++++++++++++++++++++++++++++ arch/x86/include/asm/iommu.h | 33 --------------------------------- arch/x86/kernel/amd_iommu.c | 1 + arch/x86/kernel/amd_iommu_init.c | 1 + arch/x86/kernel/early-quirks.c | 1 + arch/x86/kernel/pci-dma.c | 1 + arch/x86/kernel/setup.c | 1 + 7 files changed, 38 insertions(+), 33 deletions(-)
arch/x86/include/asm/gart.h +33 -0
@@ -29,6 +29,39 @@ extern int fix_aperture;#define AMD64_GARTCACHECTL 0x9c#define AMD64_GARTEN (1<<0) +#ifdef CONFIG_GART_IOMMU +extern int gart_iommu_aperture; +extern int gart_iommu_aperture_allowed; +extern int gart_iommu_aperture_disabled; + +extern void early_gart_iommu_check (void ); +extern void gart_iommu_init (void ); +extern void gart_iommu_shutdown (void ); +extern void __init gart_parse_options (char *); +extern void gart_iommu_hole_init (void ); + +#else +#define gart_iommu_aperture 0 +#define gart_iommu_aperture_allowed 0 +#define gart_iommu_aperture_disabled 1 + +static inline void early_gart_iommu_check (void ) +{ +} +static inline void gart_iommu_init (void ) +{ +} +static inline void gart_iommu_shutdown (void ) +{ +} +static inline void gart_parse_options (char *options) +{ +} +static inline void gart_iommu_hole_init (void ) +{ +} +#endif +extern int agp_amd64_init (void );static inline void enable_gart_translation (struct pci_dev *dev,u64 addr)
arch/x86/include/asm/iommu.h +0 -33
@@ -12,37 +12,4 @@ extern unsigned long iommu_nr_pages(unsigned long addr, unsigned long len);/* 10 seconds */ #define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000) -#ifdef CONFIG_GART_IOMMU -extern int gart_iommu_aperture; -extern int gart_iommu_aperture_allowed; -extern int gart_iommu_aperture_disabled; - -extern void early_gart_iommu_check (void ); -extern void gart_iommu_init (void ); -extern void gart_iommu_shutdown (void ); -extern void __init gart_parse_options (char *); -extern void gart_iommu_hole_init (void ); - -#else -#define gart_iommu_aperture 0 -#define gart_iommu_aperture_allowed 0 -#define gart_iommu_aperture_disabled 1 - -static inline void early_gart_iommu_check (void ) -{ -} -static inline void gart_iommu_init (void ) -{ -} -static inline void gart_iommu_shutdown (void ) -{ -} -static inline void gart_parse_options (char *options) -{ -} -static inline void gart_iommu_hole_init (void ) -{ -} -#endif -#endif /* _ASM_X86_IOMMU_H */
arch/x86/kernel/amd_iommu.c +1 -0
@@ -24,6 +24,7 @@#include <linux/iommu-helper.h> #include <asm/proto.h> #include <asm/iommu.h> +#include <asm/gart.h> #include <asm/amd_iommu_types.h> #include <asm/amd_iommu.h>
arch/x86/kernel/amd_iommu_init.c +1 -0
@@ -28,6 +28,7 @@#include <asm/amd_iommu_types.h> #include <asm/amd_iommu.h> #include <asm/iommu.h> +#include <asm/gart.h> /* * definitions for the ACPI scanning code
arch/x86/kernel/early-quirks.c +1 -0
@@ -17,6 +17,7 @@#include <asm/io_apic.h> #include <asm/apic.h> #include <asm/iommu.h> +#include <asm/gart.h> static void __init fix_hypertransport_config (int num,int slot,int func) {
arch/x86/kernel/pci-dma.c +1 -0
@@ -6,6 +6,7 @@#include <asm/proto.h> #include <asm/dma.h> #include <asm/iommu.h> +#include <asm/gart.h> #include <asm/calgary.h> #include <asm/amd_iommu.h>
arch/x86/kernel/setup.c +1 -0
@@ -93,6 +93,7 @@#include <asm/desc.h> #include <asm/dma.h> #include <asm/iommu.h> +#include <asm/gart.h> #include <asm/mmu_context.h> #include <asm/proto.h>
Signature · 1 line
1.5.6.4
Ingo Molnar
AppliedQuoted 12 lines · Joerg Roedel
Impact: cleanup
Signed-off-by Joerg Roedel <[email protected]>--- arch/x86/include/asm/gart.h | 33 +++++++++++++++++++++++++++++++++ arch/x86/include/asm/iommu.h | 33 --------------------------------- arch/x86/kernel/amd_iommu.c | 1 + arch/x86/kernel/amd_iommu_init.c | 1 + arch/x86/kernel/early-quirks.c | 1 + arch/x86/kernel/pci-dma.c | 1 + arch/x86/kernel/setup.c | 1 + 7 files changed, 38 insertions(+), 33 deletions(-)
applied to tip/x86/iommu, thanks Joerg!
Ingo