diff options
| author | Keir Fraser <Keir.Fraser@cl.cam.ac.uk> | 2005-03-30 16:17:04 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-06-07 15:35:43 -0400 |
| commit | 07eee78ea8ba2d0b7b20551c35a3e7dd158d50bb (patch) | |
| tree | a11d2e705253faaa9779cfd83bb8ca9de311b195 /include | |
| parent | e29b545cb153f230fbd8ff4c19bc98ab950f9f5c (diff) | |
[PATCH] AGP fix for Xen VMM
When Linux is running on the Xen virtual machine monitor, physical
addresses are virtualised and cannot be directly referenced by the AGP
GART. This patch fixes the GART driver for Xen by adding a layer of
abstraction between physical addresses and 'GART addresses'.
Architecture-specific functions are also defined for allocating and freeing
the GATT. Xen requires this to ensure that table really is contiguous from
the point of view of the GART.
These extra interface functions are defined as 'no-ops' for all existing
architectures that use the GART driver.
Signed-off-by: Keir Fraser <keir@xensource.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-alpha/agp.h | 10 | ||||
| -rw-r--r-- | include/asm-i386/agp.h | 10 | ||||
| -rw-r--r-- | include/asm-ia64/agp.h | 10 | ||||
| -rw-r--r-- | include/asm-ppc/agp.h | 10 | ||||
| -rw-r--r-- | include/asm-ppc64/agp.h | 10 | ||||
| -rw-r--r-- | include/asm-sparc64/agp.h | 10 | ||||
| -rw-r--r-- | include/asm-x86_64/agp.h | 10 |
7 files changed, 70 insertions, 0 deletions
diff --git a/include/asm-alpha/agp.h b/include/asm-alpha/agp.h index c99dbbb5bc..ef855a3bc0 100644 --- a/include/asm-alpha/agp.h +++ b/include/asm-alpha/agp.h | |||
| @@ -10,4 +10,14 @@ | |||
| 10 | #define flush_agp_mappings() | 10 | #define flush_agp_mappings() |
| 11 | #define flush_agp_cache() mb() | 11 | #define flush_agp_cache() mb() |
| 12 | 12 | ||
| 13 | /* Convert a physical address to an address suitable for the GART. */ | ||
| 14 | #define phys_to_gart(x) (x) | ||
| 15 | #define gart_to_phys(x) (x) | ||
| 16 | |||
| 17 | /* GATT allocation. Returns/accepts GATT kernel virtual address. */ | ||
| 18 | #define alloc_gatt_pages(order) \ | ||
| 19 | ((char *)__get_free_pages(GFP_KERNEL, (order))) | ||
| 20 | #define free_gatt_pages(table, order) \ | ||
| 21 | free_pages((unsigned long)(table), (order)) | ||
| 22 | |||
| 13 | #endif | 23 | #endif |
diff --git a/include/asm-i386/agp.h b/include/asm-i386/agp.h index a917ff5035..b82f5f3ab8 100644 --- a/include/asm-i386/agp.h +++ b/include/asm-i386/agp.h | |||
| @@ -21,4 +21,14 @@ int unmap_page_from_agp(struct page *page); | |||
| 21 | worth it. Would need a page for it. */ | 21 | worth it. Would need a page for it. */ |
| 22 | #define flush_agp_cache() asm volatile("wbinvd":::"memory") | 22 | #define flush_agp_cache() asm volatile("wbinvd":::"memory") |
| 23 | 23 | ||
| 24 | /* Convert a physical address to an address suitable for the GART. */ | ||
| 25 | #define phys_to_gart(x) (x) | ||
| 26 | #define gart_to_phys(x) (x) | ||
| 27 | |||
| 28 | /* GATT allocation. Returns/accepts GATT kernel virtual address. */ | ||
| 29 | #define alloc_gatt_pages(order) \ | ||
| 30 | ((char *)__get_free_pages(GFP_KERNEL, (order))) | ||
| 31 | #define free_gatt_pages(table, order) \ | ||
| 32 | free_pages((unsigned long)(table), (order)) | ||
| 33 | |||
| 24 | #endif | 34 | #endif |
diff --git a/include/asm-ia64/agp.h b/include/asm-ia64/agp.h index d1316f1e6e..4e517f0e6a 100644 --- a/include/asm-ia64/agp.h +++ b/include/asm-ia64/agp.h | |||
| @@ -18,4 +18,14 @@ | |||
| 18 | #define flush_agp_mappings() /* nothing */ | 18 | #define flush_agp_mappings() /* nothing */ |
| 19 | #define flush_agp_cache() mb() | 19 | #define flush_agp_cache() mb() |
| 20 | 20 | ||
| 21 | /* Convert a physical address to an address suitable for the GART. */ | ||
| 22 | #define phys_to_gart(x) (x) | ||
| 23 | #define gart_to_phys(x) (x) | ||
| 24 | |||
| 25 | /* GATT allocation. Returns/accepts GATT kernel virtual address. */ | ||
| 26 | #define alloc_gatt_pages(order) \ | ||
| 27 | ((char *)__get_free_pages(GFP_KERNEL, (order))) | ||
| 28 | #define free_gatt_pages(table, order) \ | ||
| 29 | free_pages((unsigned long)(table), (order)) | ||
| 30 | |||
| 21 | #endif /* _ASM_IA64_AGP_H */ | 31 | #endif /* _ASM_IA64_AGP_H */ |
diff --git a/include/asm-ppc/agp.h b/include/asm-ppc/agp.h index be27cfa8c5..ca9e423307 100644 --- a/include/asm-ppc/agp.h +++ b/include/asm-ppc/agp.h | |||
| @@ -10,4 +10,14 @@ | |||
| 10 | #define flush_agp_mappings() | 10 | #define flush_agp_mappings() |
| 11 | #define flush_agp_cache() mb() | 11 | #define flush_agp_cache() mb() |
| 12 | 12 | ||
| 13 | /* Convert a physical address to an address suitable for the GART. */ | ||
| 14 | #define phys_to_gart(x) (x) | ||
| 15 | #define gart_to_phys(x) (x) | ||
| 16 | |||
| 17 | /* GATT allocation. Returns/accepts GATT kernel virtual address. */ | ||
| 18 | #define alloc_gatt_pages(order) \ | ||
| 19 | ((char *)__get_free_pages(GFP_KERNEL, (order))) | ||
| 20 | #define free_gatt_pages(table, order) \ | ||
| 21 | free_pages((unsigned long)(table), (order)) | ||
| 22 | |||
| 13 | #endif | 23 | #endif |
diff --git a/include/asm-ppc64/agp.h b/include/asm-ppc64/agp.h index be27cfa8c5..ca9e423307 100644 --- a/include/asm-ppc64/agp.h +++ b/include/asm-ppc64/agp.h | |||
| @@ -10,4 +10,14 @@ | |||
| 10 | #define flush_agp_mappings() | 10 | #define flush_agp_mappings() |
| 11 | #define flush_agp_cache() mb() | 11 | #define flush_agp_cache() mb() |
| 12 | 12 | ||
| 13 | /* Convert a physical address to an address suitable for the GART. */ | ||
| 14 | #define phys_to_gart(x) (x) | ||
| 15 | #define gart_to_phys(x) (x) | ||
| 16 | |||
| 17 | /* GATT allocation. Returns/accepts GATT kernel virtual address. */ | ||
| 18 | #define alloc_gatt_pages(order) \ | ||
| 19 | ((char *)__get_free_pages(GFP_KERNEL, (order))) | ||
| 20 | #define free_gatt_pages(table, order) \ | ||
| 21 | free_pages((unsigned long)(table), (order)) | ||
| 22 | |||
| 13 | #endif | 23 | #endif |
diff --git a/include/asm-sparc64/agp.h b/include/asm-sparc64/agp.h index ba05bdf9a2..58f8cb6ae7 100644 --- a/include/asm-sparc64/agp.h +++ b/include/asm-sparc64/agp.h | |||
| @@ -8,4 +8,14 @@ | |||
| 8 | #define flush_agp_mappings() | 8 | #define flush_agp_mappings() |
| 9 | #define flush_agp_cache() mb() | 9 | #define flush_agp_cache() mb() |
| 10 | 10 | ||
| 11 | /* Convert a physical address to an address suitable for the GART. */ | ||
| 12 | #define phys_to_gart(x) (x) | ||
| 13 | #define gart_to_phys(x) (x) | ||
| 14 | |||
| 15 | /* GATT allocation. Returns/accepts GATT kernel virtual address. */ | ||
| 16 | #define alloc_gatt_pages(order) \ | ||
| 17 | ((char *)__get_free_pages(GFP_KERNEL, (order))) | ||
| 18 | #define free_gatt_pages(table, order) \ | ||
| 19 | free_pages((unsigned long)(table), (order)) | ||
| 20 | |||
| 11 | #endif | 21 | #endif |
diff --git a/include/asm-x86_64/agp.h b/include/asm-x86_64/agp.h index 0bb9019d58..06c52ee9c0 100644 --- a/include/asm-x86_64/agp.h +++ b/include/asm-x86_64/agp.h | |||
| @@ -19,4 +19,14 @@ int unmap_page_from_agp(struct page *page); | |||
| 19 | worth it. Would need a page for it. */ | 19 | worth it. Would need a page for it. */ |
| 20 | #define flush_agp_cache() asm volatile("wbinvd":::"memory") | 20 | #define flush_agp_cache() asm volatile("wbinvd":::"memory") |
| 21 | 21 | ||
| 22 | /* Convert a physical address to an address suitable for the GART. */ | ||
| 23 | #define phys_to_gart(x) (x) | ||
| 24 | #define gart_to_phys(x) (x) | ||
| 25 | |||
| 26 | /* GATT allocation. Returns/accepts GATT kernel virtual address. */ | ||
| 27 | #define alloc_gatt_pages(order) \ | ||
| 28 | ((char *)__get_free_pages(GFP_KERNEL, (order))) | ||
| 29 | #define free_gatt_pages(table, order) \ | ||
| 30 | free_pages((unsigned long)(table), (order)) | ||
| 31 | |||
| 22 | #endif | 32 | #endif |