From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: David Vrabel <david.vrabel@citrix.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Ian Campbell <ian.campbell@citrix.com>,
Tim.Deegan@citrix.com
Subject: [PATCH v6 13/27] arm: domain_build
Date: Fri, 20 Jan 2012 16:36:01 +0000 [thread overview]
Message-ID: <1327077375-7623-13-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1201201605370.3196@kaball-desktop>
Functions to build dom0: memory allocation, p2m construction, mappings
of the MMIO regions, ATAG setup.
Changes in v5:
- route interrupt 34 (peripheral timer) to dom0.
Changes in v2:
- set elf.dest.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
---
xen/arch/arm/domain_build.c | 213 ++++++++++++++++++++++++++++++++++++
xen/common/libelf/libelf-dominfo.c | 6 +
xen/include/asm-arm/setup.h | 2 +
xen/include/xen/libelf.h | 2 +-
4 files changed, 222 insertions(+), 1 deletions(-)
create mode 100644 xen/arch/arm/domain_build.c
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
new file mode 100644
index 0000000..f73df85
--- /dev/null
+++ b/xen/arch/arm/domain_build.c
@@ -0,0 +1,213 @@
+#include <xen/config.h>
+#include <xen/init.h>
+#include <xen/lib.h>
+#include <xen/mm.h>
+#include <xen/domain_page.h>
+#include <xen/sched.h>
+#include <xen/libelf.h>
+#include <asm/irq.h>
+
+#include "gic.h"
+
+static unsigned int __initdata opt_dom0_max_vcpus;
+integer_param("dom0_max_vcpus", opt_dom0_max_vcpus);
+
+struct vcpu *__init alloc_dom0_vcpu0(void)
+{
+ dom0->vcpu = xmalloc_array(struct vcpu *, opt_dom0_max_vcpus);
+ if ( !dom0->vcpu )
+ {
+ printk("failed to alloc dom0->vccpu\n");
+ return NULL;
+ }
+ memset(dom0->vcpu, 0, opt_dom0_max_vcpus * sizeof(*dom0->vcpu));
+ dom0->max_vcpus = opt_dom0_max_vcpus;
+
+ return alloc_vcpu(dom0, 0, 0);
+}
+
+extern void guest_mode_entry(void);
+
+static void copy_from_flash(void *dst, paddr_t flash, unsigned long len)
+{
+ void *src = (void *)FIXMAP_ADDR(FIXMAP_MISC);
+ unsigned long offs;
+
+ printk("Copying %#lx bytes from flash %"PRIpaddr" to %p-%p: [",
+ len, flash, dst, dst+(1<<23));
+ for ( offs = 0; offs < len ; offs += PAGE_SIZE )
+ {
+ if ( ( offs % (1<<20) ) == 0 )
+ printk(".");
+ set_fixmap(FIXMAP_MISC, (flash+offs) >> PAGE_SHIFT, DEV_SHARED);
+ memcpy(dst+offs, src, PAGE_SIZE);
+ }
+ printk("]\n");
+
+ clear_fixmap(FIXMAP_MISC);
+}
+
+static void setup_linux_atag(paddr_t tags, paddr_t ram_s, paddr_t ram_e)
+{
+ paddr_t ma = gvirt_to_maddr(tags);
+ void *map = map_domain_page(ma>>PAGE_SHIFT);
+ void *p = map + (tags & (PAGE_SIZE - 1));
+ char cmdline[] = "earlyprintk=xenboot console=ttyAMA1 root=/dev/mmcblk0 debug rw";
+
+ /* not enough room on this page for all the tags */
+ BUG_ON(PAGE_SIZE - (tags & (PAGE_SIZE - 1)) < 8 * sizeof(uint32_t));
+
+#define TAG(type, val) *(type*)p = val; p+= sizeof(type)
+
+ /* ATAG_CORE */
+ TAG(uint32_t, 2);
+ TAG(uint32_t, 0x54410001);
+
+ /* ATAG_MEM */
+ TAG(uint32_t, 4);
+ TAG(uint32_t, 0x54410002);
+ TAG(uint32_t, (ram_e - ram_s) & 0xFFFFFFFF);
+ TAG(uint32_t, ram_s & 0xFFFFFFFF);
+
+ /* ATAG_CMDLINE */
+ TAG(uint32_t, 2 + ((strlen(cmdline) + 4) >> 2));
+ TAG(uint32_t, 0x54410009);
+ memcpy(p, cmdline, strlen(cmdline) + 1);
+ p += ((strlen(cmdline) + 4) >> 2) << 2;
+
+ /* ATAG_NONE */
+ TAG(uint32_t, 0);
+ TAG(uint32_t, 0);
+
+#undef TAG
+
+ unmap_domain_page(map);
+}
+
+/* Store kernel in first 8M of flash */
+#define KERNEL_FLASH_ADDRESS 0x00000000UL
+#define KERNEL_FLASH_SIZE 0x00800000UL
+
+int construct_dom0(struct domain *d)
+{
+ int rc, kernel_order;
+ void *kernel_img;
+
+ struct vcpu *v = d->vcpu[0];
+ struct cpu_user_regs *regs = &v->arch.user_regs;
+
+ struct elf_binary elf;
+ struct elf_dom_parms parms;
+
+ /* Sanity! */
+ BUG_ON(d->domain_id != 0);
+ BUG_ON(d->vcpu[0] == NULL);
+ BUG_ON(v->is_initialised);
+
+ printk("*** LOADING DOMAIN 0 ***\n");
+
+ kernel_order = get_order_from_bytes(KERNEL_FLASH_SIZE);
+ kernel_img = alloc_xenheap_pages(kernel_order, 0);
+ if ( kernel_img == NULL )
+ panic("Cannot allocate temporary buffer for kernel.\n");
+
+ copy_from_flash(kernel_img, KERNEL_FLASH_ADDRESS, KERNEL_FLASH_SIZE);
+
+ d->max_pages = ~0U;
+
+ if ( (rc = elf_init(&elf, kernel_img, KERNEL_FLASH_SIZE )) != 0 )
+ return rc; memset(regs, 0, sizeof(*regs));
+#ifdef VERBOSE
+ elf_set_verbose(&elf);
+#endif
+ elf_parse_binary(&elf);
+ if ( (rc = elf_xen_parse(&elf, &parms)) != 0 )
+ return rc;
+
+ if ( (rc = p2m_alloc_table(d)) != 0 )
+ return rc;
+
+ /* 128M at 3G physical */
+ /* TODO size and location according to platform info */
+ printk("Populate P2M %#llx->%#llx\n", 0xc0000000ULL, 0xc8000000ULL);
+ p2m_populate_ram(d, 0xc0000000ULL, 0xc8000000ULL);
+
+ printk("Map CS2 MMIO regions 1:1 in the P2M %#llx->%#llx\n", 0x18000000ULL, 0x1BFFFFFFULL);
+ map_mmio_regions(d, 0x18000000, 0x1BFFFFFF, 0x18000000);
+ printk("Map CS3 MMIO regions 1:1 in the P2M %#llx->%#llx\n", 0x1C000000ULL, 0x1FFFFFFFULL);
+ map_mmio_regions(d, 0x1C000000, 0x1FFFFFFF, 0x1C000000);
+ printk("Map VGIC MMIO regions 1:1 in the P2M %#llx->%#llx\n", 0x2C008000ULL, 0x2DFFFFFFULL);
+ map_mmio_regions(d, 0x2C008000, 0x2DFFFFFF, 0x2C008000);
+
+ gicv_setup(d);
+
+ printk("Routing peripheral interrupts to guest\n");
+ /* TODO Get from device tree */
+ gic_route_irq_to_guest(d, 34, "timer0");
+ /*gic_route_irq_to_guest(d, 37, "uart0"); -- XXX used by Xen*/
+ gic_route_irq_to_guest(d, 38, "uart1");
+ gic_route_irq_to_guest(d, 39, "uart2");
+ gic_route_irq_to_guest(d, 40, "uart3");
+ gic_route_irq_to_guest(d, 41, "mmc0-1");
+ gic_route_irq_to_guest(d, 42, "mmc0-2");
+ gic_route_irq_to_guest(d, 44, "keyboard");
+ gic_route_irq_to_guest(d, 45, "mouse");
+ gic_route_irq_to_guest(d, 46, "lcd");
+ gic_route_irq_to_guest(d, 47, "eth");
+
+ /* Enable second stage translation */
+ WRITE_CP32(READ_CP32(HCR) | HCR_VM, HCR); isb();
+
+ /* The following load uses domain's p2m */
+ p2m_load_VTTBR(d);
+
+ printk("Loading ELF image into guest memory\n");
+ elf.dest = (void*)(unsigned long)parms.virt_kstart;
+ elf_load_binary(&elf);
+
+ printk("Free temporary kernel buffer\n");
+ free_xenheap_pages(kernel_img, kernel_order);
+
+ setup_linux_atag(0xc0000100ULL, 0xc0000000ULL, 0xc8000000ULL);
+
+ clear_bit(_VPF_down, &v->pause_flags);
+
+ memset(regs, 0, sizeof(*regs));
+
+ regs->pc = (uint32_t)parms.virt_entry;
+
+ regs->cpsr = PSR_ABT_MASK|PSR_FIQ_MASK|PSR_IRQ_MASK|PSR_MODE_SVC;
+
+/* FROM LINUX head.S
+
+ * Kernel startup entry point.
+ * ---------------------------
+ *
+ * This is normally called from the decompressor code. The requirements
+ * are: MMU = off, D-cache = off, I-cache = dont care, r0 = 0,
+ * r1 = machine nr, r2 = atags or dtb pointer.
+ *...
+ */
+
+ regs->r0 = 0; /* SBZ */
+ regs->r1 = 2272; /* Machine NR: Versatile Express */
+ regs->r2 = 0xc0000100; /* ATAGS */
+
+ WRITE_CP32(SCTLR_BASE, SCTLR);
+
+ WRITE_CP32(HCR_AMO|HCR_IMO|HCR_VM, HCR);
+ isb();
+
+ local_abort_enable();
+
+ return 0;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-set-style: "BSD"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/xen/common/libelf/libelf-dominfo.c b/xen/common/libelf/libelf-dominfo.c
index c569a48..523837f 100644
--- a/xen/common/libelf/libelf-dominfo.c
+++ b/xen/common/libelf/libelf-dominfo.c
@@ -341,6 +341,12 @@ static int elf_xen_note_check(struct elf_binary *elf,
return 0;
}
+ if ( elf_uval(elf, elf->ehdr, e_machine) == EM_ARM )
+ {
+ elf_msg(elf, "%s: Not bothering with notes on ARM\n", __FUNCTION__);
+ return 0;
+ }
+
/* Check the contents of the Xen notes or guest string. */
if ( ((strlen(parms->loader) == 0) ||
strncmp(parms->loader, "generic", 7)) &&
diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h
index c27d438..1dc3f97 100644
--- a/xen/include/asm-arm/setup.h
+++ b/xen/include/asm-arm/setup.h
@@ -5,6 +5,8 @@
void arch_get_xen_caps(xen_capabilities_info_t *info);
+int construct_dom0(struct domain *d);
+
#endif
/*
* Local variables:
diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h
index d77bda6..0ff8b5b 100644
--- a/xen/include/xen/libelf.h
+++ b/xen/include/xen/libelf.h
@@ -23,7 +23,7 @@
#ifndef __XEN_LIBELF_H__
#define __XEN_LIBELF_H__
-#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__)
+#if defined(__i386__) || defined(__x86_64__) || defined(__ia64__) || defined(__arm__)
#define XEN_ELF_LITTLE_ENDIAN
#else
#error define architectural endianness
--
1.7.2.5
next prev parent reply other threads:[~2012-01-20 16:36 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-20 16:35 [PATCH v6 00/27] xen: ARMv7 with virtualization extensions Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 01/27] Move cpufreq option parsing to cpufreq.c Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 02/27] Include some header files that are not automatically included on all archs Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 03/27] A collection of fixes to Xen common files Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 04/27] xen: implement an signed 64 bit division helper function Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 05/27] Introduce clear_user and clear_guest Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 06/27] libelf-loader: introduce elf_load_image Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 07/27] xen/common/Makefile: introduce HAS_CPUFREQ, HAS_PCI, HAS_PASSTHROUGH, HAS_NS16550, HAS_KEXEC Stefano Stabellini
2012-01-27 15:15 ` Ian Campbell
2012-02-08 8:35 ` Keir Fraser
2012-01-20 16:35 ` [PATCH v6 08/27] arm: compile tmem Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 09/27] arm: header files Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 10/27] arm: bit manipulation, copy and division libraries Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 11/27] arm: entry.S and head.S Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 12/27] arm: domain Stefano Stabellini
2012-01-20 16:36 ` Stefano Stabellini [this message]
2012-01-20 16:36 ` [PATCH v6 14/27] arm: driver for CoreLink GIC-400 Generic Interrupt Controller Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 15/27] arm: mmio handlers Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 16/27] arm: irq Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 17/27] arm: mm and p2m Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 19/27] arm: early setup code Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 20/27] arm: shutdown, smp and smpboot Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 21/27] arm: driver for the generic timer for ARMv7 Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 22/27] arm: trap handlers Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 23/27] arm: vgic emulation Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 24/27] arm: vtimer Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 25/27] arm: makefiles Stefano Stabellini
2012-02-02 16:46 ` Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 26/27] ARM: support zImage format kernels for dom0 Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 27/27] ARM: copy DTB appended to zImage Stefano Stabellini
2012-02-09 11:49 ` [PATCH v6 00/27] xen: ARMv7 with virtualization extensions Ian Campbell
2012-02-09 14:45 ` Ian Campbell
2012-02-09 14:53 ` [PATCH] arm: define domain_pirq_to_irq Ian Campbell
2012-02-09 15:18 ` Stefano Stabellini
2012-02-09 15:21 ` Ian Campbell
2012-02-09 15:28 ` Stefano Stabellini
2012-02-09 15:52 ` Ian Campbell
2012-02-09 14:53 ` [PATCH] arm: define stub arch_dump_shared_mem_info Ian Campbell
2012-02-09 15:19 ` Stefano Stabellini
2012-02-09 15:22 ` Ian Campbell
2012-02-09 15:28 ` Stefano Stabellini
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=1327077375-7623-13-git-send-email-stefano.stabellini@eu.citrix.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=Tim.Deegan@citrix.com \
--cc=david.vrabel@citrix.com \
--cc=ian.campbell@citrix.com \
--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;
as well as URLs for NNTP newsgroup(s).