OpenBIOS December 2008

openbios@openbios.org

8 participants
78 discussions

r313 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 12:53:13 +0100 (Tue, 23 Dec 2008) New Revision: 313 Modified: openbios-devel/arch/ppc/qemu/main.c Log: Use boot-device and boot-args NVRAM variables, fix warnings when debugging Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2008-12-23 10:15:14 UTC (rev 312) +++ openbios-devel/arch/ppc/qemu/main.c 2008-12-23 11:53:13 UTC (rev 313) @@ -56,7 +56,7 @@ /* the ELF-image (usually) starts at offset 0x4000 */ if( (elf_offs=find_elf(fd)) < 0 ) { - ELF_DPRINTF("----> %s is not an ELF image\n", buf ); + ELF_DPRINTF("----> %s is not an ELF image\n", get_file_path(fd)); exit(1); } if( !(phdr=elf_readhdrs(fd, elf_offs, &ehdr)) ) @@ -73,8 +73,8 @@ seek_io( fd, elf_offs + phdr[i].p_offset ); ELF_DPRINTF("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX\n", - phdr[i].p_filesz, phdr[i].p_memsz, phdr[i].p_offset, - phdr[i].p_vaddr ); + (ulong)phdr[i].p_filesz, (ulong)phdr[i].p_memsz, (ulong)phdr[i].p_offset, + (ulong)phdr[i].p_vaddr ); if( phdr[i].p_vaddr != phdr[i].p_paddr ) ELF_DPRINTF("WARNING: ELF segment virtual addr != physical addr\n"); @@ -108,28 +108,63 @@ /************************************************************************/ /* qemu booting */ /************************************************************************/ +static void +try_path(const char *path, const char *param) +{ + ulong elf_entry; + int fd; + ELF_DPRINTF("Trying %s %s\n", path, param); + if ((fd = open_io(path)) == -1) { + ELF_DPRINTF("Can't open %s\n", path); + return; + } + (void) load_elf_rom( &elf_entry, fd ); + close_io( fd ); + encode_bootpath( path, param ); + + update_nvram(); + ELF_DPRINTF("Transfering control to %s %s\n", + path, param); + transfer_control_to_elf( elf_entry ); + /* won't come here */ +} + static void yaboot_startup( void ) { - const char *paths[] = { "hd:2,\\ofclient", "hd:2,\\yaboot", NULL }; - const char *args[] = { "", "conf=hd:2,\\yaboot.conf", NULL }; - ulong elf_entry; - int i, fd; + static const char * const paths[] = { "hd:2,\\ofclient", "hd:2,\\yaboot" }; + static const char * const args[] = { "", "conf=hd:2,\\yaboot.conf" }; + char *path = pop_fstr_copy(), *param; + int i; - for( i=0; paths[i]; i++ ) { - if( (fd=open_io(paths[i])) == -1 ) - continue; - (void) load_elf_rom( &elf_entry, fd ); - close_io( fd ); - encode_bootpath( paths[i], args[i] ); - - update_nvram(); - ELF_DPRINTF("Transfering control to %s %s\n", - paths[i], args[i]); - transfer_control_to_elf( elf_entry ); - /* won't come here */ - } + if (!path) { + push_str("boot-device"); + push_str("/options"); + fword("(find-dev)"); + POP(); + fword("get-package-property"); + if (!POP()) { + path = pop_fstr_copy(); + param = strchr(path, ' '); + if (param) { + *param = '\0'; + param++; + } else { + push_str("boot-args"); + push_str("/options"); + fword("(find-dev)"); + POP(); + fword("get-package-property"); + POP(); + param = pop_fstr_copy(); + } + try_path(path, param); + } + } + for( i=0; i < sizeof(paths) / sizeof(paths[0]); i++ ) { + try_path(paths[i], args[i]); + } printk("*** Boot failure! No secondary bootloader specified ***\n"); }

1 0

Re: [OpenBIOS] r312 - in openbios-devel: arch/ppc/qemu drivers include/openbios modules
by Blue Swirl 23 Dec '08

23 Dec '08

On 12/23/08, svn(a)openbios.org <svn(a)openbios.org> wrote: > Author: blueswirl > Date: 2008-12-23 11:15:14 +0100 (Tue, 23 Dec 2008) > New Revision: 312 > > Modified: > openbios-devel/arch/ppc/qemu/init.c > openbios-devel/drivers/adb.c > openbios-devel/drivers/kbd.c > openbios-devel/drivers/kbd.h > openbios-devel/drivers/pci.c > openbios-devel/include/openbios/pci.h > openbios-devel/modules/font_8x8.c > Log: > Change part_length to a define Sorry, the log entry should have been: Make some structures used by PPC "const".

1 0

r312 - in openbios-devel: arch/ppc/qemu drivers include/openbios modules
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 11:15:14 +0100 (Tue, 23 Dec 2008) New Revision: 312 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/drivers/adb.c openbios-devel/drivers/kbd.c openbios-devel/drivers/kbd.h openbios-devel/drivers/pci.c openbios-devel/include/openbios/pci.h openbios-devel/modules/font_8x8.c Log: Change part_length to a define Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-12-23 10:14:48 UTC (rev 311) +++ openbios-devel/arch/ppc/qemu/init.c 2008-12-23 10:15:14 UTC (rev 312) @@ -46,7 +46,7 @@ ARCH_HEATHROW, }; -static pci_arch_t known_arch[] = { +static const pci_arch_t known_arch[] = { [ARCH_PREP] = { "PREP", 0x1057, 0x4801, 0x80800000, 0x800c0000, 0x80000000, 0x00100000, 0xf0000000, 0x10000000, 0x80000000, 0x00010000, 0x00000000, 0x00400000, Modified: openbios-devel/drivers/adb.c =================================================================== --- openbios-devel/drivers/adb.c 2008-12-23 10:14:48 UTC (rev 311) +++ openbios-devel/drivers/adb.c 2008-12-23 10:15:14 UTC (rev 312) @@ -65,7 +65,7 @@ */ -static keymap_t ADB_kbd_us[] = { +static const keymap_t ADB_kbd_us[] = { /* 0x00 */ { KBD_SH_CAPS, { 0x61, 0x41, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, Modified: openbios-devel/drivers/kbd.c =================================================================== --- openbios-devel/drivers/kbd.c 2008-12-23 10:14:48 UTC (rev 311) +++ openbios-devel/drivers/kbd.c 2008-12-23 10:15:14 UTC (rev 312) @@ -30,7 +30,7 @@ #define KBD_DPRINTF(fmt, args...) do { } while (0) #endif -int kbd_set_keymap (kbd_t *kbd, int nb_keys, keymap_t *keymap) +int kbd_set_keymap (kbd_t *kbd, int nb_keys, const keymap_t *keymap) { kbd->nb_keys = nb_keys; kbd->keymap = keymap; @@ -40,7 +40,7 @@ int kbd_translate_key (kbd_t *kbd, int keycode, int up_down) { - keymap_t *keyt; + const keymap_t *keyt; int mod_state, key, type; int ret; Modified: openbios-devel/drivers/kbd.h =================================================================== --- openbios-devel/drivers/kbd.h 2008-12-23 10:14:48 UTC (rev 311) +++ openbios-devel/drivers/kbd.h 2008-12-23 10:15:14 UTC (rev 312) @@ -34,7 +34,7 @@ * Right modifiers -----------+ */ int nb_keys; - keymap_t *keymap; + const keymap_t *keymap; }; /* Modifiers */ @@ -97,7 +97,7 @@ }; void *kbd_new (int len); -int kbd_set_keymap (kbd_t *kbd, int nb_keys, keymap_t *keymap); +int kbd_set_keymap (kbd_t *kbd, int nb_keys, const keymap_t *keymap); int kbd_translate_key (kbd_t *kbd, int keycode, int up_down); #endif /* !defined (__OHW_KBD_H__) */ Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-12-23 10:14:48 UTC (rev 311) +++ openbios-devel/drivers/pci.c 2008-12-23 10:15:14 UTC (rev 312) @@ -33,7 +33,7 @@ /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_pci_node, INSTALL_OPEN, 2*sizeof(int) ); -pci_arch_t *arch; +const pci_arch_t *arch; static void ob_pci_open(int *idx) Modified: openbios-devel/include/openbios/pci.h =================================================================== --- openbios-devel/include/openbios/pci.h 2008-12-23 10:14:48 UTC (rev 311) +++ openbios-devel/include/openbios/pci.h 2008-12-23 10:15:14 UTC (rev 312) @@ -21,6 +21,6 @@ unsigned long rlen; }; -extern pci_arch_t *arch; +extern const pci_arch_t *arch; #endif /* _H_PCI */ Modified: openbios-devel/modules/font_8x8.c =================================================================== --- openbios-devel/modules/font_8x8.c 2008-12-23 10:14:48 UTC (rev 311) +++ openbios-devel/modules/font_8x8.c 2008-12-23 10:15:14 UTC (rev 312) @@ -8,7 +8,7 @@ #define FONT_WIDTH 8 #define FONT_HEIGHT 8 -static unsigned char fontdata[FONTDATAMAX] = { +static const unsigned char fontdata[FONTDATAMAX] = { /* 0 0x00 '^@' */ 0x00, /* 00000000 */

1 0

r311 - openbios-devel/fs/grubfs
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 11:14:48 +0100 (Tue, 23 Dec 2008) New Revision: 311 Modified: openbios-devel/fs/grubfs/filesys.h openbios-devel/fs/grubfs/grubfs_fs.c Log: Change part_length to a define Modified: openbios-devel/fs/grubfs/filesys.h =================================================================== --- openbios-devel/fs/grubfs/filesys.h 2008-12-23 10:12:09 UTC (rev 310) +++ openbios-devel/fs/grubfs/filesys.h 2008-12-23 10:14:48 UTC (rev 311) @@ -121,8 +121,8 @@ #define current_slice 0 #define current_partition 0 -extern unsigned long part_start; -extern unsigned long part_length; +/* we fake this for now, assuming that the filesystem is not corrupt */ +#define part_length -1 extern int filepos; extern int filemax; extern int fsmax; Modified: openbios-devel/fs/grubfs/grubfs_fs.c =================================================================== --- openbios-devel/fs/grubfs/grubfs_fs.c 2008-12-23 10:12:09 UTC (rev 310) +++ openbios-devel/fs/grubfs/grubfs_fs.c 2008-12-23 10:14:48 UTC (rev 311) @@ -31,9 +31,6 @@ grub_error_t errnum; char FSYS_BUF[FSYS_BUFLEN]; -/* we fake this for now, assuming that the filesystem is not corrupt */ -unsigned long part_length=(unsigned long)-1; - /* these are not even used by us, instead * the grub fs drivers want them: */

1 0

r310 - openbios-devel/kernel
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 11:12:09 +0100 (Tue, 23 Dec 2008) New Revision: 310 Modified: openbios-devel/kernel/internal.c openbios-devel/kernel/primitives.c Log: Make words array static and change the definition to a stricter one Modified: openbios-devel/kernel/internal.c =================================================================== --- openbios-devel/kernel/internal.c 2008-12-23 10:09:04 UTC (rev 309) +++ openbios-devel/kernel/internal.c 2008-12-23 10:12:09 UTC (rev 310) @@ -13,7 +13,9 @@ * - address pointed by CFA is executed by CPU */ -extern void * const words[]; +typedef void forth_word(void); + +static forth_word * const words[]; ucell PC; volatile int runforth = 0; Modified: openbios-devel/kernel/primitives.c =================================================================== --- openbios-devel/kernel/primitives.c 2008-12-23 10:09:04 UTC (rev 309) +++ openbios-devel/kernel/primitives.c 2008-12-23 10:12:09 UTC (rev 310) @@ -39,8 +39,7 @@ * THE END). ANY OTHER CHANGE WILL BREAK COMPATIBILITY TO OLDER * BINARY DICTIONARIES. */ -void * const words[] = { - +static forth_word * const words[] = { /* * CFAs and special words */

1 0

r309 - openbios-devel/drivers
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 11:09:04 +0100 (Tue, 23 Dec 2008) New Revision: 309 Modified: openbios-devel/drivers/pci.c Log: Add copyright Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-12-23 08:11:53 UTC (rev 308) +++ openbios-devel/drivers/pci.c 2008-12-23 10:09:04 UTC (rev 309) @@ -7,6 +7,8 @@ * (C) 2004 Stefan Reinauer <stepan(a)openbios.org> * (C) 2005 Ed Schouten <ed(a)fxq.nl> * + * Some parts from OpenHackWare-0.4, Copyright (c) 2004-2005 Jocelyn Mayer + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2

1 0

[PATCH] sparc64 add cpuid to cpu node
by Igor Kovalenko 23 Dec '08

23 Dec '08

Hi! Linux kernel expects at least "cpuid" property in cpu device node, or it halts execution. This patch adds one with dummy "1" value. This allows to make some progress into booting the kernel. Please apply. -- Kind regards, Igor V. Kovalenko

2 7

r308 - openbios-devel/arch/sparc64
by svn＠openbios.org 23 Dec '08

23 Dec '08

Author: blueswirl Date: 2008-12-23 09:11:53 +0100 (Tue, 23 Dec 2008) New Revision: 308 Modified: openbios-devel/arch/sparc64/openbios.c Log: Add clock-frequency property (original patch by Igor Kovalenko) Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-12-22 16:01:44 UTC (rev 307) +++ openbios-devel/arch/sparc64/openbios.c 2008-12-23 08:11:53 UTC (rev 308) @@ -385,7 +385,7 @@ : : "r" (addr)); } -static void cpu_generic_init(const struct cpudef *cpu) +static void cpu_generic_init(const struct cpudef *cpu, uint32_t clock_frequency) { unsigned long iu_version; char nodebuff[256]; @@ -429,6 +429,11 @@ push_str("cpuid"); fword("property"); + PUSH(clock_frequency); + fword("encode-int"); + push_str("clock-frequency"); + fword("property"); + fword("finish-device"); // MMU node @@ -563,6 +568,7 @@ char buf[256]; uint32_t temp; uint64_t ram_size; + uint32_t clock_frequency; for (i = 0; i < sizeof(ohwcfg_v3_t); i++) { outb(i & 0xff, 0x74); @@ -614,9 +620,11 @@ printk("CPUs: %x", temp); + clock_frequency = 100000000; + cpu = id_cpu(); //cpu->initfn(); - cpu_generic_init(cpu); + cpu_generic_init(cpu, clock_frequency); printk(" x %s\n", cpu->name); // Add /uuid

1 0

Re: [OpenBIOS] First OOPS
by Laurent Vivier 22 Dec '08

22 Dec '08

Le 22 déc. 08 à 17:23, Blue Swirl a écrit : > On 12/22/08, Laurent Vivier <laurent(a)lvivier.info> wrote: >> >> Le 22 déc. 08 à 12:20, Blue Swirl a écrit : >> >> >> >>> On 12/22/08, Laurent Vivier <laurent(a)lvivier.info> wrote: >>> >>>> On an install CD there is a forth script which start yaboot with >>>> good >>>> parameters but currently OpenBIOS is not able to decode this script >> (inside >>>> XML tags). >>>> >>> >>> Did OHW ever handle this? >>> >> >> It does, but it is a hack: it computes the checksum of the script to >> identify it, and according the checksum the things to do are >> hardcoded into >> OHW. >> >> You have a big "switch()" and a "case" for each known script (for >> instance >> "debian etch install CD", "debian sarge install CD", etc). > > Well, it wasn't that hard. The patch o_2_use_bootinfo.diff adds > parsing of CHRP file ppc\bootinfo.txt. Still, the loaded yaboot does > not work. Maybe a problem with ELF loader? > > I've shuffled the patch series a bit, so here are all pending patches. > Would anyone mind if I applied them? > < > q_1_ppc_openbios > .diff > > > < > q_2_ppc_use_prom_env > .diff > > > < > q_3_ppc_use_fw_cfg > .diff > > > < > o_1_ppc_add_boot.diff><o_2_use_bootinfo.diff><o_3_ppc_use_fw_cfg.diff> I don't totally agree with some of them, but it is a good start and all are really needed, so please apply... Regards, Laurent ----------------------- Laurent Vivier ---------------------- "The best way to predict the future is to invent it." - Alan Kay

1 0

r307 - openbios-devel/config/examples
by svn＠openbios.org 22 Dec '08

22 Dec '08

Author: blueswirl Date: 2008-12-22 17:01:44 +0100 (Mon, 22 Dec 2008) New Revision: 307 Modified: openbios-devel/config/examples/cross-ppc_config.xml Log: Enable ISO9660 Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2008-12-22 16:01:12 UTC (rev 306) +++ openbios-devel/config/examples/cross-ppc_config.xml 2008-12-22 16:01:44 UTC (rev 307) @@ -52,7 +52,7 @@ <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_UFS" type="boolean" value="false"/> - <option name="CONFIG_FSYS_ISO9660" type="boolean" value="false"/> + <option name="CONFIG_FSYS_ISO9660" type="boolean" value="true"/> <option name="CONFIG_FSYS_FFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/>

1 0