diff options
Diffstat (limited to 'include/asm-x86/iommu.h')
| -rw-r--r-- | include/asm-x86/iommu.h | 45 |
1 files changed, 31 insertions, 14 deletions
diff --git a/include/asm-x86/iommu.h b/include/asm-x86/iommu.h index 07862fdd23c..546ad3110fe 100644 --- a/include/asm-x86/iommu.h +++ b/include/asm-x86/iommu.h @@ -1,29 +1,46 @@ -#ifndef _ASM_X8664_GART_H -#define _ASM_X8664_GART_H 1 +#ifndef ASM_X86__IOMMU_H +#define ASM_X86__IOMMU_H extern void pci_iommu_shutdown(void); extern void no_iommu_init(void); +extern struct dma_mapping_ops nommu_dma_ops; extern int force_iommu, no_iommu; extern int iommu_detected; -#ifdef CONFIG_IOMMU +extern int dmar_disabled; + +extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len); + +#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 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; +extern void gart_iommu_hole_init(void); + #else -#define iommu_aperture 0 -#define iommu_aperture_allowed 0 +#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 +#endif /* ASM_X86__IOMMU_H */ |