OpenBIOS April 2013

openbios@openbios.org

8 participants
89 discussions

Re: [OpenBIOS] Booting SunOS from OpenBIOS
by Mark Cave-Ayland 05 Apr '13

05 Apr '13

On 05/04/13 08:35, Artyom Tarasenko wrote: >> Actually there is another option - does the previous allocation before this >> one that returns 0xffc67000 as the virtual address? In that case it could >> indicate that va=0x0 doesn't have a special meaning after all. >> >> Is it possible for you to post the complete log output from an unpatched >> OpenBIOS for us to look at so we can see the complete pattern of >> allocations? > > The with the unpatched one it dies pretty early, right after claiming va=0x0. > See the the attachment. Got it. Hmmm definitely a special behaviour when va == NULL seems to be the more likely explanation for the moment. Let me know if anything changes with my latest patch. Otherwise I think you'd have to disassemble the boot loader a bit to see where the va = NULL is coming from. If it's a constant 0x0 then that would definitely confirm that the value has a special behaviour. ATB, Mark.

2 1

[commit] r1111 - trunk/openbios-devel/drivers
by repository service 05 Apr '13

05 Apr '13

Author: mcayland Date: Fri Apr 5 12:34:38 2013 New Revision: 1111 URL: http://tracker.coreboot.org/trac/openbios/changeset/1111 Log: macio: Remove unnecessary newworld check openpic_init is only called on newworld machines. Signed-off-by: Amadeusz Sławiński <amade(a)asmblr.net> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/macio.c Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Fri Apr 5 12:34:10 2013 (r1110) +++ trunk/openbios-devel/drivers/macio.c Fri Apr 5 12:34:38 2013 (r1111) @@ -167,43 +167,41 @@ fword("finish-device"); - if (is_newworld()) { - u32 *interrupt_map; - int len, i; + u32 *interrupt_map; + int len, i; - /* patch in interrupt parent */ - dnode = find_dev(buf); + /* patch in interrupt parent */ + dnode = find_dev(buf); - target_node = find_dev("/pci/mac-io"); - set_int_property(target_node, "interrupt-parent", dnode); + target_node = find_dev("/pci/mac-io"); + set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/escc/ch-a"); - set_int_property(target_node, "interrupt-parent", dnode); + target_node = find_dev("/pci/mac-io/escc/ch-a"); + set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/escc/ch-b"); - set_int_property(target_node, "interrupt-parent", dnode); + target_node = find_dev("/pci/mac-io/escc/ch-b"); + set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/ata-1"); - set_int_property(target_node, "interrupt-parent", dnode); + target_node = find_dev("/pci/mac-io/ata-1"); + set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/ata-2"); - set_int_property(target_node, "interrupt-parent", dnode); + target_node = find_dev("/pci/mac-io/ata-2"); + set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/ata-3"); - set_int_property(target_node, "interrupt-parent", dnode); + target_node = find_dev("/pci/mac-io/ata-3"); + set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/via-cuda"); - set_int_property(target_node, "interrupt-parent", dnode); + target_node = find_dev("/pci/mac-io/via-cuda"); + set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci"); - set_int_property(target_node, "interrupt-parent", dnode); + target_node = find_dev("/pci"); + set_int_property(target_node, "interrupt-parent", dnode); - interrupt_map = (u32 *)get_property(target_node, "interrupt-map", &len); - for (i = 0; i < 8; i++) { - interrupt_map[(i * 7) + PCI_INT_MAP_PIC_HANDLE] = (u32)dnode; - } - set_property(target_node, "interrupt-map", (char *)interrupt_map, len); + interrupt_map = (u32 *)get_property(target_node, "interrupt-map", &len); + for (i = 0; i < 8; i++) { + interrupt_map[(i * 7) + PCI_INT_MAP_PIC_HANDLE] = (u32)dnode; } + set_property(target_node, "interrupt-map", (char *)interrupt_map, len); } DECLARE_NODE(ob_macio, INSTALL_OPEN, sizeof(int), "Tmac-io");

1 0

[commit] r1110 - trunk/openbios-devel/drivers
by repository service 05 Apr '13

05 Apr '13

Author: mcayland Date: Fri Apr 5 12:34:10 2013 New Revision: 1110 URL: http://tracker.coreboot.org/trac/openbios/changeset/1110 Log: pci: Set interrupts property only on newworld machines Signed-off-by: Amadeusz Sławiński <amade(a)asmblr.net> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Fri Apr 5 12:33:57 2013 (r1109) +++ trunk/openbios-devel/drivers/pci.c Fri Apr 5 12:34:10 2013 (r1110) @@ -854,7 +854,7 @@ if (config->irq_pin) { OLDWORLD(set_int_property(dev, "AAPL,interrupts", config->irq_line)); - set_int_property(dev, "interrupts", config->irq_pin); + NEWWORLD(set_int_property(dev, "interrupts", config->irq_pin)); } set_int_property(dev, "min-grant", pci_config_read8(addr, PCI_MIN_GNT));

1 0

[commit] r1109 - trunk/openbios-devel/drivers
by repository service 05 Apr '13

05 Apr '13

Author: mcayland Date: Fri Apr 5 12:33:57 2013 New Revision: 1109 URL: http://tracker.coreboot.org/trac/openbios/changeset/1109 Log: pci/macio: Add missing interrupt-parent properties Based on patch from Andreas Tobler. Signed-off-by: Amadeusz Sławiński <amade(a)asmblr.net> CC: Andreas Tobler <andreast(a)fgznet.ch> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/macio.c trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Fri Apr 5 12:33:22 2013 (r1108) +++ trunk/openbios-devel/drivers/macio.c Fri Apr 5 12:33:57 2013 (r1109) @@ -183,11 +183,23 @@ target_node = find_dev("/pci/mac-io/escc/ch-b"); set_int_property(target_node, "interrupt-parent", dnode); + target_node = find_dev("/pci/mac-io/ata-1"); + set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci/mac-io/ata-2"); + set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci/mac-io/ata-3"); + set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci/mac-io/via-cuda"); + set_int_property(target_node, "interrupt-parent", dnode); + target_node = find_dev("/pci"); set_int_property(target_node, "interrupt-parent", dnode); interrupt_map = (u32 *)get_property(target_node, "interrupt-map", &len); - for (i = 0; i < 4; i++) { + for (i = 0; i < 8; i++) { interrupt_map[(i * 7) + PCI_INT_MAP_PIC_HANDLE] = (u32)dnode; } set_property(target_node, "interrupt-map", (char *)interrupt_map, len); Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Fri Apr 5 12:33:22 2013 (r1108) +++ trunk/openbios-devel/drivers/pci.c Fri Apr 5 12:33:57 2013 (r1109) @@ -375,7 +375,7 @@ */ #if defined(CONFIG_PPC) phandle_t dev = get_cur_dev(); - u32 props[7 * 4]; + u32 props[7 * 8]; int i; #if defined(CONFIG_PPC) @@ -384,7 +384,7 @@ return; #endif - for (i = 0; i < (7*4); i+=7) { + for (i = 0; i < (7*8); i+=7) { props[i+PCI_INT_MAP_PCI0] = 0; props[i+PCI_INT_MAP_PCI1] = 0; props[i+PCI_INT_MAP_PCI2] = 0; @@ -393,7 +393,7 @@ props[i+PCI_INT_MAP_PIC_INT] = arch->irqs[i / 7]; props[i+PCI_INT_MAP_PIC_POL] = 3; } - set_property(dev, "interrupt-map", (char *)props, 7 * 4 * sizeof(props[0])); + set_property(dev, "interrupt-map", (char *)props, 7 * 8 * sizeof(props[0])); props[PCI_INT_MAP_PCI0] = 0; props[PCI_INT_MAP_PCI1] = 0;

1 0

[commit] r1108 - trunk/openbios-devel/drivers
by repository service 05 Apr '13

05 Apr '13

Author: mcayland Date: Fri Apr 5 12:33:22 2013 New Revision: 1108 URL: http://tracker.coreboot.org/trac/openbios/changeset/1108 Log: macio: Fix ide interrupts initialization interrupts and #interrupt-cells are newworld properties. Also oldworld interrupts were not properly set, i.e. second one was always set to 0 instead of correct value. Signed-off-by: Amadeusz Sławiński <amade(a)asmblr.net> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/ide.c Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Fri Apr 5 12:33:03 2013 (r1107) +++ trunk/openbios-devel/drivers/ide.c Fri Apr 5 12:33:22 2013 (r1108) @@ -1611,9 +1611,11 @@ } props[1] = 0x00000000; /* XXX level triggered on real hw */ props[3] = 0x00000000; - set_property(dnode, "interrupts", - (char *)&props, 4*sizeof(props[0])); - set_int_property(dnode, "#interrupt-cells", 2); + NEWWORLD(set_property(dnode, "interrupts", + (char *)&props, 4*sizeof(props[0]))); + NEWWORLD(set_int_property(dnode, "#interrupt-cells", 2)); + + props[1] = props[2]; OLDWORLD(set_property(dnode, "AAPL,interrupts", (char *)&props, 2*sizeof(props[0])));

1 0

[commit] r1107 - trunk/openbios-devel/config/scripts
by repository service 05 Apr '13

05 Apr '13

Author: mcayland Date: Fri Apr 5 12:33:03 2013 New Revision: 1107 URL: http://tracker.coreboot.org/trac/openbios/changeset/1107 Log: Allow powerpc-unknown-linux-gnu- toolchain prefix crossdev on gentoo builds crosscompiler with powerpc-unknown-linux-gnu- prefix. Signed-off-by: Amadeusz Sławiński <amade(a)asmblr.net> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Fri Apr 5 11:35:17 2013 (r1106) +++ trunk/openbios-devel/config/scripts/switch-arch Fri Apr 5 12:33:03 2013 (r1107) @@ -97,7 +97,7 @@ select_prefix() { - for TARGET in ${1}-linux-gnu- ${1}-linux- ${1}-elf- ${1}-eabi- + for TARGET in ${1}-unknown-linux-gnu- ${1}-linux-gnu- ${1}-linux- ${1}-elf- ${1}-eabi- do if type ${TARGET}gcc > /dev/null 2>&1 then

1 0

[commit] r1106 - trunk/openbios-devel/arch/ppc/qemu
by repository service 05 Apr '13

05 Apr '13

Author: mcayland Date: Fri Apr 5 11:35:17 2013 New Revision: 1106 URL: http://tracker.coreboot.org/trac/openbios/changeset/1106 Log: PPC: Add the old-world bootcode device dev:,%BOOT to the bootdevice list By adding the bootcode device to the bootdevice list as processed by load, we automatically attempt to invoke the bootcode loader as required. As a consequence of this, we can now remove the separate C codepath used in order to facilitate an old-world boot. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> CC: Alexander Graf <agraf(a)suse.de> CC: Andreas Färber <afaerber(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/main.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Fri Apr 5 11:35:08 2013 (r1105) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Fri Apr 5 11:35:17 2013 (r1106) @@ -855,7 +855,7 @@ } /* Setup default boot devices */ - snprintf(buf, sizeof(buf), "%s:,\\\\:tbxi %s:,\\ppc\\bootinfo.txt", boot_path, boot_path); + snprintf(buf, sizeof(buf), "%s:,\\\\:tbxi %s:,\\ppc\\bootinfo.txt %s:,%%BOOT", boot_path, boot_path, boot_path); push_str(buf); fword("encode-string"); push_str("boot-device"); Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Fri Apr 5 11:35:08 2013 (r1105) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Fri Apr 5 11:35:17 2013 (r1106) @@ -39,141 +39,6 @@ #define ELF_DPRINTF(fmt, args...) SUBSYS_DPRINTF("ELF", fmt, ##args) #define NEWWORLD_DPRINTF(fmt, args...) SUBSYS_DPRINTF("NEWWORLD", fmt, ##args) -static char * -get_device( const char *path ) -{ - int i; - static char buf[1024]; - - for (i = 0; i < sizeof(buf) && path[i] && path[i] != ':'; i++) - buf[i] = path[i]; - buf[i] = 0; - - return buf; -} - -static int -get_partition( const char *path ) -{ - while ( *path && *path != ':' ) - path++; - - if (!*path) - return -1; - path++; - - if (!strchr(path, ',')) /* check if there is a ',' */ - return -1; - - return atol(path); -} - -static char * -get_filename( const char * path , char **dirname) -{ - static char buf[1024]; - char *filename; - - while ( *path && *path != ':' ) - path++; - - if (!*path) { - *dirname = NULL; - return NULL; - } - path++; - - while ( *path && isdigit(*path) ) - path++; - - if (*path == ',') - path++; - - strncpy(buf, path, sizeof(buf)); - buf[sizeof(buf) - 1] = 0; - - filename = strrchr(buf, '\\'); - if (filename) { - *dirname = buf; - (*filename++) = 0; - } else { - *dirname = NULL; - filename = buf; - } - - return filename; -} - - -static void -encode_bootpath( const char *spec, const char *args ) -{ - char path[1024]; - phandle_t chosen_ph = find_dev("/chosen"); - char *filename, *directory; - int partition; - - if (spec) - return; - - filename = get_filename(spec, &directory); - partition = get_partition(spec); - if (partition == -1) - snprintf(path, sizeof(path), "%s:,%s\\%s", get_device(spec), - directory, filename); - else - snprintf(path, sizeof(path), "%s:%d,%s\\%s", get_device(spec), - partition, directory, filename); - - ELF_DPRINTF("bootpath %s bootargs %s\n", path, args); - set_property( chosen_ph, "bootpath", path, strlen(path)+1 ); - if (args) - set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); -} - -#define OLDWORLD_BOOTCODE_BASEADDR (0x3f4000) - -static void -oldworld_boot( void ) -{ - int fd; - int len, total; - const char *path = "hd:,%BOOT"; - char *bootcode; - - if ((fd = open_io(path)) == -1) { - ELF_DPRINTF("Can't open %s\n", path); - return; - } - - - total = 0; - bootcode = (char*)OLDWORLD_BOOTCODE_BASEADDR; - while(1) { - if (seek_io(fd, total) == -1) - break; - len = read_io(fd, bootcode, 512); - bootcode += len; - total += len; - } - - close_io( fd ); - - if (total == 0) { - ELF_DPRINTF("Can't read %s\n", path); - return; - } - - encode_bootpath(path, "Linux"); - - if( ofmem_claim( OLDWORLD_BOOTCODE_BASEADDR, total, 0 ) == -1 ) - fatal_error("Claim failed!\n"); - - call_elf(0, 0, OLDWORLD_BOOTCODE_BASEADDR); - - return; -} - static void check_preloaded_kernel(void) { unsigned long kernel_image, kernel_size; @@ -213,9 +78,5 @@ check_preloaded_kernel(); } - if (boot_device == 'c') { - oldworld_boot(); - } - update_nvram(); }

1 0

[commit] r1105 - in trunk/openbios-devel: config/examples forth/debugging include/libopenbios libopenbios packages
by repository service 05 Apr '13

05 Apr '13

Author: mcayland Date: Fri Apr 5 11:35:08 2013 New Revision: 1105 URL: http://tracker.coreboot.org/trac/openbios/changeset/1105 Log: loader: implement new loader type for CHRP/Apple partition bootcode (%BOOT) One of the primary reasons that issues with the quik bootloader were not detected earlier was because arch/ppc/qemu/main.c has a separate code path for forcing an old-world boot when -boot c is passed to QEMU. This commit implements the bootcode loader as a core OpenBIOS loader which enables old-world payloads such as quik to be executed using: load hd:,%BOOT go Note that we also fix a bug in mac-parts.c to ensure that we don't try and interpose a filesystem package when %BOOT is passed as a filename. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> CC: Alexander Graf <agraf(a)suse.de> CC: Andreas Färber <afaerber(a)suse.de> Added: trunk/openbios-devel/include/libopenbios/bootcode_load.h trunk/openbios-devel/libopenbios/bootcode_load.c Modified: trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/libopenbios/build.xml trunk/openbios-devel/libopenbios/load.c trunk/openbios-devel/packages/mac-parts.c Modified: trunk/openbios-devel/config/examples/ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml Thu Apr 4 13:26:41 2013 (r1104) +++ trunk/openbios-devel/config/examples/ppc_config.xml Fri Apr 5 11:35:08 2013 (r1105) @@ -26,6 +26,7 @@ <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="true"/> + <option name="CONFIG_LOADER_BOOTCODE" type="boolean" value="true"/> <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> Modified: trunk/openbios-devel/forth/debugging/client.fs ============================================================================== --- trunk/openbios-devel/forth/debugging/client.fs Thu Apr 4 13:26:41 2013 (r1104) +++ trunk/openbios-devel/forth/debugging/client.fs Fri Apr 5 11:35:08 2013 (r1105) @@ -27,6 +27,9 @@ variable state-valid 0 state-valid ! +variable want-bootcode +0 want-bootcode ! + variable file-size : !load-size file-size ! ; @@ -44,6 +47,7 @@ 5 constant aout 10 constant fcode 11 constant forth +12 constant bootcode : init-program ( -- ) Added: trunk/openbios-devel/include/libopenbios/bootcode_load.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/bootcode_load.h Fri Apr 5 11:35:08 2013 (r1105) @@ -0,0 +1,22 @@ +/* + * Creation Date: <2010/03/22 18:00:00 mcayland> + * Time-stamp: <2010/03/22 18:00:00 mcayland> + * + * <bootcode_load.h> + * + * Raw bootcode (%BOOT) loader + * + * Copyright (C) 2013 Mark Cave-Ayland (mark.cave-ayland(a)ilande.co.uk) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#ifndef _H_BOOTCODELOAD +#define _H_BOOTCODELOAD + +extern int bootcode_load(ihandle_t dev); + +#endif /* _H__H_BOOTCODELOAD */ Added: trunk/openbios-devel/libopenbios/bootcode_load.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/libopenbios/bootcode_load.c Fri Apr 5 11:35:08 2013 (r1105) @@ -0,0 +1,71 @@ +/* + * Raw bootcode loader (CHRP/Apple %BOOT) + * Written by Mark Cave-Ayland 2013 + */ + +#include "config.h" +#include "kernel/kernel.h" +#include "libopenbios/bindings.h" +#include "libopenbios/bootcode_load.h" +#include "libc/diskio.h" +#include "drivers/drivers.h" +#define printf printk +#define debug printk + +#define OLDWORLD_BOOTCODE_BASEADDR (0x3f4000) + +int +bootcode_load(ihandle_t dev) +{ + int retval = -1, count = 0, fd; + unsigned long bootcode, loadbase, offset; + + /* Mark the saved-program-state as invalid */ + feval("0 state-valid !"); + + fd = open_ih(dev); + if (fd == -1) { + goto out; + } + + /* Default to loading at load-base */ + fword("load-base"); + loadbase = POP(); + +#ifdef CONFIG_PPC + /* However Old World Macs need to load to a different address */ + if (is_oldworld()) { + loadbase = OLDWORLD_BOOTCODE_BASEADDR; + } +#endif + + bootcode = loadbase; + offset = 0; + + while(1) { + if (seek_io(fd, offset) == -1) + break; + count = read_io(fd, (void *)bootcode, 512); + offset += count; + bootcode += count; + } + + /* If we didn't read anything then exit */ + if (!count) { + goto out; + } + + /* Initialise saved-program-state */ + PUSH(loadbase); + feval("saved-program-state >sps.entry !"); + PUSH(offset); + feval("saved-program-state >sps.file-size !"); + feval("bootcode saved-program-state >sps.file-type !"); + + feval("-1 state-valid !"); + +out: + close_io(fd); + return retval; +} + Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Thu Apr 4 13:26:41 2013 (r1104) +++ trunk/openbios-devel/libopenbios/build.xml Fri Apr 5 11:35:08 2013 (r1105) @@ -3,6 +3,7 @@ <library name="openbios" type="static" target="target"> <object source="aout_load.c" condition="LOADER_AOUT"/> <object source="bindings.c"/> + <object source="bootcode_load.c" condition="LOADER_BOOTCODE"/> <object source="bootinfo_load.c" condition="LOADER_BOOTINFO"/> <object source="client.c"/> <object source="console_common.c"/> Modified: trunk/openbios-devel/libopenbios/load.c ============================================================================== --- trunk/openbios-devel/libopenbios/load.c Thu Apr 4 13:26:41 2013 (r1104) +++ trunk/openbios-devel/libopenbios/load.c Fri Apr 5 11:35:08 2013 (r1105) @@ -36,6 +36,10 @@ #include "libopenbios/forth_load.h" #endif +#ifdef CONFIG_LOADER_BOOTCODE +#include "libopenbios/bootcode_load.h" +#endif + struct sys_info sys_info; void *elf_boot_notes = NULL; @@ -92,4 +96,13 @@ } #endif +#ifdef CONFIG_LOADER_BOOTCODE + /* Check for a "raw" %BOOT bootcode payload */ + feval("want-bootcode @"); + valid = POP(); + if (valid) { + bootcode_load(dev); + } +#endif + } Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Thu Apr 4 13:26:41 2013 (r1104) +++ trunk/openbios-devel/packages/mac-parts.c Fri Apr 5 11:35:08 2013 (r1105) @@ -89,8 +89,12 @@ parnum = atol(parstr); /* Detect if we are looking for the bootcode */ - if (strcmp(argstr, "%BOOT") == 0) + if (strcmp(argstr, "%BOOT") == 0) { want_bootcode = 1; + feval("1 want-bootcode !"); + } else { + feval("0 want-bootcode !"); + } } DPRINTF("parstr: %s argstr: %s parnum: %d\n", parstr, argstr, parnum); @@ -285,16 +289,10 @@ set_property(chosen_ph, "bootpath", bootpath, strlen(bootpath) + 1); } - - /* If the filename was %BOOT then it's not a real filename, so clear argstr before - attempting interpose */ - if (want_bootcode) { - argstr = strdup(""); - } - + /* If we have been asked to open a particular file, interpose the filesystem package with the passed filename as an argument */ - if (strlen(argstr)) { + if (!want_bootcode && strlen(argstr)) { push_str( argstr ); PUSH_ph( ph ); fword("interpose");

1 0

Re: [OpenBIOS] Booting SunOS from OpenBIOS
by Mark Cave-Ayland 05 Apr '13

05 Apr '13

On 05/04/13 02:23, Artyom Tarasenko wrote: >> That's interesting. You're asking for a page size (0x2000) on a non-page >> boundary (0xffc6.5000). The complaint is because it extends far enough to >> overlap with what the map_page_range above (0xffc6.6000). > > Yes. After looking more carefully I think it goes wrong before this point: > > OFMEM: ofmem_claim phys=ffffffffffffffff size=00001000 align=00001000 > OFMEM: ofmem_claim_virt virt=00000000 size=00001000 align=00001000 > OFMEM: ofmem_map_page_range ffc7f000 -> 006f7f000 00001000 mode 000000bc > OFMEM: ofmem_claim phys=ffffffffffffffff size=00001000 align=00001000 > OFMEM: ofmem_claim_virt virt=00000000 size=00001000 align=00001000 > OFMEM: ofmem_map_page_range ffc7e000 -> 006f7e000 00001000 mode 000000bc > OFMEM: ofmem_claim phys=ffffffffffffffff size=00001000 align=00001000 > OFMEM: ofmem_claim_virt virt=00000000 size=00001000 align=00001000 > OFMEM: ofmem_map_page_range ffc7d000 -> 006f7d000 00001000 mode 000000bc > OFMEM: ofmem_claim phys=ffffffffffffffff size=00014000 align=00020000 > OFMEM: ofmem_claim_virt virt=00000000 size=00014000 align=00014000 > OFMEM: bad alignment 81920 > > ^^^ here is something OpenBIOS doesn't like. Ah yes. Since in the case where va == NULL we've set align = size, we still need to round align to the nearest power of 2. Does the attached patch help at all? Note that this is just a proof-of-concept patch. Since the specification is quite clear about this behaviour, if it works then I'll move the power of 2 rounding directly into OFMEM so cases like this are handled automatically. ATB, Mark.

1 0

Re: [OpenBIOS] Booting SunOS from OpenBIOS
by Mark Cave-Ayland 05 Apr '13

05 Apr '13

On 04/04/13 20:35, Artyom Tarasenko wrote: > SunOS crashes at the same place as with your previous patch. (Which is > probably a good sign). > > There is one interesting thing when I try to boot kadb: > OFMEM: ofmem_claim phys=ffffffffffffffff size=00001000 align=00001000 > OFMEM: ofmem_claim_virt virt=00000000 size=00001000 align=00001000 > OFMEM: ofmem_map_page_range ffc66000 -> 006f7a000 00001000 mode 000000bc So 0xffc66000 must be being returned back to client for it to use during subsequent calculations... > OFMEM: ofmem_claim phys=ffffffffffffffff size=00002000 align=00002000 > OFMEM: ofmem_claim_virt virt=ffc65000 size=00002000 align=00000000 Can you definitely confirm that virt == va after this second call to ofmem_claim_virt()? (i.e. confirm that va isn't being rounded to 0xffc65000 when passing in va = 0xffc64000 somehow?). ATB, Mark.

2 2

← Newer
1
2
3
4
5
6
7
8
9
Older →