OpenBIOS August 2016

openbios@openbios.org

10 participants
26 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

[PATCHv2 00/11] SPARC64 context improvements
by Mark Cave-Ayland 28 Aug '16

28 Aug '16

This patchset improves the context handling in 2 ways: firstly it unifies the context structures between switch_to() and CIF entry, and secondly fixes up the context switch code enough so that we can switch and return from an arbitrary PC address in testing. This is a precursor to fixing up the load/init-program logic so that clients are able to access and alter their own context from Forth. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> v2: - Make sure trap level is preserved after SAVE_CPU_TRAP_STATE - Add separate RESET_CPU_WINDOW_STATE macro - Ensure that __context points to the saved entry state during CIF calls Mark Cave-Ayland (11): SPARC64: add parameter to indicate %cwp save/restore direction SPARC64: allocate space in context to save global registers SPARC64: save/restore global registers to context when entering CIF SPARC64: save CIF entry globals under the client stack SPARC64: introduce %pc into context and use it when exiting CIF SPARC64: make sure that %tl is restored after SAVE_CPU_TRAP_STATE SPARC64: save/restore entire CPU state when entering/leaving CIF SPARC64: split off CPU window reset logic into RESET_CPU_WINDOW_STATE macro SPARC64: split off general CPU registers into *_GENERAL_STATE macros SPARC64: point __context to saved context during CIF calls SPARC64: switch entry.S over to use existing context macros arch/sparc64/call-client.S | 94 ++++++++++++++++++++++---------- arch/sparc64/context.c | 6 +-- arch/sparc64/context.h | 7 +-- arch/sparc64/cpustate.h | 115 ++++++++++++++++++++++++--------------- arch/sparc64/entry.S | 17 +++++- arch/sparc64/switch.S | 129 ++++++++++++++++---------------------------- arch/sparc64/vectors.S | 8 ++- 7 files changed, 213 insertions(+), 163 deletions(-) -- 1.7.10.4

1 11

[PATCH 0/7] SPARC64 context improvements
by Mark Cave-Ayland 28 Aug '16

28 Aug '16

This patchset improves the context handling in 2 ways: firstly it unifies the context structures between switch_to() and CIF entry, and secondly fixes up the context switch code enough so that we can switch and return from an arbitrary PC address in testing. This is a precursor to fixing up the load/init-program logic so that clients are able access and alter their own context from Forth. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (7): SPARC64: add parameter to indicate %cwp save/restore direction SPARC64: allocate space in context to save global registers SPARC64: save/restore global registers to context when entering CIF SPARC64: save CIF entry globals under the client stack SPARC64: introduce %pc into context and use it when exiting CIF SPARC64: split off general CPU registers into *_GENERAL_STATE macros SPARC64: switch entry.S over to use existing context macros arch/sparc64/call-client.S | 71 +++++++++++++++--------- arch/sparc64/context.c | 6 +-- arch/sparc64/context.h | 7 +-- arch/sparc64/cpustate.h | 98 ++++++++++++++++++++------------- arch/sparc64/entry.S | 17 +++++- arch/sparc64/switch.S | 129 ++++++++++++++++---------------------------- 6 files changed, 175 insertions(+), 153 deletions(-) -- 1.7.10.4

1 8

[PATCH] hfsplus: don't force OS 9 startup folder selection
by Mark Cave-Ayland 26 Aug '16

26 Aug '16

For some reason the HFS+ code will ignore the startup folder chosen by the user and force the OS 9 startup folder if it exists. This can break OS X installations with Classic, making it impossible to boot back into the OS. Removing the code to force the use of the OS 9 startup folder allows switching the startup disk between OS 9/OS X using the Disk Startup Utility in each OS as expected. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- fs/hfsplus/hfsp_fs.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/hfsplus/hfsp_fs.c b/fs/hfsplus/hfsp_fs.c index df234bb..4d52478 100644 --- a/fs/hfsplus/hfsp_fs.c +++ b/fs/hfsplus/hfsp_fs.c @@ -233,8 +233,6 @@ hfsp_files_open( hfsp_info_t *mi ) int *p = (int*)&(mi->vol)->vol.finder_info[0]; int cnid = p[0]; /* printk(" p[0] = %x, p[3] = %x, p[5] = %x\n", p[0], p[3], p[5] ); */ - if( p[0] == p[5] && p[3] ) - cnid = p[3]; if( record_init_cnid(&(mi->hfspfile->rec), &(mi->vol)->catalog, cnid) ) RET ( 0 ); path += 2; -- 1.7.10.4

1 0

[PATCH] Fix build on ppc64le host
by Benjamin Herrenschmidt 26 Aug '16

26 Aug '16

Switch arch didn't get the right long size Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch index ab3b4ce..12a01f1 100755 --- a/config/scripts/switch-arch +++ b/config/scripts/switch-arch @@ -38,7 +38,7 @@ longbits() if test "$cpu" = "sparc64" -o "$cpu" = "ia64" \ -o "$cpu" = "amd64" -o "$cpu" = "x86_64" \ -o "$cpu" = "powerpc64" -o "$cpu" = "ppc64" \ - -o "$cpu" = "alpha"; then + -o "$cpu" = "alpha" -o "$cpu" = "ppc64le" ; then echo 64 else echo 32

2 1

[PATCH] SPARC32: implement full context switch
by Mark Cave-Ayland 21 Aug '16

21 Aug '16

The existing SPARC32 context switch logic was only partially complete in that it wouldn't save/restore all the register windows. This patch updates the context switch code to save the full CPU state and is enough to allow a switch and return to an arbitrary PC address in testing. This is a precursor to fixing up the load/init-program logic so that clients are able access and alter their own context from Forth. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (1): SPARC32: implement full context switch logic in switch_to() arch/sparc32/boot.h | 2 +- arch/sparc32/context.c | 8 +- arch/sparc32/context.h | 6 +- arch/sparc32/cpustate.h | 160 ++++++++++++++++++++++++++++++++++++++++ arch/sparc32/entry.S | 26 ++++++- arch/sparc32/switch.S | 187 +++++++++++++++-------------------------------- 6 files changed, 249 insertions(+), 140 deletions(-) create mode 100644 arch/sparc32/cpustate.h -- 1.7.10.4

1 1

[PATCHv2 0/3] Enable bus master support for rtl8139 network cards on Apple PPC machines
by Mark Cave-Ayland 11 Aug '16

11 Aug '16

This patchset is loosely based on earlier work by BALATON Zoltan <balaton(a)eik.bme.hu> and provides basic infrastructure to allow OpenBIOS to enable PCI device bus mastering. Following on from discussions on the QEMU mailing list, it seems that Apple's OF enables bus mastering for some PCI devices by default, and as a result some buggy drivers forget to explicitly enable it and hence these devices fail under QEMU's emulation. The first 2 patches add the basic support routines while the last patch enables bus mastering for the rtl8139 card on Apple PPC machines which is required for some OS 9, OS X and MorphOS drivers. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (3): pci: introduce ob_pci_enable_bus_master() function pci: add PCI database entry for rtl8139 network card pci: add rtl8139_config_cb() to configure rtl8139 network cards drivers/pci.c | 27 +++++++++++++++++++++++++++ drivers/pci_database.c | 6 ++++++ drivers/pci_database.h | 3 +++ include/drivers/pci.h | 1 + 4 files changed, 37 insertions(+) -- 1.7.10.4

2 8

[PATCH 1/2] bootstrap.fs: add 4+ word to bootstrap dictionary
by Mark Cave-Ayland 11 Aug '16

11 Aug '16

Old OS X bootloaders need this in order to execute their bootloader. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- forth/bootstrap/bootstrap.fs | 1 + 1 file changed, 1 insertion(+) diff --git a/forth/bootstrap/bootstrap.fs b/forth/bootstrap/bootstrap.fs index 0668cf7..7b66f5c 100644 --- a/forth/bootstrap/bootstrap.fs +++ b/forth/bootstrap/bootstrap.fs @@ -428,6 +428,7 @@ variable leaves 0 leaves ! : 1- 1 - ; : 2+ 2 + ; : 2- 2 - ; +: 4+ 4 + ; : even 1+ -2 and ; : bounds over + swap ; -- 1.7.10.4

2 3

Re: [OpenBIOS] QEMU old Mac work
by Howard Spoelstra 10 Aug '16

10 Aug '16

> On 09 Aug 2016, at 13:55, Benjamin Herrenschmidt <benh(a)kernel.crashing.org> wrote: > > On Tue, 2016-08-09 at 09:15 +0200, Howard Spoelstra wrote: >> >> Hi, I tested both OpenBIOS and Qemu from your branches in OSX, using mac model mac99p. Terminal says: >> >> MACIO: Creating PMU >> qemu-system-ppc-wip: Unknown device 'via-pmu' for default sysbus > > Check you updated the qemu config. I added a new device, you need CONFIG_MAC_PMU, > the qemu build system won't pick that up automatically. > > I don't remember how I did it, I think make defconfig or something like that.. > > Cheers, > Ben. > Great to see Leopard running. Nice work! I fixed the error by adding CONFIG_MAC_PMU=y to the default config for ppc-softmmu.mak Builds from your source fix the USB problem in OpenBIOS mainline needing the -device ich9-usb-uhci1,id=newusb -device usb-mouse,bus=newusb.0 to get mouse/kb going in 10.5. Leopard now has mouse/keyboard working without any specific USB parameters. I notice the problem in Puma (10.1) It seems there is some timer error?, as e.g., the time remaining for installation fluctuates like crazy (1600 hrs to go), and the beachball spins like mad. At boot there is a too rapid succession of “still waiting for boot device” . Just guessing, but might a timing issue also explain the slowness of Leopard? Best, Howard

3 5