OpenBIOS November 2010

openbios@openbios.org

10 participants
59 discussions

[PATCH] ppc: Increase #address-cells for ppc64
by Andreas Färber 28 Nov '10

28 Nov '10

To store a full 64-bit address we need two cells. This matches Apple's OpenFirmware on my G5. Note that an enlarged #size-cells is not strictly needed and constitutes a difference between Apple and IBM firmware. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- arch/ppc/qemu/init.c | 4 +++- arch/ppc/qemu/tree.fs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index d17c843..1a2d453 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -734,8 +734,10 @@ arch_of_init( void ) /* all memory */ - /* TODO Adjust this when #address-cells gets increased for ppc64. */ PUSH(0); +#ifdef CONFIG_PPC64 + PUSH(0); +#endif fword("encode-phys"); /* This needs adjusting if #size-cells gets increased. Alternatively use multiple (address, size) tuples. */ diff --git a/arch/ppc/qemu/tree.fs b/arch/ppc/qemu/tree.fs index 4d107a9..e4115ea 100644 --- a/arch/ppc/qemu/tree.fs +++ b/arch/ppc/qemu/tree.fs @@ -5,13 +5,15 @@ \ as published by the Free Software Foundation \ +include config.fs + \ ------------------------------------------------------------- \ device-tree \ ------------------------------------------------------------- " /" find-device -1 encode-int " #address-cells" property +[IFDEF] CONFIG_PPC64 2 [ELSE] 1 [THEN] encode-int " #address-cells" property 1 encode-int " #size-cells" property h# 05f5e100 encode-int " clock-frequency" property -- 1.7.3

2 5

[commit] r975 - trunk/openbios-devel/arch/ppc/qemu
by repository service 27 Nov '10

27 Nov '10

Author: afaerber Date: Sat Nov 27 23:37:46 2010 New Revision: 975 URL: http://tracker.coreboot.org/trac/openbios/changeset/975 Log: ppc: Increase #address-cells for ppc64 To store a full 64-bit address we need two cells. This setting matches Apple's OpenFirmware on my G5 and IBM's firmware on the JS20. The PCI driver zero-pads its physical addresses, so is okay as long as devices remain in lower 32 bits. ofmem needs changes for memory ranges and translations. Note that an enlarged #size-cells is not strictly needed and constitutes a difference between Apple and IBM firmware (1 vs. 2). v2: * Introduce local helper push_physaddr(). A more general, global definition was not easily reachable due to inability to determine in preprocessor whether phys_addr_t is wider than ucell, leading to compilation errors due to a shift the size of the variable. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/tree.fs Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 18:58:30 2010 (r974) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 23:37:46 2010 (r975) @@ -191,6 +191,16 @@ } } +/* -- phys.lo ... phys.hi */ +static void +push_physaddr(phys_addr_t value) +{ + PUSH(value); +#ifdef CONFIG_PPC64 + PUSH(value >> 32); +#endif +} + static void cpu_generic_init(const struct cpudef *cpu) { @@ -730,8 +740,7 @@ /* all memory */ - /* TODO Adjust this when #address-cells gets increased for ppc64. */ - PUSH(0); + push_physaddr(0); fword("encode-phys"); /* This needs adjusting if #size-cells gets increased. Alternatively use multiple (address, size) tuples. */ Modified: trunk/openbios-devel/arch/ppc/qemu/tree.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/tree.fs Sat Nov 27 18:58:30 2010 (r974) +++ trunk/openbios-devel/arch/ppc/qemu/tree.fs Sat Nov 27 23:37:46 2010 (r975) @@ -5,13 +5,15 @@ \ as published by the Free Software Foundation \ +include config.fs + \ ------------------------------------------------------------- \ device-tree \ ------------------------------------------------------------- " /" find-device -1 encode-int " #address-cells" property +[IFDEF] CONFIG_PPC64 2 [ELSE] 1 [THEN] encode-int " #address-cells" property 1 encode-int " #size-cells" property h# 05f5e100 encode-int " clock-frequency" property

1 0

[commit] r974 - trunk/openbios-devel/arch/ppc/qemu
by repository service 27 Nov '10

27 Nov '10

Author: afaerber Date: Sat Nov 27 18:58:30 2010 New Revision: 974 URL: http://tracker.coreboot.org/trac/openbios/changeset/974 Log: ppc: Introduce define for OpenBIOS code size Use it for all three occurrences. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Nov 27 18:07:59 2010 (r973) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Nov 27 18:58:30 2010 (r974) @@ -46,6 +46,7 @@ #define FREE_BASE 0x00004000 #define OF_CODE_START 0xfff00000UL +#define OF_CODE_SIZE 0x00100000 #define IO_BASE 0x80000000 #ifdef __powerpc64__ @@ -69,7 +70,7 @@ get_rom_base(void) { ofmem_t *ofmem = ofmem_arch_get_private(); - return ofmem->ramsize - 0x00100000; + return ofmem->ramsize - OF_CODE_SIZE; } unsigned long @@ -394,7 +395,7 @@ /* SDR1: Storage Description Register 1 */ - hash_base = (ramsize - 0x00100000 - HASH_SIZE) & hash_mask; + hash_base = (ramsize - OF_CODE_SIZE - HASH_SIZE) & hash_mask; memset((void *)hash_base, 0, HASH_SIZE); if (is_ppc64()) mtsdr1(hash_base | MAX(HASH_BITS - 18, 0)); @@ -428,7 +429,7 @@ memset(ofmem, 0, sizeof(ofmem_t)); ofmem->ramsize = ramsize; - memcpy((void *)get_rom_base(), (void *)OF_CODE_START, 0x00100000); + memcpy((void *)get_rom_base(), (void *)OF_CODE_START, OF_CODE_SIZE); /* Enable MMU */

1 0

[commit] r973 - trunk/openbios-devel/arch/ppc/qemu
by repository service 27 Nov '10

27 Nov '10

Author: afaerber Date: Sat Nov 27 18:07:59 2010 New Revision: 973 URL: http://tracker.coreboot.org/trac/openbios/changeset/973 Log: ppc: Adapt CPU definition and identification PVR is 32 bits. Use the new inline function. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 17:41:12 2010 (r972) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 18:07:59 2010 (r973) @@ -38,7 +38,7 @@ #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" struct cpudef { - unsigned long iu_version; + unsigned int iu_version; const char *name; int icache_size, dcache_size; int icache_sets, dcache_sets; @@ -502,18 +502,16 @@ static const struct cpudef * id_cpu(void) { - unsigned long iu_version; + unsigned int iu_version; unsigned int i; - asm("mfpvr %0\n" - : "=r"(iu_version) :); - iu_version &= 0xffff0000; + iu_version = mfpvr() & 0xffff0000; for (i = 0; i < sizeof(ppc_defs) / sizeof(struct cpudef); i++) { if (iu_version == ppc_defs[i].iu_version) return &ppc_defs[i]; } - printk("Unknown cpu (pvr %lx), freezing!\n", iu_version); + printk("Unknown cpu (pvr %x), freezing!\n", iu_version); for (;;) { } }

1 0

[commit] r972 - trunk/openbios-devel/arch/ppc/qemu
by repository service 27 Nov '10

27 Nov '10

Author: afaerber Date: Sat Nov 27 17:41:12 2010 New Revision: 972 URL: http://tracker.coreboot.org/trac/openbios/changeset/972 Log: ppc: Coding style cleanup, part 2 Fix some more indentations. Still no functional changes. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 17:29:32 2010 (r971) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 17:41:12 2010 (r972) @@ -68,17 +68,17 @@ int is_apple(void) { - return 1; + return 1; } int is_oldworld(void) { - return machine_id == ARCH_HEATHROW; + return machine_id == ARCH_HEATHROW; } int is_newworld(void) { - return (machine_id == ARCH_MAC99) || + return (machine_id == ARCH_MAC99) || (machine_id == ARCH_MAC99_U3); }

1 0

[commit] r971 - trunk/openbios-devel/arch/ppc/qemu
by repository service 27 Nov '10

27 Nov '10

Author: afaerber Date: Sat Nov 27 17:29:32 2010 New Revision: 971 URL: http://tracker.coreboot.org/trac/openbios/changeset/971 Log: ppc: Coding style cleanup Adopt QEMU coding style for indentation, spacing and parenthesis. Avoid empty statement in for loops. Move comment out of function body. No functional changes. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 01:46:44 2010 (r970) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 17:29:32 2010 (r971) @@ -49,14 +49,14 @@ static uint16_t machine_id = 0; -extern void unexpected_excep( int vector ); +extern void unexpected_excep(int vector); void -unexpected_excep( int vector ) +unexpected_excep(int vector) { - printk("openbios panic: Unexpected exception %x\n", vector ); - for( ;; ) - ; + printk("openbios panic: Unexpected exception %x\n", vector); + for (;;) { + } } enum { @@ -79,7 +79,7 @@ int is_newworld(void) { return (machine_id == ARCH_MAC99) || - (machine_id == ARCH_MAC99_U3); + (machine_id == ARCH_MAC99_U3); } static const pci_arch_t known_arch[] = { @@ -155,39 +155,40 @@ unsigned long isa_io_base; void -entry( void ) +entry(void) { - uint32_t temp = 0; - char buf[5]; + uint32_t temp = 0; + char buf[5]; - arch = &known_arch[ARCH_HEATHROW]; + arch = &known_arch[ARCH_HEATHROW]; - fw_cfg_init(); + fw_cfg_init(); - fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); - buf[4] = '\0'; - if (strncmp(buf, "QEMU", 4) == 0) { - temp = fw_cfg_read_i32(FW_CFG_ID); - if (temp == 1) { - machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); - arch = &known_arch[machine_id]; - } + fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); + buf[4] = '\0'; + if (strncmp(buf, "QEMU", 4) == 0) { + temp = fw_cfg_read_i32(FW_CFG_ID); + if (temp == 1) { + machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); + arch = &known_arch[machine_id]; } + } - isa_io_base = arch->io_base; + isa_io_base = arch->io_base; - if (temp != 1) { - printk("Incompatible configuration device version, freezing\n"); - for(;;); + if (temp != 1) { + printk("Incompatible configuration device version, freezing\n"); + for (;;) { } + } + + ofmem_init(); + initialize_forth(); + /* won't return */ - ofmem_init(); - initialize_forth(); - /* won't return */ - - printk("of_startup returned!\n"); - for( ;; ) - ; + printk("of_startup returned!\n"); + for (;;) { + } } static void @@ -316,8 +317,8 @@ *isi = 0x48002202; // Invalidate the cache lines - asm ( "icbi 0, %0" : : "r"(dsi) ); - asm ( "icbi 0, %0" : : "r"(isi) ); + asm ("icbi 0, %0" : : "r"(dsi)); + asm ("icbi 0, %0" : : "r"(isi)); } #endif @@ -508,352 +509,355 @@ : "=r"(iu_version) :); iu_version &= 0xffff0000; - for (i = 0; i < sizeof(ppc_defs)/sizeof(struct cpudef); i++) { + for (i = 0; i < sizeof(ppc_defs) / sizeof(struct cpudef); i++) { if (iu_version == ppc_defs[i].iu_version) return &ppc_defs[i]; } printk("Unknown cpu (pvr %lx), freezing!\n", iu_version); - for (;;); + for (;;) { + } } -static void go( void ); +static void go(void); static void -go( void ) +go(void) { ucell addr; feval("saved-program-state >sps.entry @"); addr = POP(); - call_elf( 0, 0, addr); + call_elf(0, 0, addr); } static void kvm_of_init(void) { - char hypercall[4 * 4]; - uint32_t *hc32; + char hypercall[4 * 4]; + uint32_t *hc32; + + /* Don't expose /hypervisor when not in KVM */ + if (!fw_cfg_read_i32(FW_CFG_PPC_IS_KVM)) + return; + + push_str("/"); + fword("find-device"); + + fword("new-device"); + + push_str("hypervisor"); + fword("device-name"); + + push_str("hypervisor"); + fword("device-type"); + + /* compatible */ + + push_str("linux,kvm"); + fword("encode-string"); + push_str("epapr,hypervisor-0.2"); + fword("encode-string"); + fword("encode+"); + push_str("compatible"); + fword("property"); + + /* Tell the guest about the hypercall instructions */ + fw_cfg_read(FW_CFG_PPC_KVM_HC, hypercall, 4 * 4); + hc32 = (uint32_t*)hypercall; + PUSH(hc32[0]); + fword("encode-int"); + PUSH(hc32[1]); + fword("encode-int"); + fword("encode+"); + PUSH(hc32[2]); + fword("encode-int"); + fword("encode+"); + PUSH(hc32[3]); + fword("encode-int"); + fword("encode+"); + push_str("hcall-instructions"); + fword("property"); - /* Don't expose /hypervisor when not in KVM */ - if (!fw_cfg_read_i32(FW_CFG_PPC_IS_KVM)) - return; - - push_str("/"); - fword("find-device"); - - fword("new-device"); - - push_str("hypervisor"); - fword("device-name"); - - push_str("hypervisor"); - fword("device-type"); - - /* compatible */ - - push_str("linux,kvm"); - fword("encode-string"); - push_str("epapr,hypervisor-0.2"); - fword("encode-string"); - fword("encode+"); - push_str("compatible"); - fword("property"); - - /* Tell the guest about the hypercall instructions */ - fw_cfg_read(FW_CFG_PPC_KVM_HC, hypercall, 4 * 4); - hc32 = (uint32_t*)hypercall; - PUSH(hc32[0]); - fword("encode-int"); - PUSH(hc32[1]); - fword("encode-int"); - fword("encode+"); - PUSH(hc32[2]); - fword("encode-int"); - fword("encode+"); - PUSH(hc32[3]); - fword("encode-int"); - fword("encode+"); - push_str("hcall-instructions"); - fword("property"); - - /* ePAPR requires us to provide a unique guest id */ - PUSH(fw_cfg_read_i32(FW_CFG_PPC_KVM_PID)); - fword("encode-int"); - push_str("guest-id"); - fword("property"); - - /* ePAPR requires us to provide a guest name */ - push_str("KVM guest"); - fword("encode-string"); - push_str("guest-name"); - fword("property"); + /* ePAPR requires us to provide a unique guest id */ + PUSH(fw_cfg_read_i32(FW_CFG_PPC_KVM_PID)); + fword("encode-int"); + push_str("guest-id"); + fword("property"); - fword("finish-device"); + /* ePAPR requires us to provide a guest name */ + push_str("KVM guest"); + fword("encode-string"); + push_str("guest-name"); + fword("property"); + + fword("finish-device"); } void -arch_of_init( void ) +arch_of_init(void) { #ifdef CONFIG_RTAS - phandle_t ph; + phandle_t ph; #endif - uint64_t ram_size; - const struct cpudef *cpu; - char buf[64], qemu_uuid[16]; - const char *stdin_path, *stdout_path, *boot_path; - uint32_t temp = 0; + uint64_t ram_size; + const struct cpudef *cpu; + char buf[64], qemu_uuid[16]; + const char *stdin_path, *stdout_path, *boot_path; + uint32_t temp = 0; ofmem_t *ofmem = ofmem_arch_get_private(); - openbios_init(); - modules_init(); - setup_timers(); + openbios_init(); + modules_init(); + setup_timers(); #ifdef CONFIG_DRIVER_PCI - ob_pci_init(); + ob_pci_init(); #endif - printk("\n"); - printk("=============================================================\n"); - printk(PROGRAM_NAME " " OPENBIOS_VERSION_STR " [%s]\n", - OPENBIOS_BUILD_DATE); - - fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); - buf[4] = '\0'; - printk("Configuration device id %s", buf); + printk("\n"); + printk("=============================================================\n"); + printk(PROGRAM_NAME " " OPENBIOS_VERSION_STR " [%s]\n", + OPENBIOS_BUILD_DATE); - temp = fw_cfg_read_i32(FW_CFG_ID); - printk(" version %d machine id %d\n", temp, machine_id); - - temp = fw_cfg_read_i32(FW_CFG_NB_CPUS); - - printk("CPUs: %x\n", temp); - - ram_size = ofmem->ramsize; - - printk("Memory: %lldM\n", ram_size / 1024 / 1024); - - fw_cfg_read(FW_CFG_UUID, qemu_uuid, 16); + fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); + buf[4] = '\0'; + printk("Configuration device id %s", buf); - printk("UUID: " UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], qemu_uuid[2], - qemu_uuid[3], qemu_uuid[4], qemu_uuid[5], qemu_uuid[6], - qemu_uuid[7], qemu_uuid[8], qemu_uuid[9], qemu_uuid[10], - qemu_uuid[11], qemu_uuid[12], qemu_uuid[13], qemu_uuid[14], - qemu_uuid[15]); + temp = fw_cfg_read_i32(FW_CFG_ID); + printk(" version %d machine id %d\n", temp, machine_id); - /* set device tree root info */ + temp = fw_cfg_read_i32(FW_CFG_NB_CPUS); - push_str("/"); - fword("find-device"); + printk("CPUs: %x\n", temp); - switch(machine_id) { - case ARCH_HEATHROW: /* OldWorld */ + ram_size = ofmem->ramsize; - /* model */ + printk("Memory: %lldM\n", ram_size / 1024 / 1024); - push_str("Power Macintosh"); - fword("model"); + fw_cfg_read(FW_CFG_UUID, qemu_uuid, 16); - /* compatible */ + printk("UUID: " UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], qemu_uuid[2], + qemu_uuid[3], qemu_uuid[4], qemu_uuid[5], qemu_uuid[6], + qemu_uuid[7], qemu_uuid[8], qemu_uuid[9], qemu_uuid[10], + qemu_uuid[11], qemu_uuid[12], qemu_uuid[13], qemu_uuid[14], + qemu_uuid[15]); - push_str("AAPL,PowerMac G3"); - fword("encode-string"); - push_str("MacRISC"); - fword("encode-string"); - fword("encode+"); - push_str("compatible"); - fword("property"); + /* set device tree root info */ - /* misc */ + push_str("/"); + fword("find-device"); - push_str("device-tree"); - fword("encode-string"); - push_str("AAPL,original-name"); - fword("property"); + switch(machine_id) { + case ARCH_HEATHROW: /* OldWorld */ - PUSH(0); - fword("encode-int"); - push_str("AAPL,cpu-id"); - fword("property"); + /* model */ - PUSH(66 * 1000 * 1000); - fword("encode-int"); - push_str("clock-frequency"); - fword("property"); - break; + push_str("Power Macintosh"); + fword("model"); - case ARCH_MAC99: - case ARCH_MAC99_U3: - case ARCH_PREP: - default: + /* compatible */ + + push_str("AAPL,PowerMac G3"); + fword("encode-string"); + push_str("MacRISC"); + fword("encode-string"); + fword("encode+"); + push_str("compatible"); + fword("property"); - /* model */ + /* misc */ - push_str("PowerMac2,1"); - fword("model"); + push_str("device-tree"); + fword("encode-string"); + push_str("AAPL,original-name"); + fword("property"); - /* compatible */ + PUSH(0); + fword("encode-int"); + push_str("AAPL,cpu-id"); + fword("property"); - push_str("PowerMac2,1"); - fword("encode-string"); - push_str("MacRISC"); - fword("encode-string"); - fword("encode+"); - push_str("Power Macintosh"); - fword("encode-string"); - fword("encode+"); - push_str("compatible"); - fword("property"); + PUSH(66 * 1000 * 1000); + fword("encode-int"); + push_str("clock-frequency"); + fword("property"); + break; - /* misc */ + case ARCH_MAC99: + case ARCH_MAC99_U3: + case ARCH_PREP: + default: + + /* model */ + + push_str("PowerMac2,1"); + fword("model"); + + /* compatible */ + + push_str("PowerMac2,1"); + fword("encode-string"); + push_str("MacRISC"); + fword("encode-string"); + fword("encode+"); + push_str("Power Macintosh"); + fword("encode-string"); + fword("encode+"); + push_str("compatible"); + fword("property"); - push_str("bootrom"); - fword("device-type"); + /* misc */ - PUSH(100 * 1000 * 1000); - fword("encode-int"); - push_str("clock-frequency"); - fword("property"); - break; - } + push_str("bootrom"); + fword("device-type"); - /* Perhaps we can store UUID here ? */ + PUSH(100 * 1000 * 1000); + fword("encode-int"); + push_str("clock-frequency"); + fword("property"); + break; + } - push_str("0000000000000"); - fword("encode-string"); - push_str("system-id"); - fword("property"); + /* Perhaps we can store UUID here ? */ - /* memory info */ + push_str("0000000000000"); + fword("encode-string"); + push_str("system-id"); + fword("property"); - push_str("/memory"); - fword("find-device"); + /* memory info */ - /* all memory */ + push_str("/memory"); + fword("find-device"); - /* TODO Adjust this when #address-cells gets increased for ppc64. */ - PUSH(0); - fword("encode-phys"); - /* This needs adjusting if #size-cells gets increased. - Alternatively use multiple (address, size) tuples. */ - PUSH(ram_size & 0xffffffff); - fword("encode-int"); - fword("encode+"); - push_str("reg"); - fword("property"); + /* all memory */ - cpu = id_cpu(); - cpu->initfn(cpu); - printk("CPU type %s\n", cpu->name); + /* TODO Adjust this when #address-cells gets increased for ppc64. */ + PUSH(0); + fword("encode-phys"); + /* This needs adjusting if #size-cells gets increased. + Alternatively use multiple (address, size) tuples. */ + PUSH(ram_size & 0xffffffff); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); - snprintf(buf, sizeof(buf), "/cpus/%s", cpu->name); - ofmem_register(find_dev("/memory"), find_dev(buf)); - node_methods_init(buf); + cpu = id_cpu(); + cpu->initfn(cpu); + printk("CPU type %s\n", cpu->name); + + snprintf(buf, sizeof(buf), "/cpus/%s", cpu->name); + ofmem_register(find_dev("/memory"), find_dev(buf)); + node_methods_init(buf); #ifdef CONFIG_RTAS - /* OldWorld Macs don't have an /rtas node. */ - switch (machine_id) { - case ARCH_MAC99: - case ARCH_MAC99_U3: - if (!(ph = find_dev("/rtas"))) { - printk("Warning: No /rtas node\n"); - } else { - unsigned long size = 0x1000; - while (size < (unsigned long)of_rtas_end - (unsigned long)of_rtas_start) - size *= 2; - set_property(ph, "rtas-size", (char*)&size, sizeof(size)); - set_int_property(ph, "rtas-version", is_apple() ? 0x41 : 1); - } - break; - } + /* OldWorld Macs don't have an /rtas node. */ + switch (machine_id) { + case ARCH_MAC99: + case ARCH_MAC99_U3: + if (!(ph = find_dev("/rtas"))) { + printk("Warning: No /rtas node\n"); + } else { + unsigned long size = 0x1000; + while (size < (unsigned long)of_rtas_end - (unsigned long)of_rtas_start) + size *= 2; + set_property(ph, "rtas-size", (char*)&size, sizeof(size)); + set_int_property(ph, "rtas-version", is_apple() ? 0x41 : 1); + } + break; + } #endif - if (fw_cfg_read_i16(FW_CFG_NOGRAPHIC)) { - if (CONFIG_SERIAL_PORT) { - stdin_path = "scca"; - stdout_path = "scca"; - } else { - stdin_path = "sccb"; - stdout_path = "sccb"; - } - - /* Some bootloaders force the output to the screen device, so - let's create a screen alias for the serial device too */ - push_str("/aliases"); - fword("find-device"); - - push_str(stdout_path); - fword("pathres-resolve-aliases"); - fword("encode-string"); - push_str("screen"); - fword("property"); + if (fw_cfg_read_i16(FW_CFG_NOGRAPHIC)) { + if (CONFIG_SERIAL_PORT) { + stdin_path = "scca"; + stdout_path = "scca"; } else { - stdin_path = "adb-keyboard"; - stdout_path = "screen"; + stdin_path = "sccb"; + stdout_path = "sccb"; } - kvm_of_init(); + /* Some bootloaders force the output to the screen device, so + let's create a screen alias for the serial device too */ - /* Setup nvram variables */ - push_str("/options"); + push_str("/aliases"); fword("find-device"); - uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); - switch (boot_device) { - case 'c': - boot_path = "hd"; - break; - default: - case 'd': - boot_path = "cd"; - break; - } - - /* Setup default boot devices */ - snprintf(buf, sizeof(buf), "%s:,\\\\:tbxi %s:,\\ppc\\bootinfo.txt", boot_path, boot_path); - push_str(buf); - fword("encode-string"); - push_str("boot-device"); - fword("property"); + push_str(stdout_path); + fword("pathres-resolve-aliases"); + fword("encode-string"); + push_str("screen"); + fword("property"); + } else { + stdin_path = "adb-keyboard"; + stdout_path = "screen"; + } - /* Set up other properties */ - push_str("/chosen"); - fword("find-device"); + kvm_of_init(); - push_str(stdin_path); - fword("open-dev"); - fword("encode-int"); - push_str("stdin"); - fword("property"); + /* Setup nvram variables */ + push_str("/options"); + fword("find-device"); - push_str(stdout_path); - fword("open-dev"); - fword("encode-int"); - push_str("stdout"); - fword("property"); + uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); + switch (boot_device) { + case 'c': + boot_path = "hd"; + break; + default: + case 'd': + boot_path = "cd"; + break; + } - push_str(stdin_path); - fword("pathres-resolve-aliases"); - push_str("input-device"); - fword("$setenv"); + /* Setup default boot devices */ + snprintf(buf, sizeof(buf), "%s:,\\\\:tbxi %s:,\\ppc\\bootinfo.txt", boot_path, boot_path); + push_str(buf); + fword("encode-string"); + push_str("boot-device"); + fword("property"); - push_str(stdout_path); - fword("pathres-resolve-aliases"); - push_str("output-device"); - fword("$setenv"); + /* Set up other properties */ - push_str(stdin_path); - fword("input"); + push_str("/chosen"); + fword("find-device"); - push_str(stdout_path); - fword("output"); + push_str(stdin_path); + fword("open-dev"); + fword("encode-int"); + push_str("stdin"); + fword("property"); + + push_str(stdout_path); + fword("open-dev"); + fword("encode-int"); + push_str("stdout"); + fword("property"); + + push_str(stdin_path); + fword("pathres-resolve-aliases"); + push_str("input-device"); + fword("$setenv"); + + push_str(stdout_path); + fword("pathres-resolve-aliases"); + push_str("output-device"); + fword("$setenv"); + + push_str(stdin_path); + fword("input"); + + push_str(stdout_path); + fword("output"); #if 0 - if( getbool("tty-interface?") == 1 ) + if(getbool("tty-interface?") == 1) #endif - fword("activate-tty-interface"); + fword("activate-tty-interface"); - device_end(); + device_end(); - bind_func("platform-boot", boot ); - bind_func("(go)", go); + bind_func("platform-boot", boot); + bind_func("(go)", go); } Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Nov 27 01:46:44 2010 (r970) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Nov 27 17:29:32 2010 (r971) @@ -23,12 +23,12 @@ #include "mmutypes.h" #include "asm/processor.h" -#define BIT(n) (1U<<(31-(n))) +#define BIT(n) (1U << (31 - (n))) /* called from assembly */ -extern void dsi_exception( void ); -extern void isi_exception( void ); -extern void setup_mmu( unsigned long code_base ); +extern void dsi_exception(void); +extern void isi_exception(void); +extern void setup_mmu(unsigned long code_base); /* * From Apple's BootX source comments: @@ -60,98 +60,98 @@ #define SEGR_BASE 0x0400 static inline unsigned long -get_hash_base( void ) +get_hash_base(void) { return (mfsdr1() & SDR1_HTABORG_MASK); } static inline unsigned long -get_rom_base( void ) +get_rom_base(void) { - ofmem_t *ofmem = ofmem_arch_get_private(); - return ofmem->ramsize - 0x00100000; + ofmem_t *ofmem = ofmem_arch_get_private(); + return ofmem->ramsize - 0x00100000; } unsigned long -get_ram_top( void ) +get_ram_top(void) { - return get_hash_base() - (32 + 64 + 64) * 1024 - OFMEM_SIZE; + return get_hash_base() - (32 + 64 + 64) * 1024 - OFMEM_SIZE; } unsigned long -get_ram_bottom( void ) +get_ram_bottom(void) { - return (unsigned long)FREE_BASE; + return (unsigned long)FREE_BASE; } -static ucell get_heap_top( void ) +static ucell get_heap_top(void) { - return get_hash_base() - (32 + 64 + 64) * 1024; + return get_hash_base() - (32 + 64 + 64) * 1024; } static inline size_t ALIGN_SIZE(size_t x, size_t a) { - return (x + a - 1) & ~(a-1); + return (x + a - 1) & ~(a - 1); } ofmem_t* ofmem_arch_get_private(void) { - return (ofmem_t*)cell2pointer(get_heap_top() - OFMEM_SIZE); + return (ofmem_t*)cell2pointer(get_heap_top() - OFMEM_SIZE); } void* ofmem_arch_get_malloc_base(void) { - return (char*)ofmem_arch_get_private() + ALIGN_SIZE(sizeof(ofmem_t), 4); + return (char*)ofmem_arch_get_private() + ALIGN_SIZE(sizeof(ofmem_t), 4); } ucell ofmem_arch_get_heap_top(void) { - return get_heap_top(); + return get_heap_top(); } ucell ofmem_arch_get_virt_top(void) { - return IO_BASE; + return IO_BASE; } void ofmem_arch_unmap_pages(ucell virt, ucell size) { - /* kill page mappings in provided range */ + /* kill page mappings in provided range */ } void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, ucell mode) { - /* none yet */ + /* none yet */ } retain_t *ofmem_arch_get_retained(void) { - /* not implemented */ - return NULL; + /* not implemented */ + return NULL; } +/* Return size of a single MMU package translation property entry in cells */ int ofmem_arch_get_translation_entry_size(void) { - /* Return size of a single MMU package translation property entry in cells */ - return 4; + return 4; } +/* Generate translation property entry for PPC. + * According to the platform bindings for PPC + * (http://playground.sun.com/1275/bindings/ppc/release/ppc-2_1.html#REF34579) + * a translation property entry has the following layout: + * + * virtual address + * length + * physical address + * mode + */ void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) { - /* Generate translation property entry for PPC. According to the - platform bindings for PPC (http://playground.sun.com/1275/bindings/ppc/release/ppc-2_1.html#REF34579) - a translation property entry has the following layout: - - virtual address - length - physical address - mode - */ - - transentry[0] = t->virt; - transentry[1] = t->size; - transentry[2] = t->phys; - transentry[3] = t->mode; + transentry[0] = t->virt; + transentry[1] = t->size; + transentry[2] = t->phys; + transentry[3] = t->mode; } /************************************************************************/ @@ -159,21 +159,21 @@ /************************************************************************/ void * -malloc( int size ) +malloc(int size) { - return ofmem_malloc(size); + return ofmem_malloc(size); } void -free( void *ptr ) +free(void *ptr) { - ofmem_free(ptr); + ofmem_free(ptr); } void * -realloc( void *ptr, size_t size ) +realloc(void *ptr, size_t size) { - return ofmem_realloc(ptr, size); + return ofmem_realloc(ptr, size); } @@ -181,12 +181,12 @@ /* misc */ /************************************************************************/ -ucell ofmem_arch_default_translation_mode( ucell phys ) +ucell ofmem_arch_default_translation_mode(ucell phys) { - /* XXX: Guard bit not set as it should! */ - if( phys < IO_BASE ) - return 0x02; /*0xa*/ /* wim GxPp */ - return 0x6a; /* WIm GxPp, I/O */ + /* XXX: Guard bit not set as it should! */ + if (phys < IO_BASE) + return 0x02; /*0xa*/ /* wim GxPp */ + return 0x6a; /* WIm GxPp, I/O */ } @@ -195,185 +195,185 @@ /************************************************************************/ static ucell -ea_to_phys( ucell ea, ucell *mode ) +ea_to_phys(ucell ea, ucell *mode) { - ucell phys; + ucell phys; - if (ea >= OF_CODE_START) { - /* ROM into RAM */ - ea -= OF_CODE_START; - phys = get_rom_base() + ea; - *mode = 0x02; + if (ea >= OF_CODE_START) { + /* ROM into RAM */ + ea -= OF_CODE_START; + phys = get_rom_base() + ea; + *mode = 0x02; return phys; - } + } - phys = ofmem_translate(ea, mode); - if( phys == -1 ) { - phys = ea; - *mode = ofmem_arch_default_translation_mode( phys ); - - /* print_virt_range(); */ - /* print_phys_range(); */ - /* print_trans(); */ - } - return phys; + phys = ofmem_translate(ea, mode); + if (phys == -1) { + phys = ea; + *mode = ofmem_arch_default_translation_mode(phys); + + /* print_virt_range(); */ + /* print_phys_range(); */ + /* print_trans(); */ + } + return phys; } static void -hash_page_64( ucell ea, ucell phys, ucell mode ) +hash_page_64(ucell ea, ucell phys, ucell mode) { - static int next_grab_slot=0; - uint64_t vsid_mask, page_mask, pgidx, hash; - uint64_t htab_mask, mask, avpn; - unsigned long pgaddr; - int i, found; - unsigned int vsid, vsid_sh, sdr, sdr_sh, sdr_mask; - mPTE_64_t *pp; - - vsid = (ea >> 28) + SEGR_BASE; - vsid_sh = 7; - vsid_mask = 0x00003FFFFFFFFF80ULL; - sdr = mfsdr1(); - sdr_sh = 18; - sdr_mask = 0x3FF80; - page_mask = 0x0FFFFFFF; // XXX correct? - pgidx = (ea & page_mask) >> PAGE_SHIFT; - avpn = (vsid << 12) | ((pgidx >> 4) & 0x0F80);; - - hash = ((vsid ^ pgidx) << vsid_sh) & vsid_mask; - htab_mask = 0x0FFFFFFF >> (28 - (sdr & 0x1F)); - mask = (htab_mask << sdr_sh) | sdr_mask; - pgaddr = sdr | (hash & mask); - pp = (mPTE_64_t *)pgaddr; - - /* replace old translation */ - for( found=0, i=0; !found && i<8; i++ ) - if( pp[i].avpn == avpn ) - found=1; - - /* otherwise use a free slot */ - for( i=0; !found && i<8; i++ ) - if( !pp[i].v ) - found=1; - - /* out of slots, just evict one */ - if( !found ) { - i = next_grab_slot + 1; - next_grab_slot = (next_grab_slot + 1) % 8; - } - i--; - { - mPTE_64_t p = { - // .avpn_low = avpn, - .avpn = avpn >> 7, - .h = 0, - .v = 1, - - .rpn = (phys & ~0xfff) >> 12, - .r = mode & (1 << 8) ? 1 : 0, - .c = mode & (1 << 7) ? 1 : 0, - .w = mode & (1 << 6) ? 1 : 0, - .i = mode & (1 << 5) ? 1 : 0, - .m = mode & (1 << 4) ? 1 : 0, - .g = mode & (1 << 3) ? 1 : 0, - .n = mode & (1 << 2) ? 1 : 0, - .pp = mode & 3, - }; - pp[i] = p; - } + static int next_grab_slot = 0; + uint64_t vsid_mask, page_mask, pgidx, hash; + uint64_t htab_mask, mask, avpn; + unsigned long pgaddr; + int i, found; + unsigned int vsid, vsid_sh, sdr, sdr_sh, sdr_mask; + mPTE_64_t *pp; + + vsid = (ea >> 28) + SEGR_BASE; + vsid_sh = 7; + vsid_mask = 0x00003FFFFFFFFF80ULL; + sdr = mfsdr1(); + sdr_sh = 18; + sdr_mask = 0x3FF80; + page_mask = 0x0FFFFFFF; // XXX correct? + pgidx = (ea & page_mask) >> PAGE_SHIFT; + avpn = (vsid << 12) | ((pgidx >> 4) & 0x0F80);; + + hash = ((vsid ^ pgidx) << vsid_sh) & vsid_mask; + htab_mask = 0x0FFFFFFF >> (28 - (sdr & 0x1F)); + mask = (htab_mask << sdr_sh) | sdr_mask; + pgaddr = sdr | (hash & mask); + pp = (mPTE_64_t *)pgaddr; + + /* replace old translation */ + for (found = 0, i = 0; !found && i < 8; i++) + if (pp[i].avpn == avpn) + found = 1; + + /* otherwise use a free slot */ + for (i = 0; !found && i < 8; i++) + if (!pp[i].v) + found = 1; + + /* out of slots, just evict one */ + if (!found) { + i = next_grab_slot + 1; + next_grab_slot = (next_grab_slot + 1) % 8; + } + i--; + { + mPTE_64_t p = { + // .avpn_low = avpn, + .avpn = avpn >> 7, + .h = 0, + .v = 1, + + .rpn = (phys & ~0xfff) >> 12, + .r = mode & (1 << 8) ? 1 : 0, + .c = mode & (1 << 7) ? 1 : 0, + .w = mode & (1 << 6) ? 1 : 0, + .i = mode & (1 << 5) ? 1 : 0, + .m = mode & (1 << 4) ? 1 : 0, + .g = mode & (1 << 3) ? 1 : 0, + .n = mode & (1 << 2) ? 1 : 0, + .pp = mode & 3, + }; + pp[i] = p; + } - asm volatile( "tlbie %0" :: "r"(ea) ); + asm volatile("tlbie %0" :: "r"(ea)); } static void -hash_page_32( ucell ea, ucell phys, ucell mode ) +hash_page_32(ucell ea, ucell phys, ucell mode) { #ifndef __powerpc64__ - static int next_grab_slot=0; - unsigned long *upte, cmp, hash1; - int i, vsid, found; - mPTE_t *pp; - - vsid = (ea>>28) + SEGR_BASE; - cmp = BIT(0) | (vsid << 7) | ((ea & 0x0fffffff) >> 22); - - hash1 = vsid; - hash1 ^= (ea >> 12) & 0xffff; - hash1 &= (((mfsdr1() & 0x1ff) << 16) | 0xffff) >> 6; - - pp = (mPTE_t*)(get_hash_base() + (hash1 << 6)); - upte = (unsigned long*)pp; - - /* replace old translation */ - for( found=0, i=0; !found && i<8; i++ ) - if( cmp == upte[i*2] ) - found=1; - - /* otherwise use a free slot */ - for( i=0; !found && i<8; i++ ) - if( !pp[i].v ) - found=1; - - /* out of slots, just evict one */ - if( !found ) { - i = next_grab_slot + 1; - next_grab_slot = (next_grab_slot + 1) % 8; - } - i--; - upte[i*2] = cmp; - upte[i*2+1] = (phys & ~0xfff) | mode; + static int next_grab_slot = 0; + unsigned long *upte, cmp, hash1; + int i, vsid, found; + mPTE_t *pp; + + vsid = (ea >> 28) + SEGR_BASE; + cmp = BIT(0) | (vsid << 7) | ((ea & 0x0fffffff) >> 22); + + hash1 = vsid; + hash1 ^= (ea >> 12) & 0xffff; + hash1 &= (((mfsdr1() & 0x1ff) << 16) | 0xffff) >> 6; + + pp = (mPTE_t*)(get_hash_base() + (hash1 << 6)); + upte = (unsigned long*)pp; + + /* replace old translation */ + for (found = 0, i = 0; !found && i < 8; i++) + if (cmp == upte[i*2]) + found = 1; + + /* otherwise use a free slot */ + for (i = 0; !found && i < 8; i++) + if (!pp[i].v) + found = 1; + + /* out of slots, just evict one */ + if (!found) { + i = next_grab_slot + 1; + next_grab_slot = (next_grab_slot + 1) % 8; + } + i--; + upte[i * 2] = cmp; + upte[i * 2 + 1] = (phys & ~0xfff) | mode; - asm volatile( "tlbie %0" :: "r"(ea) ); + asm volatile("tlbie %0" :: "r"(ea)); #endif } static int is_ppc64(void) { #ifdef __powerpc64__ - return 1; + return 1; #elif defined(CONFIG_PPC_64BITSUPPORT) - unsigned int pvr = mfpvr(); - return ((pvr >= 0x330000) && (pvr < 0x70330000)); + unsigned int pvr = mfpvr(); + return ((pvr >= 0x330000) && (pvr < 0x70330000)); #else - return 0; + return 0; #endif } /* XXX Remove these ugly constructs when legacy 64-bit support is dropped. */ -static void hash_page( unsigned long ea, unsigned long phys, ucell mode ) +static void hash_page(unsigned long ea, unsigned long phys, ucell mode) { - if ( is_ppc64() ) - hash_page_64(ea, phys, mode); - else - hash_page_32(ea, phys, mode); + if (is_ppc64()) + hash_page_64(ea, phys, mode); + else + hash_page_32(ea, phys, mode); } void -dsi_exception( void ) +dsi_exception(void) { - unsigned long dar, dsisr; - ucell mode; - ucell phys; + unsigned long dar, dsisr; + ucell mode; + ucell phys; - asm volatile("mfdar %0" : "=r" (dar) : ); - asm volatile("mfdsisr %0" : "=r" (dsisr) : ); + asm volatile("mfdar %0" : "=r" (dar) : ); + asm volatile("mfdsisr %0" : "=r" (dsisr) : ); - phys = ea_to_phys(dar, &mode); - hash_page( dar, phys, mode ); + phys = ea_to_phys(dar, &mode); + hash_page(dar, phys, mode); } void -isi_exception( void ) +isi_exception(void) { - unsigned long nip, srr1; - ucell mode; - ucell phys; + unsigned long nip, srr1; + ucell mode; + ucell phys; - asm volatile("mfsrr0 %0" : "=r" (nip) : ); - asm volatile("mfsrr1 %0" : "=r" (srr1) : ); + asm volatile("mfsrr0 %0" : "=r" (nip) : ); + asm volatile("mfsrr1 %0" : "=r" (srr1) : ); - phys = ea_to_phys(nip, &mode); - hash_page( nip, phys, mode ); + phys = ea_to_phys(nip, &mode); + hash_page(nip, phys, mode); } @@ -382,69 +382,69 @@ /************************************************************************/ void -setup_mmu( unsigned long ramsize ) +setup_mmu(unsigned long ramsize) { - ofmem_t *ofmem; + ofmem_t *ofmem; #ifndef __powerpc64__ - unsigned long sr_base; + unsigned long sr_base; #endif - unsigned long hash_base; - unsigned long hash_mask = ~0x000fffffUL; /* alignment for ppc64 */ - int i; - - /* SDR1: Storage Description Register 1 */ - - hash_base = (ramsize - 0x00100000 - HASH_SIZE) & hash_mask; - memset((void *)hash_base, 0, HASH_SIZE); - if (is_ppc64()) - mtsdr1(hash_base | MAX(HASH_BITS - 18, 0)); - else - mtsdr1(hash_base | ((HASH_SIZE - 1) >> 16)); + unsigned long hash_base; + unsigned long hash_mask = ~0x000fffffUL; /* alignment for ppc64 */ + int i; + + /* SDR1: Storage Description Register 1 */ + + hash_base = (ramsize - 0x00100000 - HASH_SIZE) & hash_mask; + memset((void *)hash_base, 0, HASH_SIZE); + if (is_ppc64()) + mtsdr1(hash_base | MAX(HASH_BITS - 18, 0)); + else + mtsdr1(hash_base | ((HASH_SIZE - 1) >> 16)); #ifdef __powerpc64__ - /* Segment Lookaside Buffer */ + /* Segment Lookaside Buffer */ - slbia(); /* Invalidate all SLBs except SLB 0 */ - for (i = 0; i < 16; i++) { - unsigned long rs = ((0x400 + i) << 12) | (0x10 << 7); - unsigned long rb = ((unsigned long)i << 28) | (1 << 27) | i; - slbmte(rs, rb); - } + slbia(); /* Invalidate all SLBs except SLB 0 */ + for (i = 0; i < 16; i++) { + unsigned long rs = ((0x400 + i) << 12) | (0x10 << 7); + unsigned long rb = ((unsigned long)i << 28) | (1 << 27) | i; + slbmte(rs, rb); + } #else - /* Segment Register */ + /* Segment Register */ - sr_base = SEGR_USER | SEGR_BASE ; - for( i=0; i<16; i++ ) { - int j = i << 28; - asm volatile("mtsrin %0,%1" :: "r" (sr_base + i), "r" (j) ); - } + sr_base = SEGR_USER | SEGR_BASE ; + for (i = 0; i < 16; i++) { + int j = i << 28; + asm volatile("mtsrin %0,%1" :: "r" (sr_base + i), "r" (j)); + } #endif - ofmem = ofmem_arch_get_private(); - memset(ofmem, 0, sizeof(ofmem_t)); - ofmem->ramsize = ramsize; + ofmem = ofmem_arch_get_private(); + memset(ofmem, 0, sizeof(ofmem_t)); + ofmem->ramsize = ramsize; - memcpy((void *)get_rom_base(), (void *)OF_CODE_START, 0x00100000); + memcpy((void *)get_rom_base(), (void *)OF_CODE_START, 0x00100000); - /* Enable MMU */ + /* Enable MMU */ - mtmsr(mfmsr() | MSR_IR | MSR_DR); + mtmsr(mfmsr() | MSR_IR | MSR_DR); } void -ofmem_init( void ) +ofmem_init(void) { - ofmem_t *ofmem = ofmem_arch_get_private(); + ofmem_t *ofmem = ofmem_arch_get_private(); - ofmem_claim_phys(0, get_ram_bottom(), 0); - ofmem_claim_virt(0, get_ram_bottom(), 0); - ofmem_map( 0, 0, get_ram_bottom(), 0 ); + ofmem_claim_phys(0, get_ram_bottom(), 0); + ofmem_claim_virt(0, get_ram_bottom(), 0); + ofmem_map(0, 0, get_ram_bottom(), 0); - ofmem_claim_phys(get_ram_top(), ofmem->ramsize - get_ram_top(), 0); - ofmem_claim_virt(get_ram_top(), ofmem->ramsize - get_ram_top(), 0); - ofmem_map( get_ram_top(), get_ram_top(), ofmem->ramsize - get_ram_top(), 0); + ofmem_claim_phys(get_ram_top(), ofmem->ramsize - get_ram_top(), 0); + ofmem_claim_virt(get_ram_top(), ofmem->ramsize - get_ram_top(), 0); + ofmem_map(get_ram_top(), get_ram_top(), ofmem->ramsize - get_ram_top(), 0); }

1 0

[commit] r970 - trunk/openbios-devel/arch/ppc/qemu
by repository service 27 Nov '10

27 Nov '10

Author: afaerber Date: Sat Nov 27 01:46:44 2010 New Revision: 970 URL: http://tracker.coreboot.org/trac/openbios/changeset/970 Log: ppc: Use mfpvr() for device tree init This also accounts for the fact that the PVR is 32 bits on ppc64. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Thu Nov 25 22:56:23 2010 (r969) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Nov 27 01:46:44 2010 (r970) @@ -193,8 +193,6 @@ static void cpu_generic_init(const struct cpudef *cpu) { - unsigned long iu_version; - push_str("/cpus"); fword("find-device"); @@ -206,9 +204,7 @@ push_str("cpu"); fword("device-type"); - asm("mfpvr %0\n" - : "=r"(iu_version) :); - PUSH(iu_version); + PUSH(mfpvr()); fword("encode-int"); push_str("cpu-version"); fword("property");

1 0

Q: How to "squeeze" C functions in between two symbols?
by Andreas Färber 25 Nov '10

25 Nov '10

Hello, I've gotten AIX 6/7 to instantiate RTAS (patches upcoming) and would like to trace what it's trying to do. I probably need to implement the display-character token. The RTAS code in arch/ppc/qemu/start.S currently looks like this: GLOBL(of_rtas_start): blr GLOBL(of_rtas_end): ...and I would like to branch to C code from there. Is there a way to have code from, say, rtas.c go between the blr and of_rtas_end symbol? Or do I need to move the symbols to the ldscript and place the code in a special section? If yes, how? Those symbols are being used for code size calculation and relocation in arch/ppc/qemu/methods.c. Thanks, Andreas

7 97

[commit] r968 - in trunk/openbios-devel: arch/ppc/qemu include/arch/ppc
by repository service 25 Nov '10

25 Nov '10

Author: afaerber Date: Thu Nov 25 22:53:25 2010 New Revision: 968 URL: http://tracker.coreboot.org/trac/openbios/changeset/968 Log: ppc: Dereference function descriptors on ppc64 In the ppc64 ELF ABI, similar to ia64, a function's symbol does not directly precede its machine instructions. For ppc64 it consists of a triple of entry point, TOC base and environment pointer. Introduce macros to facilitate handling this. Names suggested by Blue. Deliberately don't touch the client interface yet, as there's more work to do. Cc: Alexander Graf <agraf(a)suse.de> Cc: Blue Swirl <blauwirbel(a)gmail.com> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S trunk/openbios-devel/include/arch/ppc/asmdefs.h Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Mon Nov 22 21:00:13 2010 (r967) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Thu Nov 25 22:53:25 2010 (r968) @@ -271,13 +271,13 @@ b 1b call_dsi_exception: - LOAD_REG_IMMEDIATE(r3, dsi_exception) + LOAD_REG_FUNC(r3, dsi_exception) mtctr r3 bctrl b exception_return call_isi_exception: - LOAD_REG_IMMEDIATE(r3, isi_exception) + LOAD_REG_FUNC(r3, isi_exception) mtctr r3 bctrl b exception_return @@ -289,7 +289,7 @@ __divide_error: trap_error: mflr r3 - b unexpected_excep + b BRANCH_LABEL(unexpected_excep) VECTOR( 0x100, "SRE" ): b _entry @@ -445,8 +445,8 @@ /* save memory size in stack */ - bl setup_mmu - bl entry + bl BRANCH_LABEL(setup_mmu) + bl BRANCH_LABEL(entry) 1: nop b 1b Modified: trunk/openbios-devel/include/arch/ppc/asmdefs.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/asmdefs.h Mon Nov 22 21:00:13 2010 (r967) +++ trunk/openbios-devel/include/arch/ppc/asmdefs.h Thu Nov 25 22:53:25 2010 (r968) @@ -76,24 +76,37 @@ /************************************************************************/ #ifdef __powerpc64__ + #define LOAD_REG_IMMEDIATE(D, x) \ lis (D), (x)@highest ; \ ori (D), (D), (x)@higher ; \ sldi (D), (D), 32 ; \ oris (D), (D), (x)@h ; \ ori (D), (D), (x)@l + +#define LOAD_REG_FUNC(D, x) \ + LOAD_REG_IMMEDIATE((D), (x)) ; \ + ld (D), 0(D) + #else + #define LOAD_REG_IMMEDIATE(D, x) \ lis (D), HA(x) ; \ addi (D), (D), LO(x) + +#define LOAD_REG_FUNC(D, x) \ + LOAD_REG_IMMEDIATE((D), (x)) + #endif #ifdef __powerpc64__ #define RFI rfid #define MTMSRD(r) mtmsrd r +#define BRANCH_LABEL(name) . ## name #else #define RFI rfi #define MTMSRD(r) mtmsr r +#define BRANCH_LABEL(name) name #endif #ifndef __darwin__

1 0

[PATCH] ppc: SDR1 fixes for ppc64
by Andreas Färber 22 Nov '10

22 Nov '10

Adjust shifts and masks to 64-bit SDR1. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- arch/ppc/qemu/ofmem.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/ppc/qemu/ofmem.c b/arch/ppc/qemu/ofmem.c index fd417c2..9c60841 100644 --- a/arch/ppc/qemu/ofmem.c +++ b/arch/ppc/qemu/ofmem.c @@ -61,7 +61,7 @@ get_hash_base( void ) asm volatile("mfsdr1 %0" : "=r" (sdr1) ); - return (sdr1 & 0xffff0000); + return (sdr1 & ~0xffffUL); } static inline unsigned long @@ -71,7 +71,7 @@ get_hash_size( void ) asm volatile("mfsdr1 %0" : "=r" (sdr1) ); - return ((sdr1 << 16) | 0x0000ffff) + 1; + return (((sdr1 & 0x1f) << 16) | 0x0000ffff) + 1; } static inline unsigned long -- 1.7.3

3 25