proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-07-17 20:59:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PPC: Bamboo: Register CPU reset

Browse Source 
To be able to support CPU reset, we need to put all register initialization
and initial state into a CPU reset hook instead of a function that is only
called once on bootup.

This is a preparation step for the initial TLB setting code and brings bamboo
more in line with what e500 and virtex already do.

Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexander Graf 2012-01-03 19:10:02 +01:00
parent d29d3404fc
commit b10a04b5ae
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/ppc440_bamboo.c
View File

@ -32,6 +32,8 @@
#define FDT_ADDR 0x1800000 #define FDT_ADDR 0x1800000
#define RAMDISK_ADDR 0x1900000 #define RAMDISK_ADDR 0x1900000
static target_phys_addr_t entry;
static int bamboo_load_device_tree(target_phys_addr_t addr, static int bamboo_load_device_tree(target_phys_addr_t addr,
uint32_t ramsize, uint32_t ramsize,
target_phys_addr_t initrd_base, target_phys_addr_t initrd_base,
@ -101,6 +103,16 @@ out:
return ret; return ret;
} }
static void main_cpu_reset(void *opaque)
{
CPUState *env = opaque;
cpu_reset(env);
env->gpr[1] = (16<<20) - 8;
env->gpr[3] = FDT_ADDR;
env->nip = entry;
}
static void bamboo_init(ram_addr_t ram_size, static void bamboo_init(ram_addr_t ram_size,
const char *boot_device, const char *boot_device,
const char *kernel_filename, const char *kernel_filename,
@ -114,7 +126,6 @@ static void bamboo_init(ram_addr_t ram_size,
CPUState *env; CPUState *env;
uint64_t elf_entry; uint64_t elf_entry;
uint64_t elf_lowaddr; uint64_t elf_lowaddr;
target_phys_addr_t entry = 0;
target_phys_addr_t loadaddr = 0; target_phys_addr_t loadaddr = 0;
target_long initrd_size = 0; target_long initrd_size = 0;
int success; int success;
@ -123,6 +134,7 @@ static void bamboo_init(ram_addr_t ram_size,
/* Setup CPU. */ /* Setup CPU. */
env = ppc440ep_init(address_space_mem, &ram_size, &pcibus, env = ppc440ep_init(address_space_mem, &ram_size, &pcibus,
pci_irq_nrs, 1, cpu_model); pci_irq_nrs, 1, cpu_model);
qemu_register_reset(main_cpu_reset, env);
if (pcibus) { if (pcibus) {
/* Register network interfaces. */ /* Register network interfaces. */
@ -169,11 +181,6 @@ static void bamboo_init(ram_addr_t ram_size,
fprintf(stderr, "couldn't load device tree\n"); fprintf(stderr, "couldn't load device tree\n");
exit(1); exit(1);
} }
/* Set initial guest state. */
env->gpr[1] = (16<<20) - 8;
env->gpr[3] = FDT_ADDR;
env->nip = entry;
/* XXX we currently depend on KVM to create some initial TLB entries. */ /* XXX we currently depend on KVM to create some initial TLB entries. */
} }