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

Commit 1d9b16d1 authored by Joerg Roedel's avatar Joerg Roedel Committed by Ingo Molnar
Browse files

x86: move GART specific stuff from iommu.h to gart.h 



Impact: cleanup

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a1afd01c

arch/x86/include/asm/gart.h

+33 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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)

{