OpenBIOS December 2015

openbios@openbios.org

9 participants
19 discussions

[commit] r1360 - in trunk/openbios-devel: arch/sparc64 include/arch/sparc64
by repository service 29 Dec '15

29 Dec '15

Author: mcayland Date: Tue Dec 29 16:50:29 2015 New Revision: 1360 URL: http://tracker.coreboot.org/trac/openbios/changeset/1360 Log: SPARC64: introduce new Forth context stack (fcstack) for CPU contexts The fcstack holds a stack of complete CPU states which can be used to enable re-entrant calls into Forth (e.g. when processing interrupts). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/context.c trunk/openbios-devel/arch/sparc64/ldscript trunk/openbios-devel/include/arch/sparc64/io.h Modified: trunk/openbios-devel/arch/sparc64/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/context.c Tue Dec 29 16:50:24 2015 (r1359) +++ trunk/openbios-devel/arch/sparc64/context.c Tue Dec 29 16:50:29 2015 (r1360) @@ -40,6 +40,10 @@ /* Pointer to startup context (physical address) */ unsigned long __boot_ctx; +/* Pointer to Forth context stack */ +void *_fcstack_ptr = &_efcstack; + + /* * Main starter * This is the C function that runs first. Modified: trunk/openbios-devel/arch/sparc64/ldscript ============================================================================== --- trunk/openbios-devel/arch/sparc64/ldscript Tue Dec 29 16:50:24 2015 (r1359) +++ trunk/openbios-devel/arch/sparc64/ldscript Tue Dec 29 16:50:29 2015 (r1360) @@ -50,6 +50,11 @@ *(.bss.*) *(COMMON) + _fcstack = .; + . += 32768; + . = ALIGN(16); + _efcstack = .; + _stack = .; . += STACK_SIZE; . = ALIGN(16); Modified: trunk/openbios-devel/include/arch/sparc64/io.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/io.h Tue Dec 29 16:50:24 2015 (r1359) +++ trunk/openbios-devel/include/arch/sparc64/io.h Tue Dec 29 16:50:29 2015 (r1360) @@ -9,7 +9,7 @@ extern unsigned long va_shift; // Set in entry.S // Defined in ldscript -extern char _start, _data, _stack, _estack, _end, _iomem; +extern char _start, _data, _stack, _estack, _fcstack, _efcstack, _end, _iomem; // XXX check use and merge #define phys_to_virt(phys) ((void *) ((unsigned long) (phys)))

1 0

[commit] r1359 - trunk/openbios-devel/arch/sparc64
by repository service 29 Dec '15

29 Dec '15

Author: mcayland Date: Tue Dec 29 16:50:24 2015 New Revision: 1359 URL: http://tracker.coreboot.org/trac/openbios/changeset/1359 Log: SPARC64: create proper stack frame when entering client interface The original motivation behind reducing the stack frame size was in order to keep the stack usage low enough to boot OpenBSD/NetBSD. Since the final solution now is to save and restore the entire CPU state around CIF calls then this no longer matters. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/call-client.S Modified: trunk/openbios-devel/arch/sparc64/call-client.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/call-client.S Fri Nov 6 16:06:36 2015 (r1358) +++ trunk/openbios-devel/arch/sparc64/call-client.S Tue Dec 29 16:50:24 2015 (r1359) @@ -176,15 +176,15 @@ sparc64_of_client_interface: /* Save globals on callers stack */ - add %sp, -56, %sp + add %sp, -248, %sp - stx %g1, [%sp + 2047 + 0] - stx %g2, [%sp + 2047 + 8] - stx %g3, [%sp + 2047 + 16] - stx %g4, [%sp + 2047 + 24] - stx %g5, [%sp + 2047 + 32] - stx %g6, [%sp + 2047 + 40] - stx %g7, [%sp + 2047 + 48] + stx %g1, [%sp + 2047 + 192] + stx %g2, [%sp + 2047 + 200] + stx %g3, [%sp + 2047 + 208] + stx %g4, [%sp + 2047 + 216] + stx %g5, [%sp + 2047 + 224] + stx %g6, [%sp + 2047 + 232] + stx %g7, [%sp + 2047 + 240] /* Save client trap table */ setx client_tba, %g6, %g7 @@ -222,15 +222,15 @@ wrpr %g6, %tba /* Restore globals */ - ldx [%sp + 2047 + 0], %g1 - ldx [%sp + 2047 + 8], %g2 - ldx [%sp + 2047 + 16], %g3 - ldx [%sp + 2047 + 24], %g4 - ldx [%sp + 2047 + 32], %g5 - ldx [%sp + 2047 + 40], %g6 - ldx [%sp + 2047 + 48], %g7 + ldx [%sp + 2047 + 192], %g1 + ldx [%sp + 2047 + 200], %g2 + ldx [%sp + 2047 + 208], %g3 + ldx [%sp + 2047 + 216], %g4 + ldx [%sp + 2047 + 224], %g5 + ldx [%sp + 2047 + 232], %g6 + ldx [%sp + 2047 + 240], %g7 - add %sp, 56, %sp + add %sp, 248, %sp jmp %o7+8 nop

1 0

Re: [OpenBIOS] patch that causes a regression with Mac OS X booting
by Programmingkid 14 Dec '15

14 Dec '15

On Dec 11, 2015, at 6:28 AM, Mark Cave-Ayland wrote: > On 10/12/15 15:02, Programmingkid wrote: > >> https://lists.gnu.org/archive/html/qemu-devel/2015-10/msg05556.html >> >> From the message in the link, you said there was a patch that is needed to boot Mac OS 9, but can't be applied because it causes a regression with Mac OS X. Could you send me the patch. I would like to fix it so that all the patches needed to boot Mac OS 9 can be applied to OpenBIOS. Thanks. > > The outstanding OpenBIOS patch is this one: > > http://www.openfirmware.info/pipermail/openbios/2015-August/008763.html > > The reason it can't be applied is a little complicated. The MacOS 9 > bootloader alters the call stack using >r and r> which is illegal > outside of a word in Forth - it's like a function changing it's stack > pointing and hoping the caller can cope upon return. Apple really made something that does that? What were they thinking? I can only guess that they didn't like Forth. > I suspect the above patch only works through chance because OpenBIOS > uses a trampoline to execute words and so the trampoline is corrupted on > exit. It also causes yaboot to throw errors in my tests here, as found > on a Fedora PPC Linux for example which isn't a good solution either :( Given the info about how Mac OS 9 corrupts the call stack, maybe we could make it so that this patch only works when booting Mac OS 9. So that leads to the question - How do we know when Mac OS 9 is booting? There are several tags in the bootx and yaboot files that can be used to help. The <DESCRIPTION> tag looks like this in yaboot (Used by Linux): <DESCRIPTION> PowerPC GNU/Linux First Stage Bootstrap </DESCRIPTION> It looks like this in Mac OS 9's boot script: <DESCRIPTION> MacROM for NewWorld. </DESCRIPTION> It looks like this in Mac OS X's bootx: <DESCRIPTION> Boot Loader for Mac OS X. </DESCRIPTION> Maybe something like this can be added to OpenBIOS: if(strcmp(descriptionString, "MacROM for NewWorld.") == 0) // Mac OS 9 { using_Mac_OS_9 = true; } Given that the patch looks like this: - i c@ 0a = if + i c@ dup 0a = swap 0d = or if This might be the solution: i c@ /* common to both conditions, so always execute it */ if(using_Mac_OS_9 == true) { 0a = if } else { dup 0a = swap 0d = or if } The if/else code would probably be in forth. Setting the using_Mac_OS_9 variable can be done in C. Does this solution sound good? I know you are not convinced the code added in the patch is the right way to do things, do you have an idea what might be a better solution? Something that isn't so hacky?

2 2

Re: [OpenBIOS] patch that causes a regression with Mac OS X booting
by Programmingkid 13 Dec '15

13 Dec '15

1 0

[PATCH v3] Add revision number to banner
by Programmingkid 05 Dec '15

05 Dec '15

The banner is displayed at the start of openbios with the version and build time. This patch adds the revision number for easier identification of binary version. It would look like this: Welcome to OpenBIOS v1.1 (Revision 1358) built on Nov 28 2015 18:22 If the user doesn't have the svn command, git command, or an svn repo, the word "unknown" is used instead of the number. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> New in revision 3: Added support for a variable length repo number. New in revision 2: Added support for git if the repo is being managed by it. Index: Makefile.target =================================================================== --- Makefile.target (revision 1358) +++ Makefile.target (working copy) @@ -52,11 +52,21 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs +# Set the REVISION variable to the current svn revision or to "unknown" +REVISION := $(shell svn info .. | grep "Revision: " | cut -d ' ' -f 2) +ifeq ($(REVISION),) # Try using git to find the revision number + REVISION := $(shell git svn log --oneline -1 | cut -d '|' -f1 | cut -d 'r' -f2 | cut -d ' ' -f 1) +endif +ifeq ($(REVISION),) # if both svn and git failed to find a revision number + REVISION = "unknown" +endif + $(ODIR)/forth/version.fs: $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ - echo ": version \" $(VERSION)\" ; " ; ) \ + echo ": version \" $(VERSION)\" ; " ; \ + echo ": revision \" $(REVISION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: @@ -63,7 +73,8 @@ $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ - echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; ) \ + echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ + echo "#define OPENBIOS_REVISION \"$(REVISION)\"" ; ) \ > $(dir $(a))/openbios-version.h info: Index: forth/admin/banner.fs =================================================================== --- forth/admin/banner.fs (revision 1358) +++ forth/admin/banner.fs (working copy) @@ -9,8 +9,8 @@ ; to builtin-logo :noname - builddate s" built on " version s" Welcome to OpenBIOS v" pocket - tmpstrcat tmpstrcat tmpstrcat drop + builddate s" ) built on " revision s" (Revision " version s" Welcome to OpenBIOS v" pocket + tmpstrcat tmpstrcat tmpstrcat tmpstrcat tmpstrcat drop ; to builtin-banner : suppress-banner ( -- )

4 11

[PATCH] Add revision number to banner
by Programmingkid 04 Dec '15

04 Dec '15

The banner is displayed at the start of openbios with the version and build time. This patch adds the revision number for easier identification of binary version. It would look like this: Welcome to OpenBIOS v1.1 (Revision 1358) built on Nov 28 2015 18:22 If the user doesn't have the svn command or an svn repo, the word "unknown" is used instead of the number. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: Makefile.target =================================================================== --- Makefile.target (revision 1358) +++ Makefile.target (working copy) @@ -52,11 +52,18 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs +# Set the REVISION variable to the current svn revision or to "unknown" +REVISION := $(shell svn info .. | grep "Revision: " | cut -c11-16) +ifeq ($(REVISION),) +REVISION = "unknown" +endif + $(ODIR)/forth/version.fs: $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ - echo ": version \" $(VERSION)\" ; " ; ) \ + echo ": version \" $(VERSION)\" ; " ; \ + echo ": revision \" $(REVISION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: @@ -63,7 +70,8 @@ $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ - echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; ) \ + echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ + echo "#define OPENBIOS_REVISION \"$(REVISION)\"" ; ) \ > $(dir $(a))/openbios-version.h info: Index: forth/admin/banner.fs =================================================================== --- forth/admin/banner.fs (revision 1358) +++ forth/admin/banner.fs (working copy) @@ -9,8 +9,8 @@ ; to builtin-logo :noname - builddate s" built on " version s" Welcome to OpenBIOS v" pocket - tmpstrcat tmpstrcat tmpstrcat drop + builddate s" ) built on " revision s" (Revision " version s" Welcome to OpenBIOS v" pocket + tmpstrcat tmpstrcat tmpstrcat tmpstrcat tmpstrcat drop ; to builtin-banner : suppress-banner ( -- )

3 6

Re: [OpenBIOS] (no subject)
by Mark Cave-Ayland 03 Dec '15

03 Dec '15

On 03/12/15 03:16, Inon Fefer wrote: > Please remove me from this list > > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you Hi Inon, As per the mailing list footer, you can use the link above to manage your subscription including unsubscribing from the mailing list. If after this you are still experiencing problems, please contact me off-list. ATB, Mark.

1 0

(no subject)
by Inon Fefer 03 Dec '15

03 Dec '15

Please remove me from this list

1 0

[PATCH v2] Add revision number to banner
by Programmingkid 02 Dec '15

02 Dec '15

The banner is displayed at the start of openbios with the version and build time. This patch adds the revision number for easier identification of binary version. It would look like this: Welcome to OpenBIOS v1.1 (Revision 1358) built on Nov 28 2015 18:22 If the user doesn't have the svn command or an svn repo, the word "unknown" is used instead of the number. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> New in revision 2: Added support for git if the repo is being managed by it. Index: Makefile.target =================================================================== --- Makefile.target (revision 1358) +++ Makefile.target (working copy) @@ -52,11 +52,21 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs +# Set the REVISION variable to the current svn revision or to "unknown" +REVISION := $(shell svn info .. | grep "Revision: " | cut -c11-16) +ifeq ($(REVISION),) # Try using git to find the revision number + REVISION := $(shell git svn log --oneline -1 | cut -d '|' -f1 | cut -c2-5) +endif +ifeq ($(REVISION),) # if both svn and git failed to find a revision number + REVISION = "unknown" +endif + $(ODIR)/forth/version.fs: $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ - echo ": version \" $(VERSION)\" ; " ; ) \ + echo ": version \" $(VERSION)\" ; " ; \ + echo ": revision \" $(REVISION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: @@ -63,7 +73,8 @@ $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ - echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; ) \ + echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ + echo "#define OPENBIOS_REVISION \"$(REVISION)\"" ; ) \ > $(dir $(a))/openbios-version.h info: Index: forth/admin/banner.fs =================================================================== --- forth/admin/banner.fs (revision 1358) +++ forth/admin/banner.fs (working copy) @@ -9,8 +9,8 @@ ; to builtin-logo :noname - builddate s" built on " version s" Welcome to OpenBIOS v" pocket - tmpstrcat tmpstrcat tmpstrcat drop + builddate s" ) built on " revision s" (Revision " version s" Welcome to OpenBIOS v" pocket + tmpstrcat tmpstrcat tmpstrcat tmpstrcat tmpstrcat drop ; to builtin-banner : suppress-banner ( -- )

2 2