kvm-userspace: ppc: userspace fixes for powerpc

@@ -57,7 +57,7 @@
 
     regs.ctr = env->ctr;
     regs.lr  = env->lr;
-    regs.xer = ppc_load_xer(env);
+    regs.xer = env->xer;
     regs.msr = env->msr;
 
     regs.srr0 = env->spr[SPR_SRR0];

@@ -93,7 +93,7 @@
 
     env->ctr =regs.ctr;
     env->lr = regs.lr;
-    ppc_store_xer(env,regs.xer);
+    env->xer = regs.xer;
     env->msr = regs.msr;
     /* calculate hflags based on the current msr using the ppc qemu helper */
     hreg_compute_hflags(env);

@@ -51,7 +51,7 @@
 struct io_table mmio_table;
 
 static int ncpus = 1;
-static sem_t init_sem;
+static sem_t exited_sem;
 static __thread int vcpu;
 static sigset_t kernel_sigmask;
 static sigset_t ipi_sigmask;

@@ -220,16 +220,8 @@
 	asm volatile ("sync; isync");
 }
 
-static void init_vcpu(int n, unsigned long entry)
+static void init_vcpu(int n)
 {
-	/* XXX must set initial TLB state and stack
-	struct kvm_regs regs = {
-		.pc = entry,
-	};
-
-	kvm_set_regs(kvm, 0, &regs);
-	*/
-
 	sigemptyset(&ipi_sigmask);
 	sigaddset(&ipi_sigmask, IPI_SIGNAL);
 	sigprocmask(SIG_UNBLOCK, &ipi_sigmask, NULL);

@@ -237,7 +229,6 @@
 	vcpus[n].tid = gettid();
 	vcpu = n;
 	kvm_set_signal_mask(kvm, n, &kernel_sigmask);
-	sem_post(&init_sem);
 }
 
 static void *do_create_vcpu(void *_n)

@@ -245,8 +236,9 @@
 	int n = (long)_n;
 
 	kvm_create_vcpu(kvm, n);
-	init_vcpu(n, 0x0);
+	init_vcpu(n);
 	kvm_run(kvm, n);
+	sem_post(&exited_sem);
 	return NULL;
 }
 

@@ -368,14 +360,14 @@
 	len = load_file(vm_mem, argv[optind], 1);
 	sync_caches(vm_mem, len);
 
-	sem_init(&init_sem, 0, 0);
-	init_vcpu(0, 0x0);
-	for (i = 1; i < ncpus; ++i)
-		start_vcpu(i);
-	for (i = 0; i < ncpus; ++i)
-		sem_wait(&init_sem);
-
 	io_table_register(&mmio_table, 0xf0000000, 64, mmio_handler, NULL);
 
-	return kvm_run(kvm, 0);
+	sem_init(&exited_sem, 0, 0);
+	for (i = 0; i < ncpus; ++i)
+		start_vcpu(i);
+	/* Wait for all vcpus to exit. */
+	for (i = 0; i < ncpus; ++i)
+		sem_wait(&exited_sem);
+
+	return 0;
 }

@@ -183,7 +183,7 @@
 
 static unsigned long load_file(void *mem, const char *fname, int inval_icache)
 {
-	int r;
+	ssize_t r;
 	int fd;
 	unsigned long bytes = 0;
 

@@ -200,6 +200,7 @@
 
 	if (r == -1) {
 		perror("read");
+		printf("read %d bytes\n", bytes);
 		exit(1);
 	}
 

51 lines not on this page · raw message

new file mode 100644
@@ -0,0 +1,35 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation.
+ *
+ * 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, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright IBM Corp. 2008
+ *
+ * Authors: Hollis Blanchard <hollisb-r/[email protected]>
+ */
+
+#include "libcflat.h"
+
+#define BASE 0xf0000000
+#define _putc ((volatile char *)(BASE))
+#define _exit ((volatile char *)(BASE+1))
+
+void puts(const char *s)
+{
+	while (*s != '\0')
+		*_putc = *s++;
+}
+
+void exit(int code)
+{
+	*_exit = code;
+}

new file mode 100644
@@ -0,0 +1,23 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation;
+ *
+ * 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, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright IBM Corp. 2008
+ *
+ * Authors: Hollis Blanchard <hollisb-r/[email protected]>
+ */
+
+int main(void)
+{
+	return 1;
+}

new file mode 100644
@@ -0,0 +1,25 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation.
+ *
+ * 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, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright IBM Corp. 2008
+ *
+ * Authors: Hollis Blanchard <hollisb-r/[email protected]>
+ */
+
+#ifndef __TIMEBASE_H__
+#define __TIMEBASE_H__
+
+unsigned long long mftb(void);
+
+#endif /* __TIMEBASE_H__ */

@@ -83,6 +83,11 @@
 }
 
 static int test_try_push_interrupts(void *opaque)
+{
+	return 0;
+}
+
+static int test_try_push_nmi(void *opaque)
 {
 	return 0;
 }

@@ -175,6 +180,7 @@
 	.halt        = test_halt,
 	.io_window = test_io_window,
 	.try_push_interrupts = test_try_push_interrupts,
+	.try_push_nmi = test_try_push_nmi,
 	.post_kvm_run = test_post_kvm_run,
 	.pre_kvm_run = test_pre_kvm_run,
 	.powerpc_dcr_read = test_dcr_read,

@@ -202,7 +202,8 @@
 }
 
 QEMUMachine bamboo_machine = {
-	"bamboo",
-	"bamboo",
-	bamboo_init,
+	.name = "bamboo",
+	.desc = "bamboo",
+	.init = bamboo_init,
+	.max_cpus = 1,
 };

@@ -35,8 +35,8 @@
 	qemu_irq *pic;
 	ppc4xx_pci_t *pci;
 	CPUState *env;
-	target_ulong ep=0;
-	target_ulong la=0;
+	uint64_t ep=0;
+	uint64_t la=0;
 	int is_linux=1; /* Will assume allways is Linux for now */
 	target_long kernel_size=0;
 	target_ulong initrd_base=0;

@@ -97,6 +97,9 @@
 	/* load kernel with uboot loader */
 	printf("%s: load kernel\n", __func__);
 	ret = load_uimage(kernel_filename, &ep, &la, &kernel_size, &is_linux);
+	if (ret < 0)
+		ret = load_elf(kernel_filename, 0, &ep, &la, NULL);
+
 	if (ret < 0) {
 		fprintf(stderr, "qemu: could not load kernel '%s'\n",
 			kernel_filename);

@@ -3,6 +3,7 @@
  *
  * Copyright 2007 IBM Corporation.
  * Authors: Jerone Young <jyoung5-r/[email protected]>
+ * 	    Christian Ehrhardt <[email protected]>
  *
  * This work is licensed under the GNU GPL license version 2 or later.
  *

@@ -24,15 +25,15 @@
 
 
 void ppc440ep_init(CPUState *env,
-		target_phys_addr_t ram_bases[2],
-		target_phys_addr_t ram_sizes[2],
+		target_phys_addr_t ram_bases[PPC440_MAX_RAM_SLOTS],
+		target_phys_addr_t ram_sizes[PPC440_MAX_RAM_SLOTS],
+		int nbanks,
 		qemu_irq **picp,
 		ppc4xx_pci_t **pcip,
 		int do_init)
 {
 	ppc4xx_mmio_t *mmio;
 	qemu_irq *pic, *irqs;
-	ram_addr_t offset;
 	ppc4xx_pci_t *pci;
 	int i;
 

@@ -55,10 +56,7 @@
 	/* SDRAM controller */
 	printf("trying to setup sdram controller\n");
 	/* XXX 440EP's ECC interrupts are on UIC1 */
-	ppc405_sdram_init(env, pic[14], 2, ram_bases, ram_sizes, do_init);
-	offset = 0;
-	for (i = 0; i < 2; i++)
-		offset += ram_sizes[i];
+	ppc405_sdram_init(env, pic[14], nbanks, ram_bases, ram_sizes, do_init);
 
 	/* PCI */
 	pci = ppc4xx_pci_init(env, pic,

@@ -3,6 +3,7 @@
  *
  * Copyright 2007 IBM Corporation.
  * Authors: Jerone Young <jyoung5-r/[email protected]>
+ * 	    Christian Ehrhardt <[email protected]>
  *
  * This work is licensed under the GNU GPL licence version 2 or later
  *

@@ -20,9 +21,12 @@
 #include "exec-all.h"
 #include "boards.h"
 
+#define PPC440_MAX_RAM_SLOTS 4
+
 void ppc440ep_init(CPUState *env,
-		target_phys_addr_t ram_bases[2],
-		target_phys_addr_t ram_sizes[2],
+		target_phys_addr_t ram_bases[PPC440_MAX_RAM_SLOTS],
+		target_phys_addr_t ram_sizes[PPC440_MAX_RAM_SLOTS],
+		int nbanks,
 		qemu_irq **picp,
 		ppc4xx_pci_t **pcip,
 		int do_init);

@@ -2,7 +2,9 @@
  * Qemu PowerPC 440 board emualtion
  *
  * Copyright 2007 IBM Corporation.
- * Authors: Jerone Young <jyoung5-r/[email protected]>
+ * Authors:
+ * 	Jerone Young <jyoung5-r/[email protected]>
+ * 	Christian Ehrhardt <[email protected]>
  *
  * This work is licensed under the GNU GPL license version 2 or later.
  *

@@ -30,7 +32,8 @@
 			const char *cpu_model)
 {
 	char *buf=NULL;
-	target_phys_addr_t ram_bases[4], ram_sizes[4];
+	target_phys_addr_t ram_bases[PPC440_MAX_RAM_SLOTS];
+	target_phys_addr_t ram_sizes[PPC440_MAX_RAM_SLOTS];
 	NICInfo *nd;
 	qemu_irq *pic;
 	ppc4xx_pci_t *pci;

@@ -46,6 +49,8 @@
 	int ret;
 	int ram_stick_sizes[] = {256<<20, 128<<20, 64<<20,
 				32<<20, 16<<20, 8<<20 }; /* in bytes */
+	int nbanks = 0; /* number of used memory banks */
+	int next_bank_offset = 0;
 	ram_addr_t tmp_ram_size;
 	int i=0, k=0;
 	uint32_t cpu_freq;

@@ -55,15 +60,22 @@
 	printf("%s: START\n", __func__);
 
 	/* Setup Memory */
-	printf("Ram size passed is: %i MB\n",
-				bytes_to_mb((int)ram_size));
+	if (ram_size < 8<<20) {
+		printf("ERROR: ram size too small (min 8mb)\n");
+		exit(1);
+	} else
+		printf("Ram size passed is: %i MB\n",
+			bytes_to_mb((int)ram_size));
 
 	tmp_ram_size = ram_size;
 
-	for (i=0; i < (sizeof(ram_sizes)/sizeof(ram_sizes[0])); i++) {
-		for (k=0; k < (sizeof(ram_stick_sizes)/sizeof(ram_stick_sizes[0])); k++) {
+	for (i = 0; i < PPC440_MAX_RAM_SLOTS; i++) {
+		for (k = 0; k < (sizeof(ram_stick_sizes)/sizeof(int)); k++) {
 			if ((tmp_ram_size/ram_stick_sizes[k]) > 0) {
 				ram_sizes[i] = ram_stick_sizes[k];
+				ram_bases[i] = next_bank_offset;
+				next_bank_offset += ram_stick_sizes[k];
+				nbanks++;
 				tmp_ram_size -= ram_stick_sizes[k];
 				break;
 			}

@@ -88,11 +100,8 @@
 
 	/* call init */
 	printf("Calling function ppc440_init\n");
-	ppc440ep_init(env, ram_bases, ram_sizes, &pic, &pci, 1);
+	ppc440ep_init(env, ram_bases, ram_sizes, nbanks, &pic, &pci, 1);
 	printf("Done calling ppc440_init\n");
-
-	/* Register mem */
-	cpu_register_physical_memory(0, ram_size, 0);
 
 	/* load kernel with uboot loader */
 	printf("%s: load kernel\n", __func__);