From: Jeremy Fitzhardinge <jeremy@goop.org>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: the arch/x86 maintainers <x86@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Xen-devel <xen-devel@lists.xensource.com>,
Juan Quintela <quintela@redhat.com>,
Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Subject: [PATCH] xen dom0: Set up basic IO permissions for dom0.
Date: Fri, 27 Feb 2009 17:59:09 -0800 [thread overview]
Message-ID: <1235786365-17744-4-git-send-email-jeremy@goop.org> (raw)
In-Reply-To: <1235786365-17744-1-git-send-email-jeremy@goop.org>
From: Juan Quintela <quintela@redhat.com>
Add the direct mapping area for ISA bus access, and enable IO space
access for the guest when running as dom0.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
arch/x86/xen/enlighten.c | 8 ++++++++
arch/x86/xen/mmu.c | 24 ++++++++++++++++++++++++
arch/x86/xen/setup.c | 6 +++++-
arch/x86/xen/xen-ops.h | 1 +
4 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 95ff6a0..d5fc434 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -941,6 +941,7 @@ asmlinkage void __init xen_start_kernel(void)
xen_raw_console_write("mapping kernel into physical memory\n");
pgd = xen_setup_kernel_pagetable(pgd, xen_start_info->nr_pages);
+ xen_ident_map_ISA();
init_mm.pgd = pgd;
@@ -950,6 +951,13 @@ asmlinkage void __init xen_start_kernel(void)
if (xen_feature(XENFEAT_supervisor_mode_kernel))
pv_info.kernel_rpl = 0;
+ if (xen_initial_domain()) {
+ struct physdev_set_iopl set_iopl;
+ set_iopl.iopl = 1;
+ if (HYPERVISOR_physdev_op(PHYSDEVOP_set_iopl, &set_iopl) == -1)
+ BUG();
+ }
+
/* set the limit of our address space */
xen_reserve_top();
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index d2e8ed1..36125ea 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -1572,6 +1572,7 @@ static void *m2v(phys_addr_t maddr)
return __ka(m2p(maddr));
}
+/* Set the page permissions on an identity-mapped pages */
static void set_page_prot(void *addr, pgprot_t prot)
{
unsigned long pfn = __pa(addr) >> PAGE_SHIFT;
@@ -1789,6 +1790,29 @@ static void xen_set_fixmap(unsigned idx, unsigned long phys, pgprot_t prot)
#endif
}
+__init void xen_ident_map_ISA(void)
+{
+ unsigned long pa;
+
+ /*
+ * If we're dom0, then linear map the ISA machine addresses into
+ * the kernel's address space.
+ */
+ if (!xen_initial_domain())
+ return;
+
+ xen_raw_printk("Xen: setup ISA identity maps\n");
+
+ for (pa = ISA_START_ADDRESS; pa < ISA_END_ADDRESS; pa += PAGE_SIZE) {
+ pte_t pte = mfn_pte(PFN_DOWN(pa), PAGE_KERNEL_IO);
+
+ if (HYPERVISOR_update_va_mapping(PAGE_OFFSET + pa, pte, 0))
+ BUG();
+ }
+
+ xen_flush_tlb();
+}
+
__init void xen_post_allocator_init(void)
{
pv_mmu_ops.set_pte = xen_set_pte;
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 15c6c68..3e4cf46 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -51,6 +51,9 @@ char * __init xen_memory_setup(void)
* Even though this is normal, usable memory under Xen, reserve
* ISA memory anyway because too many things think they can poke
* about in there.
+ *
+ * In a dom0 kernel, this region is identity mapped with the
+ * hardware ISA area, so it really is out of bounds.
*/
e820_add_region(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS,
E820_RESERVED);
@@ -188,7 +191,8 @@ void __init xen_arch_setup(void)
pm_idle = xen_idle;
- paravirt_disable_iospace();
+ if (!xen_initial_domain())
+ paravirt_disable_iospace();
fiddle_vdso();
}
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
index 2f5ef26..33f7538 100644
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@ -29,6 +29,7 @@ void xen_setup_machphys_mapping(void);
pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn);
void xen_ident_map_ISA(void);
void xen_reserve_top(void);
+void xen_ident_map_ISA(void);
void xen_leave_lazy(void);
void xen_post_allocator_init(void);
--
1.6.0.6
next prev parent reply other threads:[~2009-02-28 2:02 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-28 1:59 [PATCH] xen: core dom0 support Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] xen dom0: Make hvc_xen console work for dom0 Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] xen dom0: Initialize xenbus " Jeremy Fitzhardinge
2009-02-28 1:59 ` Jeremy Fitzhardinge [this message]
2009-02-28 1:59 ` [PATCH] xen-dom0: only selectively disable cpu features Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] xen dom0: Add support for the platform_ops hypercall Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] xen mtrr: Add mtrr_ops support for Xen mtrr Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] xen: disable PAT Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] xen/dom0: use _PAGE_IOMAP in ioremap to do machine mappings Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] paravirt/xen: add pvop for page_is_ram Jeremy Fitzhardinge
2009-03-10 1:07 ` H. Peter Anvin
2009-03-10 21:19 ` Jeremy Fitzhardinge
2009-03-10 22:21 ` H. Peter Anvin
2009-03-10 22:44 ` Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] xen/dom0: Use host E820 map Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] xen: implement XENMEM_machphys_mapping Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] xen: clear reserved bits in l3 entries given in the initial pagetables Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] xen/dom0: add XEN_DOM0 config option Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] xen: allow enable use of VGA console on dom0 Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] xen mtrr: Use specific cpu_has_foo macros instead of generic cpu_has() Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] xen mtrr: Kill some unneccessary includes Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] xen mtrr: Use generic_validate_add_page() Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] xen mtrr: Implement xen_get_free_region() Jeremy Fitzhardinge
2009-02-28 1:59 ` [PATCH] xen mtrr: Add xen_{get,set}_mtrr() implementations Jeremy Fitzhardinge
2009-02-28 5:28 ` [PATCH] xen: core dom0 support Andrew Morton
2009-02-28 6:52 ` Jeremy Fitzhardinge
2009-02-28 7:20 ` Ingo Molnar
2009-02-28 8:05 ` Jeremy Fitzhardinge
2009-02-28 8:36 ` Ingo Molnar
2009-02-28 9:57 ` Jeremy Fitzhardinge
2009-03-02 9:26 ` Gerd Hoffmann
2009-03-02 12:04 ` Ingo Molnar
2009-03-02 12:26 ` Gerd Hoffmann
2009-02-28 12:09 ` Nick Piggin
2009-02-28 18:11 ` [Xen-devel] " Jody Belka
2009-02-28 18:15 ` Andi Kleen
2009-03-01 23:38 ` Jeremy Fitzhardinge
2009-03-02 0:14 ` Andi Kleen
2009-03-01 23:27 ` Jeremy Fitzhardinge
2009-03-02 6:37 ` Nick Piggin
2009-03-02 8:05 ` Jeremy Fitzhardinge
2009-03-02 8:19 ` Nick Piggin
2009-03-02 9:05 ` Jeremy Fitzhardinge
2009-03-04 17:34 ` Anthony Liguori
2009-03-04 17:38 ` Jeremy Fitzhardinge
2009-03-05 10:59 ` [Xen-devel] " George Dunlap
2009-03-05 14:37 ` Anthony Liguori
2009-03-04 17:31 ` Anthony Liguori
2009-03-04 19:03 ` Anthony Liguori
2009-03-04 19:16 ` H. Peter Anvin
2009-03-04 19:33 ` Anthony Liguori
2009-02-28 16:14 ` Andi Kleen
2009-03-01 23:34 ` Jeremy Fitzhardinge
2009-03-01 23:52 ` H. Peter Anvin
2009-03-02 0:08 ` Jeremy Fitzhardinge
2009-03-02 0:14 ` H. Peter Anvin
2009-03-02 0:42 ` Jeremy Fitzhardinge
2009-03-02 0:46 ` H. Peter Anvin
2009-03-02 0:10 ` Andi Kleen
2009-02-28 8:42 ` Ingo Molnar
2009-02-28 9:46 ` Jeremy Fitzhardinge
2009-03-02 12:08 ` Ingo Molnar
2009-03-07 9:06 ` Jeremy Fitzhardinge
2009-03-08 11:01 ` Ingo Molnar
2009-03-08 21:56 ` H. Peter Anvin
2009-03-08 22:06 ` Ingo Molnar
2009-03-08 22:08 ` H. Peter Anvin
2009-03-08 22:12 ` Ingo Molnar
2009-03-09 18:06 ` Jeremy Fitzhardinge
2009-03-10 12:44 ` Ingo Molnar
2009-03-10 12:49 ` Nick Piggin
2009-03-05 13:52 ` Morten P.D. Stevens
2009-03-08 14:25 ` Manfred Knick
2009-03-09 19:51 ` Morten P.D. Stevens
2009-03-09 20:00 ` Morten P.D. Stevens
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1235786365-17744-4-git-send-email-jeremy@goop.org \
--to=jeremy@goop.org \
--cc=hpa@zytor.com \
--cc=jeremy.fitzhardinge@citrix.com \
--cc=linux-kernel@vger.kernel.org \
--cc=quintela@redhat.com \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®