OpenBIOS March 2009

openbios@openbios.org

12 participants
29 discussions

r466 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 08 Mar '09

08 Mar '09

Author: laurent Date: 2009-03-08 02:06:56 +0100 (Sun, 08 Mar 2009) New Revision: 466 Modified: openbios-devel/arch/ppc/qemu/init.c Log: Author: Alexander Graf <alex(a)csgraf.de> Expose PCI controller information Linux tries to detect which PCI controller it's supposed to work with. On PPC32 there is fallback code that doesn't get compiled with CONFIG_PPC64, so we really have to expose a controller or we don't have pci config space accessor functions. Let's expose a un3-agp if we have a mac99 model, as that's what is supposed to be in there anyways. Signed-off-by: Alexander Graf <alex(a)csgraf.de> Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-03-08 01:03:17 UTC (rev 465) +++ openbios-devel/arch/ppc/qemu/init.c 2009-03-08 01:06:56 UTC (rev 466) @@ -566,6 +566,17 @@ push_str("system-id"); fword("property"); + /* pci info */ + + if (machine_id == ARCH_MAC99) { + push_str("/pci"); + fword("find-device"); + push_str("u3-agp"); + fword("encode-string"); + push_str("compatible"); + fword("property"); + } + /* memory info */ push_str("/memory");

1 0

r465 - in openbios-devel: arch/ppc/qemu drivers include/openbios
by svn＠openbios.org 08 Mar '09

08 Mar '09

Author: laurent Date: 2009-03-08 02:03:17 +0100 (Sun, 08 Mar 2009) New Revision: 465 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/drivers/macio.c openbios-devel/include/openbios/drivers.h Log: Author: Alexander Graf <alex(a)csgraf.de> Expose NVRAM compatibility Linux requires the NVRAM to expose a 'nvram,flash' compatibility in the device tree. Let's expose it so it's happy. v2 adds a NEWWORLD macro to protect nvram,flash getting exposed in oldworld macs. Signed-off-by: Alexander Graf <alex(a)csgraf.de> Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-03-08 00:54:06 UTC (rev 464) +++ openbios-devel/arch/ppc/qemu/init.c 2009-03-08 01:03:17 UTC (rev 465) @@ -75,6 +75,11 @@ return machine_id == ARCH_HEATHROW; } +int is_newworld(void) +{ + return machine_id == ARCH_MAC99; +} + static const pci_arch_t known_arch[] = { [ARCH_PREP] = { "PREP", PCI_VENDOR_ID_MOTOROLA, PCI_DEVICE_ID_MOTOROLA_RAVEN, Modified: openbios-devel/drivers/macio.c =================================================================== --- openbios-devel/drivers/macio.c 2009-03-08 00:54:06 UTC (rev 464) +++ openbios-devel/drivers/macio.c 2009-03-08 01:03:17 UTC (rev 465) @@ -71,6 +71,7 @@ props[1] = __cpu_to_be32(nvram_size); set_property(dnode, "reg", (char *)&props, sizeof(props)); set_property(dnode, "device_type", "nvram", 6); + NEWWORLD(set_property(dnode, "compatible", "nvram,flash", 12)); chosen = find_dev("/chosen"); push_str(buf); Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2009-03-08 00:54:06 UTC (rev 464) +++ openbios-devel/include/openbios/drivers.h 2009-03-08 01:03:17 UTC (rev 465) @@ -22,6 +22,7 @@ #ifdef CONFIG_PPC extern int is_apple(void); extern int is_oldworld(void); +extern int is_newworld(void); #else static inline int is_apple(void) { @@ -31,9 +32,14 @@ { return 0; } +static inline int is_newworld(void) +{ + return 0; +} #endif #define AAPL(_cmd) do { if (is_apple()) _cmd; } while(0) #define OLDWORLD(_cmd) do { if (is_oldworld()) _cmd; } while(0) +#define NEWWORLD(_cmd) do { if (is_newworld()) _cmd; } while(0) #endif #ifdef CONFIG_DRIVER_SBUS /* drivers/sbus.c */

1 0

r464 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 08 Mar '09

08 Mar '09

Author: laurent Date: 2009-03-08 01:54:06 +0100 (Sun, 08 Mar 2009) New Revision: 464 Modified: openbios-devel/arch/ppc/qemu/start.S Log: Author: Alexander Graf <alex(a)csgraf.de> PPC64: Switch to 32-bit mode in interrupts All the code in OpenBIOS runs in 32 bits, which is fine. Now, when an interrupt arrives, the 970 CPU automatically sets the MSR_SF bit, making us run in 64 bit mode. That breaks address calculation, because 'lis' and 'ba' get sign extended. In order to circumvent that mess, let's just go back to 32 bit mode whenever we get an interrupt. Signed-off-by: Alexander Graf <alex(a)csgraf.de> Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: openbios-devel/arch/ppc/qemu/start.S =================================================================== --- openbios-devel/arch/ppc/qemu/start.S 2009-03-01 20:07:47 UTC (rev 463) +++ openbios-devel/arch/ppc/qemu/start.S 2009-03-08 00:54:06 UTC (rev 464) @@ -34,6 +34,9 @@ #define EXCEPTION_PREAMBLE_TEMPLATE \ mtsprg1 r1 ; /* scratch */ \ + mfmsr r1 ; /* unset MSR_SF */ \ + clrlwi r1,r1,0 ; \ + mtmsr r1 ; \ mfsprg0 r1 ; /* exception stack in sprg0 */ \ .ifc ULONG_SIZE, 8 ; \ addi r1,r1,-(40 * ULONG_SIZE) ; /* push exception frame */ \

1 0

[PATCH] PPC64: Switch to 32-bit mode in interrupts
by Alexander Graf 06 Mar '09

06 Mar '09

All the code in OpenBIOS runs in 32 bits, which is fine. Now, when an interrupt arrives, the 970 CPU automatically sets the MSR_SF bit, making us run in 64 bit mode. That breaks address calculation, because 'lis' and 'ba' get sign extended. In order to circumvent that mess, let's just go back to 32 bit mode whenever we get an interrupt. Signed-off-by: Alexander Graf <alex(a)csgraf.de> --- arch/ppc/qemu/start.S | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/ppc/qemu/start.S b/arch/ppc/qemu/start.S index 857885a..66df9a2 100644 --- a/arch/ppc/qemu/start.S +++ b/arch/ppc/qemu/start.S @@ -34,6 +34,9 @@ #define EXCEPTION_PREAMBLE_TEMPLATE \ mtsprg1 r1 ; /* scratch */ \ + mfmsr r1 ; /* unset MSR_SF */ \ + clrlwi r1,r1,0 ; \ + mtmsr r1 ; \ mfsprg0 r1 ; /* exception stack in sprg0 */ \ .ifc ULONG_SIZE, 8 ; \ addi r1,r1,-(40 * ULONG_SIZE) ; /* push exception frame */ \ -- 1.6.0.2

3 4

[PATCH] Expose NVRAM compatibility v2
by Alexander Graf 06 Mar '09

06 Mar '09

Linux requires the NVRAM to expose a 'nvram,flash' compatibility in the device tree. Let's expose it so it's happy. v2 adds a NEWWORLD macro to protect nvram,flash getting exposed in oldworld macs. Signed-off-by: Alexander Graf <alex(a)csgraf.de> --- arch/ppc/qemu/init.c | 5 +++++ drivers/macio.c | 1 + include/openbios/drivers.h | 6 ++++++ 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 9b7bdab..c81f0be 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -75,6 +75,11 @@ int is_oldworld(void) return machine_id == ARCH_HEATHROW; } +int is_newworld(void) +{ + return machine_id == ARCH_MAC99; +} + static const pci_arch_t known_arch[] = { [ARCH_PREP] = { "PREP", PCI_VENDOR_ID_MOTOROLA, PCI_DEVICE_ID_MOTOROLA_RAVEN, diff --git a/drivers/macio.c b/drivers/macio.c index e150a18..d6b2a33 100644 --- a/drivers/macio.c +++ b/drivers/macio.c @@ -71,6 +71,7 @@ void macio_nvram_init(const char *path, uint32_t addr) props[1] = __cpu_to_be32(nvram_size); set_property(dnode, "reg", (char *)&props, sizeof(props)); set_property(dnode, "device_type", "nvram", 6); + NEWWORLD(set_property(dnode, "compatible", "nvram,flash", 12)); chosen = find_dev("/chosen"); push_str(buf); diff --git a/include/openbios/drivers.h b/include/openbios/drivers.h index 459c5a1..30f11a6 100644 --- a/include/openbios/drivers.h +++ b/include/openbios/drivers.h @@ -22,6 +22,7 @@ int ob_pci_init(void); #ifdef CONFIG_PPC extern int is_apple(void); extern int is_oldworld(void); +extern int is_newworld(void); #else static inline int is_apple(void) { @@ -31,9 +32,14 @@ static inline int is_oldworld(void) { return 0; } +static inline int is_newworld(void) +{ + return 0; +} #endif #define AAPL(_cmd) do { if (is_apple()) _cmd; } while(0) #define OLDWORLD(_cmd) do { if (is_oldworld()) _cmd; } while(0) +#define NEWWORLD(_cmd) do { if (is_newworld()) _cmd; } while(0) #endif #ifdef CONFIG_DRIVER_SBUS /* drivers/sbus.c */ -- 1.6.0.2

1 0

Incorrect implementation of b?branch?
by Mark Cave-Ayland 02 Mar '09

02 Mar '09

Hi everyone, I've been spending some time over the past few weeks trying to get a Sparc64/Solaris disk image to boot under qemu, and as far as I can tell, the first reason that the code terminates incorrectly is because b?branch doesn't work. This can be demonstrated fairly easily using the following couple of Fcode programs. Note that while I'm working on Sparc64, I see the same issue on x86 OpenBIOS too. Example 1: b?branch with -1 on stack: ignore branch & abort CC \ offset16 10 \ b(lit) FF FF FF FF \ (-1) 14 00 04 \ b?branch 02 16 \ if false, abort 9D \ if true, display stack 00 \ end 0 > true to ?fcode-verbose ok 0 > here CC10FFFFFFFF1400 /n allot over ! ok 1 > here 0402169D00000000 /n allot over ! drop ok 1 > 1 byte-load byte-load: evaluating fcode at 0xffd9d128 fcode-table at 0xffdb7f90 offset16 [ 0xcc ] b(lit) [ 0x10 ] b?branch [ 0x14 ] abort [ 0x216 ] byte-load: exception caught! ok Example 2: b?branch with 0 on stack: skip abort, display stack CC \ offset16 10 \ b(lit) 00 00 00 00 \ (0) 14 00 04 \ b?branch 02 16 \ if false, abort 9D \ if true, display stack 00 \ end 0 > true to ?fcode-verbose ok 0 > here CC10000000001400 /n allot over ! ok 1 > here 0402169D00000000 /n allot over ! drop ok 1 > 1 byte-load byte-load: evaluating fcode at 0xffd9d128 fcode-table at 0xffdb7f90 offset16 [ 0xcc ] b(lit) [ 0x10 ] b?branch [ 0x14 ] abort [ 0x216 ] byte-load: exception caught! ok Okay, so did anyone notice the difference?! This led me to look into the definition of b?branch in forth/device/fcode.fs: \ b?branch ( continue? -- ) \ Conditional branch FCode. Followed by FCode-offset. : b?branch ['] do?branch , fcode-offset 0< if \ if we jump backwards, we can forsee where it goes resolve-dest else here 0 , then ; immediate By adding some extra debugging into b?branch, I can see that for the above Fcode, do?branch is *never* called, although it correct takes the "else" branch listed above. I'm still reasonably new to Forth, but AIUI, all the code above does is allocate one cell to store the xt of do?branch, and in the case of a forward branch, push the here location onto the stack and then store 0 into another allocated cell. This agrees with my investigation that shows that do?branch is never actually called. Given that this code is also missing a section that will read and discard Fcode-offset-2 bytes for a forward branch, I'm inclined to think that this code is just wrong. Can anyone else with any experience with this code comment upon this? ATB, Mark. -- Mark Cave-Ayland Sirius Corporation - The Open Source Experts http://www.siriusit.co.uk T: +44 870 608 0063

4 9

OpenBIOS 1.0 released
by Blue Swirl 01 Mar '09

01 Mar '09

OpenBIOS 1.0 has been released. After the previous release candidate (1.0RC1), there have been more than 300 commits with bug fixes and new features. OpenBIOS can be used to boot Linux and many other operating systems on Sparc32 and PowerPC systems emulated by QEMU. There is also experimental support for 64 bit Sparc64 and PowerPC64 systems. I'd like to thank Stefan Reinauer for steering and guidance, expert advise on all matters ranging from Forth magic to OpenBIOS internals and of course for the main development that we could build upon. Laurent Vivier deserves credit for bootstrapping the PowerPC port and other important work, especially on PCI. Thanks also to all those who contributed in form of patches (from SVN commits in alphabetic order): Stefan Assmann Paul Brook Mark Cave-Ayland Justin Chevrier Peter Creath Alexander Graf Mike Hommey Aurelien Jarno Igor Kovalenko as well as those mentioned in the Credits page: Patrick Mauritz Samuel Rydh Greg Watson David Paktor Chen-Chau Chu Tim Barrett Krishna Myneni but many others tested, reported bugs and provided helpful comments, thanks to you all. Please visit http://www.openfirmware.info/ for more information on OpenBIOS.

1 0

r463 - in openbios-devel: config/examples include
by svn＠openbios.org 01 Mar '09

01 Mar '09

Author: blueswirl Date: 2009-03-01 21:07:47 +0100 (Sun, 01 Mar 2009) New Revision: 463 Modified: openbios-devel/config/examples/amd64_rules.xml openbios-devel/config/examples/cross-ppc_rules.xml openbios-devel/config/examples/cross-sparc32_rules.xml openbios-devel/config/examples/cross-sparc64_rules.xml openbios-devel/config/examples/cross-x86_rules.xml openbios-devel/config/examples/ppc_rules.xml openbios-devel/config/examples/sparc32_rules.xml openbios-devel/config/examples/sparc64_rules.xml openbios-devel/config/examples/x86_rules.xml openbios-devel/include/mconfig.h Log: Version 1.0 Modified: openbios-devel/config/examples/amd64_rules.xml =================================================================== --- openbios-devel/config/examples/amd64_rules.xml 2009-02-28 18:38:55 UTC (rev 462) +++ openbios-devel/config/examples/amd64_rules.xml 2009-03-01 20:07:47 UTC (rev 463) @@ -37,7 +37,7 @@ all: versions dictionaries host-libraries target-libraries host-executables target-executables -VERSION := "1.0RC1" +VERSION := "1.0" versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs Modified: openbios-devel/config/examples/cross-ppc_rules.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_rules.xml 2009-02-28 18:38:55 UTC (rev 462) +++ openbios-devel/config/examples/cross-ppc_rules.xml 2009-03-01 20:07:47 UTC (rev 463) @@ -42,7 +42,7 @@ all: mol versions dictionaries host-libraries target-libraries host-executables target-executables -VERSION := "1.0RC1" +VERSION := "1.0" versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs Modified: openbios-devel/config/examples/cross-sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_rules.xml 2009-02-28 18:38:55 UTC (rev 462) +++ openbios-devel/config/examples/cross-sparc32_rules.xml 2009-03-01 20:07:47 UTC (rev 463) @@ -38,7 +38,7 @@ all: versions dictionaries host-libraries target-libraries host-executables target-executables -VERSION := "1.0RC1" +VERSION := "1.0" versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs Modified: openbios-devel/config/examples/cross-sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_rules.xml 2009-02-28 18:38:55 UTC (rev 462) +++ openbios-devel/config/examples/cross-sparc64_rules.xml 2009-03-01 20:07:47 UTC (rev 463) @@ -39,7 +39,7 @@ all: versions dictionaries host-libraries target-libraries host-executables target-executables -VERSION := "1.0RC1" +VERSION := "1.0" versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs Modified: openbios-devel/config/examples/cross-x86_rules.xml =================================================================== --- openbios-devel/config/examples/cross-x86_rules.xml 2009-02-28 18:38:55 UTC (rev 462) +++ openbios-devel/config/examples/cross-x86_rules.xml 2009-03-01 20:07:47 UTC (rev 463) @@ -39,7 +39,7 @@ all: versions dictionaries host-libraries target-libraries host-executables target-executables -VERSION := "1.0RC1" +VERSION := "1.0" versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs Modified: openbios-devel/config/examples/ppc_rules.xml =================================================================== --- openbios-devel/config/examples/ppc_rules.xml 2009-02-28 18:38:55 UTC (rev 462) +++ openbios-devel/config/examples/ppc_rules.xml 2009-03-01 20:07:47 UTC (rev 463) @@ -41,7 +41,7 @@ all: mol versions dictionaries host-libraries target-libraries host-executables target-executables -VERSION := "1.0RC1" +VERSION := "1.0" versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs Modified: openbios-devel/config/examples/sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/sparc32_rules.xml 2009-02-28 18:38:55 UTC (rev 462) +++ openbios-devel/config/examples/sparc32_rules.xml 2009-03-01 20:07:47 UTC (rev 463) @@ -43,7 +43,7 @@ all: versions dictionaries host-libraries target-libraries host-executables target-executables -VERSION := "1.0RC1" +VERSION := "1.0" versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs Modified: openbios-devel/config/examples/sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/sparc64_rules.xml 2009-02-28 18:38:55 UTC (rev 462) +++ openbios-devel/config/examples/sparc64_rules.xml 2009-03-01 20:07:47 UTC (rev 463) @@ -44,7 +44,7 @@ all: versions dictionaries host-libraries target-libraries host-executables target-executables -VERSION := "1.0RC1" +VERSION := "1.0" versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs Modified: openbios-devel/config/examples/x86_rules.xml =================================================================== --- openbios-devel/config/examples/x86_rules.xml 2009-02-28 18:38:55 UTC (rev 462) +++ openbios-devel/config/examples/x86_rules.xml 2009-03-01 20:07:47 UTC (rev 463) @@ -41,7 +41,7 @@ all: versions dictionaries host-libraries target-libraries host-executables target-executables -VERSION := "1.0RC1" +VERSION := "1.0" versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs Modified: openbios-devel/include/mconfig.h =================================================================== --- openbios-devel/include/mconfig.h 2009-02-28 18:38:55 UTC (rev 462) +++ openbios-devel/include/mconfig.h 2009-03-01 20:07:47 UTC (rev 463) @@ -66,7 +66,7 @@ #define STDC_HEADERS 1 /* Version */ -#define VERSION "1.0.RC1" +#define VERSION "1.0" /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */

1 0

OpenBIOS release
by Blue Swirl 01 Mar '09

01 Mar '09

Hi, I think we are pretty much ready for the 1.0 release of OpenBIOS. I'll bump the version number, update the web pages and upload the image files also to Qemu within a few hours, unless there are objections.

3 4