OpenBIOS September 2016

openbios@openbios.org

8 participants
10 discussions

[PATCH] libopenbios/bootinfo_load.c: Implement Mac OS 9.2 boot script support
by Programmingkid 25 Dec '17

25 Dec '17

This patch makes booting Mac OS 9.2 possible. It replaces all occurrences of >r and r> with sub_>r and sub_r>. This allows for the return stack to be left alone. This patch also makes it so that the boot script is executed one line at a time. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Note: this patch depends on the strstr() and return stack substitution patches. Index: libopenbios/bootinfo_load.c =================================================================== --- libopenbios/bootinfo_load.c (revision 1395) +++ libopenbios/bootinfo_load.c (working copy) @@ -19,6 +19,7 @@ #include "libopenbios/bootinfo_load.h" #include "libopenbios/ofmem.h" #include "libc/vsprintf.h" +#include "libc/string.h" //#define DEBUG_BOOTINFO @@ -116,6 +117,75 @@ return LOADER_NOT_SUPPORT; } +// Replace all occurrences of orig_str in buffer with replace_str +static void replace_string(char *buffer, const char *orig_str, const char *replace_str) +{ + char *ptr; + int index, new_buf_index = 0; + const int max_size = 5000; + char *new_buffer = malloc(max_size * sizeof(char)); + + for (index = 0; index < strlen(buffer); index++) { + if (buffer[index] == orig_str[0]) { + ptr = strstr(buffer + index, orig_str); + + // if we encountered an orig_str in the buffer + if (index == (ptr - buffer)) { + sprintf(new_buffer + new_buf_index, "%s ", replace_str); + new_buf_index += strlen(replace_str) + 1; + index += strlen(orig_str); + continue; + } + } + new_buffer[new_buf_index++] = buffer[index]; + } + + // copy new_buffer into buffer + for (index = 0; index < strlen(new_buffer); index++) { + buffer[index] = new_buffer[index]; + } + buffer[index+1] = '\0'; +} + +/* Replace >r and r> with sub_>r and sub_r> */ +static void replace_return_stack_words(char *bootscript) +{ + const char *find_str1 = ">r"; + const char *replace_str1 = "sub_>r"; + const char *find_str2 = "r>"; + const char *replace_str2 = "sub_r>"; + + replace_string(bootscript, find_str1, replace_str1); + replace_string(bootscript, find_str2, replace_str2); +} + +/* Runs the bootscript one line at a time */ +void run_script(char *bootscript) +{ + int index = 0, buf_index = 0; + char c; + char *buffer = malloc(1000 * sizeof(char)); + + while (1) { + c = bootscript[index]; + + // fill up buffer + while (c != '\n' && c != '\r' && c != '\0') { + buffer[buf_index++] = c; + c = bootscript[++index]; + } + buffer[buf_index] = '\0'; + buf_index = 0; + index++; + DPRINTF("%s\n", buffer); + feval(buffer); + if (c == '\0') { + break; + } + } + free(buffer); +} + /* Parse SGML structure like: <chrp-boot> @@ -209,9 +279,6 @@ script = 0; bootscript[scriptlen] = '\0'; - DPRINTF("got bootscript %s\n", - bootscript); - scriptvalid = -1; break; @@ -261,8 +328,8 @@ /* If the payload is bootinfo then we execute it immediately */ if (scriptvalid) { - DPRINTF("bootscript: %s\n", bootscript); - feval(bootscript); + replace_return_stack_words(bootscript); + run_script(bootscript); } else DPRINTF("Unable to parse bootinfo bootscript\n");

4 9

[PATCH 1/6] Fix encoding of PCI and IDE "interrupts" properties
by Benjamin Herrenschmidt 07 Nov '16

07 Nov '16

The main IDE interrupt and the PCI LSIs are level sensitive which is represented by a "1" in the device-tree. Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> --- drivers/ide.c | 2 +- drivers/pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ide.c b/drivers/ide.c index 1da60c8..53a0b80 100644 --- a/drivers/ide.c +++ b/drivers/ide.c @@ -1630,7 +1630,7 @@ int macio_ide_init(const char *path, uint32_t addr, int nb_channels) props[2] = 0x00000000; break; } - props[1] = 0x00000000; /* XXX level triggered on real hw */ + props[1] = 0x00000001; props[3] = 0x00000000; NEWWORLD(set_property(dnode, "interrupts", (char *)&props, 4*sizeof(props[0]))); diff --git a/drivers/pci.c b/drivers/pci.c index 5062f30..2cffa2f 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -1510,7 +1510,7 @@ static void ob_pci_host_set_interrupt_map(phandle_t host) props[ncells++] = intno; props[ncells++] = dnode; props[ncells++] = arch->irqs[intno - 1]; - props[ncells++] = 3; + props[ncells++] = 1; #else /* Keep compiler quiet */ dnode = dnode; -- 2.7.4

8 32

[PATCH 2/2] implement convert_to_ints()
by Programmingkid 02 Oct '16

02 Oct '16

convert_to_ints() converts all the string resolutions in the resolutions property of the QEMU,VGA node and converts them to an int array. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- arch/ppc/qemu/init.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 6f21814..b6c7db0 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -619,6 +619,83 @@ id_cpu(void) } } + +/* convert ASCII string to number */ +static int atoi(const char *str) +{ + int result = 0; + while (*str) { + result = result * 10 + *str - '0'; + str++; + } + return result; +} + +void convert_to_ints(void); + +/* Converts the QEMU,VGA node's resolutions property to int's*/ +void convert_to_ints(void) +{ + const int max_buffer_size = 200; + char *orig_property; + char buffer[max_buffer_size]; + int index, count, value, addr, len; + char c; + + count = 0; + index = 0; + push_str("/pci/QEMU,VGA"); + fword("find-package"); + if (POP() == 0) { + fword("cr"); + push_str("convert-to-ints(): could not find package /pci/QEMU,VGA!"); + fword("type"); + fword("cr"); + return; + } + fword("active-package!"); + push_str("resolutions"); + fword("active-package"); + fword("get-package-property"); + if (POP() == -1) { + fword("cr"); + push_str("convert-to-ints(): could not find resolutions property!"); + fword("type"); + fword("cr"); + return; + } + len = POP(); + addr = POP(); + orig_property = (char *) malloc(len); + strncpy(orig_property, (char *)addr, len); + c = orig_property[0]; + while(c != '\0') { + if (c == 'x' || c == ',') { + buffer[index] = '\0'; + value = atoi(buffer); + count++; + if (count == 3) { + count = 1; + fword("encode+"); + continue; + } + PUSH(value); + fword("encode-int"); + index = -1; + } + else { + buffer[index] = c; + } + index++; + c = *(++orig_property); + } + fword("encode+"); + push_str("resolutions"); + fword("property"); + free(orig_property); +} + + static void go(void); unsigned int start_elf(unsigned long entry_point, unsigned long param); @@ -632,6 +709,10 @@ go(void) fword("insert-copyright-property"); } + /* Used to support user specified resolutions */ + fword("copy-resolutions-property"); + convert_to_ints(); + feval("saved-program-state >sps.entry @"); addr = POP(); @@ -1078,3 +1159,4 @@ arch_of_init(void) bind_func("platform-boot", boot); bind_func("(go)", go); } + -- 2.7.2

6 29

[PATCH v2] implement convert_to_ints()
by Programmingkid 30 Sep '16

30 Sep '16

convert_to_ints() converts all the string resolutions in the resolutions property of the QEMU,VGA node and converts them to an int array. Needed to support the VGA driver. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- v2 changes: Added function resolutions_property_available() - used to determine if there is a resolutions property. Removed convert_to_ints() prototype. arch/ppc/qemu/init.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 6f21814..b950a61 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -619,6 +619,106 @@ id_cpu(void) } } + +/* convert ASCII string to number */ +static int atoi(const char *str) +{ + int result = 0; + while (*str) { + result = result * 10 + *str - '0'; + str++; + } + return result; +} + + +/* Converts the QEMU,VGA node's resolutions property to int's*/ +static void convert_to_ints(void) +{ + const int max_buffer_size = 200; + char *orig_property; + char buffer[max_buffer_size]; + int index, count, value, addr, len; + char c; + + count = 0; + index = 0; + push_str("/pci/QEMU,VGA"); + fword("find-package"); + if (POP() == 0) { + fword("cr"); + push_str("convert-to-ints(): could not find package /pci/QEMU,VGA!"); + fword("type"); + fword("cr"); + return; + } + fword("active-package!"); + push_str("resolutions"); + fword("active-package"); + fword("get-package-property"); + if (POP() == -1) { + fword("cr"); + push_str("convert-to-ints(): could not find resolutions property!"); + fword("type"); + fword("cr"); + return; + } + len = POP(); + addr = POP(); + orig_property = (char *) malloc(len); + strncpy(orig_property, (char *)addr, len); + c = orig_property[0]; + while(c != '\0') { + if (c == 'x' || c == ',') { + buffer[index] = '\0'; + value = atoi(buffer); + count++; + if (count == 3) { + count = 1; + fword("encode+"); + continue; + } + PUSH(value); + fword("encode-int"); + index = -1; + } + else { + buffer[index] = c; + } + index++; + c = *(++orig_property); + } + fword("encode+"); + push_str("resolutions"); + fword("property"); + free(orig_property); +} + + +/* Determines if there is a resolutions property in the options node*/ +static bool resolutions_property_available(void) +{ + push_str("/options"); + fword("find-package"); + if (POP() != -1) { + return false; + } + fword("active-package!"); + push_str("resolutions"); + fword("active-package"); + fword("get-package-property"); + if (POP() == -1) { + return false; + } + + /* Remove str-addr and str-len */ + POP(); + POP(); + + return true; +} + + static void go(void); unsigned int start_elf(unsigned long entry_point, unsigned long param); @@ -631,7 +731,13 @@ go(void) if (find_dev("/rom/macos")) { fword("insert-copyright-property"); } - + + /* Used to support user specified resolutions */ + if (resolutions_property_available()) { + fword("copy-resolutions-property"); + convert_to_ints(); + } + feval("saved-program-state >sps.entry @"); addr = POP(); @@ -1078,3 +1184,4 @@ arch_of_init(void) bind_func("platform-boot", boot); bind_func("(go)", go); } + -- 2.7.2

1 0

[PATCH 1/2] Implement copy-resolutions-property
by Programmingkid 25 Sep '16

25 Sep '16

The copy-resolutions-property copies all the resolutions from the resolutions property of the options node to the resolutions property of the QEMU,VGA node. This is used to support specifying resolutions via the command-line. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- arch/ppc/qemu/qemu.fs | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/ppc/qemu/qemu.fs b/arch/ppc/qemu/qemu.fs index 3d99a34..2a83fe7 100644 --- a/arch/ppc/qemu/qemu.fs +++ b/arch/ppc/qemu/qemu.fs @@ -138,3 +138,27 @@ variable keyboard-phandle 0 keyboard-phandle ! 3drop 0 then ; + +\ Copies the resolutions property from the /options node to QEMU,VGA node + +: copy-resolutions-property ( -- ) + " /options" find-package + if + active-package! + " resolutions" active-package get-package-property false = + if + " /pci/QEMU,VGA" find-package + if + active-package! + " resolutions" + property + else + cr ." copy-resolutions-property: Failed to find QEMU,VGA package!" cr + then + else + cr ." copy-resolutions-property: Failed to find resolutions property!" cr + then + else + cr ." copy-resolutions-property: Failed to find options node!" cr + then +; -- 2.7.2

2 3

Re: [OpenBIOS] [PATCH] Add resolutions via the command-line
by G 3 23 Sep '16

23 Sep '16

On Sep 20, 2016, at 8:41 PM, Benjamin Herrenschmidt wrote: > On Tue, 2016-09-20 at 20:35 -0400, G 3 wrote: >> >> When I use the -prom-env option I can easily add properties to the >> options node. >> Can something like this be done with the chosen node? > > We can make it so. That or we can add code to OpenBIOS to copy the > list > of resolutions into the device-node of the VGA device. The latter is > probably the best, that way we can also have all the default ones in > OpenBIOS and remove the hard coded list completely. You really want to remove the included list of resolutions? I was thinking about adding a lot more built-in resolutions in another patch. A built-in list is very convenient. As for the options node problem. We need a way to add resolutions from the command-line for a Mac OS X guest. Using "-prom-env" isn't an option because of some unknown bug. I suppose it is possible to fix this bug - if it is a bug. Another idea I have is to add a completely different command-line option to QEMU just for resolutions. The user could specify resolutions like this: -video- resolutions 640x480,1024x768,1280x700.... This feature could place the list of resolutions inside a property of the VGA device node. I am betting the VGA driver could access this node and parse the list of resolutions. So this: qemu -video-resolutions ---> OpenBIOS VGA device node ---> VGA driver Would anyone have another idea they would like to share?

4 7

QEMU 2.8 development tree open
by Mark Cave-Ayland 09 Sep '16

09 Sep '16

Hi all, Now that QEMU 2.7 is out of the door, I've just pushed my next branch of trivial patches to master which is mostly PPC fix-ups from Ben. Following on from this, my priority is to get the outstanding context patches for SPARC32/SPARC64 pushed reasonably quickly, along with the corresponding follow-up patches to fix up load/init-program as per spec since they touch a large chunk of critical code which will benefit from a thorough testing from users. ATB, Mark.

2 3

[PATCH] pci: only try and detect Mac driver in PCI ROM for PPC machines
by Mark Cave-Ayland 09 Sep '16

09 Sep '16

It seems that the VGA option ROM isn't mapped on SPARC64 which causes a fault upon access. Temporarily handle this by surrounding the code in #ifdef CONFIG_PPC guards until the proper solution can be implemented. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- drivers/pci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/pci.c b/drivers/pci.c index eec6a20..4e4e9ae 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -773,13 +773,15 @@ int macio_keylargo_config_cb (const pci_config_t *config) int vga_config_cb (const pci_config_t *config) { +#ifdef CONFIG_PPC unsigned long rom; uint32_t rom_size, size, bar; phandle_t ph; - +#endif if (config->assigned[0] != 0x00000000) { setup_video(); +#ifdef CONFIG_PPC if (config->assigned[6]) { rom = pci_bus_addr_to_host_addr(MEMORY_SPACE_32, config->assigned[6] & ~0x0000000F); @@ -805,6 +807,8 @@ int vga_config_cb (const pci_config_t *config) } } } +#endif + /* Currently we don't read FCode from the hardware but execute * it directly */ feval("['] vga-driver-fcode 2 cells + 1 byte-load"); -- 1.7.10.4

1 0

[PATCH 00/24] Implement load/init-program as per IEEE-1275 specification
by Mark Cave-Ayland 09 Sep '16

09 Sep '16

The current implementation of load/init-program has some fairly big hacks in order to work around the fact that we don't have per-architecture CPU contexts. An example of this is chained bootloaders used for SPARC64 which use Forth to alter the saved CPU context so that control is returned to a different address by directly executing init-program before return. With all architectures now able to save/restore CPU contexts, these hacks can now be removed and init-program changed to be a single per-architecture implementation along with some associated tidy-ups. I've given this a fairly thorough testing across all my OpenBIOS test images and as far as I can tell doesn't cause any regressions. Requires the previously posted SPARC32 and SPARC64 context patches to be applied first. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (24): libopenbios: rename saved-program-state to load-state libopenbios: introduce arch_init_program() in preparation for per-arch implementations all: create client program context once at startup client.fs: add load-state param variable amd64: introduce arch_init_program() implementation ppc: introduce arch_init_program() implementation SPARC32: introduce arch_init_program() implementation SPARC64: introduce arch_init_program() implementation x86: introduce arch_init_program() implementation libopenbios: add context wrappers for Fcode/Forth payloads SPARC32: move Forth/FCode over to use new context wrappers SPARC64: move Forth/FCode over to use new context wrappers x86: move Forth/FCode over to use new context wrappers elf: set boot notes in elf_load() if supplied SPARC64: remove start_client_image() libopenbios: move prototypes for start_elf() and __context into libopenbios libopenbios: move go() function into libopenbios aout: implement load/init-program as per IEEE-1275 specification bootcode: implement load/init-program as per IEEE-1275 specification elf: implement load/init-program as per IEEE-1275 specification fcode: implement load/init-program as per IEEE-1275 specification forth: implement load/init-program as per IEEE-1275 specification libopenbios: remove conditional logic from go() libopenbios: remove address parameter from start_elf() arch/amd64/context.c | 51 ++++++++++++++++++++----- arch/ppc/qemu/context.c | 67 ++++++++++++++++++++++----------- arch/ppc/qemu/init.c | 14 ++----- arch/sparc32/boot.c | 71 ++++------------------------------- arch/sparc32/boot.h | 6 +-- arch/sparc32/context.c | 39 +++++++++++++++---- arch/sparc32/openbios.c | 2 +- arch/sparc64/boot.c | 54 +------------------------- arch/sparc64/boot.h | 6 --- arch/sparc64/context.c | 68 ++++++++++++++++++++------------- arch/sparc64/openbios.c | 1 - arch/unix/boot.c | 13 +++++++ arch/x86/boot.c | 53 +------------------------- arch/x86/boot.h | 6 +-- arch/x86/context.c | 52 ++++++++++++++++++++----- arch/x86/openbios.c | 1 - forth/debugging/client.fs | 30 ++++++++------- include/libopenbios/bootcode_load.h | 2 + include/libopenbios/initprogram.h | 9 +++++ libopenbios/aout_load.c | 48 +++++++++++------------ libopenbios/bootcode_load.c | 33 +++++++++++++--- libopenbios/elf_load.c | 28 +++++++------- libopenbios/fcode_load.c | 32 ++++++---------- libopenbios/forth_load.c | 30 +++++++-------- libopenbios/init.c | 3 ++ libopenbios/initprogram.c | 45 ++++++++++++++++++++++ libopenbios/load.c | 47 ++++++++--------------- libopenbios/xcoff_load.c | 8 ++-- 28 files changed, 417 insertions(+), 402 deletions(-) -- 1.7.10.4

3 33

[PATCHv2 00/25] Implement load/init-program as per IEEE-1275 specification
by Mark Cave-Ayland 08 Sep '16

08 Sep '16

The current implementation of load/init-program has some fairly big hacks in order to work around the fact that we don't have per-architecture CPU contexts. An example of this is chained bootloaders used for SPARC64 which use Forth to alter the saved CPU context so that control is returned to a different address by directly executing init-program before return. With all architectures now able to save/restore CPU contexts, these hacks can now be removed and init-program changed to be a single per-architecture implementation along with some associated tidy-ups. I've given this a fairly thorough testing across all my OpenBIOS test images and as far as I can tell doesn't cause any regressions. Requires the previously posted SPARC32 and SPARC64 context patches to be applied first. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> v2: - Fix missing patch for XCOFF loader conversion - Switch aout_init_program() to use memmove() - Fix minor typo in aout_init_program() comment Mark Cave-Ayland (25): libopenbios: rename saved-program-state to load-state libopenbios: introduce arch_init_program() in preparation for per-arch implementations all: create client program context once at startup client.fs: add load-state param variable amd64: introduce arch_init_program() implementation ppc: introduce arch_init_program() implementation SPARC32: introduce arch_init_program() implementation SPARC64: introduce arch_init_program() implementation x86: introduce arch_init_program() implementation libopenbios: add context wrappers for Fcode/Forth payloads SPARC32: move Forth/FCode over to use new context wrappers SPARC64: move Forth/FCode over to use new context wrappers x86: move Forth/FCode over to use new context wrappers elf: set boot notes in elf_load() if supplied SPARC64: remove start_client_image() libopenbios: move prototypes for start_elf() and __context into libopenbios libopenbios: move go() function into libopenbios aout: implement load/init-program as per IEEE-1275 specification bootcode: implement load/init-program as per IEEE-1275 specification elf: implement load/init-program as per IEEE-1275 specification fcode: implement load/init-program as per IEEE-1275 specification forth: implement load/init-program as per IEEE-1275 specification xcoff: implement load/init-program as per IEEE-1275 specification libopenbios: remove conditional logic from go() libopenbios: remove address parameter from start_elf() arch/amd64/context.c | 51 ++++++++++++---- arch/ppc/qemu/context.c | 67 ++++++++++++++------- arch/ppc/qemu/init.c | 14 +---- arch/sparc32/boot.c | 71 +++------------------- arch/sparc32/boot.h | 6 +- arch/sparc32/context.c | 39 +++++++++--- arch/sparc32/openbios.c | 2 +- arch/sparc64/boot.c | 54 +---------------- arch/sparc64/boot.h | 6 -- arch/sparc64/context.c | 68 ++++++++++++--------- arch/sparc64/openbios.c | 1 - arch/unix/boot.c | 13 ++++ arch/x86/boot.c | 53 +---------------- arch/x86/boot.h | 6 +- arch/x86/context.c | 52 ++++++++++++---- arch/x86/openbios.c | 1 - forth/debugging/client.fs | 30 +++++----- include/libopenbios/bootcode_load.h | 2 + include/libopenbios/initprogram.h | 9 +++ include/libopenbios/xcoff_load.h | 2 +- libopenbios/aout_load.c | 48 +++++++-------- libopenbios/bootcode_load.c | 33 +++++++++-- libopenbios/elf_load.c | 28 ++++----- libopenbios/fcode_load.c | 32 ++++------ libopenbios/forth_load.c | 30 +++++----- libopenbios/init.c | 3 + libopenbios/initprogram.c | 45 ++++++++++++++ libopenbios/load.c | 58 +++++++++--------- libopenbios/xcoff_load.c | 111 +++++++++++++++++++++++++++++++---- 29 files changed, 526 insertions(+), 409 deletions(-) -- 1.7.10.4

1 25