Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 72802
b: refs/heads/master
c: 395624f
h: refs/heads/master
v: v3
  • Loading branch information
Joerg Roedel authored and Thomas Gleixner committed Oct 29, 2007
1 parent 5b804a8 commit 7cfa33c
Show file tree
Hide file tree
Showing 13 changed files with 42 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e1054b39b275340f7ba0308eca83c127b36e936e
refs/heads/master: 395624fcddd178de01a78aa88670a86ec919de77
2 changes: 1 addition & 1 deletion trunk/arch/x86/Kconfig.x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ config HPET_EMULATE_RTC
# Mark as embedded because too many people got it wrong.
# The code disables itself when not needed.
config IOMMU
bool "IOMMU support" if EMBEDDED
bool "GART IOMMU support" if EMBEDDED
default y
select SWIOTLB
select AGP
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86/kernel/aperture_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <linux/ioport.h>
#include <asm/e820.h>
#include <asm/io.h>
#include <asm/iommu.h>
#include <asm/gart.h>
#include <asm/pci-direct.h>
#include <asm/dma.h>
#include <asm/k8.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86/kernel/early-quirks.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <asm/apic.h>

#ifdef CONFIG_IOMMU
#include <asm/iommu.h>
#include <asm/gart.h>
#endif

static void __init via_bugs(void)
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86/kernel/pci-calgary_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <linux/pci.h>
#include <linux/delay.h>
#include <linux/scatterlist.h>
#include <asm/iommu.h>
#include <asm/gart.h>
#include <asm/calgary.h>
#include <asm/tce.h>
#include <asm/pci-direct.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86/kernel/pci-dma_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <linux/module.h>
#include <linux/dmar.h>
#include <asm/io.h>
#include <asm/iommu.h>
#include <asm/gart.h>
#include <asm/calgary.h>

int iommu_merge __read_mostly = 1;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86/kernel/pci-gart_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <asm/mtrr.h>
#include <asm/pgtable.h>
#include <asm/proto.h>
#include <asm/iommu.h>
#include <asm/gart.h>
#include <asm/cacheflush.h>
#include <asm/swiotlb.h>
#include <asm/dma.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86/kernel/pci-nommu_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <linux/dma-mapping.h>
#include <linux/scatterlist.h>

#include <asm/iommu.h>
#include <asm/gart.h>
#include <asm/processor.h>
#include <asm/dma.h>

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86/kernel/pci-swiotlb_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <linux/module.h>
#include <linux/dma-mapping.h>

#include <asm/iommu.h>
#include <asm/gart.h>
#include <asm/swiotlb.h>
#include <asm/dma.h>

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/x86/kernel/reboot_64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
#include <asm/apic.h>
#include <asm/iommu.h>
#include <asm/gart.h>

/*
* Power off function, if any
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/pci/intel-iommu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include "intel-iommu.h"
#include <asm/proto.h> /* force_iommu in this header in x86-64*/
#include <asm/cacheflush.h>
#include <asm/iommu.h>
#include <asm/gart.h>
#include "pci.h"

#define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY)
Expand Down
29 changes: 29 additions & 0 deletions trunk/include/asm-x86/gart.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#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_IOMMU
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;
#else
#define iommu_aperture 0
#define iommu_aperture_allowed 0

static inline void gart_iommu_shutdown(void)
{
}

#endif

#endif
4 changes: 2 additions & 2 deletions trunk/include/asm-x86/iommu.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _ASM_X8664_IOMMU_H
#define _ASM_X8664_IOMMU_H 1
#ifndef _ASM_X8664_GART_H
#define _ASM_X8664_GART_H 1

extern void pci_iommu_shutdown(void);
extern void no_iommu_init(void);
Expand Down

0 comments on commit 7cfa33c

Please sign in to comment.