OpenBIOS February 2009

openbios@openbios.org

15 participants
46 discussions

building openbios-qemu.elf?
by Hollis Blanchard 24 Feb '09

24 Feb '09

Hi, I just tried to build openbios-qemu.elf, but it is a little too big (1MB + 4 bytes): Elf file type is EXEC (Executable file) Entry point 0xfff08000 There are 3 program headers, starting at offset 52 Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align LOAD 0x000094 0xfff00000 0xfff00000 0x100000 0x100000 RWE 0x4 LOAD 0x100094 0xfffffffc 0xfffffffc 0x00004 0x00004 R E 0x1 GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RWE 0x4 Section to Segment mapping: Segment Sections... 00 .text.vectors .text .rodata .data .sdata .bss .sbss 01 .romentry 02 In contrast, the openbios-ppc binary in qemu looks like this: Elf file type is EXEC (Executable file) Entry point 0xfff08000 There are 2 program headers, starting at offset 52 Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align LOAD 0x000074 0xfff00000 0xfff00000 0x41044 0x4bc44 RWE 0x4 LOAD 0x0410b8 0xfffffffc 0xfffffffc 0x00004 0x00004 R E 0x1 Section to Segment mapping: Segment Sections... 00 .text.vectors .text .rodata .data .sdata .bss .sbss.1 .sbss.2 .sbss.3 .sbss.4 .sbss.5 .sbss.6 .sbss.7 .sbss.8 01 .romentry I'm building with gcc 4.2.3. Any ideas? -- Hollis Blanchard IBM Linux Technology Center

3 3

Re: [OpenBIOS] [Qemu-devel] Re: building openbios-qemu.elf?
by Laurent Vivier 24 Feb '09

24 Feb '09

>On Tue, 2009-02-24 at 00:07 +0100, Laurent Vivier wrote: >> Hi, >> >> Do you use source from SVN head ? > >Yes. > >> Do you have any information in obj-ppc/build.log ? > >This is somewhat interesting: > >powerpc-440-linux-gnu-strip openbios-qemu.elf >BFD: st4PszLi: warning: allocated section `.bss' not in segment >BFD: st4PszLi: warning: allocated section `.sbss' not in segment > >The "nostrip" version of openbios-qemu.elf looks much better: > >Program Headers: > Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align > LOAD 0x000094 0xfff00000 0xfff00000 0x42044 0x4bcb4 RWE 0x4 > LOAD 0x0420d8 0xfffffffc 0xfffffffc 0x00004 0x00004 R E 0x1 > GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RWE 0x4 > > Section to Segment mapping: > Segment Sections... > 00 .text.vectors .text .rodata .data .sdata > 01 .romentry > 02 > >So something goes wrong in the strip process. > What is the version of your binutils ? (I use 2.18.0.20080103) You can also try the native strip of your host if you have installed binutils-multiarch (for a debian system). Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

2 1

r459 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 21 Feb '09

21 Feb '09

Author: blueswirl Date: 2009-02-21 18:13:41 +0100 (Sat, 21 Feb 2009) New Revision: 459 Modified: openbios-devel/arch/ppc/qemu/init.c Log: Postpone serial console use until PCI probe, fixes reset Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-02-21 16:27:51 UTC (rev 458) +++ openbios-devel/arch/ppc/qemu/init.c 2009-02-21 17:13:41 UTC (rev 459) @@ -103,7 +103,7 @@ entry( void ) { uint32_t temp = 0; - char buf[5], qemu_uuid[16]; + char buf[5]; arch = &known_arch[ARCH_HEATHROW]; @@ -121,37 +121,11 @@ isa_io_base = arch->io_base; - uart_init(0x80013000ULL + (CONFIG_SERIAL_PORT ? 0 : 0x20), - CONFIG_SERIAL_SPEED); - - printk("\n"); - printk("=============================================================\n"); - printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); - - if (temp != 1) { printk("Incompatible configuration device version, freezing\n"); for(;;); } - printk("Configuration device id %s", buf); - printk(" version %d machine id %d\n", temp, machine_id); - - temp = fw_cfg_read_i32(FW_CFG_NB_CPUS); - - printk("CPUs: %x\n", temp); - - temp = fw_cfg_read_i32(FW_CFG_RAM_SIZE); - printk("Memory: %dM\n", temp / 1024 / 1024); - - fw_cfg_read(FW_CFG_UUID, qemu_uuid, 16); - - 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]); - ofmem_init(); initialize_forth(); /* won't return */ @@ -413,9 +387,43 @@ #endif uint64_t ram_size; const struct cpudef *cpu; - char buf[64]; + char buf[64], qemu_uuid[16]; const char *stdin_path, *stdout_path; + uint32_t temp = 0; + modules_init(); + setup_timers(); +#ifdef CONFIG_DRIVER_PCI + ob_pci_init(); +#endif + + printk("\n"); + printk("=============================================================\n"); + printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); + + fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); + buf[4] = '\0'; + printk("Configuration device id %s", buf); + + 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 = get_ram_size(); + + printk("Memory: %lldM\n", ram_size / 1024 / 1024); + + fw_cfg_read(FW_CFG_UUID, qemu_uuid, 16); + + 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]); + /* set device tree root info */ push_str("/"); @@ -505,8 +513,6 @@ /* all memory */ - ram_size = get_ram_size(); - PUSH(ram_size >> 32); fword("encode-int"); PUSH(ram_size & 0xffffffff); @@ -541,11 +547,6 @@ cpu->initfn(cpu); printk("CPU type %s\n", cpu->name); - modules_init(); - setup_timers(); -#ifdef CONFIG_DRIVER_PCI - ob_pci_init(); -#endif snprintf(buf, sizeof(buf), "/cpus/%s", cpu->name); ofmem_register(find_dev(buf)); node_methods_init(buf);

1 0

r458 - openbios-devel/forth/device
by svn＠openbios.org 21 Feb '09

21 Feb '09

Author: blueswirl Date: 2009-02-21 17:27:51 +0100 (Sat, 21 Feb 2009) New Revision: 458 Modified: openbios-devel/forth/device/fcode.fs Log: Fix b?branch (Mark Cave-Ayland) Modified: openbios-devel/forth/device/fcode.fs =================================================================== --- openbios-devel/forth/device/fcode.fs 2009-02-21 11:11:56 UTC (rev 457) +++ openbios-devel/forth/device/fcode.fs 2009-02-21 16:27:51 UTC (rev 458) @@ -416,7 +416,7 @@ \ Conditional branch FCode. Followed by FCode-offset. : b?branch - ['] do?branch , + setup-tmp-comp ['] do?branch , fcode-offset 0< if \ if we jump backwards, we can forsee where it goes resolve-dest else @@ -439,6 +439,7 @@ : b(>resolve) resolve-orig + execute-tmp-comp ; immediate

1 0

r457 - openbios-devel/arch/sparc64
by svn＠openbios.org 21 Feb '09

21 Feb '09

Author: blueswirl Date: 2009-02-21 12:11:56 +0100 (Sat, 21 Feb 2009) New Revision: 457 Modified: openbios-devel/arch/sparc64/entry.S Log: Clear TLBs on reset Modified: openbios-devel/arch/sparc64/entry.S =================================================================== --- openbios-devel/arch/sparc64/entry.S 2009-02-18 13:58:35 UTC (rev 456) +++ openbios-devel/arch/sparc64/entry.S 2009-02-21 11:11:56 UTC (rev 457) @@ -76,6 +76,23 @@ bne bad_conf nop + ! Clear ITLB + mov 6 << 3, %g1 + stxa %g0, [%g1] ASI_IMMU + stxa %g0, [%g1] ASI_DMMU + mov 63 << 3, %g1 +1: stxa %g0, [%g1] ASI_ITLB_DATA_ACCESS + subcc %g1, 1 << 3, %g1 + bne 1b + nop + + ! Clear DTLB + mov 63 << 3, %g1 +1: stxa %g0, [%g1] ASI_DTLB_DATA_ACCESS + subcc %g1, 1 << 3, %g1 + bne 1b + nop + ! Get memory size from configuration device ! NB: little endian format mov FW_CFG_RAM_SIZE, %g2

1 0

r456 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 18 Feb '09

18 Feb '09

Author: laurent Date: 2009-02-18 14:58:35 +0100 (Wed, 18 Feb 2009) New Revision: 456 Modified: openbios-devel/arch/ppc/qemu/main.c Log: Extract "bootargs" from "boot" command line. It is needed to boot Fedora-10 as we must specify the path to the yaboot.conf. To boot Fedora: boot cd: conf=cd:,\ppc\ppc32\yaboot.conf so "bootpath" is "cd:", and "bootargs" is "conf=cd:,\ppc\ppc32\yaboot.conf" Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2009-02-17 22:45:41 UTC (rev 455) +++ openbios-devel/arch/ppc/qemu/main.c 2009-02-18 13:58:35 UTC (rev 456) @@ -182,7 +182,8 @@ ELF_DPRINTF("bootpath %s bootargs %s\n", path, args); set_property( chosen_ph, "bootpath", path, strlen(spec)+1 ); - set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); + if (args) + set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); } /************************************************************************/ @@ -224,7 +225,7 @@ http://playground.sun.com/1275/bindings/chrp/chrp1_7a.ps */ static void -try_bootinfo(const char *path) +try_bootinfo(const char *path, const char *param) { int fd, len, tag, taglen, script, scriptlen, entity; char tagbuf[256], bootscript[256], c; @@ -311,6 +312,8 @@ ELF_DPRINTF("got bootscript %s\n", bootscript); + encode_bootpath(path, param); + feval(bootscript); badf: close_io( fd ); @@ -412,6 +415,12 @@ char *path = pop_fstr_copy(), *param; int i; + param = strchr(path, ' '); + if (param) { + *param = 0; + param++; + } + if (!path) { ELF_DPRINTF("Entering boot, no path\n"); push_str("boot-device"); @@ -435,7 +444,7 @@ param = pop_fstr_copy(); } try_path(path, param); - try_bootinfo(path); + try_bootinfo(path, param); } else { char boot_device = nvram_read(0x34); @@ -448,12 +457,12 @@ path = strdup("cd:0"); break; } - try_bootinfo(path); + try_bootinfo(path, NULL); } } else { ELF_DPRINTF("Entering boot, path %s\n", path); - try_path(path, ""); - try_bootinfo(path); + try_path(path, param); + try_bootinfo(path, param); } for( i=0; i < sizeof(paths) / sizeof(paths[0]); i++ ) { try_path(paths[i], args[i]);

1 0

r455 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 17 Feb '09

17 Feb '09

Author: laurent Date: 2009-02-17 23:45:41 +0100 (Tue, 17 Feb 2009) New Revision: 455 Modified: openbios-devel/arch/ppc/qemu/start.S Log: remove unused function timer_calib_start Modified: openbios-devel/arch/ppc/qemu/start.S =================================================================== --- openbios-devel/arch/ppc/qemu/start.S 2009-02-16 18:38:07 UTC (rev 454) +++ openbios-devel/arch/ppc/qemu/start.S 2009-02-17 22:45:41 UTC (rev 455) @@ -410,16 +410,6 @@ GLOBL(of_rtas_end): - /* used in a hack to the newworld calibration */ -GLOBL(nw_dec_calibration): - .long 0 -GLOBL(timer_calib_start): - lis r3,HA(nw_dec_calibration) - addi r3,r3,LO(nw_dec_calibration) - lwz r3,0(r3) - blr -GLOBL(timer_calib_end): - #define CACHE_LINE_SIZE 32 #define LG_CACHE_LINE_SIZE 5

1 0

r454 - openbios-devel/kernel
by svn＠openbios.org 16 Feb '09

16 Feb '09

Author: blueswirl Date: 2009-02-16 19:38:07 +0100 (Mon, 16 Feb 2009) New Revision: 454 Modified: openbios-devel/kernel/bootstrap.c Log: Fix gcc 4.3 warning Modified: openbios-devel/kernel/bootstrap.c =================================================================== --- openbios-devel/kernel/bootstrap.c 2009-02-15 20:20:55 UTC (rev 453) +++ openbios-devel/kernel/bootstrap.c 2009-02-16 18:38:07 UTC (rev 454) @@ -178,9 +178,6 @@ .length = target_ulong((uint32_t)dicthead), .last = target_ucell((ucell)((unsigned long)last - (unsigned long)dict)), - .reserved[0] = 0, - .reserved[1] = 0, - .reserved[2] = 0, }; /*

1 0

r453 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 15 Feb '09

15 Feb '09

Author: laurent Date: 2009-02-15 21:20:55 +0100 (Sun, 15 Feb 2009) New Revision: 453 Modified: openbios-devel/arch/ppc/qemu/main.c Log: In "<boot-script>", from bootinfo.txt, decode all bootinfo entities: device, partition, directory, filename, full-path. (as defined in "PowerPC Microprocessor CHRP binding r1.8", chapter 3.1.6.1.) Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2009-02-14 09:44:55 UTC (rev 452) +++ openbios-devel/arch/ppc/qemu/main.c 2009-02-15 20:20:55 UTC (rev 453) @@ -14,7 +14,6 @@ * */ - #include "openbios/config.h" #include "openbios/bindings.h" #include "openbios/elfload.h" @@ -135,15 +134,18 @@ } static char * -get_filename( const char * path ) +get_filename( const char * path , char **dirname) { static char buf[1024]; + char *filename; while ( *path && *path != ':' ) path++; - if (!*path) + if (!*path) { + *dirname = NULL; return NULL; + } path++; while ( *path && isdigit(*path) ) @@ -155,7 +157,16 @@ strncpy(buf, path, sizeof(buf)); buf[sizeof(buf) - 1] = 0; - return buf; + filename = strrchr(buf, '\\'); + if (filename) { + *dirname = buf; + (*filename++) = 0; + } else { + *dirname = NULL; + filename = buf; + } + + return filename; } static void @@ -163,9 +174,11 @@ { char path[1024]; phandle_t chosen_ph = find_dev("/chosen"); + char *filename, *directory; - snprintf(path, sizeof(path), "%s:%d,%s", get_device(spec), - get_partition(spec), get_filename(spec)); + filename = get_filename(spec, &directory); + snprintf(path, sizeof(path), "%s:%d,%s\\%s", get_device(spec), + get_partition(spec), directory, filename); ELF_DPRINTF("bootpath %s bootargs %s\n", path, args); set_property( chosen_ph, "bootpath", path, strlen(spec)+1 ); @@ -215,11 +228,12 @@ { int fd, len, tag, taglen, script, scriptlen, entity; char tagbuf[256], bootscript[256], c; - char *device; + char *device, *filename, *directory; int partition; device = get_device(path); partition = get_partition(path); + filename = get_filename(path, &directory); /* read boot script */ @@ -272,6 +286,15 @@ } else if (strcasecmp(tagbuf, "partition") == 0) { sprintf(bootscript + scriptlen, "%d", partition); scriptlen = strlen(bootscript); + } else if (strcasecmp(tagbuf, "directory") == 0) { + strcpy(bootscript + scriptlen, directory); + scriptlen += strlen(directory); + } else if (strcasecmp(tagbuf, "filename") == 0) { + strcpy(bootscript + scriptlen, filename); + scriptlen += strlen(filename); + } else if (strcasecmp(tagbuf, "full-path") == 0) { + strcpy(bootscript + scriptlen, path); + scriptlen += strlen(path); } else { /* unknown, keep it */ bootscript[scriptlen] = '&'; strcpy(bootscript + scriptlen + 1, tagbuf);

1 0

r452 - in openbios-devel: arch/ppc/qemu drivers
by svn＠openbios.org 14 Feb '09

14 Feb '09

Author: blueswirl Date: 2009-02-14 10:44:55 +0100 (Sat, 14 Feb 2009) New Revision: 452 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/qemu.fs openbios-devel/drivers/escc.c Log: Support for Qemu -nographic flag Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-02-12 19:39:47 UTC (rev 451) +++ openbios-devel/arch/ppc/qemu/init.c 2009-02-14 09:44:55 UTC (rev 452) @@ -414,6 +414,7 @@ uint64_t ram_size; const struct cpudef *cpu; char buf[64]; + const char *stdin_path, *stdout_path; /* set device tree root info */ @@ -560,6 +561,50 @@ } #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"; + } + } else { + stdin_path = "adb-keyboard"; + stdout_path = "screen"; + } + + push_str("/chosen"); + fword("find-device"); + + 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 ) #endif Modified: openbios-devel/arch/ppc/qemu/qemu.fs =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.fs 2009-02-12 19:39:47 UTC (rev 451) +++ openbios-devel/arch/ppc/qemu/qemu.fs 2009-02-14 09:44:55 UTC (rev 452) @@ -37,26 +37,15 @@ :noname " rtc" " rtc" preopen " memory" " /memory" preopen - \ " stdout" " /packages/terminal-emulator" preopen - " stdout" " screen" preopen - " stdin" " adb-keyboard" preopen - ; SYSTEM-initializer \ use the tty interface if available : activate-tty-interface " /packages/terminal-emulator" find-dev if drop - " adb-keyboard" " input-device" $setenv - " screen" " output-device" $setenv then ; -:noname - " keyboard" input -; CONSOLE-IN-initializer - - \ ------------------------------------------------------------------------- \ pre-booting \ ------------------------------------------------------------------------- Modified: openbios-devel/drivers/escc.c =================================================================== --- openbios-devel/drivers/escc.c 2009-02-12 19:39:47 UTC (rev 451) +++ openbios-devel/drivers/escc.c 2009-02-14 09:44:55 UTC (rev 452) @@ -140,7 +140,7 @@ len = POP(); addr = (char *)POP(); - if (len != 1) + if (len < 1) printk("escc_read: bad len, addr %x len %x\n", (unsigned int)addr, len); if (uart_charav(*address)) { @@ -175,19 +175,17 @@ static void escc_open(unsigned long *address) { +#ifdef CONFIG_DRIVER_ESCC_SUN int len; phandle_t ph; unsigned long *prop; -#ifdef CONFIG_DRIVER_ESCC_SUN char *args; -#endif fword("my-self"); fword("ihandle>phandle"); ph = (phandle_t)POP(); prop = (unsigned long *)get_property(ph, "address", &len); *address = *prop; -#ifdef CONFIG_DRIVER_ESCC_SUN fword("my-args"); args = pop_fstr_copy(); if (args) { @@ -196,6 +194,8 @@ //printk("escc_open: address %lx, args %s\n", *address, args); free(args); } +#else + *address = (unsigned long)serial_dev; // XXX #endif RET ( -1 ); } @@ -295,7 +295,7 @@ len = POP(); addr = (unsigned char *)POP(); - if (len != 1) + if (len < 1) printk("escc_read: bad len, addr %x len %x\n", (unsigned int)addr, len); if (keyboard_dataready()) {

1 0