OpenBIOS December 2013

openbios@openbios.org

10 participants
27 discussions

[commit] r1237 - in trunk/openbios-devel: libopenbios packages

by repository service

Author: mcayland Date: Tue Dec 10 22:01:42 2013 New Revision: 1237 URL: http://tracker.coreboot.org/trac/openbios/changeset/1237 Log: load.c: fix Forth stack underflow The load() API was incorrect in that it did not push the resulting loaded file size onto the Forth stack. This caused a stack underflow in the Forth $load word, except for devices which were interposed (such as those with partition arguments). Fix the load() function so that the resulting size is pushed onto the Forth stack as per the load package method description in IEEE1275. Since the loaders access load-base directly then currently the address argument is dropped. This exposed another bug whereby disk-label would explicitly drop the address parameter from the stack for non-interposed packages. Remove this as it is now consistently handled in load() for all cases. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/libopenbios/load.c trunk/openbios-devel/packages/disk-label.c Modified: trunk/openbios-devel/libopenbios/load.c ============================================================================== --- trunk/openbios-devel/libopenbios/load.c Sun Dec 8 13:48:24 2013 (r1236) +++ trunk/openbios-devel/libopenbios/load.c Tue Dec 10 22:01:42 2013 (r1237) @@ -44,11 +44,17 @@ struct sys_info sys_info; void *elf_boot_notes = NULL; +/* ( addr -- size ) */ + void load(ihandle_t dev) { /* Invoke the loaders on the specified device */ char *param; - ucell valid; + ucell valid; + + /* TODO: Currently the internal loader APIs use load-base directly, so + drop the address */ + POP(); #ifdef CONFIG_LOADER_ELF @@ -65,6 +71,7 @@ feval("state-valid @"); valid = POP(); if (valid) { + feval("saved-program-state >sps.file-size @"); return; } #endif @@ -74,6 +81,7 @@ feval("state-valid @"); valid = POP(); if (valid) { + feval("saved-program-state >sps.file-size @"); return; } #endif @@ -83,6 +91,7 @@ feval("state-valid @"); valid = POP(); if (valid) { + feval("saved-program-state >sps.file-size @"); return; } #endif @@ -92,6 +101,7 @@ feval("state-valid @"); valid = POP(); if (valid) { + feval("saved-program-state >sps.file-size @"); return; } #endif @@ -105,4 +115,6 @@ } #endif + /* Didn't load anything, so return zero size */ + PUSH(0); } Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Sun Dec 8 13:48:24 2013 (r1236) +++ trunk/openbios-devel/packages/disk-label.c Tue Dec 10 22:01:42 2013 (r1237) @@ -187,19 +187,8 @@ dlabel_load( __attribute__((unused)) dlabel_info_t *di ) { /* Try the load method of the part package */ -#ifdef DEBUG_DISK_LABEL - char *buf; -#endif xt_t xt; -#ifdef DEBUG_DISK_LABEL - buf = (char *)POP(); -#else - POP(); -#endif - - DPRINTF("load invoked with address %p\n", buf); - /* If we have a partition handle, invoke the load word on it */ if (di->part_ih) { xt = find_ih_method("load", di->part_ih);

6 years, 8 months

[PATCH v2] Fix cross compiling sparc64 on arm32 host

by Cole Robinson

Add arm32 to the whitelist for handling lack of int128 type variants. Otherwise we get errors like: /target/include/asm/types.h:79:1: error: unknown type name ‘__int128_t’ typedef __int128_t dcell; This may introduce issues building on aarch64 but I have no way to test. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- v2: Break out arm check to its own 'if' line config/scripts/switch-arch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch index 44f2df4..868eae6 100755 --- a/config/scripts/switch-arch +++ b/config/scripts/switch-arch @@ -79,6 +79,8 @@ crosscflags() -o "$target" = "alpha"; then if test "$host" = "x86"; then cflags="$cflags -DNEED_FAKE_INT128_T" + elif test "$host" = "arm"; then + cflags="$cflags -DNEED_FAKE_INT128_T" elif test "$host" = "ppc" -a `uname -s` = "Darwin"; then cflags="$cflags -DNEED_FAKE_INT128_T" fi -- 1.8.4.2

6 years, 8 months

[commit] r1209 - trunk/openbios-devel/arch/sparc32

by repository service

Author: mcayland Date: Mon Aug 19 09:40:12 2013 New Revision: 1209 URL: http://tracker.coreboot.org/trac/openbios/changeset/1209 Log: SPARC32: fix romvec stdin/stdout field initialisation Previously the romvec stdin/stdout ihandles were configured so that they were set to the current stdin and stdout paths at initialisation time. Unfortunately as stdin/stdout can be changed with the input and output words, they can end up pointing to invalid ihandles causing a crash when trying to output to the console. Fix this by pointing the romvec structure to the address of the stdin/stdout variables so that they are always in sync. Similarly we also resolve the text path stdin/stdout variables at boot time to ensure that they will never be stale. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/romvec.c Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Mon Aug 19 09:40:10 2013 (r1208) +++ trunk/openbios-devel/arch/sparc32/boot.c Mon Aug 19 09:40:12 2013 (r1209) @@ -23,7 +23,7 @@ void go(void) { ucell address, type, size; - int image_retval = 0, proplen, target, device; + int image_retval = 0, intprop, proplen, target, device; phandle_t chosen; char *prop, *id, *name; static char bootpathbuf[128], bootargsbuf[128], buf[128]; @@ -40,8 +40,19 @@ needs to be set up to pass certain parameters using a C struct. Hence this section extracts the relevant boot information and places it in obp_arg. */ - /* Get the name of the selected boot device, along with the device and unit number */ + /* Get the stdin and stdout paths */ chosen = find_dev("/chosen"); + intprop = get_int_property(chosen, "stdin", &proplen); + PUSH(intprop); + fword("get-instance-path"); + ((struct linux_romvec *)romvec)->pv_stdin = pop_fstr_copy(); + + intprop = get_int_property(chosen, "stdout", &proplen); + PUSH(intprop); + fword("get-instance-path"); + ((struct linux_romvec *)romvec)->pv_stdout = pop_fstr_copy(); + + /* Get the name of the selected boot device, along with the device and unit number */ prop = get_property(chosen, "bootpath", &proplen); strncpy(bootpathbuf, prop, proplen); prop = get_property(chosen, "bootargs", &proplen); Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Mon Aug 19 09:40:10 2013 (r1208) +++ trunk/openbios-devel/arch/sparc32/romvec.c Mon Aug 19 09:40:12 2013 (r1209) @@ -25,7 +25,6 @@ #endif char obp_stdin, obp_stdout; -static int obp_fd_stdin, obp_fd_stdout; const char *obp_stdin_path, *obp_stdout_path; struct linux_arguments_v0 obp_arg; @@ -498,15 +497,12 @@ romvec0.pv_v2bootargs.bootpath = &bootpath; romvec0.pv_v2bootargs.bootargs = &obp_arg.argv[1]; - romvec0.pv_v2bootargs.fd_stdin = &obp_fd_stdin; - romvec0.pv_v2bootargs.fd_stdout = &obp_fd_stdout; - push_str(obp_stdin_path); - fword("open-dev"); - obp_fd_stdin = POP(); - push_str(obp_stdout_path); - fword("open-dev"); - obp_fd_stdout = POP(); + /* Point fd_stdin/fd_stdout to the Forth stdin/stdout variables */ + fword("stdin"); + romvec0.pv_v2bootargs.fd_stdin = cell2pointer(POP()); + fword("stdout"); + romvec0.pv_v2bootargs.fd_stdout = cell2pointer(POP()); romvec0.v3_memalloc = obp_memalloc_handler;

6 years, 8 months

[PATCH] forthstrap: avoid unaligned accesses

by Aurelien Jarno

Trying to compile OpenBIOS for SPARC32 on a SPARC machine, I get a SIGBUS within forthstrap, more precisely accessing reloc_table in load_dictionary. This table is not aligned because the dictionnary head as a size which is not a multiple of 4. This is due to the file QEMU,tcx.bin which is being encoded, and which has a size which is not a multiple of 4. Fix that by adding some padding after the encoded data. --- kernel/bootstrap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/bootstrap.c b/kernel/bootstrap.c index 546ffee..7f4458e 100644 --- a/kernel/bootstrap.c +++ b/kernel/bootstrap.c @@ -1008,6 +1008,7 @@ encode_file( const char *name ) PUSH( pointer2cell(dict + dicthead) ); PUSH( size ); dicthead += size; + paddict(sizeof(cell)); } -- 1.8.4.2

6 years, 8 months

[commit] r1236 - trunk/openbios-devel/kernel

by repository service

Author: mcayland Date: Sun Dec 8 13:48:24 2013 New Revision: 1236 URL: http://tracker.coreboot.org/trac/openbios/changeset/1236 Log: forthstrap: avoid unaligned accesses Trying to compile OpenBIOS for SPARC32 on a SPARC machine, I get a SIGBUS within forthstrap, more precisely accessing reloc_table in load_dictionary. This table is not aligned because the dictionnary head as a size which is not a multiple of 4. This is due to the file QEMU,tcx.bin which is being encoded, and which has a size which is not a multiple of 4. Fix that by adding some padding after the encoded data. Signed-off-by: Aurelien Jarno <aurelien(a)aurel32.net> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/kernel/bootstrap.c Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Sun Nov 10 21:14:39 2013 (r1235) +++ trunk/openbios-devel/kernel/bootstrap.c Sun Dec 8 13:48:24 2013 (r1236) @@ -1008,6 +1008,7 @@ PUSH( pointer2cell(dict + dicthead) ); PUSH( size ); dicthead += size; + paddict(sizeof(cell)); }

6 years, 8 months

[PATCH] forthstrap: avoid unaligned accesses

by Aurelien Jarno

Trying to compile OpenBIOS for SPARC32 on a SPARC machine, I get a SIGBUS within forthstrap, more precisely accessing reloc_table in load_dictionary. This table is not aligned because the dictionnary head as a size which is not a multiple of 4. This is due to the file QEMU,tcx.bin which is being encoded, and which has a size which is not a multiple of 4. Fix that by adding some padding after the encoded data. Signed-off-by: Aurelien Jarno <aurelien(a)aurel32.net> --- kernel/bootstrap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/bootstrap.c b/kernel/bootstrap.c index 546ffee..7f4458e 100644 --- a/kernel/bootstrap.c +++ b/kernel/bootstrap.c @@ -1008,6 +1008,7 @@ encode_file( const char *name ) PUSH( pointer2cell(dict + dicthead) ); PUSH( size ); dicthead += size; + paddict(sizeof(cell)); } -- 1.8.4.2

6 years, 8 months

[PATCH] Fix cross compiling sparc64 on arm32 host

by Cole Robinson

Add arm32 to the whitelist for handling lack of int128 type variants. Otherwise we get errors like: /target/include/asm/types.h:79:1: error: unknown type name ‘__int128_t’ typedef __int128_t dcell; This may introduce issues building on aarch64 but I have no way to test. --- Recently, Fedora's build system had many arm hosts added. Since we always cross build openbios, the RPM build is scheduled independent of the build machine architecture. So whenever an openbios build was scheduled to an arm host, things fell over. config/scripts/switch-arch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch index 44f2df4..86cab3c 100755 --- a/config/scripts/switch-arch +++ b/config/scripts/switch-arch @@ -77,7 +77,7 @@ crosscflags() if test "$target" = "sparc64" -o "$target" = "ia64" \ -o "$target" = "amd64" -o "$target" = "x86_64" \ -o "$target" = "alpha"; then - if test "$host" = "x86"; then + if test "$host" = "x86" -o "$host" = "arm"; then cflags="$cflags -DNEED_FAKE_INT128_T" elif test "$host" = "ppc" -a `uname -s` = "Darwin"; then cflags="$cflags -DNEED_FAKE_INT128_T" -- 1.8.4.2

6 years, 8 months