Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 100092
b: refs/heads/master
c: e93be88
h: refs/heads/master
v: v3
  • Loading branch information
FUJITA Tomonori authored and Ingo Molnar committed Jul 10, 2008
1 parent 83413eb commit 13ba7fa
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 43 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 849567b9363dc8b90c369fff8acc245a1b47d94d
refs/heads/master: e93be88d7ec9d183c1cca51eabe040c051cdb687
34 changes: 4 additions & 30 deletions trunk/include/asm-x86/gart.h
Original file line number Diff line number Diff line change
@@ -1,40 +1,14 @@
#ifndef _ASM_X8664_IOMMU_H
#define _ASM_X8664_IOMMU_H 1
#ifndef _ASM_X8664_GART_H
#define _ASM_X8664_GART_H 1

#include <asm/e820.h>
#include <asm/iommu.h>

extern void pci_iommu_shutdown(void);
extern void no_iommu_init(void);
extern int force_iommu, no_iommu;
extern int iommu_detected;
extern int agp_amd64_init(void);
#ifdef CONFIG_GART_IOMMU
extern void gart_iommu_init(void);
extern void gart_iommu_shutdown(void);
extern void __init gart_parse_options(char *);
extern void early_gart_iommu_check(void);
extern void gart_iommu_hole_init(void);
extern void set_up_gart_resume(u32, u32);

extern int fallback_aper_order;
extern int fallback_aper_force;
extern int gart_iommu_aperture;
extern int gart_iommu_aperture_allowed;
extern int gart_iommu_aperture_disabled;
extern int fix_aperture;
#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_shutdown(void)
{
}

#endif

/* PTE bits. */
#define GPTE_VALID 1
Expand Down
29 changes: 17 additions & 12 deletions trunk/include/asm-x86/iommu.h
Original file line number Diff line number Diff line change
@@ -1,29 +1,34 @@
#ifndef _ASM_X8664_GART_H
#define _ASM_X8664_GART_H 1
#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_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 gart_iommu_shutdown(void)
static inline void early_gart_iommu_check(void)
{
}

static inline void gart_iommu_shutdown(void)
{
}
#endif

#endif

0 comments on commit 13ba7fa

Please sign in to comment.