[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] [LIBXC] move xc_ppc_linux_build.c into a powerpc64 directory
# HG changeset patch # User Hollis Blanchard <hollisb@xxxxxxxxxx> # Node ID b2fc8357b8ffc421c3d49a24d4f3e3e5411bbc90 # Parent 00a41d1daf899b8d4bc906138aa74098a2042ae3 [LIBXC] move xc_ppc_linux_build.c into a powerpc64 directory Signed-off-by: Hollis Blanchard <hollisb@xxxxxxxxxx> --- tools/libxc/xc_ppc_linux_build.c | 408 --------------------------------- tools/libxc/powerpc64/Makefile | 1 tools/libxc/powerpc64/xc_linux_build.c | 408 +++++++++++++++++++++++++++++++++ 3 files changed, 409 insertions(+), 408 deletions(-) diff -r 00a41d1daf89 -r b2fc8357b8ff tools/libxc/powerpc64/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxc/powerpc64/Makefile Tue Aug 08 15:11:25 2006 -0500 @@ -0,0 +1,1 @@ +CTRL_SRCS-y += powerpc64/xc_linux_build.c diff -r 00a41d1daf89 -r b2fc8357b8ff tools/libxc/powerpc64/xc_linux_build.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tools/libxc/powerpc64/xc_linux_build.c Tue Aug 08 15:11:25 2006 -0500 @@ -0,0 +1,408 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Copyright (C) IBM Corporation 2006 + * + * Authors: Hollis Blanchard <hollisb@xxxxxxxxxx> + */ + +#include <stdio.h> +#include <stdint.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <fcntl.h> +#include <sys/types.h> +#include <inttypes.h> + +#include <xen/dom0_ops.h> +#include <xen/memory.h> +#include <xc_private.h> +#include <xg_private.h> +#include <xenctrl.h> + +/* XXX 64M hack */ +#define MEMSIZE (64UL << 20) +#define INITRD_ADDR (24UL << 20) + +#define ALIGN_UP(addr,size) (((addr)+((size)-1))&(~((size)-1))) + +#define max(x,y) ({ \ + const typeof(x) _x = (x); \ + const typeof(y) _y = (y); \ + (void) (&_x == &_y); \ + _x > _y ? _x : _y; }) + +static void *load_file(const char *path, unsigned long *filesize) +{ + void *img; + ssize_t size; + int fd; + + DPRINTF("load_file(%s)\n", path); + + fd = open(path, O_RDONLY); + if (fd < 0) { + perror(path); + return NULL; + } + + size = lseek(fd, 0, SEEK_END); + if (size < 0) { + perror(path); + close(fd); + return NULL; + } + lseek(fd, 0, SEEK_SET); + + img = malloc(size); + if (img == NULL) { + perror(path); + close(fd); + return NULL; + } + + size = read(fd, img, size); + if (size <= 0) { + perror(path); + close(fd); + free(img); + return NULL; + } + + if (filesize) + *filesize = size; + close(fd); + return img; +} + +static int init_boot_vcpu( + int xc_handle, + int domid, + struct domain_setup_info *dsi, + unsigned long dtb, + unsigned long kaddr) +{ + vcpu_guest_context_t ctxt; + int rc; + + memset(&ctxt.user_regs, 0x55, sizeof(ctxt.user_regs)); + ctxt.user_regs.pc = dsi->v_kernentry; + ctxt.user_regs.msr = 0; + ctxt.user_regs.gprs[1] = 0; /* Linux uses its own stack */ + ctxt.user_regs.gprs[3] = dtb; + ctxt.user_regs.gprs[4] = kaddr; + ctxt.user_regs.gprs[5] = 0; + /* There is a buggy kernel that does not zero the "local_paca", so + * we must make sure this register is 0 */ + ctxt.user_regs.gprs[13] = 0; + + DPRINTF("xc_vcpu_setvcpucontext:\n" + " pc 0x%"PRIx64", msr 0x016%"PRIx64"\n" + " r1-5 %016"PRIx64" %016"PRIx64" %016"PRIx64" %016"PRIx64 + " %016"PRIx64"\n", + ctxt.user_regs.pc, ctxt.user_regs.msr, + ctxt.user_regs.gprs[1], + ctxt.user_regs.gprs[2], + ctxt.user_regs.gprs[3], + ctxt.user_regs.gprs[4], + ctxt.user_regs.gprs[5]); + rc = xc_vcpu_setcontext(xc_handle, domid, 0, &ctxt); + if (rc < 0) + perror("setdomaininfo"); + + return rc; +} + +static int install_image( + int xc_handle, + int domid, + xen_pfn_t *page_array, + void *image, + unsigned long paddr, + unsigned long size) +{ + uint8_t *img = image; + int i; + int rc = 0; + + if (paddr & ~PAGE_MASK) { + printf("*** unaligned address\n"); + return -1; + } + + for (i = 0; i < size; i += PAGE_SIZE) { + void *page = img + i; + xen_pfn_t pfn = (paddr + i) >> PAGE_SHIFT; + xen_pfn_t mfn = page_array[pfn]; + + rc = xc_copy_to_domain_page(xc_handle, domid, mfn, page); + if (rc < 0) { + perror("xc_copy_to_domain_page"); + break; + } + } + return rc; +} + +/* XXX be more flexible about placement in memory */ +static int load_dtb( + int xc_handle, + int domid, + const char *dtb_path, + unsigned long dtb_addr, + struct domain_setup_info *dsi, + xen_pfn_t *page_array) +{ + uint8_t *img; + unsigned long dtb_size; + int rc = 0; + + img = load_file(dtb_path, &dtb_size); + if (img == NULL) { + rc = -1; + goto out; + } + + DPRINTF("copying device tree to 0x%lx[0x%lx]\n", dtb_addr, dtb_size); + rc = install_image(xc_handle, domid, page_array, img, dtb_addr, dtb_size); + +out: + free(img); + return rc; +} + +unsigned long spin_list[] = { +#if 0 + 0x100, + 0x200, + 0x300, + 0x380, + 0x400, + 0x480, + 0x500, + 0x700, + 0x900, + 0xc00, +#endif + 0 +}; + +/* XXX yes, this is a hack */ +static void hack_kernel_img(char *img) +{ + const off_t file_offset = 0x10000; + unsigned long *addr = spin_list; + + while (*addr) { + uint32_t *instruction = (uint32_t *)(img + *addr + file_offset); + printf("installing spin loop at %lx (%x)\n", *addr, *instruction); + *instruction = 0x48000000; + addr++; + } +} + +static int load_kernel( + int xc_handle, + int domid, + const char *kernel_path, + struct domain_setup_info *dsi, + xen_pfn_t *page_array) +{ + struct load_funcs load_funcs; + char *kernel_img; + unsigned long kernel_size; + int rc; + + /* load the kernel ELF file */ + kernel_img = load_file(kernel_path, &kernel_size); + if (kernel_img == NULL) { + rc = -1; + goto out; + } + + hack_kernel_img(kernel_img); + + DPRINTF("probe_elf\n"); + rc = probe_elf(kernel_img, kernel_size, &load_funcs); + if (rc < 0) { + rc = -1; + printf("%s is not an ELF file\n", kernel_path); + goto out; + } + + DPRINTF("parseimage\n"); + rc = (load_funcs.parseimage)(kernel_img, kernel_size, dsi); + if (rc < 0) { + rc = -1; + goto out; + } + + DPRINTF("loadimage\n"); + (load_funcs.loadimage)(kernel_img, kernel_size, xc_handle, domid, + page_array, dsi); + + DPRINTF(" v_start %016"PRIx64"\n", dsi->v_start); + DPRINTF(" v_end %016"PRIx64"\n", dsi->v_end); + DPRINTF(" v_kernstart %016"PRIx64"\n", dsi->v_kernstart); + DPRINTF(" v_kernend %016"PRIx64"\n", dsi->v_kernend); + DPRINTF(" v_kernentry %016"PRIx64"\n", dsi->v_kernentry); + +out: + free(kernel_img); + return rc; +} + +static int load_initrd( + int xc_handle, + int domid, + xen_pfn_t *page_array, + const char *initrd_path, + unsigned long *base, + unsigned long *len) +{ + uint8_t *initrd_img; + int rc = -1; + + /* load the initrd file */ + initrd_img = load_file(initrd_path, len); + if (initrd_img == NULL) + return -1; + + DPRINTF("copying initrd to 0x%lx[0x%lx]\n", INITRD_ADDR, *len); + if (install_image(xc_handle, domid, page_array, initrd_img, INITRD_ADDR, + *len)) + goto out; + + *base = INITRD_ADDR; + rc = 0; + +out: + free(initrd_img); + return rc; +} + +static unsigned long create_start_info(start_info_t *si, + unsigned int console_evtchn, unsigned int store_evtchn) +{ + unsigned long eomem; + unsigned long si_addr; + + memset(si, 0, sizeof(*si)); + snprintf(si->magic, sizeof(si->magic), "xen-%d.%d-powerpc64HV", 3, 0); + + eomem = MEMSIZE; + si->nr_pages = eomem >> PAGE_SHIFT; + si->shared_info = eomem - (PAGE_SIZE * 1); + si->store_mfn = si->nr_pages - 2; + si->store_evtchn = store_evtchn; + si->console_mfn = si->nr_pages - 3; + si->console_evtchn = console_evtchn; + si_addr = eomem - (PAGE_SIZE * 4); + + return si_addr; +} + +static int get_page_array(int xc_handle, int domid, xen_pfn_t **page_array) +{ + int nr_pages; + int rc; + + DPRINTF("xc_get_tot_pages\n"); + nr_pages = xc_get_tot_pages(xc_handle, domid); + DPRINTF(" 0x%x\n", nr_pages); + + *page_array = malloc(nr_pages * sizeof(xen_pfn_t)); + if (*page_array == NULL) { + perror("malloc"); + return -1; + } + + DPRINTF("xc_get_pfn_list\n"); + rc = xc_get_pfn_list(xc_handle, domid, *page_array, nr_pages); + if (rc != nr_pages) { + perror("Could not get the page frame list"); + return -1; + } + + return 0; +} + + + +int xc_linux_build(int xc_handle, + uint32_t domid, + const char *image_name, + const char *initrd_name, + const char *cmdline, + const char *features, + unsigned long flags, + unsigned int store_evtchn, + unsigned long *store_mfn, + unsigned int console_evtchn, + unsigned long *console_mfn) +{ + struct domain_setup_info dsi; + xen_pfn_t *page_array = NULL; + unsigned long kern_addr; + unsigned long dtb_addr; + unsigned long si_addr; + unsigned long initrd_base = 0; + unsigned long initrd_len = 0; + start_info_t si; + int rc = 0; + + if (get_page_array(xc_handle, domid, &page_array)) { + rc = -1; + goto out; + } + + if (load_kernel(xc_handle, domid, image_name, &dsi, page_array)) { + rc = -1; + goto out; + } + kern_addr = 0; + + if (initrd_name && initrd_name[0] != '\0' && + load_initrd(xc_handle, domid, page_array, initrd_name, &initrd_base, + &initrd_len)) { + rc = -1; + goto out; + } + /* XXX install initrd addr/len into device tree */ + + dtb_addr = (16 << 20); + if (load_dtb(xc_handle, domid, "/root/DomU.dtb", dtb_addr, &dsi, page_array)) { + dtb_addr = 0; + } + + si_addr = create_start_info(&si, console_evtchn, store_evtchn); + *console_mfn = page_array[si.console_mfn]; + *store_mfn = page_array[si.store_mfn]; + + if (install_image(xc_handle, domid, page_array, &si, si_addr, + sizeof(start_info_t))) { + rc = -1; + goto out; + } + + if (init_boot_vcpu(xc_handle, domid, &dsi, dtb_addr, kern_addr)) { + rc = -1; + goto out; + } + +out: + return rc; +} diff -r 00a41d1daf89 -r b2fc8357b8ff tools/libxc/xc_ppc_linux_build.c --- a/tools/libxc/xc_ppc_linux_build.c Mon Aug 07 17:16:18 2006 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,408 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * Copyright (C) IBM Corporation 2006 - * - * Authors: Hollis Blanchard <hollisb@xxxxxxxxxx> - */ - -#include <stdio.h> -#include <stdint.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <fcntl.h> -#include <sys/types.h> -#include <inttypes.h> - -#include <xen/dom0_ops.h> -#include <xen/memory.h> -#include <xc_private.h> -#include <xg_private.h> -#include <xenctrl.h> - -/* XXX 64M hack */ -#define MEMSIZE (64UL << 20) -#define INITRD_ADDR (24UL << 20) - -#define ALIGN_UP(addr,size) (((addr)+((size)-1))&(~((size)-1))) - -#define max(x,y) ({ \ - const typeof(x) _x = (x); \ - const typeof(y) _y = (y); \ - (void) (&_x == &_y); \ - _x > _y ? _x : _y; }) - -static void *load_file(const char *path, unsigned long *filesize) -{ - void *img; - ssize_t size; - int fd; - - DPRINTF("load_file(%s)\n", path); - - fd = open(path, O_RDONLY); - if (fd < 0) { - perror(path); - return NULL; - } - - size = lseek(fd, 0, SEEK_END); - if (size < 0) { - perror(path); - close(fd); - return NULL; - } - lseek(fd, 0, SEEK_SET); - - img = malloc(size); - if (img == NULL) { - perror(path); - close(fd); - return NULL; - } - - size = read(fd, img, size); - if (size <= 0) { - perror(path); - close(fd); - free(img); - return NULL; - } - - if (filesize) - *filesize = size; - close(fd); - return img; -} - -static int init_boot_vcpu( - int xc_handle, - int domid, - struct domain_setup_info *dsi, - unsigned long dtb, - unsigned long kaddr) -{ - vcpu_guest_context_t ctxt; - int rc; - - memset(&ctxt.user_regs, 0x55, sizeof(ctxt.user_regs)); - ctxt.user_regs.pc = dsi->v_kernentry; - ctxt.user_regs.msr = 0; - ctxt.user_regs.gprs[1] = 0; /* Linux uses its own stack */ - ctxt.user_regs.gprs[3] = dtb; - ctxt.user_regs.gprs[4] = kaddr; - ctxt.user_regs.gprs[5] = 0; - /* There is a buggy kernel that does not zero the "local_paca", so - * we must make sure this register is 0 */ - ctxt.user_regs.gprs[13] = 0; - - DPRINTF("xc_vcpu_setvcpucontext:\n" - " pc 0x%"PRIx64", msr 0x016%"PRIx64"\n" - " r1-5 %016"PRIx64" %016"PRIx64" %016"PRIx64" %016"PRIx64 - " %016"PRIx64"\n", - ctxt.user_regs.pc, ctxt.user_regs.msr, - ctxt.user_regs.gprs[1], - ctxt.user_regs.gprs[2], - ctxt.user_regs.gprs[3], - ctxt.user_regs.gprs[4], - ctxt.user_regs.gprs[5]); - rc = xc_vcpu_setcontext(xc_handle, domid, 0, &ctxt); - if (rc < 0) - perror("setdomaininfo"); - - return rc; -} - -static int install_image( - int xc_handle, - int domid, - xen_pfn_t *page_array, - void *image, - unsigned long paddr, - unsigned long size) -{ - uint8_t *img = image; - int i; - int rc = 0; - - if (paddr & ~PAGE_MASK) { - printf("*** unaligned address\n"); - return -1; - } - - for (i = 0; i < size; i += PAGE_SIZE) { - void *page = img + i; - xen_pfn_t pfn = (paddr + i) >> PAGE_SHIFT; - xen_pfn_t mfn = page_array[pfn]; - - rc = xc_copy_to_domain_page(xc_handle, domid, mfn, page); - if (rc < 0) { - perror("xc_copy_to_domain_page"); - break; - } - } - return rc; -} - -/* XXX be more flexible about placement in memory */ -static int load_dtb( - int xc_handle, - int domid, - const char *dtb_path, - unsigned long dtb_addr, - struct domain_setup_info *dsi, - xen_pfn_t *page_array) -{ - uint8_t *img; - unsigned long dtb_size; - int rc = 0; - - img = load_file(dtb_path, &dtb_size); - if (img == NULL) { - rc = -1; - goto out; - } - - DPRINTF("copying device tree to 0x%lx[0x%lx]\n", dtb_addr, dtb_size); - rc = install_image(xc_handle, domid, page_array, img, dtb_addr, dtb_size); - -out: - free(img); - return rc; -} - -unsigned long spin_list[] = { -#if 0 - 0x100, - 0x200, - 0x300, - 0x380, - 0x400, - 0x480, - 0x500, - 0x700, - 0x900, - 0xc00, -#endif - 0 -}; - -/* XXX yes, this is a hack */ -static void hack_kernel_img(char *img) -{ - const off_t file_offset = 0x10000; - unsigned long *addr = spin_list; - - while (*addr) { - uint32_t *instruction = (uint32_t *)(img + *addr + file_offset); - printf("installing spin loop at %lx (%x)\n", *addr, *instruction); - *instruction = 0x48000000; - addr++; - } -} - -static int load_kernel( - int xc_handle, - int domid, - const char *kernel_path, - struct domain_setup_info *dsi, - xen_pfn_t *page_array) -{ - struct load_funcs load_funcs; - char *kernel_img; - unsigned long kernel_size; - int rc; - - /* load the kernel ELF file */ - kernel_img = load_file(kernel_path, &kernel_size); - if (kernel_img == NULL) { - rc = -1; - goto out; - } - - hack_kernel_img(kernel_img); - - DPRINTF("probe_elf\n"); - rc = probe_elf(kernel_img, kernel_size, &load_funcs); - if (rc < 0) { - rc = -1; - printf("%s is not an ELF file\n", kernel_path); - goto out; - } - - DPRINTF("parseimage\n"); - rc = (load_funcs.parseimage)(kernel_img, kernel_size, dsi); - if (rc < 0) { - rc = -1; - goto out; - } - - DPRINTF("loadimage\n"); - (load_funcs.loadimage)(kernel_img, kernel_size, xc_handle, domid, - page_array, dsi); - - DPRINTF(" v_start %016"PRIx64"\n", dsi->v_start); - DPRINTF(" v_end %016"PRIx64"\n", dsi->v_end); - DPRINTF(" v_kernstart %016"PRIx64"\n", dsi->v_kernstart); - DPRINTF(" v_kernend %016"PRIx64"\n", dsi->v_kernend); - DPRINTF(" v_kernentry %016"PRIx64"\n", dsi->v_kernentry); - -out: - free(kernel_img); - return rc; -} - -static int load_initrd( - int xc_handle, - int domid, - xen_pfn_t *page_array, - const char *initrd_path, - unsigned long *base, - unsigned long *len) -{ - uint8_t *initrd_img; - int rc = -1; - - /* load the initrd file */ - initrd_img = load_file(initrd_path, len); - if (initrd_img == NULL) - return -1; - - DPRINTF("copying initrd to 0x%lx[0x%lx]\n", INITRD_ADDR, *len); - if (install_image(xc_handle, domid, page_array, initrd_img, INITRD_ADDR, - *len)) - goto out; - - *base = INITRD_ADDR; - rc = 0; - -out: - free(initrd_img); - return rc; -} - -static unsigned long create_start_info(start_info_t *si, - unsigned int console_evtchn, unsigned int store_evtchn) -{ - unsigned long eomem; - unsigned long si_addr; - - memset(si, 0, sizeof(*si)); - snprintf(si->magic, sizeof(si->magic), "xen-%d.%d-powerpc64HV", 3, 0); - - eomem = MEMSIZE; - si->nr_pages = eomem >> PAGE_SHIFT; - si->shared_info = eomem - (PAGE_SIZE * 1); - si->store_mfn = si->nr_pages - 2; - si->store_evtchn = store_evtchn; - si->console_mfn = si->nr_pages - 3; - si->console_evtchn = console_evtchn; - si_addr = eomem - (PAGE_SIZE * 4); - - return si_addr; -} - -static int get_page_array(int xc_handle, int domid, xen_pfn_t **page_array) -{ - int nr_pages; - int rc; - - DPRINTF("xc_get_tot_pages\n"); - nr_pages = xc_get_tot_pages(xc_handle, domid); - DPRINTF(" 0x%x\n", nr_pages); - - *page_array = malloc(nr_pages * sizeof(xen_pfn_t)); - if (*page_array == NULL) { - perror("malloc"); - return -1; - } - - DPRINTF("xc_get_pfn_list\n"); - rc = xc_get_pfn_list(xc_handle, domid, *page_array, nr_pages); - if (rc != nr_pages) { - perror("Could not get the page frame list"); - return -1; - } - - return 0; -} - - - -int xc_linux_build(int xc_handle, - uint32_t domid, - const char *image_name, - const char *initrd_name, - const char *cmdline, - const char *features, - unsigned long flags, - unsigned int store_evtchn, - unsigned long *store_mfn, - unsigned int console_evtchn, - unsigned long *console_mfn) -{ - struct domain_setup_info dsi; - xen_pfn_t *page_array = NULL; - unsigned long kern_addr; - unsigned long dtb_addr; - unsigned long si_addr; - unsigned long initrd_base = 0; - unsigned long initrd_len = 0; - start_info_t si; - int rc = 0; - - if (get_page_array(xc_handle, domid, &page_array)) { - rc = -1; - goto out; - } - - if (load_kernel(xc_handle, domid, image_name, &dsi, page_array)) { - rc = -1; - goto out; - } - kern_addr = 0; - - if (initrd_name && initrd_name[0] != '\0' && - load_initrd(xc_handle, domid, page_array, initrd_name, &initrd_base, - &initrd_len)) { - rc = -1; - goto out; - } - /* XXX install initrd addr/len into device tree */ - - dtb_addr = (16 << 20); - if (load_dtb(xc_handle, domid, "/root/DomU.dtb", dtb_addr, &dsi, page_array)) { - dtb_addr = 0; - } - - si_addr = create_start_info(&si, console_evtchn, store_evtchn); - *console_mfn = page_array[si.console_mfn]; - *store_mfn = page_array[si.store_mfn]; - - if (install_image(xc_handle, domid, page_array, &si, si_addr, - sizeof(start_info_t))) { - rc = -1; - goto out; - } - - if (init_boot_vcpu(xc_handle, domid, &dsi, dtb_addr, kern_addr)) { - rc = -1; - goto out; - } - -out: - return rc; -} _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |