aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/asm-x86/gart.h34
-rw-r--r--include/asm-x86/iommu.h29
2 files changed, 21 insertions, 42 deletions
diff --git a/include/asm-x86/gart.h b/include/asm-x86/gart.h
index 417f76ea677b..33b9aeeb35a2 100644
--- a/include/asm-x86/gart.h
+++ b/include/asm-x86/gart.h
@@ -1,40 +1,14 @@
1#ifndef _ASM_X8664_IOMMU_H 1#ifndef _ASM_X8664_GART_H
2#define _ASM_X8664_IOMMU_H 1 2#define _ASM_X8664_GART_H 1
3 3
4#include <asm/e820.h> 4#include <asm/e820.h>
5#include <asm/iommu.h>
5 6
6extern void pci_iommu_shutdown(void);
7extern void no_iommu_init(void);
8extern int force_iommu, no_iommu;
9extern int iommu_detected;
10extern int agp_amd64_init(void);
11#ifdef CONFIG_GART_IOMMU
12extern void gart_iommu_init(void);
13extern void gart_iommu_shutdown(void);
14extern void __init gart_parse_options(char *);
15extern void early_gart_iommu_check(void);
16extern void gart_iommu_hole_init(void);
17extern void set_up_gart_resume(u32, u32); 7extern void set_up_gart_resume(u32, u32);
8
18extern int fallback_aper_order; 9extern int fallback_aper_order;
19extern int fallback_aper_force; 10extern int fallback_aper_force;
20extern int gart_iommu_aperture;
21extern int gart_iommu_aperture_allowed;
22extern int gart_iommu_aperture_disabled;
23extern int fix_aperture; 11extern int fix_aperture;
24#else
25#define gart_iommu_aperture 0
26#define gart_iommu_aperture_allowed 0
27#define gart_iommu_aperture_disabled 1
28
29static inline void early_gart_iommu_check(void)
30{
31}
32
33static inline void gart_iommu_shutdown(void)
34{
35}
36
37#endif
38 12
39/* PTE bits. */ 13/* PTE bits. */
40#define GPTE_VALID 1 14#define GPTE_VALID 1
diff --git a/include/asm-x86/iommu.h b/include/asm-x86/iommu.h
index cb7e9891bfd2..068c9a40aa5b 100644
--- a/include/asm-x86/iommu.h
+++ b/include/asm-x86/iommu.h
@@ -1,29 +1,34 @@
1#ifndef _ASM_X8664_GART_H 1#ifndef _ASM_X8664_IOMMU_H
2#define _ASM_X8664_GART_H 1 2#define _ASM_X8664_IOMMU_H 1
3 3
4extern void pci_iommu_shutdown(void); 4extern void pci_iommu_shutdown(void);
5extern void no_iommu_init(void); 5extern void no_iommu_init(void);
6extern int force_iommu, no_iommu; 6extern int force_iommu, no_iommu;
7extern int iommu_detected; 7extern int iommu_detected;
8
8#ifdef CONFIG_GART_IOMMU 9#ifdef CONFIG_GART_IOMMU
10extern int gart_iommu_aperture;
11extern int gart_iommu_aperture_allowed;
12extern int gart_iommu_aperture_disabled;
13
14extern void early_gart_iommu_check(void);
9extern void gart_iommu_init(void); 15extern void gart_iommu_init(void);
10extern void gart_iommu_shutdown(void); 16extern void gart_iommu_shutdown(void);
11extern void __init gart_parse_options(char *); 17extern void __init gart_parse_options(char *);
12extern void iommu_hole_init(void); 18extern void gart_iommu_hole_init(void);
13extern int fallback_aper_order; 19
14extern int fallback_aper_force;
15extern int iommu_aperture;
16extern int iommu_aperture_allowed;
17extern int iommu_aperture_disabled;
18extern int fix_aperture;
19#else 20#else
20#define iommu_aperture 0 21#define gart_iommu_aperture 0
21#define iommu_aperture_allowed 0 22#define gart_iommu_aperture_allowed 0
23#define gart_iommu_aperture_disabled 1
22 24
23static inline void gart_iommu_shutdown(void) 25static inline void early_gart_iommu_check(void)
24{ 26{
25} 27}
26 28
29static inline void gart_iommu_shutdown(void)
30{
31}
27#endif 32#endif
28 33
29#endif 34#endif
generated by cgit v1.2.2 (git 2.25.0) at 2025-12-25 09:44:30 -0500