August 2009 - OpenBIOS - mail.coreboot.org

[PATHC][RFC] OldWorld Booting Method
by Laurent Vivier Aug. 12, 2009

Aug. 12, 2009

Hi, the attached patch allows to boot using "boot hd:%BOOT". This is the method used by OldWorld bootloader, Quik. As I've only tested it with PPC target, I'd like to have some comments before commiting it (If someone can test sparc, I'll be happy). Regards, Laurent

3 2

r550 - trunk/openbios-devel/config/examples
by svn＠openbios.org Aug. 11, 2009

Aug. 11, 2009

Author: laurent Date: 2009-08-11 22:47:13 +0200 (Tue, 11 Aug 2009) New Revision: 550 Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/ppc_config.xml Log: For powerpc, use HFSPlus instead of HFS. Later, this will allow to boot like a real NewWorld OpenFirmware: boot hd:,\\:tbxi Where "\\" is the default (blessed) system folder (defined by the filesystem, generally "/System/Library/CoreServices" on MacOS X), and ":tbxi" the first file with the "tbxi" file attribute ("BootX" on MacOS X) Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-08-11 20:31:50 UTC (rev 549) +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-08-11 20:47:13 UTC (rev 550) @@ -48,8 +48,8 @@ <option name="CONFIG_DEBUG_MAC_PARTS" type="boolean" value="false"/> <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> - <option name="CONFIG_HFS" type="boolean" value="true"/> - <option name="CONFIG_HFSP" type="boolean" value="false"/> + <option name="CONFIG_HFS" type="boolean" value="false"/> + <option name="CONFIG_HFSP" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml 2009-08-11 20:31:50 UTC (rev 549) +++ trunk/openbios-devel/config/examples/ppc_config.xml 2009-08-11 20:47:13 UTC (rev 550) @@ -49,8 +49,8 @@ <option name="CONFIG_DEBUG_MAC_PARTS" type="boolean" value="false"/> <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> - <option name="CONFIG_HFS" type="boolean" value="true"/> - <option name="CONFIG_HFSP" type="boolean" value="false"/> + <option name="CONFIG_HFS" type="boolean" value="false"/> + <option name="CONFIG_HFSP" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/>

1 0

[PATCH 1/4] Disable strict aliasing for all targets
by Pavel Roskin Aug. 11, 2009

Aug. 11, 2009

--- Makefile.target | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile.target b/Makefile.target index f94f450..bf83b5b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -25,6 +25,7 @@ STRIP := $(TARGET)strip RANLIB := $(TARGET)ranlib CFLAGS+= -Os -g -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS +CFLAGS+= -fno-strict-aliasing CFLAGS+= -Wall -Wredundant-decls -Wshadow -Wpointer-arith CFLAGS+= -Wstrict-prototypes -Wmissing-declarations -Wundef -Wendif-labels CFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes

2 8

r549 - trunk/openbios-devel/fs
by svn＠openbios.org Aug. 11, 2009

Aug. 11, 2009

Author: laurent Date: 2009-08-11 22:31:50 +0200 (Tue, 11 Aug 2009) New Revision: 549 Modified: trunk/openbios-devel/fs/hfs_mdb.h Log: Author: Pavel Roskin <proski(a)gnu.org> Rewrite hfs_get_ushort() and hfs_get_uint() as inline functions so that their arguments are checked. Use __be16_to_cpu and __be32_to_cpu to byte-swap the result as needed. Modified: trunk/openbios-devel/fs/hfs_mdb.h =================================================================== --- trunk/openbios-devel/fs/hfs_mdb.h 2009-08-11 20:27:17 UTC (rev 548) +++ trunk/openbios-devel/fs/hfs_mdb.h 2009-08-11 20:31:50 UTC (rev 549) @@ -15,13 +15,22 @@ #ifndef _H_HFS_MDB #define _H_HFS_MDB +#include "libc/byteorder.h" + typedef unsigned char hfs_char_t; typedef unsigned char hfs_ushort_t[2]; typedef unsigned char hfs_uint_t[4]; -#define hfs_get_ushort(addr) (*((unsigned short*)(addr))) -#define hfs_get_uint(addr) (*((unsigned int*)(addr))) +static inline unsigned short hfs_get_ushort(hfs_ushort_t addr) +{ + return __be16_to_cpu(*((unsigned short *)(addr))); +} +static inline unsigned int hfs_get_uint(hfs_uint_t addr) +{ + return __be32_to_cpu(*((unsigned int *)(addr))); +} + /* * The HFS Master Directory Block (MDB). *

1 0

r548 - trunk/openbios-devel/config/scripts
by svn＠openbios.org Aug. 11, 2009

Aug. 11, 2009

Author: laurent Date: 2009-08-11 22:27:17 +0200 (Tue, 11 Aug 2009) New Revision: 548 Modified: trunk/openbios-devel/config/scripts/switch-arch Log: Author: Pavel Roskin <proski(a)gnu.org> Check that the script is run from the top-level directory. Check that the config file is available for every specified architecture. Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-08-11 20:23:43 UTC (rev 547) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-08-11 20:27:17 UTC (rev 548) @@ -84,6 +84,11 @@ -e "s/Power Macintosh/ppc/"` } +if ! test -f utils/dist/debian/rules; then + echo "switch-arch must be run from the top-level source directory" >&2 + exit 1 +fi + # This is needed because viewvc messes with the permissions of executables: chmod 755 utils/dist/debian/rules chmod 755 config/scripts/switch-arch @@ -97,6 +102,11 @@ echo "Configuring OpenBIOS on $HOSTARCH for $*" for RULES_ARCH in $*; do + if ! test -f config/examples/${RULES_ARCH}_config.xml; then + echo "Cannot find config/examples/${RULES_ARCH}_config.xml" >&2 + exit 1 + fi + ARCH=`echo $RULES_ARCH | sed s/cross-//g` case $ARCH in amd64)

1 0

r547 - trunk/openbios-devel/config/examples
by svn＠openbios.org Aug. 11, 2009

Aug. 11, 2009

Author: laurent Date: 2009-08-11 22:23:43 +0200 (Tue, 11 Aug 2009) New Revision: 547 Modified: trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/config/examples/sparc64_config.xml Log: Author: Pavel Roskin <proski(a)gnu.org> CONFIG_OFMEM and CONFIG_OFMEM_MALLOC_ALIGN are defined in cross-ppc_config.xml, but not in ppc_config.xml, so copy them. Likewise, copy those setting from cross-sparc64_config.xml to sparc64_config.xml. Modified: trunk/openbios-devel/config/examples/ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml 2009-08-10 20:18:27 UTC (rev 546) +++ trunk/openbios-devel/config/examples/ppc_config.xml 2009-08-11 20:23:43 UTC (rev 547) @@ -35,6 +35,8 @@ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + <option name="CONFIG_OFMEM" type="boolean" value="true"/> + <option name="CONFIG_OFMEM_MALLOC_ALIGN" type="integer" value="4"/> <option name="CONFIG_VGA_WIDTH" type="integer" value="800"/> <option name="CONFIG_VGA_HEIGHT" type="integer" value="600"/> <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/> Modified: trunk/openbios-devel/config/examples/sparc64_config.xml =================================================================== --- trunk/openbios-devel/config/examples/sparc64_config.xml 2009-08-10 20:18:27 UTC (rev 546) +++ trunk/openbios-devel/config/examples/sparc64_config.xml 2009-08-11 20:23:43 UTC (rev 547) @@ -39,6 +39,8 @@ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + <option name="CONFIG_OFMEM" type="boolean" value="true"/> + <option name="CONFIG_OFMEM_MALLOC_ALIGN" type="integer" value="8"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/>

1 0

Re: [OpenBIOS] [PATCH 1/4] Disable strict aliasing for all targets
by Laurent Vivier Aug. 11, 2009

Aug. 11, 2009

> >--- > Makefile.target | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > >diff --git a/Makefile.target b/Makefile.target >index f94f450..bf83b5b 100644 >--- a/Makefile.target >+++ b/Makefile.target >@@ -25,6 +25,7 @@ STRIP := $(TARGET)strip > RANLIB := $(TARGET)ranlib > > CFLAGS+= -Os -g -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS >+CFLAGS+= -fno-strict-aliasing ... Why is this needed ? 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

Re: [OpenBIOS] [RFC] Make BootX from Mac OS X 10.4 work
by Laurent Vivier Aug. 10, 2009

Aug. 10, 2009

> >On 10.08.2009, at 00:51, Laurent Vivier wrote: > >> Le jeudi 30 juillet 2009 à 18:00 +0200, Alexander Graf a écrit : >>> Using this patch stacked on Steven Noonan's I was able to make >>> BootX from >>> Mac OS X 10.4 load XNU successfully in qemu-system-ppc. >> >> Hi, >> >> I'd like to play with that. >> >> Which patches to apply before ? > >I took those rebased on current git: > >http://github.com/tycho/openbios/tree/macosx-boot > >> How to boot ? > >The normal way. Just use -boot d. So far only the 10.4 CD did boot IIRC. > OK, thank you. I'll try to integrate some of these patches (the trivial ones) into the openbios main repository. (but I really don't understand why commit 4722c8a01d186a08183de49759dc8b7b74cf41c9 is needed, if someone can explain...). 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

3 2

r546 - trunk/openbios-devel/modules
by svn＠openbios.org Aug. 10, 2009

Aug. 10, 2009

Author: laurent Date: 2009-08-10 22:18:27 +0200 (Mon, 10 Aug 2009) New Revision: 546 Modified: trunk/openbios-devel/modules/disk-label.c Log: This patch modifies disk-label.c to not allow to read beyond the selected partition limits. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/disk-label.c =================================================================== --- trunk/openbios-devel/modules/disk-label.c 2009-08-10 19:57:43 UTC (rev 545) +++ trunk/openbios-devel/modules/disk-label.c 2009-08-10 20:18:27 UTC (rev 546) @@ -99,8 +99,8 @@ if( ph ) { di->offs_hi = 0; di->offs_lo = 0; - di->size_hi = -1; - di->size_lo = -1; + di->size_hi = 0; + di->size_lo = 0; di->part_ih = 0; di->type = -1; di->block_size = 512; @@ -174,7 +174,14 @@ { int ret, len = POP(); char *buf = (char*)POP(); + llong pos = tell( di->fd ); + ducell offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; + ducell size = ((ducell)di->size_hi << BITS) | di->size_lo; + if (size && len > pos - offs + size) { + len = size - (pos - offs); + } + ret = read_io( di->fd, buf, len ); PUSH( ret ); } @@ -188,6 +195,7 @@ ducell offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; ducell size = ((ducell)di->size_hi << BITS) | di->size_lo; + DPRINTF("dlabel_seek %llx [%llx, %llx]\n", pos, offs, size); if( pos != -1 ) pos += offs; else if( size ) { @@ -196,8 +204,12 @@ } else { /* let parent handle the EOF seek. */ } + DPRINTF("dlabel_seek: 0x%llx\n", pos ); + if (size && (pos - offs >= size )) { + PUSH(-1); + return; + } - DPRINTF("dlabel_seek: %x %08x\n", (int)(pos>>32), (int)pos ); ret = seek_io( di->fd, pos ); PUSH( ret ); }

1 0

r545 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org Aug. 10, 2009

Aug. 10, 2009

Author: laurent Date: 2009-08-10 21:57:43 +0200 (Mon, 10 Aug 2009) New Revision: 545 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c Log: There are numerous places where using 'ELF_DPRINTF' does not make sense, because the loader does not use ELF binaries or is not directly involved in loading them. Created a generic SUBSYS_PRINTF macro, as well as loader-specific ELF_DPRINTF, CHRP_DPRINTF, and YABOOT_DPRINTF macros. Signed-off-by: Steven Noonan <steven(a)uplinklabs.net> Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-10 19:50:04 UTC (rev 544) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-10 19:57:43 UTC (rev 545) @@ -25,14 +25,18 @@ #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" -//#define DEBUG_ELF +//#define DEBUG_QEMU -#ifdef DEBUG_ELF -#define ELF_DPRINTF(fmt, args...) \ -do { printk("ELF - %s: " fmt, __func__ , ##args); } while (0) +#ifdef DEBUG_QEMU +#define SUBSYS_DPRINTF(subsys, fmt, args...) \ + do { printk("%s - %s: " fmt, subsys, __func__ , ##args); } while (0) #else -#define ELF_DPRINTF(fmt, args...) do { } while (0) +#define SUBSYS_DPRINTF(subsys, fmt, args...) \ + do { } while (0) #endif +#define CHRP_DPRINTF(fmt, args...) SUBSYS_DPRINTF("CHRP", fmt, ##args) +#define ELF_DPRINTF(fmt, args...) SUBSYS_DPRINTF("ELF", fmt, ##args) +#define YABOOT_DPRINTF(fmt, args...) SUBSYS_DPRINTF("YABOOT", fmt, ##args) static void transfer_control_to_elf( ulong elf_entry ) @@ -239,7 +243,7 @@ snprintf(bootscript, sizeof(bootscript), "%s:%d,%s", device, partition, script_path); - ELF_DPRINTF("Trying %s\n", bootscript); + CHRP_DPRINTF("Trying %s\n", bootscript); if ((fd = open_io(bootscript)) == -1) { ELF_DPRINTF("Can't open %s\n", bootscript); return; @@ -308,7 +312,7 @@ } } while (1); - ELF_DPRINTF("got bootscript %s\n", bootscript); + CHRP_DPRINTF("got bootscript %s\n", bootscript); encode_bootpath(of_path, param); @@ -399,7 +403,7 @@ } if (!path) { - ELF_DPRINTF("Entering boot, no path\n"); + YABOOT_DPRINTF("Entering boot, no path\n"); push_str("boot-device"); push_str("/options"); fword("(find-dev)"); @@ -440,7 +444,7 @@ } } } else { - ELF_DPRINTF("Entering boot, path %s\n", path); + YABOOT_DPRINTF("Entering boot, path %s\n", path); try_path(path, param); for( i=0; i < sizeof(chrp_paths) / sizeof(chrp_paths[0]); i++ ) { try_chrp_script(path, param, chrp_paths[i]);

1 0