# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1232878571 0
# Node ID ef156b933aad4c505f0c1eb8899995aeb1930e91
# Parent 55bf9404a675357c5e0a00a49313124a2e77aaa8
vt-d: Do not explicitly exclude tboot ranges from dom0 vt-d
mappings. tboot is not registered as RAM in e820 tables, and hence
will not be mapped anyway (fails memory_is_conventional_ram() check).
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
xen/arch/ia64/xen/xensetup.c | 5 -----
xen/arch/x86/tboot.c | 12 ------------
xen/drivers/passthrough/vtd/iommu.c | 9 ++-------
3 files changed, 2 insertions(+), 24 deletions(-)
diff -r 55bf9404a675 -r ef156b933aad xen/arch/ia64/xen/xensetup.c
--- a/xen/arch/ia64/xen/xensetup.c Sun Jan 25 10:12:38 2009 +0000
+++ b/xen/arch/ia64/xen/xensetup.c Sun Jan 25 10:16:11 2009 +0000
@@ -747,8 +747,3 @@ int xen_in_range(paddr_t start, paddr_t
return start < end;
}
-
-int tboot_in_range(paddr_t start, paddr_t end)
-{
- return 0;
-}
diff -r 55bf9404a675 -r ef156b933aad xen/arch/x86/tboot.c
--- a/xen/arch/x86/tboot.c Sun Jan 25 10:12:38 2009 +0000
+++ b/xen/arch/x86/tboot.c Sun Jan 25 10:16:11 2009 +0000
@@ -96,18 +96,6 @@ int tboot_in_measured_env(void)
return (g_tboot_shared != NULL);
}
-int tboot_in_range(paddr_t start, paddr_t end)
-{
- if ( g_tboot_shared == NULL || g_tboot_shared->version < 0x02 )
- return 0;
-
- start = max_t(paddr_t, start, g_tboot_shared->tboot_base);
- end = min_t(paddr_t, end,
- g_tboot_shared->tboot_base + g_tboot_shared->tboot_size);
-
- return start < end;
-}
-
/*
* Local variables:
* mode: C
diff -r 55bf9404a675 -r ef156b933aad xen/drivers/passthrough/vtd/iommu.c
--- a/xen/drivers/passthrough/vtd/iommu.c Sun Jan 25 10:12:38 2009 +0000
+++ b/xen/drivers/passthrough/vtd/iommu.c Sun Jan 25 10:16:11 2009 +0000
@@ -994,16 +994,11 @@ static int intel_iommu_domain_init(struc
if ( d->domain_id == 0 )
{
extern int xen_in_range(paddr_t start, paddr_t end);
- extern int tboot_in_range(paddr_t start, paddr_t end);
-
- /*
- * Set up 1:1 page table for dom0 except the critical segments
- * like Xen and tboot.
- */
+
+ /* Set up 1:1 page table for dom0 for all RAM except Xen bits. */
for ( i = 0; i < max_page; i++ )
{
if ( xen_in_range(i << PAGE_SHIFT, (i + 1) << PAGE_SHIFT) ||
- tboot_in_range(i << PAGE_SHIFT, (i + 1) << PAGE_SHIFT) ||
!memory_is_conventional_ram(i << PAGE_SHIFT) )
continue;
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home