OpenBIOS March 2013

openbios@openbios.org

10 participants
31 discussions

[PATCH] mac-parts.c: Fix auto-partition selection for the dir word.
by Mark Cave-Ayland 16 Mar '13

16 Mar '13

Commit r1100 fixed the quik bootloader but broke automatic partition selection for the dir word. Differentiate between the package having no arguments (argstr == NULL) and the package having empty arguments (argstr == ""), and alter the dir word to use the latter version to invoke the automatic partition selection code when required. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> CC: Alexander Graf <agraf(a)suse.de> --- openbios-devel/forth/debugging/client.fs | 2 +- openbios-devel/packages/mac-parts.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openbios-devel/forth/debugging/client.fs b/openbios-devel/forth/debugging/client.fs index d454d22..24b1ec7 100644 --- a/openbios-devel/forth/debugging/client.fs +++ b/openbios-devel/forth/debugging/client.fs @@ -126,7 +126,7 @@ variable file-size : dir ( "{paths}<cr>" -- ) linefeed parse - ascii , left-split + ascii , split-after 2dup open-dev dup 0= if drop cr ." Unable to locate device " type diff --git a/openbios-devel/packages/mac-parts.c b/openbios-devel/packages/mac-parts.c index 12c94e5..85d53f8 100644 --- a/openbios-devel/packages/mac-parts.c +++ b/openbios-devel/packages/mac-parts.c @@ -79,6 +79,10 @@ macparts_open( macparts_info_t *di ) } else { argstr = str; } + + /* Make sure argstr is not null */ + if (argstr == NULL) + argstr = strdup(""); /* Convert the id to a partition number */ if (parstr && strlen(parstr)) @@ -89,10 +93,6 @@ macparts_open( macparts_info_t *di ) want_bootcode = 1; } - /* Make sure argstr is not null */ - if (argstr == NULL) - argstr = strdup(""); - DPRINTF("parstr: %s argstr: %s parnum: %d\n", parstr, argstr, parnum); DPRINTF("want_bootcode %d\n", want_bootcode); @@ -126,7 +126,7 @@ macparts_open( macparts_info_t *di ) * Implement partition selection as per the PowerPC Microprocessor CHRP bindings */ - if (str == NULL || parnum == 0) { + if (argstr == NULL || parnum == 0) { /* According to the spec, partition 0 as well as no arguments means the whole disk */ offs = (long long)0; size = (long long)__be32_to_cpu(dmap.sbBlkCount) * bs; -- 1.7.10.4

2 1

[PATCH 00/16] Switch to standards-compliant Forth console from C console
by Mark Cave-Ayland 15 Mar '13

15 Mar '13

As mentioned in my previous email on-list, OpenBIOS currently contains two consoles - a C based console and a Forth based console. The Forth based console is currently broken, but is more feature complete than the C console, whilst also being more portable across different architectures. This patchset performs the following functions: - Fix various bugs in the Forth console - Optimise performance using low-level C graphics routines - Add simple IEEE1275-like initialisers for TCX and VGA graphics - Switch TCX and VGA drivers over to use the new console using the standard is-install word Once this patchset is committed, a further patchset will follow to remove all of the duplicate C console code, remove packages/video.c and unify the console input/routines into libopenbios. Mark Cave-Ayland (16): display.fs: Fix up default-font word. display.fs: Fix fb8-delete-lines within the inbuilt Forth terminal emulator. terminal.fs: Fix linefeeds on the bottom line of the Forth console. terminal.fs: Fix backspace sequence in Forth terminal. video: Create new video_common.c file for shared video primitive routines. video_common.c: Move primitive graphic operations into libopenbios/video_common.c. pci: Modify PCI display devices so that open and close words are not created automatically during initialisation. video: Create tcx.fs and vga.fs to simulate Fcode video initialisation code. display.fs: pass the colour depth in bytes to the Forth terminal routines. video_common.c: create low-level video_mask_blit() function. video_common.c: create low-level video_invert_rect() function. display.fs: Fix fb8 routines to work with bit depths > 8. video_common.c: create low-level video_fill_rect() function. display.fs: optimise scrolling by copying/deleting multiple scanlines at once. display.fs: Add vertical font-spacing as per the existing C console implementation. video: switch VGA and TCX drivers over to Forth console using is-install. openbios-devel/arch/sparc32/console.c | 12 - openbios-devel/arch/sparc32/openbios.c | 2 +- openbios-devel/drivers/build.xml | 2 + openbios-devel/drivers/pci.c | 14 +- openbios-devel/drivers/pci.h | 1 + openbios-devel/drivers/sbus.c | 2 + openbios-devel/drivers/tcx.fs | 13 + openbios-devel/drivers/vga.fs | 13 + openbios-devel/drivers/vga_vbe.c | 2 +- openbios-devel/forth/device/display.fs | 172 +++++------ openbios-devel/forth/device/font.fs | 4 + openbios-devel/forth/device/terminal.fs | 10 +- openbios-devel/include/libopenbios/video.h | 24 ++ openbios-devel/include/packages/video.h | 6 +- openbios-devel/libopenbios/build.xml | 1 + openbios-devel/libopenbios/console_common.c | 1 + openbios-devel/libopenbios/video_common.c | 444 +++++++++++++++++++++++++++ openbios-devel/packages/video.c | 279 +---------------- 18 files changed, 607 insertions(+), 395 deletions(-) create mode 100644 openbios-devel/drivers/tcx.fs create mode 100644 openbios-devel/drivers/vga.fs create mode 100644 openbios-devel/include/libopenbios/video.h create mode 100644 openbios-devel/libopenbios/video_common.c -- 1.7.10.4

4 20

Re: [OpenBIOS] [PATCH 00/16] Switch to standards-compliant Forth console from C console
by Mark Cave-Ayland 11 Mar '13

11 Mar '13

On 10/03/13 19:31, Blue Swirl wrote: >> Based on a quick Debian 3.1 CDROM boot test, it looks like scrolling >> and clear screen does not work at all. Text is also offset by one line >> down and one column right. Okay - is this on SPARC? I have a feeling the offset by one is simply because apparently the OF line# and column# variables are zero based while the ANSI terminal position is one based. > NetBSD 4.0 also suffers from lack of scrolling and clear screen, but > characters are positioned correctly. SPARC again? If so, can you point me towards the ISO and I'll try it here? > On the positive side, reverse text now works and I guess the screen > flashes show BEL handling. :) ATB, Mark.

2 1

Re: [OpenBIOS] [PATCH 00/16] Switch to standards-compliant Forth console from C console
by Mark Cave-Ayland 11 Mar '13

11 Mar '13

On 10/03/13 20:52, Blue Swirl wrote: > I used the following to fix the warning, please squash into patch #5: > > diff --git a/include/libopenbios/video.h b/include/libopenbios/video.h > index 13bf143..1840981 100644 > --- a/include/libopenbios/video.h > +++ b/include/libopenbios/video.h > @@ -17,7 +17,7 @@ typedef struct osi_fb_info { > int rb, w, h, depth; > } osi_fb_info_t; > > -struct { > +extern struct video_info { > int has_video; > osi_fb_info_t fb; > unsigned long *pal; /* 256 elements */ > diff --git a/libopenbios/video_common.c b/libopenbios/video_common.c > index 11aeec7..621f032 100644 > --- a/libopenbios/video_common.c > +++ b/libopenbios/video_common.c > @@ -23,6 +23,7 @@ > #include "packages/video.h" > #include "drivers/vga.h" > > +struct video_info video; > > unsigned long > get_color( int col_ind ) Thanks - I will do that. > It looks like Forth version is a bit too buggy, for example > 1b emit ." [H" > should position cursor to top left corner of the screen (like HEAD), > but with the patch set it does nothing except leaves a stray '0' on > the stack! Thanks for the hint - I think that it should be fairly easy to fix (I temporarily force debugger output to the serial port when working on the video routines). I'm quite tempted to make this a permanent behaviour when CONFIG_DEBUG_VIDEO_CONSOLE is enabled, and change the default to "false" so that this becomes a developer option. ATB, Mark.

1 0

Re: [OpenBIOS] [PATCH 00/16] Switch to standards-compliant Forth console from C console
by Mark Cave-Ayland 11 Mar '13

11 Mar '13

On 10/03/13 18:16, Blue Swirl wrote: > I'm getting these warnings during build, perhaps something is not correct: > LINK openbios-builtin.elf > libopenbios.a(console_common.o): warning: multiple common of `video' > libsparc32.a(openbios.o): warning: previous common is here > libopenbios.a(video_common.o): warning: multiple common of `video' > libsparc32.a(openbios.o): warning: previous common is here > libpackages.a(video.o): warning: multiple common of `video' > libsparc32.a(openbios.o): warning: previous common is here > GEN openbios-builtin.elf.syms Thanks for testing :) Okay I see you patch for that - I'll update my patchset accordingly. > Based on a quick Debian 3.1 CDROM boot test, it looks like scrolling > and clear screen does not work at all. Text is also offset by one line > down and one column right. Right I'll take a look at that. Am I right in thinking that the codes we need to implement are those in Annex B of the IEEE1275 specification? So that would be CSI n S, CSI n T and CSI n J? > Some usual messages (CPUs, UUID) are not going to screen but that's probably OK. Yeah. I can fix those, but it requires changing the video struct which I can do for a later patchset. ATB, Mark.

1 0

Re: [OpenBIOS] [PATCH 00/16] Switch to standards-compliant Forth console from C console
by Blue Swirl 10 Mar '13

10 Mar '13

On Sun, Mar 10, 2013 at 7:31 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: > On Sun, Mar 10, 2013 at 6:16 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: >> On Sun, Mar 10, 2013 at 4:50 PM, Mark Cave-Ayland >> <mark.cave-ayland(a)ilande.co.uk> wrote: >>> As mentioned in my previous email on-list, OpenBIOS currently contains two >>> consoles - a C based console and a Forth based console. The Forth based console >>> is currently broken, but is more feature complete than the C console, whilst also >>> being more portable across different architectures. >>> >>> This patchset performs the following functions: >>> >>> - Fix various bugs in the Forth console >>> - Optimise performance using low-level C graphics routines >>> - Add simple IEEE1275-like initialisers for TCX and VGA graphics >>> - Switch TCX and VGA drivers over to use the new console using the standard >>> is-install word >>> >>> Once this patchset is committed, a further patchset will follow to remove all of >>> the duplicate C console code, remove packages/video.c and unify the console >>> input/routines into libopenbios. >> >> I'm getting these warnings during build, perhaps something is not correct: >> LINK openbios-builtin.elf >> libopenbios.a(console_common.o): warning: multiple common of `video' >> libsparc32.a(openbios.o): warning: previous common is here >> libopenbios.a(video_common.o): warning: multiple common of `video' >> libsparc32.a(openbios.o): warning: previous common is here >> libpackages.a(video.o): warning: multiple common of `video' >> libsparc32.a(openbios.o): warning: previous common is here >> GEN openbios-builtin.elf.syms I used the following to fix the warning, please squash into patch #5: diff --git a/include/libopenbios/video.h b/include/libopenbios/video.h index 13bf143..1840981 100644 --- a/include/libopenbios/video.h +++ b/include/libopenbios/video.h @@ -17,7 +17,7 @@ typedef struct osi_fb_info { int rb, w, h, depth; } osi_fb_info_t; -struct { +extern struct video_info { int has_video; osi_fb_info_t fb; unsigned long *pal; /* 256 elements */ diff --git a/libopenbios/video_common.c b/libopenbios/video_common.c index 11aeec7..621f032 100644 --- a/libopenbios/video_common.c +++ b/libopenbios/video_common.c @@ -23,6 +23,7 @@ #include "packages/video.h" #include "drivers/vga.h" +struct video_info video; unsigned long get_color( int col_ind ) >> >> Based on a quick Debian 3.1 CDROM boot test, it looks like scrolling >> and clear screen does not work at all. Text is also offset by one line >> down and one column right. > > NetBSD 4.0 also suffers from lack of scrolling and clear screen, but > characters are positioned correctly. > > On the positive side, reverse text now works and I guess the screen > flashes show BEL handling. It looks like Forth version is a bit too buggy, for example 1b emit ." [H" should position cursor to top left corner of the screen (like HEAD), but with the patch set it does nothing except leaves a stray '0' on the stack! > >> >> Some usual messages (CPUs, UUID) are not going to screen but that's probably OK. >> >>> >>> >>> Mark Cave-Ayland (16): >>> display.fs: Fix up default-font word. >>> display.fs: Fix fb8-delete-lines within the inbuilt Forth terminal >>> emulator. >>> terminal.fs: Fix linefeeds on the bottom line of the Forth console. >>> terminal.fs: Fix backspace sequence in Forth terminal. >>> video: Create new video_common.c file for shared video primitive >>> routines. >>> video_common.c: Move primitive graphic operations into >>> libopenbios/video_common.c. >>> pci: Modify PCI display devices so that open and close words are not >>> created automatically during initialisation. >>> video: Create tcx.fs and vga.fs to simulate Fcode video >>> initialisation code. >>> display.fs: pass the colour depth in bytes to the Forth terminal >>> routines. >>> video_common.c: create low-level video_mask_blit() function. >>> video_common.c: create low-level video_invert_rect() function. >>> display.fs: Fix fb8 routines to work with bit depths > 8. >>> video_common.c: create low-level video_fill_rect() function. >>> display.fs: optimise scrolling by copying/deleting multiple scanlines >>> at once. >>> display.fs: Add vertical font-spacing as per the existing C console >>> implementation. >>> video: switch VGA and TCX drivers over to Forth console using >>> is-install. >>> >>> openbios-devel/arch/sparc32/console.c | 12 - >>> openbios-devel/arch/sparc32/openbios.c | 2 +- >>> openbios-devel/drivers/build.xml | 2 + >>> openbios-devel/drivers/pci.c | 14 +- >>> openbios-devel/drivers/pci.h | 1 + >>> openbios-devel/drivers/sbus.c | 2 + >>> openbios-devel/drivers/tcx.fs | 13 + >>> openbios-devel/drivers/vga.fs | 13 + >>> openbios-devel/drivers/vga_vbe.c | 2 +- >>> openbios-devel/forth/device/display.fs | 172 +++++------ >>> openbios-devel/forth/device/font.fs | 4 + >>> openbios-devel/forth/device/terminal.fs | 10 +- >>> openbios-devel/include/libopenbios/video.h | 24 ++ >>> openbios-devel/include/packages/video.h | 6 +- >>> openbios-devel/libopenbios/build.xml | 1 + >>> openbios-devel/libopenbios/console_common.c | 1 + >>> openbios-devel/libopenbios/video_common.c | 444 +++++++++++++++++++++++++++ >>> openbios-devel/packages/video.c | 279 +---------------- >>> 18 files changed, 607 insertions(+), 395 deletions(-) >>> create mode 100644 openbios-devel/drivers/tcx.fs >>> create mode 100644 openbios-devel/drivers/vga.fs >>> create mode 100644 openbios-devel/include/libopenbios/video.h >>> create mode 100644 openbios-devel/libopenbios/video_common.c >>> >>> -- >>> 1.7.10.4 >>> >>> >>> -- >>> OpenBIOS http://openbios.org/ >>> Mailinglist: http://lists.openbios.org/mailman/listinfo >>> Free your System - May the Forth be with you

1 0

Re: [OpenBIOS] [PATCH 00/16] Switch to standards-compliant Forth console from C console
by Blue Swirl 10 Mar '13

10 Mar '13

On Sun, Mar 10, 2013 at 6:16 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: > On Sun, Mar 10, 2013 at 4:50 PM, Mark Cave-Ayland > <mark.cave-ayland(a)ilande.co.uk> wrote: >> As mentioned in my previous email on-list, OpenBIOS currently contains two >> consoles - a C based console and a Forth based console. The Forth based console >> is currently broken, but is more feature complete than the C console, whilst also >> being more portable across different architectures. >> >> This patchset performs the following functions: >> >> - Fix various bugs in the Forth console >> - Optimise performance using low-level C graphics routines >> - Add simple IEEE1275-like initialisers for TCX and VGA graphics >> - Switch TCX and VGA drivers over to use the new console using the standard >> is-install word >> >> Once this patchset is committed, a further patchset will follow to remove all of >> the duplicate C console code, remove packages/video.c and unify the console >> input/routines into libopenbios. > > I'm getting these warnings during build, perhaps something is not correct: > LINK openbios-builtin.elf > libopenbios.a(console_common.o): warning: multiple common of `video' > libsparc32.a(openbios.o): warning: previous common is here > libopenbios.a(video_common.o): warning: multiple common of `video' > libsparc32.a(openbios.o): warning: previous common is here > libpackages.a(video.o): warning: multiple common of `video' > libsparc32.a(openbios.o): warning: previous common is here > GEN openbios-builtin.elf.syms > > Based on a quick Debian 3.1 CDROM boot test, it looks like scrolling > and clear screen does not work at all. Text is also offset by one line > down and one column right. NetBSD 4.0 also suffers from lack of scrolling and clear screen, but characters are positioned correctly. On the positive side, reverse text now works and I guess the screen flashes show BEL handling. > > Some usual messages (CPUs, UUID) are not going to screen but that's probably OK. > >> >> >> Mark Cave-Ayland (16): >> display.fs: Fix up default-font word. >> display.fs: Fix fb8-delete-lines within the inbuilt Forth terminal >> emulator. >> terminal.fs: Fix linefeeds on the bottom line of the Forth console. >> terminal.fs: Fix backspace sequence in Forth terminal. >> video: Create new video_common.c file for shared video primitive >> routines. >> video_common.c: Move primitive graphic operations into >> libopenbios/video_common.c. >> pci: Modify PCI display devices so that open and close words are not >> created automatically during initialisation. >> video: Create tcx.fs and vga.fs to simulate Fcode video >> initialisation code. >> display.fs: pass the colour depth in bytes to the Forth terminal >> routines. >> video_common.c: create low-level video_mask_blit() function. >> video_common.c: create low-level video_invert_rect() function. >> display.fs: Fix fb8 routines to work with bit depths > 8. >> video_common.c: create low-level video_fill_rect() function. >> display.fs: optimise scrolling by copying/deleting multiple scanlines >> at once. >> display.fs: Add vertical font-spacing as per the existing C console >> implementation. >> video: switch VGA and TCX drivers over to Forth console using >> is-install. >> >> openbios-devel/arch/sparc32/console.c | 12 - >> openbios-devel/arch/sparc32/openbios.c | 2 +- >> openbios-devel/drivers/build.xml | 2 + >> openbios-devel/drivers/pci.c | 14 +- >> openbios-devel/drivers/pci.h | 1 + >> openbios-devel/drivers/sbus.c | 2 + >> openbios-devel/drivers/tcx.fs | 13 + >> openbios-devel/drivers/vga.fs | 13 + >> openbios-devel/drivers/vga_vbe.c | 2 +- >> openbios-devel/forth/device/display.fs | 172 +++++------ >> openbios-devel/forth/device/font.fs | 4 + >> openbios-devel/forth/device/terminal.fs | 10 +- >> openbios-devel/include/libopenbios/video.h | 24 ++ >> openbios-devel/include/packages/video.h | 6 +- >> openbios-devel/libopenbios/build.xml | 1 + >> openbios-devel/libopenbios/console_common.c | 1 + >> openbios-devel/libopenbios/video_common.c | 444 +++++++++++++++++++++++++++ >> openbios-devel/packages/video.c | 279 +---------------- >> 18 files changed, 607 insertions(+), 395 deletions(-) >> create mode 100644 openbios-devel/drivers/tcx.fs >> create mode 100644 openbios-devel/drivers/vga.fs >> create mode 100644 openbios-devel/include/libopenbios/video.h >> create mode 100644 openbios-devel/libopenbios/video_common.c >> >> -- >> 1.7.10.4 >> >> >> -- >> OpenBIOS http://openbios.org/ >> Mailinglist: http://lists.openbios.org/mailman/listinfo >> Free your System - May the Forth be with you

1 0

Re: [OpenBIOS] RFC: Rework of OpenBIOS terminal/console
by Mark Cave-Ayland 09 Mar '13

09 Mar '13

On 09/03/13 12:57, Blue Swirl wrote: > I did some work on the control sequence handling in 2007 and 2009 > based on what Debian 3.1 and NetBSD 4.0 expect of the OpenBIOS > console. Later versions of Debian and other distros use fbdev console > which is independent of this. > > Based on a quick comparison, both Forth and C versions implement a lot > of control characters. > > Only in Forth version (or real implementation instead of dummy): > BEL, VT, Esc-E, Esc-L, Esc-m, Esc-P, Esc-p, Esc-q, Esc-s > > Esc-K seems to be simpler in Forth than C version, which has three > separate modes. Similarly Esc-J handling does not seem to match. > > Only in C console: > CAN, SUB > > But I have no objection, I can retest Debian 3.1 and NetBSD 4.0 > afterwards and try to fix or reimplement if something is missing since > the differences seem to be minor. Great! I've done some testing here, and I do have a proof-of-concept patchset which works well. The problem is that in order to maintain bisectability for each feature, the vast majority of commits end up having to back-out certain parts of previous commits in order to maintain a working binary until the switch occurs. My plan is to break out the Forth terminal fixes into a separate patchset and commit them straight away, and then post a separate patch series that does the switch. Once this is in done, it should be possible to further tidy up the console/graphic initialisation by moving the low-level C console code from the various architectures into libopenbios/console_common.c to remove even more redundancy. ATB, Mark.

1 0

RFC: Rework of OpenBIOS terminal/console
by Mark Cave-Ayland 09 Mar '13

09 Mar '13

Hi all, Whilst looking at the possibility of supporting additional graphics cards in OpenBIOS, I noticed that there are actually two terminal consoles built in: a standards-compliant Forth one in forth/device/terminal.fs and a C-based one in libopenbios/console_common.c (which is the default). Some experimentation with the Forth console shows that with some minor fixes it can be made to work, and in fact produces better console output in many cases because the fb8-* and terminal words are implemented correctly. With this in mind, I'd like to propose switching over to the Forth console and removing the C console entirely. Would anyone have any major objections to doing this? ATB, Mark.

2 1

[commit] r1102 - trunk/openbios-devel/arch/ppc/qemu
by repository service 09 Mar '13

09 Mar '13

Author: agraf Date: Sat Mar 9 00:37:44 2013 New Revision: 1102 URL: http://tracker.coreboot.org/trac/openbios/changeset/1102 Log: PPC: Handle trap_error on ppc64 When running on ppc64, we have to disable MSR_SF before we issue a lis instruction. All exceptions were doing this, except for the error trap. This isn't crucial, because when we got there we're already screwed up, but let's not confuse users by jumping to invalid addresses. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Sun Mar 3 10:02:29 2013 (r1101) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Sat Mar 9 00:37:44 2013 (r1102) @@ -296,6 +296,14 @@ EXCEPTION_EPILOGUE trap_error: + lis r1, 0x8000 /* r1=0x80000000 */ + add. r1,r1,r1 /* r1=r1+r1 (high 32bit !0) */ + beq 1f + + mfmsr r1 /* unset MSR_SF */ + clrldi r1,r1,1 + mtmsrd r1 +1: mflr r3 LOAD_REG_FUNC(r4, unexpected_excep) mtctr r4

1 0