- OpenBIOS - mail.coreboot.org

r549 - trunk/openbios-devel/fs
by svn＠openbios.org 11 Aug '09

11 Aug '09

Author: laurent Date: 2009-08-11 22:31:50 +0200 (Tue, 11 Aug 2009) New Revision: 549 Modified: trunk/openbios-devel/fs/hfs_mdb.h Log: Author: Pavel Roskin <proski(a)gnu.org> Rewrite hfs_get_ushort() and hfs_get_uint() as inline functions so that their arguments are checked. Use __be16_to_cpu and __be32_to_cpu to byte-swap the result as needed. Modified: trunk/openbios-devel/fs/hfs_mdb.h =================================================================== --- trunk/openbios-devel/fs/hfs_mdb.h 2009-08-11 20:27:17 UTC (rev 548) +++ trunk/openbios-devel/fs/hfs_mdb.h 2009-08-11 20:31:50 UTC (rev 549) @@ -15,13 +15,22 @@ #ifndef _H_HFS_MDB #define _H_HFS_MDB +#include "libc/byteorder.h" + typedef unsigned char hfs_char_t; typedef unsigned char hfs_ushort_t[2]; typedef unsigned char hfs_uint_t[4]; -#define hfs_get_ushort(addr) (*((unsigned short*)(addr))) -#define hfs_get_uint(addr) (*((unsigned int*)(addr))) +static inline unsigned short hfs_get_ushort(hfs_ushort_t addr) +{ + return __be16_to_cpu(*((unsigned short *)(addr))); +} +static inline unsigned int hfs_get_uint(hfs_uint_t addr) +{ + return __be32_to_cpu(*((unsigned int *)(addr))); +} + /* * The HFS Master Directory Block (MDB). *

1 0

r548 - trunk/openbios-devel/config/scripts
by svn＠openbios.org 11 Aug '09

11 Aug '09

Author: laurent Date: 2009-08-11 22:27:17 +0200 (Tue, 11 Aug 2009) New Revision: 548 Modified: trunk/openbios-devel/config/scripts/switch-arch Log: Author: Pavel Roskin <proski(a)gnu.org> Check that the script is run from the top-level directory. Check that the config file is available for every specified architecture. Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-08-11 20:23:43 UTC (rev 547) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-08-11 20:27:17 UTC (rev 548) @@ -84,6 +84,11 @@ -e "s/Power Macintosh/ppc/"` } +if ! test -f utils/dist/debian/rules; then + echo "switch-arch must be run from the top-level source directory" >&2 + exit 1 +fi + # This is needed because viewvc messes with the permissions of executables: chmod 755 utils/dist/debian/rules chmod 755 config/scripts/switch-arch @@ -97,6 +102,11 @@ echo "Configuring OpenBIOS on $HOSTARCH for $*" for RULES_ARCH in $*; do + if ! test -f config/examples/${RULES_ARCH}_config.xml; then + echo "Cannot find config/examples/${RULES_ARCH}_config.xml" >&2 + exit 1 + fi + ARCH=`echo $RULES_ARCH | sed s/cross-//g` case $ARCH in amd64)

1 0

r547 - trunk/openbios-devel/config/examples
by svn＠openbios.org 11 Aug '09

11 Aug '09

Author: laurent Date: 2009-08-11 22:23:43 +0200 (Tue, 11 Aug 2009) New Revision: 547 Modified: trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/config/examples/sparc64_config.xml Log: Author: Pavel Roskin <proski(a)gnu.org> CONFIG_OFMEM and CONFIG_OFMEM_MALLOC_ALIGN are defined in cross-ppc_config.xml, but not in ppc_config.xml, so copy them. Likewise, copy those setting from cross-sparc64_config.xml to sparc64_config.xml. Modified: trunk/openbios-devel/config/examples/ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml 2009-08-10 20:18:27 UTC (rev 546) +++ trunk/openbios-devel/config/examples/ppc_config.xml 2009-08-11 20:23:43 UTC (rev 547) @@ -35,6 +35,8 @@ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + <option name="CONFIG_OFMEM" type="boolean" value="true"/> + <option name="CONFIG_OFMEM_MALLOC_ALIGN" type="integer" value="4"/> <option name="CONFIG_VGA_WIDTH" type="integer" value="800"/> <option name="CONFIG_VGA_HEIGHT" type="integer" value="600"/> <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/> Modified: trunk/openbios-devel/config/examples/sparc64_config.xml =================================================================== --- trunk/openbios-devel/config/examples/sparc64_config.xml 2009-08-10 20:18:27 UTC (rev 546) +++ trunk/openbios-devel/config/examples/sparc64_config.xml 2009-08-11 20:23:43 UTC (rev 547) @@ -39,6 +39,8 @@ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + <option name="CONFIG_OFMEM" type="boolean" value="true"/> + <option name="CONFIG_OFMEM_MALLOC_ALIGN" type="integer" value="8"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/>

1 0

Re: [OpenBIOS] [PATCH 1/4] Disable strict aliasing for all targets
by Laurent Vivier 11 Aug '09

11 Aug '09

> >--- > Makefile.target | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > >diff --git a/Makefile.target b/Makefile.target >index f94f450..bf83b5b 100644 >--- a/Makefile.target >+++ b/Makefile.target >@@ -25,6 +25,7 @@ STRIP := $(TARGET)strip > RANLIB := $(TARGET)ranlib > > CFLAGS+= -Os -g -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS >+CFLAGS+= -fno-strict-aliasing ... Why is this needed ? Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

2 1

Re: [OpenBIOS] [RFC] Make BootX from Mac OS X 10.4 work
by Laurent Vivier 10 Aug '09

10 Aug '09

> >On 10.08.2009, at 00:51, Laurent Vivier wrote: > >> Le jeudi 30 juillet 2009 à 18:00 +0200, Alexander Graf a écrit : >>> Using this patch stacked on Steven Noonan's I was able to make >>> BootX from >>> Mac OS X 10.4 load XNU successfully in qemu-system-ppc. >> >> Hi, >> >> I'd like to play with that. >> >> Which patches to apply before ? > >I took those rebased on current git: > >http://github.com/tycho/openbios/tree/macosx-boot > >> How to boot ? > >The normal way. Just use -boot d. So far only the 10.4 CD did boot IIRC. > OK, thank you. I'll try to integrate some of these patches (the trivial ones) into the openbios main repository. (but I really don't understand why commit 4722c8a01d186a08183de49759dc8b7b74cf41c9 is needed, if someone can explain...). Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

3 2

r546 - trunk/openbios-devel/modules
by svn＠openbios.org 10 Aug '09

10 Aug '09

Author: laurent Date: 2009-08-10 22:18:27 +0200 (Mon, 10 Aug 2009) New Revision: 546 Modified: trunk/openbios-devel/modules/disk-label.c Log: This patch modifies disk-label.c to not allow to read beyond the selected partition limits. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/disk-label.c =================================================================== --- trunk/openbios-devel/modules/disk-label.c 2009-08-10 19:57:43 UTC (rev 545) +++ trunk/openbios-devel/modules/disk-label.c 2009-08-10 20:18:27 UTC (rev 546) @@ -99,8 +99,8 @@ if( ph ) { di->offs_hi = 0; di->offs_lo = 0; - di->size_hi = -1; - di->size_lo = -1; + di->size_hi = 0; + di->size_lo = 0; di->part_ih = 0; di->type = -1; di->block_size = 512; @@ -174,7 +174,14 @@ { int ret, len = POP(); char *buf = (char*)POP(); + llong pos = tell( di->fd ); + ducell offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; + ducell size = ((ducell)di->size_hi << BITS) | di->size_lo; + if (size && len > pos - offs + size) { + len = size - (pos - offs); + } + ret = read_io( di->fd, buf, len ); PUSH( ret ); } @@ -188,6 +195,7 @@ ducell offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; ducell size = ((ducell)di->size_hi << BITS) | di->size_lo; + DPRINTF("dlabel_seek %llx [%llx, %llx]\n", pos, offs, size); if( pos != -1 ) pos += offs; else if( size ) { @@ -196,8 +204,12 @@ } else { /* let parent handle the EOF seek. */ } + DPRINTF("dlabel_seek: 0x%llx\n", pos ); + if (size && (pos - offs >= size )) { + PUSH(-1); + return; + } - DPRINTF("dlabel_seek: %x %08x\n", (int)(pos>>32), (int)pos ); ret = seek_io( di->fd, pos ); PUSH( ret ); }

1 0

r545 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 10 Aug '09

10 Aug '09

Author: laurent Date: 2009-08-10 21:57:43 +0200 (Mon, 10 Aug 2009) New Revision: 545 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c Log: There are numerous places where using 'ELF_DPRINTF' does not make sense, because the loader does not use ELF binaries or is not directly involved in loading them. Created a generic SUBSYS_PRINTF macro, as well as loader-specific ELF_DPRINTF, CHRP_DPRINTF, and YABOOT_DPRINTF macros. Signed-off-by: Steven Noonan <steven(a)uplinklabs.net> Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-10 19:50:04 UTC (rev 544) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-10 19:57:43 UTC (rev 545) @@ -25,14 +25,18 @@ #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" -//#define DEBUG_ELF +//#define DEBUG_QEMU -#ifdef DEBUG_ELF -#define ELF_DPRINTF(fmt, args...) \ -do { printk("ELF - %s: " fmt, __func__ , ##args); } while (0) +#ifdef DEBUG_QEMU +#define SUBSYS_DPRINTF(subsys, fmt, args...) \ + do { printk("%s - %s: " fmt, subsys, __func__ , ##args); } while (0) #else -#define ELF_DPRINTF(fmt, args...) do { } while (0) +#define SUBSYS_DPRINTF(subsys, fmt, args...) \ + do { } while (0) #endif +#define CHRP_DPRINTF(fmt, args...) SUBSYS_DPRINTF("CHRP", fmt, ##args) +#define ELF_DPRINTF(fmt, args...) SUBSYS_DPRINTF("ELF", fmt, ##args) +#define YABOOT_DPRINTF(fmt, args...) SUBSYS_DPRINTF("YABOOT", fmt, ##args) static void transfer_control_to_elf( ulong elf_entry ) @@ -239,7 +243,7 @@ snprintf(bootscript, sizeof(bootscript), "%s:%d,%s", device, partition, script_path); - ELF_DPRINTF("Trying %s\n", bootscript); + CHRP_DPRINTF("Trying %s\n", bootscript); if ((fd = open_io(bootscript)) == -1) { ELF_DPRINTF("Can't open %s\n", bootscript); return; @@ -308,7 +312,7 @@ } } while (1); - ELF_DPRINTF("got bootscript %s\n", bootscript); + CHRP_DPRINTF("got bootscript %s\n", bootscript); encode_bootpath(of_path, param); @@ -399,7 +403,7 @@ } if (!path) { - ELF_DPRINTF("Entering boot, no path\n"); + YABOOT_DPRINTF("Entering boot, no path\n"); push_str("boot-device"); push_str("/options"); fword("(find-dev)"); @@ -440,7 +444,7 @@ } } } else { - ELF_DPRINTF("Entering boot, path %s\n", path); + YABOOT_DPRINTF("Entering boot, path %s\n", path); try_path(path, param); for( i=0; i < sizeof(chrp_paths) / sizeof(chrp_paths[0]); i++ ) { try_chrp_script(path, param, chrp_paths[i]);

1 0

r544 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 10 Aug '09

10 Aug '09

Author: laurent Date: 2009-08-10 21:50:04 +0200 (Mon, 10 Aug 2009) New Revision: 544 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c Log: try_chrp_script() now accepts a third parameter which indicates the script to be loaded and parsed. It will also terminate parsing on the '</chrp-boot>' tag, which makes locating embedded data after the script easier. Signed-off-by: Steven Noonan <steven(a)uplinklabs.net> (laurent: remove XCOFF placeholder) Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-08 22:42:52 UTC (rev 543) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-10 19:50:04 UTC (rev 544) @@ -223,21 +223,21 @@ http://playground.sun.com/1275/bindings/chrp/chrp1_7a.ps */ static void -try_bootinfo(const char *path, const char *param) +try_chrp_script(const char *of_path, const char *param, const char *script_path) { int fd, len, tag, taglen, script, scriptlen, entity; char tagbuf[256], bootscript[256], c; char *device, *filename, *directory; int partition; - device = get_device(path); - partition = get_partition(path); - filename = get_filename(path, &directory); + device = get_device(of_path); + partition = get_partition(of_path); + filename = get_filename(of_path, &directory); /* read boot script */ - snprintf(bootscript, sizeof(bootscript), "%s:%d,ppc\\bootinfo.txt", - device, partition); + snprintf(bootscript, sizeof(bootscript), "%s:%d,%s", + device, partition, script_path); ELF_DPRINTF("Trying %s\n", bootscript); if ((fd = open_io(bootscript)) == -1) { @@ -267,10 +267,10 @@ tagbuf[taglen] = '\0'; if (strcasecmp(tagbuf, "boot-script") == 0) script = 1; - else if (strcasecmp(tagbuf, "/boot-script") == 0) { + else if (strcasecmp(tagbuf, "/boot-script") == 0) bootscript[scriptlen] = '\0'; - break; - } + else if (strcasecmp(tagbuf, "/chrp-boot") == 0) + break; } else if (tag && taglen < sizeof(tagbuf)) { tagbuf[taglen++] = c; } else if (script && c == '&') { @@ -292,8 +292,8 @@ strcpy(bootscript + scriptlen, filename); scriptlen += strlen(filename); } else if (strcasecmp(tagbuf, "full-path") == 0) { - strcpy(bootscript + scriptlen, path); - scriptlen += strlen(path); + strcpy(bootscript + scriptlen, of_path); + scriptlen += strlen(of_path); } else { /* unknown, keep it */ bootscript[scriptlen] = '&'; strcpy(bootscript + scriptlen + 1, tagbuf); @@ -310,7 +310,7 @@ ELF_DPRINTF("got bootscript %s\n", bootscript); - encode_bootpath(path, param); + encode_bootpath(of_path, param); feval(bootscript); badf: @@ -386,7 +386,8 @@ static void yaboot_startup( void ) { - static const char * const paths[] = { "hd:2,\\ofclient", "hd:2,\\yaboot" }; + static const char * const chrp_paths[] = { "ppc\\bootinfo.txt", "System\\Library\\CoreServices\\BootX" }; + static const char * const elf_paths[] = { "hd:2,\\ofclient", "hd:2,\\yaboot" }; static const char * const args[] = { "", "conf=hd:2,\\yaboot.conf" }; char *path = pop_fstr_copy(), *param; int i; @@ -420,7 +421,9 @@ param = pop_fstr_copy(); } try_path(path, param); - try_bootinfo(path, param); + for( i=0; i < sizeof(chrp_paths) / sizeof(chrp_paths[0]); i++ ) { + try_chrp_script(path, param, chrp_paths[i]); + } } else { uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); switch (boot_device) { @@ -432,15 +435,19 @@ path = strdup("cd:0"); break; } - try_bootinfo(path, NULL); + for( i=0; i < sizeof(chrp_paths) / sizeof(chrp_paths[0]); i++ ) { + try_chrp_script(path, param, chrp_paths[i]); + } } } else { ELF_DPRINTF("Entering boot, path %s\n", path); try_path(path, param); - try_bootinfo(path, param); + for( i=0; i < sizeof(chrp_paths) / sizeof(chrp_paths[0]); i++ ) { + try_chrp_script(path, param, chrp_paths[i]); + } } - for( i=0; i < sizeof(paths) / sizeof(paths[0]); i++ ) { - try_path(paths[i], args[i]); + for( i=0; i < sizeof(elf_paths) / sizeof(elf_paths[0]); i++ ) { + try_path(elf_paths[i], args[i]); } printk("*** Boot failure! No secondary bootloader specified ***\n"); }

1 0

Re: [OpenBIOS] [RFC] Make BootX from Mac OS X 10.4 work
by Laurent Vivier 10 Aug '09

10 Aug '09

> >On 10.08.2009, at 00:51, Laurent Vivier wrote: > >> Le jeudi 30 juillet 2009 à 18:00 +0200, Alexander Graf a écrit : >>> Using this patch stacked on Steven Noonan's I was able to make >>> BootX from >>> Mac OS X 10.4 load XNU successfully in qemu-system-ppc. >> >> Hi, >> >> I'd like to play with that. >> >> Which patches to apply before ? > >I took those rebased on current git: > >http://github.com/tycho/openbios/tree/macosx-boot > >> How to boot ? > >The normal way. Just use -boot d. So far only the 10.4 CD did boot IIRC. > >Alex > >> >> Regards, >> Laurent >> >>> Unfortunately, most of this patch is nothing but a mere hack to >>> find out >>> what we really need to get this working. >>> >>> Also I didn't manage to get anything but 10.4 running. Other >>> versions broke >>> in the partition table interpretation. >>> >>> I would not feel good taking the patch as is, because it would be >>> better to >>> implement the correct Forth magic to make the real callbacks work. >>> Here is >>> what I found to be broken: >>> >>> - unselect-dev is missing >>> - local variables don't work ({ ... }) >>> - I ran into an endless loop, getting isi and dsi faults on the >>> same 2 >>> addresses all the time >>> >>> Also, Qemu's only usable Desktop PPC target is a G3 Beige which is >>> only >>> supported up to 10.2.8 IIRC. So even getting the bootloader running >>> for >>> 10.4 didn't exactly buy me much. >>> >>> Don't apply the patch as is! >>> It'd be great to see someone build on this! >>> --- >>> arch/ppc/qemu/ofmem.c | 4 ++-- >>> modules/client.c | 40 ++++++++++++++++++++++++++++++++++++++++ >>> 2 files changed, 42 insertions(+), 2 deletions(-) >>> >>> diff --git a/arch/ppc/qemu/ofmem.c b/arch/ppc/qemu/ofmem.c >>> index a1a8fb1..32642e2 100644 >>> --- a/arch/ppc/qemu/ofmem.c >>> +++ b/arch/ppc/qemu/ofmem.c >>> @@ -716,8 +716,8 @@ hash_page_32( ulong ea, ulong phys, int mode ) >>> >>> /* out of slots, just evict one */ >>> if( !found ) { >>> - i = next_grab_slot + 1; >>> - next_grab_slot = (next_grab_slot + 1) % 8; >>> + i = next_grab_slot + 3; >>> + next_grab_slot = (next_grab_slot + 3) % 8; >>> } >>> i--; >>> upte[i*2] = cmp; >>> diff --git a/modules/client.c b/modules/client.c >>> index a2e8405..a8c89ff 100644 >>> --- a/modules/client.c >>> +++ b/modules/client.c >>> @@ -49,6 +49,46 @@ handle_calls( prom_args_t *pb ) >>> pb->nargs, pb->nret); >>> #endif >>> >>> +#if 1 >>> + if (!strcmp(pb->service, "interpret")) >>> + { >>> + char *ns; >>> + >>> + ns = strstr((char*)pb->args[0], "{ ; dpth }"); >>> + if (ns) return 0; >>> + >>> + ns = strstr((char*)pb->args[0], "dev /chosen "); >>> + if (ns) memcpy(ns, " \" /chosen\"", 11); >>> + } >>> + else if (!strcmp(pb->service, "call-method")) >>> + { >>> + if (!strncmp((char*)pb->args[0], "slw_init_keymap", 15)) { >>> + >>> + char *a = (char*)malloc(20); >>> + memset(a, 0x00, 20); >>> + pb->args[4] = (uint32_t)a; >>> + pb->args[3] = 0; >>> + >>> + return 0; >>> + } >>> + if (!strncmp((char*)pb->args[0], "slw_emit", >>> strlen("slw_emit"))) { >>> + PUSH( (char)pb->args[2] ); >>> + fword("emit"); >>> + >>> + return 0; >>> + } >>> + if (!strncmp((char*)pb->args[0], "slw_cr", strlen("slw_cr"))) { >>> + PUSH( '\n' ); >>> + fword("emit"); >>> + return 0; >>> + } >>> + if (!strncmp((char*)pb->args[0], "slw_update_keymap", >>> strlen("slw_update_keymap"))) return 0; >>> + if (!strncmp((char*)pb->args[0], "slw_set_output_level", >>> strlen("slw_set_output_level"))) return 0; >>> + if (!strncmp((char*)pb->args[0], "slw_spin_init", >>> strlen("slw_spin_init"))) return 0; >>> + if (!strncmp((char*)pb->args[0], "slw_spin", >>> strlen("slw_spin"))) return 0; >>> + } >>> +#endif >>> + >>> for( i=pb->nargs-1; i>=0; i-- ) >>> PUSH( pb->args[i] ); >>> >>> -- >>> 1.6.0.2 >>> >>> >> -- >> --------------------- laurent(a)vivier.eu ---------------------- >> "Tout ce qui est impossible reste à accomplir" Jules Verne >> "Things are only impossible until they're not" Jean-Luc Picard >> >> >> -- >> OpenBIOS http://openbios.org/ >> Mailinglist: http://lists.openbios.org/mailman/listinfo >> Free your System - May the Forth be with you > > >-- >OpenBIOS http://openbios.org/ >Mailinglist: http://lists.openbios.org/mailman/listinfo >Free your System - May the Forth be with you -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

1 0

[RFC] Make BootX from Mac OS X 10.4 work
by Alexander Graf 10 Aug '09

10 Aug '09

Using this patch stacked on Steven Noonan's I was able to make BootX from Mac OS X 10.4 load XNU successfully in qemu-system-ppc. Unfortunately, most of this patch is nothing but a mere hack to find out what we really need to get this working. Also I didn't manage to get anything but 10.4 running. Other versions broke in the partition table interpretation. I would not feel good taking the patch as is, because it would be better to implement the correct Forth magic to make the real callbacks work. Here is what I found to be broken: - unselect-dev is missing - local variables don't work ({ ... }) - I ran into an endless loop, getting isi and dsi faults on the same 2 addresses all the time Also, Qemu's only usable Desktop PPC target is a G3 Beige which is only supported up to 10.2.8 IIRC. So even getting the bootloader running for 10.4 didn't exactly buy me much. Don't apply the patch as is! It'd be great to see someone build on this! --- arch/ppc/qemu/ofmem.c | 4 ++-- modules/client.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/arch/ppc/qemu/ofmem.c b/arch/ppc/qemu/ofmem.c index a1a8fb1..32642e2 100644 --- a/arch/ppc/qemu/ofmem.c +++ b/arch/ppc/qemu/ofmem.c @@ -716,8 +716,8 @@ hash_page_32( ulong ea, ulong phys, int mode ) /* out of slots, just evict one */ if( !found ) { - i = next_grab_slot + 1; - next_grab_slot = (next_grab_slot + 1) % 8; + i = next_grab_slot + 3; + next_grab_slot = (next_grab_slot + 3) % 8; } i--; upte[i*2] = cmp; diff --git a/modules/client.c b/modules/client.c index a2e8405..a8c89ff 100644 --- a/modules/client.c +++ b/modules/client.c @@ -49,6 +49,46 @@ handle_calls( prom_args_t *pb ) pb->nargs, pb->nret); #endif +#if 1 + if (!strcmp(pb->service, "interpret")) + { + char *ns; + + ns = strstr((char*)pb->args[0], "{ ; dpth }"); + if (ns) return 0; + + ns = strstr((char*)pb->args[0], "dev /chosen "); + if (ns) memcpy(ns, " \" /chosen\"", 11); + } + else if (!strcmp(pb->service, "call-method")) + { + if (!strncmp((char*)pb->args[0], "slw_init_keymap", 15)) { + + char *a = (char*)malloc(20); + memset(a, 0x00, 20); + pb->args[4] = (uint32_t)a; + pb->args[3] = 0; + + return 0; + } + if (!strncmp((char*)pb->args[0], "slw_emit", strlen("slw_emit"))) { + PUSH( (char)pb->args[2] ); + fword("emit"); + + return 0; + } + if (!strncmp((char*)pb->args[0], "slw_cr", strlen("slw_cr"))) { + PUSH( '\n' ); + fword("emit"); + return 0; + } + if (!strncmp((char*)pb->args[0], "slw_update_keymap", strlen("slw_update_keymap"))) return 0; + if (!strncmp((char*)pb->args[0], "slw_set_output_level", strlen("slw_set_output_level"))) return 0; + if (!strncmp((char*)pb->args[0], "slw_spin_init", strlen("slw_spin_init"))) return 0; + if (!strncmp((char*)pb->args[0], "slw_spin", strlen("slw_spin"))) return 0; + } +#endif + for( i=pb->nargs-1; i>=0; i-- ) PUSH( pb->args[i] ); -- 1.6.0.2

4 8

r543 - trunk/openbios-devel/modules
by svn＠openbios.org 09 Aug '09

09 Aug '09

Author: laurent Date: 2009-08-09 00:42:52 +0200 (Sun, 09 Aug 2009) New Revision: 543 Modified: trunk/openbios-devel/modules/disk-label.c Log: Add DPRINTF() to disk-label.c Modified: trunk/openbios-devel/modules/disk-label.c =================================================================== --- trunk/openbios-devel/modules/disk-label.c 2009-08-08 22:00:10 UTC (rev 542) +++ trunk/openbios-devel/modules/disk-label.c 2009-08-08 22:42:52 UTC (rev 543) @@ -19,6 +19,15 @@ #include "libc/diskio.h" #include "modules.h" +//#define DEBUG_DISK_LABEL + +#ifdef DEBUG_DISK_LABEL +#define DPRINTF(fmt, args...) \ +do { printk("DISK-LABEL - %s: " fmt, __func__ , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) do { } while (0) +#endif + typedef struct { int fd; @@ -55,7 +64,7 @@ xt_t xt; parstr = my_args_copy(); - /* printk("dlabel-open '%s'\n", parstr ); */ + DPRINTF("dlabel-open '%s'\n", parstr ); if( (fd=open_ih(my_parent())) == -1 ) goto out; @@ -79,6 +88,7 @@ filename++; } } + DPRINTF("parstr %s filename %s\n", parstr, filename); /* try to see if there is a filesystem without partition */ @@ -181,13 +191,13 @@ if( pos != -1 ) pos += offs; else if( size ) { - /* printk("Seek EOF\n"); */ + DPRINTF("Seek EOF\n"); pos = offs + size; } else { /* let parent handle the EOF seek. */ } - /* printk("dlabel_seek: %x %08x\n", (int)(pos>>32), (int)pos ); */ + DPRINTF("dlabel_seek: %x %08x\n", (int)(pos>>32), (int)pos ); ret = seek_io( di->fd, pos ); PUSH( ret ); }

1 0

r542 - trunk/openbios-devel/modules
by svn＠openbios.org 09 Aug '09

09 Aug '09

Author: laurent Date: 2009-08-09 00:00:10 +0200 (Sun, 09 Aug 2009) New Revision: 542 Modified: trunk/openbios-devel/modules/mac-parts.c trunk/openbios-devel/modules/mac-parts.h Log: If the partition type is the mac partition type, this patch allows to not select the partition to boot from but to boot from the first bootable partition. "PowerPC Microprocessor Common Hardware Reference Platform (CHRP) System binding to: IEEE Std 1275-1994 Standard for Boot (Initialization, Configuration) Firmware Revision: 1.8" "Chapter 11.1.2. Open Method Algorith" "[...] If the partition component is present, it selects the desired partition, where partition 0 refers to the entire disk, partition 1 refers to the first partition, partition 2 to the second, and so forth. If the partition component is absent and the disk has an FDISK or Mac partition, the first "bootable" partition is used. [...]" Modified: trunk/openbios-devel/modules/mac-parts.c =================================================================== --- trunk/openbios-devel/modules/mac-parts.c 2009-08-08 21:56:26 UTC (rev 541) +++ trunk/openbios-devel/modules/mac-parts.c 2009-08-08 22:00:10 UTC (rev 542) @@ -45,23 +45,21 @@ char *str = my_args_copy(); xt_t seek_xt = find_parent_method("seek"); xt_t read_xt = find_parent_method("read"); - int bs, parnum=-1; + int bs, parnum=0; desc_map_t dmap; part_entry_t par; + int ret = 0; if( str ) { parnum = atol(str); - if( !strlen(str) ) - parnum = 1; - free( str ); + if( *str == 0 || *str == ',' ) + parnum = -1; } - if( parnum < 0 ) - parnum = 0; DPRINTF("macparts_open %d\n", parnum); SEEK( 0 ); if( READ(&dmap, sizeof(dmap)) != sizeof(dmap) ) - RET(0); + goto out; /* partition maps might support multiple block sizes; in this case, * pmPyPartStart is typically given in terms of 512 byte blocks. @@ -70,33 +68,75 @@ if( bs != 512 ) { SEEK( 512 ); READ( &par, sizeof(par) ); - if( par.pmSig == 0x504d /* 'PM' */ ) + if( par.pmSig == DESC_PART_SIGNATURE ) bs = 512; } + SEEK( bs ); + if( READ(&par, sizeof(par)) != sizeof(par) ) + goto out; + if (par.pmSig != DESC_PART_SIGNATURE) + goto out; + + if (parnum == -1) { + /* search a bootable partition */ + /* see PowerPC Microprocessor CHRP bindings */ + + parnum = 1; + while (parnum <= par.pmMapBlkCnt) { + SEEK( (bs * parnum) ); + READ( &par, sizeof(par) ); + if( par.pmSig != DESC_PART_SIGNATURE || + !par.pmPartBlkCnt ) + goto out; + + if( (par.pmPartStatus & kPartitionAUXIsBootValid) && + (par.pmPartStatus & kPartitionAUXIsValid) && + (par.pmPartStatus & kPartitionAUXIsAllocated) && + (par.pmPartStatus & kPartitionAUXIsReadable) && + (strcmp(par.pmProcessor, "PowerPC") == 0) ) { + di->blocksize =(uint)bs; + di->offs = (llong)par.pmPyPartStart * bs; + di->size = (llong)par.pmPartBlkCnt * bs; + ret = -1; + goto out; + } + + parnum++; + } + /* not found */ + ret = 0; + goto out; + } + if (parnum == 0) { di->blocksize =(uint)bs; di->offs = (llong)0; di->size = (llong)dmap.sbBlkCount * bs; - PUSH( -1 ); - return; + ret = -1; + goto out; } - SEEK( bs ); - if( READ(&par, sizeof(par)) != sizeof(par) ) - RET(0); - if( parnum > par.pmMapBlkCnt || par.pmSig != 0x504d /* 'PM' */ ) - RET(0); + if( parnum > par.pmMapBlkCnt) + goto out; + SEEK( (bs * parnum) ); READ( &par, sizeof(par) ); + if( par.pmSig != DESC_PART_SIGNATURE || !par.pmPartBlkCnt ) + goto out; + if( !(par.pmPartStatus & kPartitionAUXIsValid) || + !(par.pmPartStatus & kPartitionAUXIsAllocated) || + !(par.pmPartStatus & kPartitionAUXIsReadable) ) + goto out; - if( par.pmSig != 0x504d /* 'PM' */ || !par.pmPartBlkCnt ) - RET(0); - + ret = -1; di->blocksize =(uint)bs; di->offs = (llong)par.pmPyPartStart * bs; di->size = (llong)par.pmPartBlkCnt * bs; - PUSH( -1 ); +out: + if (str) + free(str); + PUSH( ret); } /* ( block0 -- flag? ) */ Modified: trunk/openbios-devel/modules/mac-parts.h =================================================================== --- trunk/openbios-devel/modules/mac-parts.h 2009-08-08 21:56:26 UTC (rev 541) +++ trunk/openbios-devel/modules/mac-parts.h 2009-08-08 22:00:10 UTC (rev 542) @@ -20,7 +20,23 @@ /* This information is based upon IM vol V. */ #define DESC_MAP_SIGNATURE 0x4552 +#define DESC_PART_SIGNATURE 0x504d +enum { + kPartitionAUXIsValid = 0x00000001, + kPartitionAUXIsAllocated = 0x00000002, + kPartitionAUXIsInUse = 0x00000004, + kPartitionAUXIsBootValid = 0x00000008, + kPartitionAUXIsReadable = 0x00000010, + kPartitionAUXIsWriteable = 0x00000020, + kPartitionAUXIsBootCodePositionIndependent = 0x00000040, + kPartitionISMountedAtStartup = 0x40000000, + kPartitionIsStartup = 0x80000000, + kPartitionIsChainCompatible = 0x00000100, + kPartitionIsRealDeviceDriver = 0x00000200, + kPartitionCanChainToNext = 0x00000400, +}; + typedef struct { long ddBlock; /* first block of driver */ short ddSize; /* driver size in blocks */

1 0

r541 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 08 Aug '09

08 Aug '09

Author: laurent Date: 2009-08-08 23:56:26 +0200 (Sat, 08 Aug 2009) New Revision: 541 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c Log: quik_startup() uses now encode_bootpath() instead of calling find_dev()/set_property(). Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-08 14:40:36 UTC (rev 540) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-08 21:56:26 UTC (rev 541) @@ -346,7 +346,6 @@ struct first_info fi; } fi; } u; - phandle_t ph; if ((fd = open_io(path)) == -1) { ELF_DPRINTF("Can't open %s\n", path); @@ -367,10 +366,7 @@ if (memcmp(u.fi.fi.quik_vers, "QUIK", 4)) return; - ph = find_dev("/options"); - set_property(ph, "boot-device", path, strlen(path) + 1); - ph = find_dev("/chosen"); - set_property(ph, "bootargs", "Linux", 6); + encode_bootpath(path, "Linux"); if( ofmem_claim( QUIK_FIRST_BASEADDR, len, 0 ) == -1 ) fatal_error("Claim failed!\n");

1 0

r540 - trunk/openbios-devel/config/scripts
by svn＠openbios.org 08 Aug '09

08 Aug '09

Author: blueswirl Date: 2009-08-08 16:40:36 +0200 (Sat, 08 Aug 2009) New Revision: 540 Modified: trunk/openbios-devel/config/scripts/switch-arch Log: Fix leakage of AS_FLAGS between targets Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-08-08 10:52:59 UTC (rev 539) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-08-08 14:40:36 UTC (rev 540) @@ -102,11 +102,13 @@ amd64) TARGET="x86_64-linux-gnu-" CFLAGS="-fno-builtin" + AS_FLAGS= ;; ppc) TARGET="powerpc-linux-gnu-" CFLAGS="-msoft-float -fno-builtin-bcopy -fno-builtin-log2" + AS_FLAGS= ;; sparc32)

1 0

r539 - in trunk/openbios-devel: config/examples drivers include/ppc include/sparc64
by svn＠openbios.org 08 Aug '09

08 Aug '09

Author: blueswirl Date: 2009-08-08 12:52:59 +0200 (Sat, 08 Aug 2009) New Revision: 539 Modified: trunk/openbios-devel/config/examples/cross-sparc64_config.xml trunk/openbios-devel/config/examples/sparc64_config.xml trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/include/ppc/io.h trunk/openbios-devel/include/sparc64/io.h Log: Sparc64: configure screen size from QEMU command line options Configure the screen size from QEMU command line options using FW_CFG interface, like r538 for PPC. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/config/examples/cross-sparc64_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-sparc64_config.xml 2009-08-04 21:08:37 UTC (rev 538) +++ trunk/openbios-devel/config/examples/cross-sparc64_config.xml 2009-08-08 10:52:59 UTC (rev 539) @@ -4,6 +4,7 @@  <option name="CONFIG_SPARC" type="boolean" value="true"/> <option name="CONFIG_SPARC64" type="boolean" value="true"/> + <option name="CONFIG_QEMU" type="boolean" value="true"/> <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/>  Modified: trunk/openbios-devel/config/examples/sparc64_config.xml =================================================================== --- trunk/openbios-devel/config/examples/sparc64_config.xml 2009-08-04 21:08:37 UTC (rev 538) +++ trunk/openbios-devel/config/examples/sparc64_config.xml 2009-08-08 10:52:59 UTC (rev 539) @@ -4,6 +4,7 @@  <option name="CONFIG_SPARC" type="boolean" value="true"/> <option name="CONFIG_SPARC64" type="boolean" value="true"/> + <option name="CONFIG_QEMU" type="boolean" value="true"/> <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/>  Modified: trunk/openbios-devel/drivers/vga_vbe.c =================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c 2009-08-04 21:08:37 UTC (rev 538) +++ trunk/openbios-devel/drivers/vga_vbe.c 2009-08-08 10:52:59 UTC (rev 539) @@ -131,11 +131,11 @@ int depth = VGA_DEFAULT_DEPTH; int linebytes = VGA_DEFAULT_LINEBYTES; -#if defined(CONFIG_QEMU) && defined(CONFIG_PPC) +#if defined(CONFIG_QEMU) && (defined(CONFIG_PPC) || defined(CONFIG_SPARC64)) int w, h, d; - w = fw_cfg_read_i16(FW_CFG_PPC_WIDTH); - h = fw_cfg_read_i16(FW_CFG_PPC_HEIGHT); - d = fw_cfg_read_i16(FW_CFG_PPC_DEPTH); + w = fw_cfg_read_i16(FW_CFG_ARCH_WIDTH); + h = fw_cfg_read_i16(FW_CFG_ARCH_HEIGHT); + d = fw_cfg_read_i16(FW_CFG_ARCH_DEPTH); if (w && h && d) { width = w; height = h; Modified: trunk/openbios-devel/include/ppc/io.h =================================================================== --- trunk/openbios-devel/include/ppc/io.h 2009-08-04 21:08:37 UTC (rev 538) +++ trunk/openbios-devel/include/ppc/io.h 2009-08-08 10:52:59 UTC (rev 539) @@ -165,9 +165,9 @@ #endif #if defined(CONFIG_QEMU) -#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00) -#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01) -#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02) +#define FW_CFG_ARCH_WIDTH (FW_CFG_ARCH_LOCAL + 0x00) +#define FW_CFG_ARCH_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01) +#define FW_CFG_ARCH_DEPTH (FW_CFG_ARCH_LOCAL + 0x02) #endif #endif /* _ASM_IO_H */ Modified: trunk/openbios-devel/include/sparc64/io.h =================================================================== --- trunk/openbios-devel/include/sparc64/io.h 2009-08-04 21:08:37 UTC (rev 538) +++ trunk/openbios-devel/include/sparc64/io.h 2009-08-08 10:52:59 UTC (rev 539) @@ -3,6 +3,9 @@ #include "asm/types.h" +#define NO_QEMU_PROTOS +#include "openbios/fw_cfg.h" + extern unsigned long va_shift; // Set in entry.S // Defined in ldscript extern char _start, _data, _stack, _estack, _end, _vmem, _evmem, _iomem; @@ -213,4 +216,11 @@ extern void outsw(u32 reg, const void *addr, unsigned long count); #endif #endif + +#if defined(CONFIG_QEMU) +#define FW_CFG_ARCH_WIDTH (FW_CFG_ARCH_LOCAL + 0x00) +#define FW_CFG_ARCH_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01) +#define FW_CFG_ARCH_DEPTH (FW_CFG_ARCH_LOCAL + 0x02) +#endif + #endif /* _ASM_IO_H */

1 0

r538 - in trunk/openbios-devel: drivers include/ppc
by svn＠openbios.org 04 Aug '09

04 Aug '09

Author: laurent Date: 2009-08-04 23:08:37 +0200 (Tue, 04 Aug 2009) New Revision: 538 Modified: trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/include/ppc/io.h Log: Allows to configure screen size from Qemu command line options using FW_CFG interface. Only enabled for PPC/QEMU and VGA/VBE. Modified: trunk/openbios-devel/drivers/vga_vbe.c =================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c 2009-08-04 21:04:32 UTC (rev 537) +++ trunk/openbios-devel/drivers/vga_vbe.c 2009-08-04 21:08:37 UTC (rev 538) @@ -126,16 +126,32 @@ { phandle_t ph, chosen, aliases, options; char buf[6]; + int width = VGA_DEFAULT_WIDTH; + int height = VGA_DEFAULT_HEIGHT; + int depth = VGA_DEFAULT_DEPTH; + int linebytes = VGA_DEFAULT_LINEBYTES; - vga_vbe_set_mode(VGA_DEFAULT_WIDTH, VGA_DEFAULT_HEIGHT, - VGA_DEFAULT_DEPTH); +#if defined(CONFIG_QEMU) && defined(CONFIG_PPC) + int w, h, d; + w = fw_cfg_read_i16(FW_CFG_PPC_WIDTH); + h = fw_cfg_read_i16(FW_CFG_PPC_HEIGHT); + d = fw_cfg_read_i16(FW_CFG_PPC_DEPTH); + if (w && h && d) { + width = w; + height = h; + depth = d; + linebytes = (width * ((depth + 7) / 8)); + } +#endif + vga_vbe_set_mode(width, height, depth); + ph = find_dev(path); - set_int_property(ph, "width", VGA_DEFAULT_WIDTH); - set_int_property(ph, "height", VGA_DEFAULT_HEIGHT); - set_int_property(ph, "depth", VGA_DEFAULT_DEPTH); - set_int_property(ph, "linebytes", VGA_DEFAULT_LINEBYTES); + set_int_property(ph, "width", width); + set_int_property(ph, "height", height); + set_int_property(ph, "depth", depth); + set_int_property(ph, "linebytes", linebytes); set_int_property(ph, "address", fb & ~0x0000000F); chosen = find_dev("/chosen"); @@ -147,9 +163,9 @@ set_property(aliases, "screen", path, strlen(path) + 1); options = find_dev("/options"); - snprintf(buf, sizeof(buf), "%d", VGA_DEFAULT_WIDTH / FONT_WIDTH); + snprintf(buf, sizeof(buf), "%d", width / FONT_WIDTH); set_property(options, "screen-#columns", buf, strlen(buf) + 1); - snprintf(buf, sizeof(buf), "%d", VGA_DEFAULT_HEIGHT / FONT_HEIGHT); + snprintf(buf, sizeof(buf), "%d", height / FONT_HEIGHT); set_property(options, "screen-#rows", buf, strlen(buf) + 1); if (rom_size >= 8) { @@ -164,6 +180,5 @@ } } - init_video(fb, VGA_DEFAULT_WIDTH, VGA_DEFAULT_HEIGHT, - VGA_DEFAULT_DEPTH, VGA_DEFAULT_LINEBYTES); + init_video(fb, width, height, depth, linebytes); } Modified: trunk/openbios-devel/include/ppc/io.h =================================================================== --- trunk/openbios-devel/include/ppc/io.h 2009-08-04 21:04:32 UTC (rev 537) +++ trunk/openbios-devel/include/ppc/io.h 2009-08-04 21:08:37 UTC (rev 538) @@ -3,6 +3,9 @@ #include "asm/types.h" +#define NO_QEMU_PROTOS +#include "openbios/fw_cfg.h" + extern unsigned long virt_offset; #define phys_to_virt(phys) ((void *) ((unsigned long) (phys) - virt_offset)) @@ -160,4 +163,11 @@ extern void outsw(u32 reg, const void *addr, unsigned long count); #endif #endif + +#if defined(CONFIG_QEMU) +#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00) +#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01) +#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02) +#endif + #endif /* _ASM_IO_H */

1 0

r537 - in trunk/openbios-devel: config/examples drivers
by svn＠openbios.org 04 Aug '09

04 Aug '09

Author: laurent Date: 2009-08-04 23:04:32 +0200 (Tue, 04 Aug 2009) New Revision: 537 Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/drivers/vga_vbe.c Log: Allows to configure screen size from the configuration files using CONFIG_VGA_WIDTH, CONFIG_VGA_HEIGHT, CONFIG_VGA_DEPTH. For the moment, only enabled for PPC/QEMU and VGA VBE interface. Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-08-04 20:37:36 UTC (rev 536) +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-08-04 21:04:32 UTC (rev 537) @@ -37,6 +37,9 @@ <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> <option name="CONFIG_OFMEM" type="boolean" value="true"/> <option name="CONFIG_OFMEM_MALLOC_ALIGN" type="integer" value="4"/> + <option name="CONFIG_VGA_WIDTH" type="integer" value="800"/> + <option name="CONFIG_VGA_HEIGHT" type="integer" value="600"/> + <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml 2009-08-04 20:37:36 UTC (rev 536) +++ trunk/openbios-devel/config/examples/ppc_config.xml 2009-08-04 21:04:32 UTC (rev 537) @@ -35,7 +35,11 @@ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + <option name="CONFIG_VGA_WIDTH" type="integer" value="800"/> + <option name="CONFIG_VGA_HEIGHT" type="integer" value="600"/> + <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/> +  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> Modified: trunk/openbios-devel/drivers/vga_vbe.c =================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c 2009-08-04 20:37:36 UTC (rev 536) +++ trunk/openbios-devel/drivers/vga_vbe.c 2009-08-04 21:04:32 UTC (rev 537) @@ -101,20 +101,41 @@ vga_build_rgb_palette(); } +#ifdef CONFIG_VGA_WIDTH +#define VGA_DEFAULT_WIDTH CONFIG_VGA_WIDTH +#else +#define VGA_DEFAULT_WIDTH 800 +#endif + +#ifdef CONFIG_VGA_HEIGHT +#define VGA_DEFAULT_HEIGHT CONFIG_VGA_HEIGHT +#else +#define VGA_DEFAULT_HEIGHT 600 +#endif + +#ifdef CONFIG_VGA_DEPTH +#define VGA_DEFAULT_DEPTH CONFIG_VGA_DEPTH +#else +#define VGA_DEFAULT_DEPTH 8 +#endif + +#define VGA_DEFAULT_LINEBYTES (VGA_DEFAULT_WIDTH*((VGA_DEFAULT_DEPTH+7)/8)) + void vga_vbe_init(const char *path, unsigned long fb, uint32_t fb_size, unsigned long rom, uint32_t rom_size) { phandle_t ph, chosen, aliases, options; char buf[6]; - vga_vbe_set_mode(800, 600, 8); + vga_vbe_set_mode(VGA_DEFAULT_WIDTH, VGA_DEFAULT_HEIGHT, + VGA_DEFAULT_DEPTH); ph = find_dev(path); - set_int_property(ph, "width", 800); - set_int_property(ph, "height", 600); - set_int_property(ph, "depth", 8); - set_int_property(ph, "linebytes", 800); + set_int_property(ph, "width", VGA_DEFAULT_WIDTH); + set_int_property(ph, "height", VGA_DEFAULT_HEIGHT); + set_int_property(ph, "depth", VGA_DEFAULT_DEPTH); + set_int_property(ph, "linebytes", VGA_DEFAULT_LINEBYTES); set_int_property(ph, "address", fb & ~0x0000000F); chosen = find_dev("/chosen"); @@ -126,9 +147,9 @@ set_property(aliases, "screen", path, strlen(path) + 1); options = find_dev("/options"); - snprintf(buf, sizeof(buf), "%d", 800 / FONT_WIDTH); + snprintf(buf, sizeof(buf), "%d", VGA_DEFAULT_WIDTH / FONT_WIDTH); set_property(options, "screen-#columns", buf, strlen(buf) + 1); - snprintf(buf, sizeof(buf), "%d", 600 / FONT_HEIGHT); + snprintf(buf, sizeof(buf), "%d", VGA_DEFAULT_HEIGHT / FONT_HEIGHT); set_property(options, "screen-#rows", buf, strlen(buf) + 1); if (rom_size >= 8) { @@ -143,5 +164,6 @@ } } - init_video(fb, 800, 600, 8, 800); + init_video(fb, VGA_DEFAULT_WIDTH, VGA_DEFAULT_HEIGHT, + VGA_DEFAULT_DEPTH, VGA_DEFAULT_LINEBYTES); }

1 0

r536 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 04 Aug '09

04 Aug '09

Author: blueswirl Date: 2009-08-04 22:37:36 +0200 (Tue, 04 Aug 2009) New Revision: 536 Modified: trunk/openbios-devel/arch/sparc64/boot.h trunk/openbios-devel/arch/sparc64/sys_info.c Log: Fix most Sparc64 warnings from Sparse Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/boot.h =================================================================== --- trunk/openbios-devel/arch/sparc64/boot.h 2009-08-04 20:37:34 UTC (rev 535) +++ trunk/openbios-devel/arch/sparc64/boot.h 2009-08-04 20:37:36 UTC (rev 536) @@ -36,7 +36,7 @@ void boot(void); // sys_info.c -extern unsigned int qemu_mem_size; +extern uint64_t qemu_mem_size; // console.c void ob_su_init(uint64_t base, uint64_t offset, int intr); Modified: trunk/openbios-devel/arch/sparc64/sys_info.c =================================================================== --- trunk/openbios-devel/arch/sparc64/sys_info.c 2009-08-04 20:37:34 UTC (rev 535) +++ trunk/openbios-devel/arch/sparc64/sys_info.c 2009-08-04 20:37:36 UTC (rev 536) @@ -3,6 +3,7 @@ #include "elf_boot.h" #include "sys_info.h" #include "context.h" +#include "boot.h" #define printf printk #ifdef CONFIG_DEBUG_BOOT

1 0

r535 - in trunk/openbios-devel: arch/unix libgcc
by svn＠openbios.org 04 Aug '09

04 Aug '09

Author: blueswirl Date: 2009-08-04 22:37:34 +0200 (Tue, 04 Aug 2009) New Revision: 535 Modified: trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/libgcc/libgcc.h Log: Fix Unix target warnings from Sparse Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/unix/unix.c =================================================================== --- trunk/openbios-devel/arch/unix/unix.c 2009-08-04 20:37:32 UTC (rev 534) +++ trunk/openbios-devel/arch/unix/unix.c 2009-08-04 20:37:34 UTC (rev 535) @@ -52,13 +52,12 @@ /* local variables */ -ucell *latest, *state; -ucell *memory; +static ucell *memory; -int diskemu; +static int diskemu; static int segfault = 0; -int verbose = 0; +static int verbose = 0; #ifdef CONFIG_PPC uint32_t isa_io_base; @@ -477,7 +476,7 @@ sa.sa_sigaction = segv_handler; sigemptyset(&sa.sa_mask); sa.sa_flags = SA_SIGINFO | SA_NODEFER; - sigaction(SIGSEGV, &sa, 0); + sigaction(SIGSEGV, &sa, NULL); if (verbose) printk("done.\n"); @@ -492,7 +491,7 @@ sa.sa_sigaction = int_handler; sigemptyset(&sa.sa_mask); sa.sa_flags = SA_SIGINFO | SA_NODEFER; - sigaction(SIGINT, &sa, 0); + sigaction(SIGINT, &sa, NULL); if (verbose) printk("done.\n"); Modified: trunk/openbios-devel/libgcc/libgcc.h =================================================================== --- trunk/openbios-devel/libgcc/libgcc.h 2009-08-04 20:37:32 UTC (rev 534) +++ trunk/openbios-devel/libgcc/libgcc.h 2009-08-04 20:37:34 UTC (rev 535) @@ -27,7 +27,7 @@ // Must be implemented outside: void __divide_error(void); -#ifdef __arch64__ +#if defined(__arch64__) || defined(__LP64__) typedef int TItype __attribute__ ((mode (TI))); __uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem);

1 0

r534 - trunk/openbios-devel/arch/x86
by svn＠openbios.org 04 Aug '09

04 Aug '09

Author: blueswirl Date: 2009-08-04 22:37:32 +0200 (Tue, 04 Aug 2009) New Revision: 534 Modified: trunk/openbios-devel/arch/x86/boot.h trunk/openbios-devel/arch/x86/context.c trunk/openbios-devel/arch/x86/elfload.c trunk/openbios-devel/arch/x86/linux_load.c trunk/openbios-devel/arch/x86/multiboot.c Log: Fix most x86 warnings from Sparse Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/x86/boot.h =================================================================== --- trunk/openbios-devel/arch/x86/boot.h 2009-08-02 18:20:53 UTC (rev 533) +++ trunk/openbios-devel/arch/x86/boot.h 2009-08-04 20:37:32 UTC (rev 534) @@ -6,9 +6,19 @@ * the copyright and warranty status of this work. */ +/* forthload.c */ int forth_load(struct sys_info *info, const char *filename, const char *cmdline); + +/* elfload.c */ int elf_load(struct sys_info *info, const char *filename, const char *cmdline); + +/* linux_load.c */ int linux_load(struct sys_info *info, const char *file, const char *cmdline); +/* context.c */ +extern struct context *__context; unsigned int start_elf(unsigned long entry_point, unsigned long param); + +/* boot.c */ +extern struct sys_info sys_info; void boot(void); Modified: trunk/openbios-devel/arch/x86/context.c =================================================================== --- trunk/openbios-devel/arch/x86/context.c 2009-08-02 18:20:53 UTC (rev 533) +++ trunk/openbios-devel/arch/x86/context.c 2009-08-04 20:37:32 UTC (rev 534) @@ -26,7 +26,7 @@ * It is placed at the bottom of our stack, and loaded by assembly routine * to start us up. */ -struct context main_ctx __attribute__((section (".initctx"))) = { +static struct context main_ctx __attribute__((section (".initctx"))) = { .gdt_base = (uint32_t) gdt, .gdt_limit = GDT_LIMIT, .cs = FLAT_CS, Modified: trunk/openbios-devel/arch/x86/elfload.c =================================================================== --- trunk/openbios-devel/arch/x86/elfload.c 2009-08-02 18:20:53 UTC (rev 533) +++ trunk/openbios-devel/arch/x86/elfload.c 2009-08-04 20:37:32 UTC (rev 534) @@ -30,7 +30,7 @@ if (alloc_size < nmemb || alloc_size < size) { printk("calloc overflow: %u, %u\n", nmemb, size); - return 0; + return NULL; } mem = malloc(alloc_size); @@ -314,7 +314,7 @@ int retval = -1; int image_retval; - image_name = image_version = 0; + image_name = image_version = NULL; if (!file_open(filename)) goto out; Modified: trunk/openbios-devel/arch/x86/linux_load.c =================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c 2009-08-02 18:20:53 UTC (rev 533) +++ trunk/openbios-devel/arch/x86/linux_load.c 2009-08-04 20:37:32 UTC (rev 534) @@ -157,7 +157,7 @@ uint8_t reserved17[1792]; /* 0x900 - 0x1000 */ }; -uint64_t forced_memsize; +static uint64_t forced_memsize; /* Load the first part the file and check if it's Linux */ static uint32_t load_linux_header(struct linux_header *hdr) @@ -294,14 +294,14 @@ int len; int k_len; int to_kern; - char *initrd = 0; + char *initrd = NULL; int toolong = 0; forced_memsize = 0; if (!orig_cmdline) { *kern_cmdline = 0; - return 0; + return NULL; } k_len = 0; @@ -328,7 +328,7 @@ val = sep + 1; len = end - val; } else { - val = 0; + val = NULL; len = 0; } @@ -610,7 +610,7 @@ struct linux_header hdr; struct linux_params *params; uint32_t kern_addr, kern_size; - char *initrd_file = 0; + char *initrd_file = NULL; if (!file_open(file)) return -1; Modified: trunk/openbios-devel/arch/x86/multiboot.c =================================================================== --- trunk/openbios-devel/arch/x86/multiboot.c 2009-08-02 18:20:53 UTC (rev 533) +++ trunk/openbios-devel/arch/x86/multiboot.c 2009-08-04 20:37:32 UTC (rev 534) @@ -14,7 +14,8 @@ struct mbheader { unsigned int magic, flags, checksum; }; -const struct mbheader multiboot_header + +static const struct mbheader multiboot_header __attribute__((section (".hdr"))) = { MULTIBOOT_HEADER_MAGIC,

1 0

[PATCH v1 00/10] extract OF memory manager module
by Igor Kovalenko 04 Aug '09

04 Aug '09

Hi! This patch series moves OF memory manager code to separate module. New OFMEM module is used by sparc64 and all ppc configurations. Since ppc briq/mol/pearpc are not buildable for years I used local build hack to verify this change does not make those even worse. Boot-tested on sparc64 and ppc/qemu. Changes v0->v1: - clean up ppc internal prototypes patch (whitespace) - split ofmem migration patch to smaller ppc and sparc patches Signed-off-by: igor.v.kovalenko(a)gmail.com -- Kind regards, Igor V. Kovalenko

3 14

r533 - in trunk/openbios-devel: . arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu arch/unix config/scripts include include/openbios kernel modules
by svn＠openbios.org 02 Aug '09

02 Aug '09

Author: blueswirl Date: 2009-08-02 20:20:53 +0200 (Sun, 02 Aug 2009) New Revision: 533 Added: trunk/openbios-devel/VERSION Modified: trunk/openbios-devel/Makefile.target trunk/openbios-devel/arch/ppc/briq/init.c trunk/openbios-devel/arch/ppc/mol/init.c trunk/openbios-devel/arch/ppc/pearpc/init.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/config/scripts/switch-arch trunk/openbios-devel/include/mconfig.h trunk/openbios-devel/include/openbios/config.h trunk/openbios-devel/kernel/bootstrap.c trunk/openbios-devel/modules/elfnote.c Log: Improve version number handling Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/Makefile.target =================================================================== --- trunk/openbios-devel/Makefile.target 2009-08-02 16:59:05 UTC (rev 532) +++ trunk/openbios-devel/Makefile.target 2009-08-02 18:20:53 UTC (rev 533) @@ -38,8 +38,6 @@ all: versions dictionaries host-libraries target-libraries host-executables target-executables -VERSION := "1.0" - versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs $(ODIR)/forth/version.fs: @@ -51,8 +49,7 @@ $(ODIR)/target/include/openbios-version.h: @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_RELEASE \"$(VERSION)\"" ; ) \ + echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; ) \ > $(dir $(a))/openbios-version.h info: Added: trunk/openbios-devel/VERSION =================================================================== --- trunk/openbios-devel/VERSION (rev 0) +++ trunk/openbios-devel/VERSION 2009-08-02 18:20:53 UTC (rev 533) @@ -0,0 +1 @@ +1.0 Modified: trunk/openbios-devel/arch/ppc/briq/init.c =================================================================== --- trunk/openbios-devel/arch/ppc/briq/init.c 2009-08-02 16:59:05 UTC (rev 532) +++ trunk/openbios-devel/arch/ppc/briq/init.c 2009-08-02 18:20:53 UTC (rev 533) @@ -61,7 +61,8 @@ printk("\n"); printk("=============================================================\n"); - printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); + printk(PROGRAM_NAME " " OPENBIOS_VERSION_STR " [%s]\n", + OPENBIOS_BUILD_DATE); ofmem_init(); initialize_forth(); Modified: trunk/openbios-devel/arch/ppc/mol/init.c =================================================================== --- trunk/openbios-devel/arch/ppc/mol/init.c 2009-08-02 16:59:05 UTC (rev 532) +++ trunk/openbios-devel/arch/ppc/mol/init.c 2009-08-02 18:20:53 UTC (rev 533) @@ -57,7 +57,8 @@ printk("\n"); printk("=============================================================\n"); - printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); + printk(PROGRAM_NAME " " OPENBIOS_VERSION_STR " [%s]\n", + OPENBIOS_BUILD_DATE); ofmem_init(); initialize_forth(); Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c =================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/init.c 2009-08-02 16:59:05 UTC (rev 532) +++ trunk/openbios-devel/arch/ppc/pearpc/init.c 2009-08-02 18:20:53 UTC (rev 533) @@ -64,7 +64,8 @@ printk("\n"); printk("=============================================================\n"); - printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); + printk(PROGRAM_NAME " " OPENBIOS_VERSION_STR " [%s]\n", + OPENBIOS_BUILD_DATE); ofmem_init(); initialize_forth(); Modified: trunk/openbios-devel/arch/ppc/qemu/init.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c 2009-08-02 16:59:05 UTC (rev 532) +++ trunk/openbios-devel/arch/ppc/qemu/init.c 2009-08-02 18:20:53 UTC (rev 533) @@ -461,7 +461,8 @@ printk("\n"); printk("=============================================================\n"); - printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); + printk(PROGRAM_NAME " " OPENBIOS_VERSION_STR " [%s]\n", + OPENBIOS_BUILD_DATE); fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); buf[4] = '\0'; Modified: trunk/openbios-devel/arch/unix/unix.c =================================================================== --- trunk/openbios-devel/arch/unix/unix.c 2009-08-02 16:59:05 UTC (rev 532) +++ trunk/openbios-devel/arch/unix/unix.c 2009-08-02 18:20:53 UTC (rev 533) @@ -32,6 +32,7 @@ #include "openbios/stack.h" #include "unix/plugins.h" #include "openbios/bindings.h" +#include "openbios-version.h" #include "blk.h" @@ -415,11 +416,12 @@ switch (c) { case 'V': - printk(BANNER "Version " VERSION "\n"); + printk(BANNER "Version " OPENBIOS_VERSION_STR "\n"); return 0; case 'h': case '?': - printk(BANNER "Version " VERSION "\n" USAGE, argv[0]); + printk(BANNER "Version " OPENBIOS_VERSION_STR "\n" + USAGE, argv[0]); return 0; case 'v': verbose = 1; Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-08-02 16:59:05 UTC (rev 532) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-08-02 18:20:53 UTC (rev 533) @@ -93,6 +93,8 @@ archname fi +VERSION=`head VERSION` + echo "Configuring OpenBIOS on $HOSTARCH for $*" for RULES_ARCH in $*; do ARCH=`echo $RULES_ARCH | sed s/cross-//g` @@ -173,6 +175,7 @@ echo "AS_FLAGS=$AS_FLAGS" >> $ODIR/config.mak echo "HOSTARCH?=$HOSTARCH" >> $ODIR/config.mak echo "CROSSCFLAGS=$CROSSCFLAGS" >> $ODIR/config.mak + echo "VERSION=\"$VERSION\"" >> $ODIR/config.mak ln -s $SRCDIR/config/xml/rules.xml $ODIR/rules.xml ln -s $SRCDIR/config/examples/${RULES_ARCH}_config.xml $ODIR/config.xml ln -s ../Makefile.target $ODIR/Makefile Modified: trunk/openbios-devel/include/mconfig.h =================================================================== --- trunk/openbios-devel/include/mconfig.h 2009-08-02 16:59:05 UTC (rev 532) +++ trunk/openbios-devel/include/mconfig.h 2009-08-02 18:20:53 UTC (rev 533) @@ -41,9 +41,6 @@ /* Define to 1 if you have the <unistd.h> header file. */ #define HAVE_UNISTD_H 1 -/* Minor OpenBIOS version */ -#define MINOR_VERSION 0 - /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "" @@ -59,15 +56,9 @@ /* Define to the version of this package. */ #define PACKAGE_VERSION "" -/* Patchlevel */ -#define PATCH_LEVEL RC1 - /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -/* Version */ -#define VERSION "1.0" - /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ #define YYTEXT_POINTER 1 Modified: trunk/openbios-devel/include/openbios/config.h =================================================================== --- trunk/openbios-devel/include/openbios/config.h 2009-08-02 16:59:05 UTC (rev 532) +++ trunk/openbios-devel/include/openbios/config.h 2009-08-02 18:20:53 UTC (rev 533) @@ -22,7 +22,6 @@ #include "asm/types.h" #define PROGRAM_NAME "OpenBIOS" -#define PROGRAM_VERSION VERSION #ifndef BOOTSTRAP Modified: trunk/openbios-devel/kernel/bootstrap.c =================================================================== --- trunk/openbios-devel/kernel/bootstrap.c 2009-08-02 16:59:05 UTC (rev 532) +++ trunk/openbios-devel/kernel/bootstrap.c 2009-08-02 18:20:53 UTC (rev 533) @@ -27,6 +27,7 @@ #include "openbios/kernel.h" #include "dict.h" #include "cross.h" +#include "openbios-version.h" #define MEMORY_SIZE (1024*1024) /* 1M ram for hosted system */ @@ -992,11 +993,12 @@ switch (c) { case 'V': - printk("Version " VERSION "\n"); + printk("Version " OPENBIOS_VERSION_STR "\n"); return 0; case 'h': case '?': - printk("Version " VERSION "\n" USAGE, argv[0]); + printk("Version " OPENBIOS_VERSION_STR "\n" USAGE, + argv[0]); return 0; case 'v': verbose = 1; Modified: trunk/openbios-devel/modules/elfnote.c =================================================================== --- trunk/openbios-devel/modules/elfnote.c 2009-08-02 16:59:05 UTC (rev 532) +++ trunk/openbios-devel/modules/elfnote.c 2009-08-02 18:20:53 UTC (rev 533) @@ -4,6 +4,7 @@ #include "sys_info.h" #include "asm/io.h" #include "ipchecksum.h" +#include "openbios-version.h" #define printf printk #define debug printk @@ -19,7 +20,7 @@ Elf_Nhdr hdr1; char name1[sizeof(ELF_NOTE_BOOT)]; - char version[sizeof(PROGRAM_VERSION)]; + char version[sizeof(OPENBIOS_VERSION_STR)]; Elf_Nhdr hdr2; char name2[sizeof(ELF_NOTE_BOOT)]; @@ -39,11 +40,11 @@ .hdr1 = { .n_namesz = sizeof(ELF_NOTE_BOOT), - .n_descsz = sizeof(PROGRAM_VERSION), + .n_descsz = sizeof(OPENBIOS_VERSION_STR), .n_type = EIN_PROGRAM_VERSION, }, .name1 = ELF_NOTE_BOOT, - .version = PROGRAM_VERSION, + .version = OPENBIOS_VERSION_STR, .hdr2 = { .n_namesz = sizeof(ELF_NOTE_BOOT), @@ -81,7 +82,7 @@ .int EIN_PROGRAM_VERSION 1: .asciz "ELFBoot" 2: .align 4 -3: .asciz PROGRAM_VERSION +3: .asciz OPENBIOS_VERSION_STR 4: .align 4

1 0

r532 - in trunk/openbios-devel: . config/examples config/scripts config/xml
by svn＠openbios.org 02 Aug '09

02 Aug '09

Author: blueswirl Date: 2009-08-02 18:59:05 +0200 (Sun, 02 Aug 2009) New Revision: 532 Added: trunk/openbios-devel/Makefile.target trunk/openbios-devel/config/xml/rules.xml Removed: trunk/openbios-devel/config/examples/amd64_rules.xml trunk/openbios-devel/config/examples/cross-ppc_rules.xml trunk/openbios-devel/config/examples/cross-sparc32_rules.xml trunk/openbios-devel/config/examples/cross-sparc64_rules.xml trunk/openbios-devel/config/examples/cross-x86_rules.xml trunk/openbios-devel/config/examples/ppc_rules.xml trunk/openbios-devel/config/examples/sparc32_rules.xml trunk/openbios-devel/config/examples/sparc64_rules.xml trunk/openbios-devel/config/examples/x86_rules.xml trunk/openbios-devel/config/scripts/archname trunk/openbios-devel/config/scripts/crosscflags Modified: trunk/openbios-devel/Makefile trunk/openbios-devel/config/scripts/switch-arch Log: Refactor the build rules Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/Makefile =================================================================== --- trunk/openbios-devel/Makefile 2009-08-02 12:41:31 UTC (rev 531) +++ trunk/openbios-devel/Makefile 2009-08-02 16:59:05 UTC (rev 532) @@ -1,4 +1,3 @@ -HOSTARCH=$(shell config/scripts/archname) ODIRS=$(wildcard obj-*) TARGETS=$(subst obj-,,$(ODIRS)) @@ -9,13 +8,13 @@ echo; exit 1 ) info: - @echo "Building OpenBIOS on $(HOSTARCH) for $(TARGETS)" + @echo "Building OpenBIOS for $(TARGETS)" clean: - @printf "Cleaning up..." - @rm -rf $(ODIRS) forth.dict.core - @find . -type f -name "*~" -exec rm \{\} \; - @echo " ok" + @echo "Cleaning up..." + @for dir in $(ODIRS); do \ + $(MAKE) -C $$dir clean; \ + done build: @printf "Building..." Added: trunk/openbios-devel/Makefile.target =================================================================== --- trunk/openbios-devel/Makefile.target (rev 0) +++ trunk/openbios-devel/Makefile.target 2009-08-02 16:59:05 UTC (rev 532) @@ -0,0 +1,71 @@ +# +# OpenBIOS Makefile +# (C) 2004-2009 by the OpenBIOS team +# + +include config.mak + +ODIR := . +SRCDIR := .. +HOSTCC := gcc + +HOSTCFLAGS+= -O2 -g -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) +HOSTCFLAGS+= -Wall -Wredundant-decls -Wshadow -Wpointer-arith +HOSTCFLAGS+= -Wstrict-prototypes -Wmissing-declarations -Wundef -Wendif-labels +HOSTCFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes +HOSTCFLAGS+= -W +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include + +CC := $(TARGET)gcc +AS := $(TARGET)as +AR := $(TARGET)ar +LD := $(TARGET)ld +NM := $(TARGET)nm +STRIP := $(TARGET)strip +RANLIB := $(TARGET)ranlib + +CFLAGS+= -Os -g -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS +CFLAGS+= -Wall -Wredundant-decls -Wshadow -Wpointer-arith +CFLAGS+= -Wstrict-prototypes -Wmissing-declarations -Wundef -Wendif-labels +CFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes +CFLAGS+= -Werror +INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include +AS_FLAGS+= -g + +# +# pre rules +# + +all: versions dictionaries host-libraries target-libraries host-executables target-executables + +VERSION := "1.0" + +versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs + +$(ODIR)/forth/version.fs: + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ + ( echo ": builddate \" $$DATE\" ; " ; \ + echo ": version \" $(VERSION)\" ; " ; ) \ + > $(dir $(a))/version.fs + +$(ODIR)/target/include/openbios-version.h: + @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_RELEASE \"$(VERSION)\"" ; ) \ + > $(dir $(a))/openbios-version.h + +info: + @echo "Building OpenBIOS on $(HOSTARCH) for $(ARCH)" + +clean: + @printf "Cleaning up for $(ARCH)..." + @rm -rf forth.dict.core forthstrap *.dict openbios-* + @find . -type f -name "*~" -o -name '*.o' -o -name '*.a' -exec rm \{\} \; + @echo " ok" + +build-verbose: info build + +build: all + +include rules.mak Deleted: trunk/openbios-devel/config/examples/amd64_rules.xml =================================================================== --- trunk/openbios-devel/config/examples/amd64_rules.xml 2009-08-02 12:41:31 UTC (rev 531) +++ trunk/openbios-devel/config/examples/amd64_rules.xml 2009-08-02 16:59:05 UTC (rev 532) @@ -1,86 +0,0 @@ -<rules> - -<pre><![CDATA[ -# -# Autogenerated OpenBIOS Makefile -# (C) 2004-2005 by the OpenBIOS team -# - -ARCH := amd64 -ODIR := . -SRCDIR := .. -HOSTCC := gcc -HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) -CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) -HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) -HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include - -CC := gcc -AS := as -AR := ar -LD := ld -NM := nm -STRIP := strip -RANLIB := ranlib -INSTALL := install - -CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g -CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include - -# -# pre rules -# - -all: versions dictionaries host-libraries target-libraries host-executables target-executables - -VERSION := "1.0" - -versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs - -$(ODIR)/forth/version.fs: - @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ - ( echo ": builddate \" $$DATE\" ; " ; \ - echo ": version \" $(VERSION)\" ; " ; ) \ - > $(dir $(a))/version.fs - -$(ODIR)/target/include/openbios-version.h: - @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_RELEASE \"$(VERSION)\"" ; ) \ - > $(dir $(a))/openbios-version.h -]]></pre> - -  - -<rule target="host" entity="executable"> - $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ -</rule> - -<rule target="host" entity="object"> - $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ -</rule> - -<rule target="host" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ -</rule> - -  - -<rule target="target" entity="executable"> - $(CC) $(CFLAGS) -o $@ $^ -</rule> - -<rule target="target" entity="object"> - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ -</rule> - -<rule target="target" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ -</rule> - -</rules> Deleted: trunk/openbios-devel/config/examples/cross-ppc_rules.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_rules.xml 2009-08-02 12:41:31 UTC (rev 531) +++ trunk/openbios-devel/config/examples/cross-ppc_rules.xml 2009-08-02 16:59:05 UTC (rev 532) @@ -1,104 +0,0 @@ -<rules> - -<pre><![CDATA[ -# -# Autogenerated OpenBIOS Makefile -# (C) 2004-2005 by the OpenBIOS team -# - -ARCH := ppc -ODIR := . -SRCDIR := .. -HOSTCC := gcc -HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) -CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) -HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) -HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include -# -# MOLPATH is needed if you want to build openbios-mol.elf -# -MOLPATH=$(HOME)/mol-0.9.71 - -TARGET=powerpc-linux-gnu- -CC := $(TARGET)gcc -AS := $(TARGET)as -AR := $(TARGET)ar -LD := $(TARGET)ld -NM := $(TARGET)nm -STRIP := $(TARGET)strip -RANLIB := $(TARGET)ranlib -CFLAGS := -Os -Wall -msoft-float -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 -CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Werror -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include - -M4 := m4 - -# -# pre rules -# - -all: mol versions dictionaries host-libraries target-libraries host-executables target-executables - -VERSION := "1.0" - -versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs - -$(ODIR)/forth/version.fs: - @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ - ( echo ": builddate \" $$DATE\" ; " ; \ - echo ": version \" $(VERSION)\" ; " ; ) \ - > $(dir $(a))/version.fs - -$(ODIR)/target/include/openbios-version.h: - @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_RELEASE \"$(VERSION)\"" ; ) \ - > $(dir $(a))/openbios-version.h -mol: - @grep CONFIG_MOL $(ODIR)/forth/config.fs >/dev/null && ( \ - echo "Using MOL path $(MOLPATH)..."; \ - ln -s $(MOLPATH)/src/shared/osi_calls.h $(ODIR)/target/include/; \ - ln -s $(MOLPATH)/src/shared/osi.h $(ODIR)/target/include/; \ - ln -s $(MOLPATH)/src/shared/prom.h $(ODIR)/target/include/; \ - ln -s $(MOLPATH)/src/include/boothelper_sh.h $(ODIR)/target/include/; \ - ln -s $(MOLPATH)/src/include/video_sh.h $(ODIR)/target/include/; \ - ln -s $(MOLPATH)/src/include/pseudofs_sh.h $(ODIR)/target/include/; \ - ln -s $(MOLPATH)/src/include/kbd_sh.h $(ODIR)/target/include/; \ - ln -s $(MOLPATH)/src/drivers/disk/include/scsi_sh.h $(ODIR)/target/include/; \ - ln -s $(MOLPATH)/src/drivers/disk/include/ablk_sh.h $(ODIR)/target/include/ ) || true - -]]></pre> - -  - -<rule target="host" entity="executable"> - $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ -</rule> - -<rule target="host" entity="object"> - $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ -</rule> - -<rule target="host" entity="library"> - $(AR) cru $@ $^; ranlib $@ -</rule> - -  - -<rule target="target" entity="executable"> - $(CC) $(CFLAGS) -o $@ $^ -</rule> - -<rule target="target" entity="object"> - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ -</rule> - -<rule target="target" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ -</rule> - -</rules> Deleted: trunk/openbios-devel/config/examples/cross-sparc32_rules.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-sparc32_rules.xml 2009-08-02 12:41:31 UTC (rev 531) +++ trunk/openbios-devel/config/examples/cross-sparc32_rules.xml 2009-08-02 16:59:05 UTC (rev 532) @@ -1,87 +0,0 @@ -<rules> - -<pre><![CDATA[ -# -# Autogenerated OpenBIOS Makefile -# (C) 2004-2006 by the OpenBIOS team -# - -ARCH := sparc32 -ODIR := . -SRCDIR := .. -HOSTCC := gcc -HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) -CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) -HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) -HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include - -TARGET=sparc-elf- -CC := $(TARGET)gcc -AS := $(TARGET)as -AR := $(TARGET)ar -LD := $(TARGET)ld -NM := $(TARGET)nm -STRIP := $(TARGET)strip -RANLIB := $(TARGET)ranlib -CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g -CFLAGS+= -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc -CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Werror -INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include -AS_FLAGS := -Wa,-xarch=v8 -Wa,-32 -g - -# -# pre rules -# - -all: versions dictionaries host-libraries target-libraries host-executables target-executables - -VERSION := "1.0" - -versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs - -$(ODIR)/forth/version.fs: - @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ - ( echo ": builddate \" $$DATE\" ; " ; \ - echo ": version \" $(VERSION)\" ; " ; ) \ - > $(dir $(a))/version.fs - -$(ODIR)/target/include/openbios-version.h: - @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_RELEASE \"$(VERSION)\"" ; ) \ - > $(dir $(a))/openbios-version.h -]]></pre> - -  - -<rule target="host" entity="executable"> - $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ -</rule> - -<rule target="host" entity="object"> - $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ -</rule> - -<rule target="host" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ -</rule> - -  - -<rule target="target" entity="executable"> - $(CC) $(CFLAGS) -o $@ $^ -</rule> - -<rule target="target" entity="object"> - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ -</rule> - -<rule target="target" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ -</rule> - -</rules> Deleted: trunk/openbios-devel/config/examples/cross-sparc64_rules.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-sparc64_rules.xml 2009-08-02 12:41:31 UTC (rev 531) +++ trunk/openbios-devel/config/examples/cross-sparc64_rules.xml 2009-08-02 16:59:05 UTC (rev 532) @@ -1,88 +0,0 @@ -<rules> - -<pre><![CDATA[ -# -# Autogenerated OpenBIOS Makefile -# (C) 2004-2006 by the OpenBIOS team -# - -ARCH := sparc64 -ODIR := . -SRCDIR := .. -HOSTCC := gcc -HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) -CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) -HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) -HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include - -TARGET=sparc64-elf- -CC := $(TARGET)gcc -AS := $(TARGET)as -AR := $(TARGET)ar -LD := $(TARGET)ld -NM := $(TARGET)nm -STRIP := $(TARGET)strip -RANLIB := $(TARGET)ranlib -CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -g -CFLAGS+= -Wa,-xarch=v9b -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany -CFLAGS+= -fno-builtin -nostdlib -ffreestanding -CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Werror -INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include -AS_FLAGS := -Wa,-xarch=v9b -Wa,-64 -g - -# -# pre rules -# - -all: versions dictionaries host-libraries target-libraries host-executables target-executables - -VERSION := "1.0" - -versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs - -$(ODIR)/forth/version.fs: - @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ - ( echo ": builddate \" $$DATE\" ; " ; \ - echo ": version \" $(VERSION)\" ; " ; ) \ - > $(dir $(a))/version.fs - -$(ODIR)/target/include/openbios-version.h: - @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_RELEASE \"$(VERSION)\"" ; ) \ - > $(dir $(a))/openbios-version.h -]]></pre> - -  - -<rule target="host" entity="executable"> - $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ -</rule> - -<rule target="host" entity="object"> - $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ -</rule> - -<rule target="host" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ -</rule> - -  - -<rule target="target" entity="executable"> - $(CC) $(CFLAGS) -o $@ $^ -</rule> - -<rule target="target" entity="object"> - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ -</rule> - -<rule target="target" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ -</rule> - -</rules> Deleted: trunk/openbios-devel/config/examples/cross-x86_rules.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-x86_rules.xml 2009-08-02 12:41:31 UTC (rev 531) +++ trunk/openbios-devel/config/examples/cross-x86_rules.xml 2009-08-02 16:59:05 UTC (rev 532) @@ -1,88 +0,0 @@ -<rules> - -<pre><![CDATA[ -# -# Autogenerated OpenBIOS Makefile -# (C) 2004-2005 by the OpenBIOS team -# - -ARCH := x86 -ODIR := . -SRCDIR := .. -HOSTCC := gcc -HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) -CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) -HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) -HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include - -#TARGET=i386-elf- -TARGET= -CC := $(TARGET)gcc -AS := $(TARGET)as -AR := $(TARGET)ar -LD := $(TARGET)ld -NM := $(TARGET)nm -STRIP := $(TARGET)strip -RANLIB := $(TARGET)ranlib -CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g -CFLAGS+= -m32 -CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include -AS_FLAGS := -Wa,-32 -g - -# -# pre rules -# - -all: versions dictionaries host-libraries target-libraries host-executables target-executables - -VERSION := "1.0" - -versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs - -$(ODIR)/forth/version.fs: - @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ - ( echo ": builddate \" $$DATE\" ; " ; \ - echo ": version \" $(VERSION)\" ; " ; ) \ - > $(dir $(a))/version.fs - -$(ODIR)/target/include/openbios-version.h: - @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_RELEASE \"$(VERSION)\"" ; ) \ - > $(dir $(a))/openbios-version.h -]]></pre> - -  - -<rule target="host" entity="executable"> - $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ -</rule> - -<rule target="host" entity="object"> - $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ -</rule> - -<rule target="host" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ -</rule> - -  - -<rule target="target" entity="executable"> - $(CC) $(CFLAGS) -o $@ $^ -</rule> - -<rule target="target" entity="object"> - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ -</rule> - -<rule target="target" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ -</rule> - -</rules> Deleted: trunk/openbios-devel/config/examples/ppc_rules.xml =================================================================== --- trunk/openbios-devel/config/examples/ppc_rules.xml 2009-08-02 12:41:31 UTC (rev 531) +++ trunk/openbios-devel/config/examples/ppc_rules.xml 2009-08-02 16:59:05 UTC (rev 532) @@ -1,103 +0,0 @@ -<rules> - -<pre><![CDATA[ -# -# Autogenerated OpenBIOS Makefile -# (C) 2004-2005 by the OpenBIOS team -# - -ARCH := ppc -ODIR := . -SRCDIR := .. -HOSTCC := gcc -HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) -CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) -HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) -HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include -# -# MOLPATH is needed if you want to build openbios-mol.elf -# -MOLPATH=$(HOME)/mol-0.9.71 - -CC := gcc -AS := as -AR := ar -LD := ld -NM := nm -STRIP := strip -RANLIB := ranlib -CFLAGS := -Os -Wall -msoft-float -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 -CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Werror -INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include - -M4 := m4 - -# -# pre rules -# - -all: mol versions dictionaries host-libraries target-libraries host-executables target-executables - -VERSION := "1.0" - -versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs - -$(ODIR)/forth/version.fs: - @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ - ( echo ": builddate \" $$DATE\" ; " ; \ - echo ": version \" $(VERSION)\" ; " ; ) \ - > $(dir $(a))/version.fs - -$(ODIR)/target/include/openbios-version.h: - @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_RELEASE \"$(VERSION)\"" ; ) \ - > $(dir $(a))/openbios-version.h -mol: - @grep CONFIG_MOL $(ODIR)/forth/config.fs >/dev/null && ( \ - echo "Using MOL path $(MOLPATH)..."; \ - ln -s $(MOLPATH)/src/shared/osi_calls.h $(ODIR)/target/include/; \ - ln -s $(MOLPATH)/src/shared/osi.h $(ODIR)/target/include/; \ - ln -s $(MOLPATH)/src/shared/prom.h $(ODIR)/target/include/; \ - ln -s $(MOLPATH)/src/include/boothelper_sh.h $(ODIR)/target/include/; \ - ln -s $(MOLPATH)/src/include/video_sh.h $(ODIR)/target/include/; \ - ln -s $(MOLPATH)/src/include/pseudofs_sh.h $(ODIR)/target/include/; \ - ln -s $(MOLPATH)/src/include/kbd_sh.h $(ODIR)/target/include/; \ - ln -s $(MOLPATH)/src/drivers/disk/include/scsi_sh.h $(ODIR)/target/include/; \ - ln -s $(MOLPATH)/src/drivers/disk/include/ablk_sh.h $(ODIR)/target/include/ ) || true - -]]></pre> - -  - -<rule target="host" entity="executable"> - $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ -</rule> - -<rule target="host" entity="object"> - $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ -</rule> - -<rule target="host" entity="library"> - $(AR) cru $@ $^; ranlib $@ -</rule> - -  - -<rule target="target" entity="executable"> - $(CC) $(CFLAGS) -o $@ $^ -</rule> - -<rule target="target" entity="object"> - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ -</rule> - -<rule target="target" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ -</rule> - -</rules> Deleted: trunk/openbios-devel/config/examples/sparc32_rules.xml =================================================================== --- trunk/openbios-devel/config/examples/sparc32_rules.xml 2009-08-02 12:41:31 UTC (rev 531) +++ trunk/openbios-devel/config/examples/sparc32_rules.xml 2009-08-02 16:59:05 UTC (rev 532) @@ -1,92 +0,0 @@ -<rules> - -<pre><![CDATA[ -# -# Autogenerated OpenBIOS Makefile -# (C) 2004-2006 by the OpenBIOS team -# - -ARCH := sparc32 -ODIR := . -SRCDIR := .. -HOSTCC := gcc -HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) -CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) -HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) -HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include - -CC := gcc -AS := as -AR := ar -LD := ld -NM := nm -STRIP := strip -RANLIB := ranlib -INSTALL := install - -ifeq ($(shell uname), Linux) - LIBDL_LDFLAGS=-ldl -endif - -CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g -CFLAGS+= -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc -CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Werror -INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include -AS_FLAGS := -Wa,-xarch=v8 -Wa,-32 -g - -# -# pre rules -# - -all: versions dictionaries host-libraries target-libraries host-executables target-executables - -VERSION := "1.0" - -versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs - -$(ODIR)/forth/version.fs: - @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ - ( echo ": builddate \" $$DATE\" ; " ; \ - echo ": version \" $(VERSION)\" ; " ; ) \ - > $(dir $(a))/version.fs - -$(ODIR)/target/include/openbios-version.h: - @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_RELEASE \"$(VERSION)\"" ; ) \ - > $(dir $(a))/openbios-version.h -]]></pre> - -  - -<rule target="host" entity="executable"> - $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ -</rule> - -<rule target="host" entity="object"> - $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ -</rule> - -<rule target="host" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ -</rule> - -  - -<rule target="target" entity="executable"> - $(CC) $(CFLAGS) -o $@ $^ -</rule> - -<rule target="target" entity="object"> - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ -</rule> - -<rule target="target" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ -</rule> - -</rules> Deleted: trunk/openbios-devel/config/examples/sparc64_rules.xml =================================================================== --- trunk/openbios-devel/config/examples/sparc64_rules.xml 2009-08-02 12:41:31 UTC (rev 531) +++ trunk/openbios-devel/config/examples/sparc64_rules.xml 2009-08-02 16:59:05 UTC (rev 532) @@ -1,93 +0,0 @@ -<rules> - -<pre><![CDATA[ -# -# Autogenerated OpenBIOS Makefile -# (C) 2004-2006 by the OpenBIOS team -# - -ARCH := sparc64 -ODIR := . -SRCDIR := .. -HOSTCC := gcc -HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) -CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) -HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) -HOSTCFLAGS+= -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany -HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include - -CC := gcc -AS := as -AR := ar -LD := ld -NM := nm -STRIP := strip -RANLIB := ranlib -INSTALL := install - -ifeq ($(shell uname), Linux) - LIBDL_LDFLAGS=-ldl -endif - -CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g -CFLAGS+= -Wa,-xarch=v9b -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany -CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Werror -INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include -AS_FLAGS := -Wa,-xarch=v9b -Wa,-64 -g - -# -# pre rules -# - -all: versions dictionaries host-libraries target-libraries host-executables target-executables - -VERSION := "1.0" - -versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs - -$(ODIR)/forth/version.fs: - @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ - ( echo ": builddate \" $$DATE\" ; " ; \ - echo ": version \" $(VERSION)\" ; " ; ) \ - > $(dir $(a))/version.fs - -$(ODIR)/target/include/openbios-version.h: - @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_RELEASE \"$(VERSION)\"" ; ) \ - > $(dir $(a))/openbios-version.h -]]></pre> - -  - -<rule target="host" entity="executable"> - $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ -</rule> - -<rule target="host" entity="object"> - $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ -</rule> - -<rule target="host" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ -</rule> - -  - -<rule target="target" entity="executable"> - $(CC) $(CFLAGS) -o $@ $^ -</rule> - -<rule target="target" entity="object"> - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ -</rule> - -<rule target="target" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ -</rule> - -</rules> Deleted: trunk/openbios-devel/config/examples/x86_rules.xml =================================================================== --- trunk/openbios-devel/config/examples/x86_rules.xml 2009-08-02 12:41:31 UTC (rev 531) +++ trunk/openbios-devel/config/examples/x86_rules.xml 2009-08-02 16:59:05 UTC (rev 532) @@ -1,90 +0,0 @@ -<rules> - -<pre><![CDATA[ -# -# Autogenerated OpenBIOS Makefile -# (C) 2004-2005 by the OpenBIOS team -# - -ARCH := x86 -ODIR := . -SRCDIR := .. -HOSTCC := gcc -HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) -CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) -HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) -HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -HOSTCFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include - -CC := gcc -AR := ar -NM := nm -STRIP := strip -RANLIB := ranlib -INSTALL := install - -ifeq ($(shell uname), Linux) - LIBDL_LDFLAGS=-ldl -endif - -CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g -CFLAGS+= -m32 -CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include -AS_FLAGS := -Wa,-32 -g - -# -# pre rules -# - -all: versions dictionaries host-libraries target-libraries host-executables target-executables - -VERSION := "1.0" - -versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs - -$(ODIR)/forth/version.fs: - @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ - ( echo ": builddate \" $$DATE\" ; " ; \ - echo ": version \" $(VERSION)\" ; " ; ) \ - > $(dir $(a))/version.fs - -$(ODIR)/target/include/openbios-version.h: - @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_RELEASE \"$(VERSION)\"" ; ) \ - > $(dir $(a))/openbios-version.h -]]></pre> - -  - -<rule target="host" entity="executable"> - $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ -</rule> - -<rule target="host" entity="object"> - $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ -</rule> - -<rule target="host" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ -</rule> - -  - -<rule target="target" entity="executable"> - $(CC) $(CFLAGS) -o $@ $^ -</rule> - -<rule target="target" entity="object"> - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ -</rule> - -<rule target="target" entity="library"> - $(AR) cru $@ $^; $(RANLIB) $@ -</rule> - -</rules> Deleted: trunk/openbios-devel/config/scripts/archname =================================================================== --- trunk/openbios-devel/config/scripts/archname 2009-08-02 12:41:31 UTC (rev 531) +++ trunk/openbios-devel/config/scripts/archname 2009-08-02 16:59:05 UTC (rev 532) @@ -1,17 +0,0 @@ -#!/bin/sh - -unset ARCH - -case "$1" in - # ppc|powerpc) ARCH=ppc ;; - # mpc107) ARCH=mpc107 ;; - # osx|darwin) ARCH=osx ;; - ppc|powerpc|mpc107|osx|darwin) ARCH=ppc ;; -esac - -test "$ARCH" || ARCH=`uname -m | sed -e s/i.86/x86/ -e s/i86pc/x86/ \ - -e s/sun4u/sparc64/ -e s/sparc$/sparc32/ \ - -e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/ \ - -e "s/Power Macintosh/ppc/"` - -echo $ARCH Deleted: trunk/openbios-devel/config/scripts/crosscflags =================================================================== --- trunk/openbios-devel/config/scripts/crosscflags 2009-08-02 12:41:31 UTC (rev 531) +++ trunk/openbios-devel/config/scripts/crosscflags 2009-08-02 16:59:05 UTC (rev 532) @@ -1,60 +0,0 @@ -#!/bin/sh - -host=$1 -target=$2 - -if test "$host" = "powerpc" -o "$host" = "ppc" \ - -o "$host" = "mips" -o "$host" = "s390" \ - -o "$host" = "sparc32" -o "$host" = "sparc64" \ - -o "$host" = "m68k" -o "$host" = "armv4b"; then - hostbigendian="yes" -else - hostbigendian="no" -fi - -# host long bits test -if test "$host" = "sparc64" -o "$host" = "ia64" \ - -o "$host" = "amd64" -o "$host" = "x86_64" \ - -o "$host" = "alpha"; then - hostlongbits="64" -else - hostlongbits="32" -fi - -if test "$target" = "powerpc" -o "$target" = "ppc" \ - -o "$target" = "mips" -o "$target" = "s390" \ - -o "$target" = "sparc32" -o "$target" = "sparc64" \ - -o "$target" = "m68k" -o "$target" = "armv4b"; then - targetbigendian="yes" -else - targetbigendian="no" -fi - -# target long bits test -if test "$target" = "sparc64" -o "$target" = "ia64" \ - -o "$target" = "amd64" -o "target" = "x86_64" \ - -o "$target" = "alpha"; then - targetlongbits="64" -else - targetlongbits="32" -fi - -if test "$targetbigendian" = "$hostbigendian"; then - cflags="-USWAP_ENDIANNESS" -else - cflags="-DSWAP_ENDIANNESS" -fi - -if test "$targetlongbits" = "$hostlongbits"; then - cflags="$cflags -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH" -elif test "$targetlongbits" -lt "$hostlongbits"; then - cflags="$cflags -DNATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH" -else - cflags="$cflags -DNATIVE_BITWIDTH_LARGER_THAN_HOST_BITWIDTH" -fi - -if test "$host" = "x86" -a "$targetlongbits" = "64"; then - cflags="$cflags -DNEED_FAKE_INT128_T" -fi - -echo "$cflags" Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-08-02 12:41:31 UTC (rev 531) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-08-02 16:59:05 UTC (rev 532) @@ -1,5 +1,10 @@ #!/bin/sh +# +# MOLPATH is needed if you want to build openbios-mol.elf +# +MOLPATH=$HOME/mol-0.9.71 + if [ x"$1" = x ]; then printf "Usage:\n $0 [arch-config]...\n" printf "arch-config values supported for native builds:\n" @@ -9,19 +14,121 @@ exit 0 fi +crosscflags() +{ + local host=$1 + local target=$2 + + if test "$host" = "powerpc" -o "$host" = "ppc" \ + -o "$host" = "mips" -o "$host" = "s390" \ + -o "$host" = "sparc32" -o "$host" = "sparc64" \ + -o "$host" = "m68k" -o "$host" = "armv4b"; then + hostbigendian="yes" + else + hostbigendian="no" + fi + +# host long bits test + if test "$host" = "sparc64" -o "$host" = "ia64" \ + -o "$host" = "amd64" -o "$host" = "x86_64" \ + -o "$host" = "alpha"; then + hostlongbits="64" + else + hostlongbits="32" + fi + + if test "$target" = "powerpc" -o "$target" = "ppc" \ + -o "$target" = "mips" -o "$target" = "s390" \ + -o "$target" = "sparc32" -o "$target" = "sparc64" \ + -o "$target" = "m68k" -o "$target" = "armv4b"; then + targetbigendian="yes" + else + targetbigendian="no" + fi + +# target long bits test + if test "$target" = "sparc64" -o "$target" = "ia64" \ + -o "$target" = "amd64" -o "target" = "x86_64" \ + -o "$target" = "alpha"; then + targetlongbits="64" + else + targetlongbits="32" + fi + + if test "$targetbigendian" = "$hostbigendian"; then + cflags="-USWAP_ENDIANNESS" + else + cflags="-DSWAP_ENDIANNESS" + fi + + if test "$targetlongbits" = "$hostlongbits"; then + cflags="$cflags -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH" + elif test "$targetlongbits" -lt "$hostlongbits"; then + cflags="$cflags -DNATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH" + else + cflags="$cflags -DNATIVE_BITWIDTH_LARGER_THAN_HOST_BITWIDTH" + fi + + if test "$host" = "x86" -a "$targetlongbits" = "64"; then + cflags="$cflags -DNEED_FAKE_INT128_T" + fi + + CROSSCFLAGS=$cflags +} + +archname() +{ + HOSTARCH=`uname -m | sed -e s/i.86/x86/ -e s/i86pc/x86/ \ + -e s/sun4u/sparc64/ -e s/sparc$/sparc32/ \ + -e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/ \ + -e "s/Power Macintosh/ppc/"` +} + # This is needed because viewvc messes with the permissions of executables: chmod 755 utils/dist/debian/rules chmod 755 config/scripts/switch-arch -chmod 755 config/scripts/archname chmod 755 config/scripts/reldir -chmod 755 config/scripts/crosscflags + if test "x$HOSTARCH" = "x"; then - HOSTARCH=`config/scripts/archname` + archname fi echo "Configuring OpenBIOS on $HOSTARCH for $*" for RULES_ARCH in $*; do - ARCH=`cat config/examples/${RULES_ARCH}_rules.xml |grep "^ARCH" |cut -d\= -f2|tr -d \ ` + ARCH=`echo $RULES_ARCH | sed s/cross-//g` + case $ARCH in + amd64) + TARGET="x86_64-linux-gnu-" + CFLAGS="-fno-builtin" + ;; + + ppc) + TARGET="powerpc-linux-gnu-" + CFLAGS="-msoft-float -fno-builtin-bcopy -fno-builtin-log2" + ;; + + sparc32) + TARGET="sparc-elf-" + CFLAGS="-Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc -fno-builtin" + AS_FLAGS="-Wa,-xarch=v8 -Wa,-32" + ;; + + sparc64) + TARGET="sparc64-elf-" + CFLAGS="-Wa,-xarch=v9b -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany -fno-builtin" + AS_FLAGS="-Wa,-xarch=v9b -Wa,-64" + ;; + + x86) + TARGET="i486-linux-gnu-" + CFLAGS="-fno-builtin -m32" + AS_FLAGS="-Wa,-32" + ;; + esac + if test "$ARCH" = "$RULES_ARCH"; then + TARGET="" + fi + crosscflags $HOSTARCH $ARCH OBJDIR=obj-$ARCH printf "Initializing build tree $OBJDIR..." rm -rf "$OBJDIR" @@ -60,15 +167,35 @@ ODIR=. printf "Creating target Makefile..." - ln -s $SRCDIR/config/examples/${RULES_ARCH}_rules.xml $ODIR/rules.xml + echo "ARCH=$ARCH" > $ODIR/config.mak + echo "TARGET=$TARGET" >> $ODIR/config.mak + echo "CFLAGS=$CFLAGS" >> $ODIR/config.mak + echo "AS_FLAGS=$AS_FLAGS" >> $ODIR/config.mak + echo "HOSTARCH?=$HOSTARCH" >> $ODIR/config.mak + echo "CROSSCFLAGS=$CROSSCFLAGS" >> $ODIR/config.mak + ln -s $SRCDIR/config/xml/rules.xml $ODIR/rules.xml ln -s $SRCDIR/config/examples/${RULES_ARCH}_config.xml $ODIR/config.xml + ln -s ../Makefile.target $ODIR/Makefile xsltproc $SRCDIR/config/xml/xinclude.xsl $SRCDIR/build.xml > $ODIR/build-full.xml - xsltproc $SRCDIR/config/xml/makefile.xsl $ODIR/build-full.xml > $ODIR/Makefile + xsltproc $SRCDIR/config/xml/makefile.xsl $ODIR/build-full.xml > $ODIR/rules.mak echo "ok." printf "Creating config files..." xsltproc $SRCDIR/config/xml/config-c.xsl $SRCDIR/config/examples/${RULES_ARCH}_config.xml > $ODIR/host/include/autoconf.h xsltproc $SRCDIR/config/xml/config-c.xsl $SRCDIR/config/examples/${RULES_ARCH}_config.xml > $ODIR/target/include/autoconf.h xsltproc $SRCDIR/config/xml/config-forth.xsl $SRCDIR/config/examples/${RULES_ARCH}_config.xml > $ODIR/forth/config.fs echo "ok." + + grep CONFIG_MOL $ODIR/forth/config.fs >/dev/null && ( \ + echo "Using MOL path $MOLPATH..."; \ + ln -s $MOLPATH/src/shared/osi_calls.h $ODIR/target/include/; \ + ln -s $MOLPATH/src/shared/osi.h $ODIR/target/include/; \ + ln -s $MOLPATH/src/shared/prom.h $ODIR/target/include/; \ + ln -s $MOLPATH/src/include/boothelper_sh.h $ODIR/target/include/; \ + ln -s $MOLPATH/src/include/video_sh.h $ODIR/target/include/; \ + ln -s $MOLPATH/src/include/pseudofs_sh.h $ODIR/target/include/; \ + ln -s $MOLPATH/src/include/kbd_sh.h $ODIR/target/include/; \ + ln -s $MOLPATH/src/drivers/disk/include/scsi_sh.h $ODIR/target/include/; \ + ln -s $MOLPATH/src/drivers/disk/include/ablk_sh.h $ODIR/target/include/ ) || true + cd $SRCDIR done Added: trunk/openbios-devel/config/xml/rules.xml =================================================================== --- trunk/openbios-devel/config/xml/rules.xml (rev 0) +++ trunk/openbios-devel/config/xml/rules.xml 2009-08-02 16:59:05 UTC (rev 532) @@ -0,0 +1,23 @@ +<rules> +  +<rule target="host" entity="executable"> + $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ +</rule> +<rule target="host" entity="object"> + $(HOSTCC) $(HOSTCFLAGS) $(HOSTINCLUDES) -c -o $@ $^ +</rule> +<rule target="host" entity="library"> + $(AR) cru $@ $^; $(RANLIB) $@ +</rule> + +  +<rule target="target" entity="executable"> + $(CC) $(CFLAGS) -o $@ $^ +</rule> +<rule target="target" entity="object"> + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^ +</rule> +<rule target="target" entity="library"> + $(AR) cru $@ $^; $(RANLIB) $@ +</rule> +</rules>

1 0

r531 - trunk/openbios-devel/config/scripts
by svn＠openbios.org 02 Aug '09

02 Aug '09

Author: blueswirl Date: 2009-08-02 14:41:31 +0200 (Sun, 02 Aug 2009) New Revision: 531 Modified: trunk/openbios-devel/config/scripts/crosscflags Log: Make crosscflags executable Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Property changes on: trunk/openbios-devel/config/scripts/crosscflags ___________________________________________________________________ Added: svn:executable + *

1 0

r530 - trunk/openbios-devel
by svn＠openbios.org 02 Aug '09

02 Aug '09

Author: blueswirl Date: 2009-08-02 14:37:02 +0200 (Sun, 02 Aug 2009) New Revision: 530 Added: trunk/openbios-devel/.gitignore Log: Add a .gitignore file Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Added: trunk/openbios-devel/.gitignore =================================================================== --- trunk/openbios-devel/.gitignore (rev 0) +++ trunk/openbios-devel/.gitignore 2009-08-02 12:37:02 UTC (rev 530) @@ -0,0 +1 @@ +obj-*

1 0

r529 - trunk/openbios-devel/modules
by svn＠openbios.org 02 Aug '09

02 Aug '09

Author: blueswirl Date: 2009-08-02 14:28:24 +0200 (Sun, 02 Aug 2009) New Revision: 529 Modified: trunk/openbios-devel/modules/sun-parts.c Log: Fix compile when CONFIG_DEBUG_SUN_PARTS is defined Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/modules/sun-parts.c =================================================================== --- trunk/openbios-devel/modules/sun-parts.c 2009-08-02 11:08:01 UTC (rev 528) +++ trunk/openbios-devel/modules/sun-parts.c 2009-08-02 12:28:24 UTC (rev 529) @@ -146,7 +146,8 @@ di->size_hi = size >> BITS; di->size_lo = size & (ucell) -1; di->type = __be32_to_cpu(p->infos[parnum].id); - DPRINTF("Found Sun partition table, offs %lld size %lld\n", offs, size); + DPRINTF("Found Sun partition table, offs %lld size %lld\n", + (llong)offs, (llong)size); RET( -1 ); }

1 0

r528 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 config/examples
by svn＠openbios.org 02 Aug '09

02 Aug '09

Author: blueswirl Date: 2009-08-02 13:08:01 +0200 (Sun, 02 Aug 2009) New Revision: 528 Modified: trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h trunk/openbios-devel/config/examples/cross-sparc64_config.xml Log: switch sparc64 to ofmem module implementation (Igor Kovalenko) Modified: trunk/openbios-devel/arch/sparc32/lib.c =================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c 2009-08-02 11:07:13 UTC (rev 527) +++ trunk/openbios-devel/arch/sparc32/lib.c 2009-08-02 11:08:01 UTC (rev 528) @@ -68,25 +68,6 @@ struct linux_mlist_v0 *ptmap; struct linux_mlist_v0 *ptavail; -typedef struct alloc_desc { - struct alloc_desc *next; - int size; /* size (including) this struct */ -} alloc_desc_t; - -typedef struct mem_range { - struct mem_range *next; - ulong start; - ulong size; -} range_t; - -typedef struct trans { - struct trans *next; - ulong virt; /* chain is sorted by virt */ - ulong size; - ulong phys; - int mode; -} translation_t; - static struct { char *next_malloc; int left; Modified: trunk/openbios-devel/arch/sparc64/lib.c =================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c 2009-08-02 11:07:13 UTC (rev 527) +++ trunk/openbios-devel/arch/sparc64/lib.c 2009-08-02 11:08:01 UTC (rev 528) @@ -298,11 +298,19 @@ } } -void ofmem_unmap_pages(ucell virt, ucell size) +void ofmem_arch_unmap_pages(ucell virt, ucell size) { unmap_pages(virt, size); } +void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, ucell mode) +{ + if (mode & SPITFIRE_TTE_LOCKED) { + // install locked tlb entries now + ofmem_map_pages(phys, virt, size, mode); + } +} + /* 3.6.5 unmap ( virt size -- ) @@ -332,14 +340,8 @@ virt = POP(); } - printk("claim virt=" FMT_ucellx " size=" FMT_ucellx " align=" FMT_ucellx - "\n", - virt, size, align); - virt = ofmem_claim_virt(virt, size, align); - printk("claimed virt=" FMT_ucellx "\n", virt); - PUSH(virt); } @@ -354,9 +356,8 @@ size = POP(); virt = POP(); - printk("release virt=" FMT_ucellx " size=" FMT_ucellx "\n", virt, size); - ofmem_release(virt, size); + ofmem_release_virt(virt, size); } /* ( phys size align --- base ) */ @@ -373,14 +374,8 @@ phys |= POP(); } - printk("mem_claim phys=" FMT_ucellx " size=" FMT_ucellx - " align=" FMT_ucellx "\n", - phys, size, align); - phys = ofmem_claim_phys(phys, size, align); - printk("ofmem_claim_phys result phys=" FMT_ucellx "\n", phys); - ofmem_map(phys, phys, size, -1); PUSH(phys >> 32); @@ -395,9 +390,8 @@ size = POP(); phys = POP(); - printk("release virt=" FMT_ucellx " size=" FMT_ucellx "\n", phys, size); - ofmem_release(phys, size); + ofmem_release_phys(phys, size); } DECLARE_NODE(memory, INSTALL_OPEN, 0, "/memory"); Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c =================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c 2009-08-02 11:07:13 UTC (rev 527) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c 2009-08-02 11:08:01 UTC (rev 528) @@ -18,11 +18,6 @@ #include "ofmem_sparc64.h" #include "spitfire.h" -static inline uint64_t ALIGN_SIZE(uint64_t x, uint64_t a) -{ - return (x + a - 1) & ~(a-1); -} - #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) #define MEMSIZE ((128 + 256 + 512) * 1024) @@ -36,199 +31,41 @@ translation_t **g_ofmem_translations = &s_ofmem_data.ofmem.trans; -ulong get_ram_size( void ) +static ucell get_heap_top( void ) { - ofmem_t *ofmem = OFMEM; - return ofmem->ramsize; + return (ucell)TOP_OF_RAM; } -static phandle_t s_phandle_memory = 0; -static phandle_t s_phandle_mmu = 0; - -static void ofmem_update_mmu_translations( void ) +static inline size_t ALIGN_SIZE(size_t x, size_t a) { - ofmem_t *ofmem = OFMEM; - translation_t *t; - int ncells; - ucell *props; - - if (s_phandle_mmu == 0) - return; - - for( t = ofmem->trans, ncells = 0; t ; t=t->next, ncells++ ) { - } - - props = malloc(ncells * sizeof(ucell) * 3); - - if (props == NULL) - return; - - for( t = ofmem->trans, ncells = 0 ; t ; t=t->next ) { - props[ncells++] = t->virt; - props[ncells++] = t->size; - props[ncells++] = t->mode; - } - - set_property(s_phandle_mmu, "translations", - (char*)props, ncells * sizeof(props[0])); - - free(props); + return (x + a - 1) & ~(a-1); } -static void ofmem_update_memory_available( phandle_t ph, range_t *range, - u64 top_address ) +ofmem_t* ofmem_arch_get_private(void) { - range_t *r; - int ncells; - ucell *props; - - ucell start, size; - - if (s_phandle_memory == 0) - return; - - /* count phys_range list entries */ - for( r = range, ncells = 0; r ; r=r->next, ncells++ ) { - } - - /* inverse of phys_range list could take 2 more cells for the tail */ - props = malloc((ncells+1) * sizeof(ucell) * 2); - - if (props == NULL) { - /* out of memory! */ - return; - } - - start = 0; - ncells = 0; - - for (r = range; r; r=r->next) { - if (r->start >= top_address) { - break; - } - - size = r->start - start; - if (size) { - props[ncells++] = start; - props[ncells++] = size; - } - start = r->start + r->size; - } - - /* tail */ - if (start < top_address) { - props[ncells++] = start; - props[ncells++] = top_address - start; - } - - set_property(ph, "available", - (char*)props, ncells * sizeof(props[0])); - - free(props); + return OFMEM; } -static void ofmem_update_translations( void ) +void* ofmem_arch_get_malloc_base(void) { - ofmem_t *ofmem = OFMEM; - - ofmem_update_memory_available(s_phandle_memory, - ofmem->phys_range, ofmem->ramsize); - ofmem_update_memory_available(s_phandle_mmu, - ofmem->virt_range, -1ULL); - ofmem_update_mmu_translations(); + return OF_MALLOC_BASE; } -/************************************************************************/ -/* OF private allocations */ -/************************************************************************/ - -void* ofmem_malloc( size_t size ) +ucell ofmem_arch_get_heap_top(void) { - ofmem_t *ofmem = OFMEM; - alloc_desc_t *d, **pp; - char *ret; - - if( !size ) - return NULL; - - if( !ofmem->next_malloc ) - ofmem->next_malloc = (char*)OF_MALLOC_BASE; - - /* assuming sizeof(alloc_desc_t) is multiple of 8 */ - size = ALIGN_SIZE(size + sizeof(alloc_desc_t), 8); - - /* look in the freelist */ - for( pp=&ofmem->mfree; *pp && (**pp).size < size; pp = &(**pp).next ) { - } - - /* waste at most 4K by taking an entry from the freelist */ - if( *pp && (**pp).size < size + 0x1000 ) { - ret = (char*)*pp + sizeof(alloc_desc_t); - memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); - *pp = (**pp).next; - return ret; - } - - if( ofmem->next_malloc + size >= TOP_OF_RAM ) { - printk("out of malloc memory (%x)!\n", size ); - return NULL; - } - - d = (alloc_desc_t*) ofmem->next_malloc; - ofmem->next_malloc += size; - - d->next = NULL; - d->size = size; - - ret = (char*)d + sizeof(alloc_desc_t); - memset( ret, 0, size - sizeof(alloc_desc_t) ); - - return ret; + return get_heap_top(); } -void ofmem_free( void *ptr ) +ucell ofmem_arch_get_virt_top(void) { - ofmem_t *ofmem = OFMEM; - alloc_desc_t **pp, *d; - - /* it is legal to free NULL pointers (size zero allocations) */ - if( !ptr ) - return; - - d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t)); - d->next = ofmem->mfree; - - /* insert in the (sorted) freelist */ - for( pp=&ofmem->mfree; *pp && (**pp).size < d->size ; pp = &(**pp).next ) { - } - - d->next = *pp; - *pp = d; + return (ucell)TOP_OF_RAM; } -void* ofmem_realloc( void *ptr, size_t size ) -{ - alloc_desc_t *d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t)); - char *p; - - if( !ptr ) - return malloc( size ); - if( !size ) { - free( ptr ); - return NULL; - } - p = malloc( size ); - memcpy( p, ptr, MIN(d->size - sizeof(alloc_desc_t),size) ); - free( ptr ); - return p; -} - - /************************************************************************/ /* misc */ /************************************************************************/ -static inline ucell def_memmode( ucell phys ) +ucell ofmem_arch_default_translation_mode( ucell phys ) { /* Writable, cacheable */ /* not privileged and not locked */ @@ -236,399 +73,9 @@ } -/************************************************************************/ -/* client interface */ -/************************************************************************/ -static int is_free( ucell ea, ucell size, range_t *r ) -{ - if( size == 0 ) - return 1; - for( ; r ; r=r->next ) { - if( r->start + r->size - 1 >= ea && r->start <= ea ) - return 0; - if( r->start >= ea && r->start <= ea + size - 1 ) - return 0; - } - return 1; -} -static void add_entry_( ucell ea, ucell size, range_t **r ) -{ - range_t *nr; - - for( ; *r && (**r).start < ea; r=&(**r).next ) { - } - - nr = (range_t*)malloc( sizeof(range_t) ); - nr->next = *r; - nr->start = ea; - nr->size = size; - *r = nr; -} - -static int add_entry( ucell ea, ucell size, range_t **r ) -{ - if( !is_free( ea, size, *r ) ) { - printk("add_entry: range not free!\n"); - return -1; - } - add_entry_( ea, size, r ); - return 0; -} - -static ucell find_area( ucell align, ucell size, range_t *r, - ucell min, ucell max, int reverse ) -{ - ucell base = min; - range_t *r2; - - if( (align & (align-1)) ) { - printk("bad alignment " FMT_ucell "\n", align); - align = 0x1000; - } - if( !align ) - align = 0x1000; - - base = reverse ? max - size : min; - r2 = reverse ? NULL : r; - - for( ;; ) { - if( !reverse ) { - base = (base + align - 1) & ~(align-1); - if( base < min ) - base = min; - if( base + size - 1 >= max -1 ) - break; - } else { - if( base > max - size ) - base = max - size; - base -= base & (align-1); - } - if( is_free( base, size, r ) ) - return base; - - if( !reverse ) { - if( !r2 ) - break; - base = r2->start + r2->size; - r2 = r2->next; - } else { - range_t *rp; - - for( rp=r; rp && rp->next != r2 ; rp=rp->next ) { - } - - r2 = rp; - if( !r2 ) - break; - base = r2->start - size; - } - } - return (ucell)-1; -} - -static ucell ofmem_claim_phys_( ucell phys, ucell size, ucell align, - ucell min, ucell max, int reverse ) -{ - ofmem_t *ofmem = OFMEM; - if( !align ) { - if( !is_free( phys, size, ofmem->phys_range ) ) { - printk("Non-free physical memory claimed!\n"); - return -1; - } - add_entry( phys, size, &ofmem->phys_range ); - return phys; - } - phys = find_area( align, size, ofmem->phys_range, min, max, reverse ); - if( phys == (ucell)-1 ) { - printk("ofmem->claim_phys - out of space\n"); - return -1; - } - add_entry( phys, size, &ofmem->phys_range ); - - ofmem_update_translations(); - - return phys; -} - -/* if align != 0, phys is ignored. Returns -1 on error */ -ucell ofmem_claim_phys( ucell phys, ucell size, ucell align ) -{ - /* printk("+ ofmem_claim phys %08lx %lx %ld\n", phys, size, align ); */ - return ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); -} - -static ucell ofmem_claim_virt_( ucell virt, ucell size, ucell align, - ucell min, ucell max, int reverse ) -{ - ofmem_t *ofmem = OFMEM; - if( !align ) { - if( !is_free( virt, size, ofmem->virt_range ) ) { - printk("Non-free physical memory claimed!\n"); - return -1; - } - add_entry( virt, size, &ofmem->virt_range ); - return virt; - } - - virt = find_area( align, size, ofmem->virt_range, min, max, reverse ); - if( virt == -1UL ) { - printk("ofmem_claim_virt - out of space\n"); - return -1UL; - } - add_entry( virt, size, &ofmem->virt_range ); - return virt; -} - -ucell ofmem_claim_virt( ucell virt, ucell size, ucell align ) -{ - /* printk("+ ofmem_claim virt %08lx %lx %ld\n", virt, size, align ); */ - return ofmem_claim_virt_( virt, size, align, get_ram_size(), (ucell)TOP_OF_RAM, 0 ); -} - - -/* allocate both physical and virtual space and add a translation */ -ucell ofmem_claim( ucell addr, ucell size, ucell align ) -{ - ofmem_t *ofmem = OFMEM; - ucell virt, phys; - ucell offs = addr & 0xfff; - - /* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */ - virt = phys = 0; - if( !align ) { - if( is_free(addr, size, ofmem->virt_range) && - is_free(addr, size, ofmem->phys_range) ) { - ofmem_claim_phys_( addr, size, 0, 0, 0, 0 ); - ofmem_claim_virt_( addr, size, 0, 0, 0, 0 ); - virt = phys = addr; - } else { - /* printk("**** ofmem_claim failure ***!\n"); */ - return -1; - } - } else { - if( align < 0x1000 ) - align = 0x1000; - phys = ofmem_claim_phys_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); - virt = ofmem_claim_virt_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); - if( phys == (ucell)-1 || virt == (ucell)-1 ) { - printk("ofmem_claim failed\n"); - return -1; - } - /* printk("...phys = %08lX, virt = %08lX, size = %08lX\n", phys, virt, size ); */ - } - - /* align */ - if( phys & 0xfff ) { - size += (phys & 0xfff); - virt -= (phys & 0xfff); - phys &= ~0xfff; - } - if( size & 0xfff ) - size = (size + 0xfff) & ~0xfff; - - /* printk("...free memory found... phys: %08lX, virt: %08lX, size %lX\n", phys, virt, size ); */ - ofmem_map( phys, virt, size, -1 ); - return virt + offs; -} - - /************************************************************************/ -/* keep track of ea -> phys translations */ -/************************************************************************/ - -static void split_trans( ucell virt ) -{ - ofmem_t *ofmem = OFMEM; - translation_t *t, *t2; - - for( t=ofmem->trans; t; t=t->next ) { - if( virt > t->virt && virt < t->virt + t->size-1 ) { - t2 = (translation_t*)malloc( sizeof(translation_t) ); - t2->virt = virt; - t2->size = t->size - (virt - t->virt); - t->size = virt - t->virt; - t2->phys = t->phys + t->size; - t2->mode = t->mode; - t2->next = t->next; - t->next = t2; - } - } -} - -static int map_page_range( ucell phys, ucell virt, ucell size, ucell mode ) -{ - ofmem_t *ofmem = OFMEM; - translation_t *t, **tt; - - OFMEM_TRACE("map_page_range " FMT_ucellx - " -> " FMT_ucellx " " FMT_ucellx " mode " FMT_ucellx "\n", - virt, phys, size, mode ); - - split_trans( virt ); - split_trans( virt + size ); - - /* detect remappings */ - for( t=ofmem->trans; t; ) { - if( virt == t->virt || (virt < t->virt && virt + size > t->virt )) { - if( t->phys + virt - t->virt != phys ) { - OFMEM_TRACE("mapping altered virt=" FMT_ucellx ")\n", t->virt ); - } else if( t->mode != mode ){ - OFMEM_TRACE("mapping mode altered virt=" FMT_ucellx - " old mode=" FMT_ucellx " new mode=" FMT_ucellx "\n", - t->virt, t->mode, mode); - } - - for( tt=&ofmem->trans; *tt != t ; tt=&(**tt).next ) { - } - - *tt = t->next; - - /* really unmap these pages */ - ofmem_unmap_pages(t->virt, t->size); - - free((char*)t); - - t=ofmem->trans; - continue; - } - t=t->next; - } - - /* add mapping */ - for( tt=&ofmem->trans; *tt && (**tt).virt < virt ; tt=&(**tt).next ) { - } - - t = (translation_t*)malloc( sizeof(translation_t) ); - t->virt = virt; - t->phys = phys; - t->size = size; - t->mode = mode; - t->next = *tt; - *tt = t; - - ofmem_update_translations(); - - return 0; -} - -static int unmap_page_range( ucell virt, ucell size ) -{ - ofmem_t *ofmem = OFMEM; - translation_t **plink; - - /* make sure there is exactly one matching translation entry */ - - split_trans( virt ); - split_trans( virt + size ); - - /* find and unlink entries in range */ - plink = &ofmem->trans; - - while (*plink && (*plink)->virt < virt+size) { - translation_t **plinkentry = plink; - translation_t *t = *plink; - - /* move ahead */ - plink = &t->next; - - if (t->virt >= virt && t->virt + t->size <= virt+size) { - - /* unlink entry */ - *plinkentry = t->next; - - printk("unmap_page_range found " FMT_ucellx - " -> " FMT_ucellx " " FMT_ucellx " mode " FMT_ucellx "\n", - t->virt, t->phys, t->size, t->mode ); - - // really map these pages - ofmem_unmap_pages(t->virt, t->size); - - free((char*)t); - } - } - - ofmem_update_translations(); - - return 0; -} - -int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ) -{ - /* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n", - virt, phys, size, mode ); */ - - if( (phys & 0xfff) || (virt & 0xfff) || (size & 0xfff) ) { - /* printk("ofmem_map: Bad parameters (%08lX %08lX %08lX)\n", - phys, virt, size ); */ - phys &= ~0xfff; - virt &= ~0xfff; - size = (size + 0xfff) & ~0xfff; - } - - if (mode==-1) { - mode = def_memmode(phys); - } - - // install translations - map_page_range(phys, virt, size, mode); - - if (mode & SPITFIRE_TTE_LOCKED) { - // install locked tlb entries now - ofmem_map_pages(phys, virt, size, mode); - } - - return 0; -} - -int ofmem_unmap( ucell virt, ucell size ) -{ - OFMEM_TRACE("ofmem_unmap " FMT_ucellx " " FMT_ucellx "\n", - virt, size ); - - if( (virt & 0xfff) || (size & 0xfff) ) { - /* printk("ofmem_unmap: Bad parameters (%08lX %08lX)\n", - virt, size ); */ - virt &= ~0xfff; - size = (size + 0xfff) & ~0xfff; - } - - /* remove translations and unmap pages */ - unmap_page_range(virt, size); - - return 0; -} - -/* virtual -> physical. */ -ucell ofmem_translate( ucell virt, ucell *mode ) -{ - ofmem_t *ofmem = OFMEM; - translation_t *t; - - for( t=ofmem->trans; t && t->virt <= virt ; t=t->next ) { - ucell offs; - if( t->virt + t->size - 1 < virt ) - continue; - offs = virt - t->virt; - *mode = t->mode; - return t->phys + offs; - } - - /*printk("ofmem_translate: no translation defined (%08lx)\n", virt);*/ - /*print_trans();*/ - return -1UL; -} - -/* release memory allocated by ofmem_claim */ -void ofmem_release( ucell virt, ucell size ) -{ - printk("ofmem_release unimplemented (" FMT_ucellx ", " FMT_ucellx ")\n", - virt, size ); -} - - -/************************************************************************/ /* init / cleanup */ /************************************************************************/ @@ -636,12 +83,12 @@ static int remap_page_range( ucell phys, ucell virt, ucell size, ucell mode ) { - map_page_range(phys, virt, size, mode); + ofmem_map_page_range(phys, virt, size, mode); if (!(mode & SPITFIRE_TTE_LOCKED)) { OFMEM_TRACE("remap_page_range clearing translation " FMT_ucellx " -> " FMT_ucellx " " FMT_ucellx " mode " FMT_ucellx "\n", virt, phys, size, mode ); - ofmem_unmap_pages(virt, size); + ofmem_arch_unmap_pages(virt, size); } return 0; } @@ -655,10 +102,3 @@ ofmem_walk_boot_map(remap_page_range); } -void ofmem_register( phandle_t ph_memory, phandle_t ph_mmu ) -{ - s_phandle_memory = ph_memory; - s_phandle_mmu = ph_mmu; - - ofmem_update_translations(); -} Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h =================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h 2009-08-02 11:07:13 UTC (rev 527) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h 2009-08-02 11:08:01 UTC (rev 528) @@ -16,54 +16,13 @@ #include "ofmem.h" -extern void* ofmem_malloc( size_t size ); -extern void ofmem_free( void *ptr ); -extern void* ofmem_realloc( void *ptr, size_t size ); - -extern int ofmem_unmap(ucell virt, ucell size); - -ulong get_ram_size( void ); -ulong get_ram_top( void ); -ulong get_ram_bottom( void ); -extern void ofmem_register( phandle_t ph_memory, phandle_t ph_mmu ); extern void ofmem_map_pages(ucell phys, ucell virt, ucell size, ucell mode); -extern void ofmem_unmap_pages(ucell virt, ucell size); typedef int (*translation_entry_cb)(ucell phys, ucell virt, ucell size, ucell mode); extern void ofmem_walk_boot_map(translation_entry_cb cb); -typedef struct alloc_desc { - struct alloc_desc *next; - ucell size; /* size (including) this struct */ -} alloc_desc_t; - -typedef struct mem_range { - struct mem_range *next; - ucell start; - ucell size; -} range_t; - -typedef struct trans { - struct trans *next; - ucell virt; /* chain is sorted by virt */ - ucell size; - ucell phys; - ucell mode; -} translation_t; - -typedef struct { - uint64_t ramsize; - char *next_malloc; - alloc_desc_t *mfree; /* list of free malloc blocks */ - - range_t *phys_range; - range_t *virt_range; - - translation_t *trans; /* this is really a translation_t */ -} ofmem_t; - extern translation_t **g_ofmem_translations; #endif /* _H_OFMEM_SPARC64 */ Modified: trunk/openbios-devel/config/examples/cross-sparc64_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-sparc64_config.xml 2009-08-02 11:07:13 UTC (rev 527) +++ trunk/openbios-devel/config/examples/cross-sparc64_config.xml 2009-08-02 11:08:01 UTC (rev 528) @@ -38,6 +38,8 @@ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + <option name="CONFIG_OFMEM" type="boolean" value="true"/> + <option name="CONFIG_OFMEM_MALLOC_ALIGN" type="integer" value="8"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/>

1 0

r527 - in trunk/openbios-devel: arch/ppc arch/ppc/qemu config/examples
by svn＠openbios.org 02 Aug '09

02 Aug '09

Author: blueswirl Date: 2009-08-02 13:07:13 +0200 (Sun, 02 Aug 2009) New Revision: 527 Modified: trunk/openbios-devel/arch/ppc/ofmem.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/config/examples/cross-ppc_config.xml Log: switch ppc to ofmem module implementation (Igor Kovalenko) Modified: trunk/openbios-devel/arch/ppc/ofmem.c =================================================================== --- trunk/openbios-devel/arch/ppc/ofmem.c 2009-08-02 11:06:13 UTC (rev 526) +++ trunk/openbios-devel/arch/ppc/ofmem.c 2009-08-02 11:07:13 UTC (rev 527) @@ -69,35 +69,6 @@ #define RAMSIZE 0x02000000 /* XXXXXXXXXXXXXXXXXXX FIXME XXXXXXXXXXXXXXX */ -typedef struct alloc_desc { - struct alloc_desc *next; - ucell size; /* size (including) this struct */ -} alloc_desc_t; - -typedef struct mem_range { - struct mem_range *next; - ucell start; - ucell size; -} range_t; - -typedef struct trans { - struct trans *next; - ucell virt; /* chain is sorted by virt */ - ucell size; - ucell phys; - ucell mode; -} translation_t; - -typedef struct { - char *next_malloc; - alloc_desc_t *mfree; /* list of free malloc blocks */ - - range_t *phys_range; - range_t *virt_range; - - translation_t *trans; /* this is really a translation_t */ -} ofmem_t; - static ofmem_t s_ofmem; #define IO_BASE 0x80000000 @@ -115,500 +86,82 @@ return HASH_SIZE; } -ulong -get_ram_size( void ) +static ucell get_heap_top( void ) { - return RAMSIZE; + return HASH_BASE; } -/************************************************************************/ -/* OF private allocations */ -/************************************************************************/ - -void * -malloc( int size ) +static inline size_t ALIGN_SIZE(size_t x, size_t a) { - ofmem_t *ofmem = OFMEM; - alloc_desc_t *d, **pp; - char *ret; - ulong top; - - if( !size ) - return NULL; - - if( !ofmem->next_malloc ) - ofmem->next_malloc = (char*)OF_MALLOC_BASE; - - if( size & 3 ) - size += 4 - (size & 3); - size += sizeof(alloc_desc_t); - - /* look in the freelist */ - for( pp=&ofmem->mfree; *pp && (**pp).size < size; pp = &(**pp).next ) - ; - - /* waste at most 4K by taking an entry from the freelist */ - if( *pp && (**pp).size < size + 0x1000 ) { - ret = (char*)*pp + sizeof(alloc_desc_t); - memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); - *pp = (**pp).next; - return ret; - } - - top = HASH_BASE; - if( (ulong)ofmem->next_malloc + size > top ) { - printk("out of malloc memory (%x)!\n", size ); - return NULL; - } - - d = (alloc_desc_t*) ofmem->next_malloc; - ofmem->next_malloc += size; - - d->next = NULL; - d->size = size; - - ret = (char*)d + sizeof(alloc_desc_t); - memset( ret, 0, size - sizeof(alloc_desc_t) ); - - return ret; + return (x + a - 1) & ~(a-1); } -void -free( void *ptr ) +ofmem_t* ofmem_arch_get_private(void) { - ofmem_t *ofmem = OFMEM; - alloc_desc_t **pp, *d; - - /* it is legal to free NULL pointers (size zero allocations) */ - if( !ptr ) - return; - - d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t)); - d->next = ofmem->mfree; - - /* insert in the (sorted) freelist */ - for( pp=&ofmem->mfree; *pp && (**pp).size < d->size ; pp = &(**pp).next ) - ; - d->next = *pp; - *pp = d; + return OFMEM; } -void * -realloc( void *ptr, size_t size ) +void* ofmem_arch_get_malloc_base(void) { - alloc_desc_t *d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t)); - char *p; - - if( !ptr ) - return malloc( size ); - if( !size ) { - free( ptr ); - return NULL; - } - p = malloc( size ); - memcpy( p, ptr, MIN(d->size - sizeof(alloc_desc_t),size) ); - free( ptr ); - return p; + return OF_MALLOC_BASE; } - -/************************************************************************/ -/* debug */ -/************************************************************************/ - -#if 0 -static void -print_range( range_t *r, char *str ) +ucell ofmem_arch_get_heap_top(void) { - printk("--- Range %s ---\n", str ); - for( ; r; r=r->next ) - printk("%08lx - %08lx\n", r->start, r->start + r->size -1 ); - printk("\n"); + return get_heap_top(); } -static void -print_phys_range() +ucell ofmem_arch_get_virt_top(void) { - print_range( ofmem.phys_range, "phys" ); + return IO_BASE; } -static void -print_virt_range() +void ofmem_arch_unmap_pages(ucell virt, ucell size) { - print_range( ofmem.virt_range, "virt" ); + /* kill page mappings in provided range */ } -static void -print_trans( void ) +void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, ucell mode) { - translation_t *t = ofmem.trans; - - printk("--- Translations ---\n"); - for( ; t; t=t->next ) - printk("%08lx -> %08lx [size %lx]\n", t->virt, t->phys, t->size ); - printk("\n"); + /* none yet */ } -#endif - /************************************************************************/ -/* misc */ +/* OF private allocations */ /************************************************************************/ -static inline ucell -def_memmode( ucell phys ) +void * +malloc( int size ) { - /* XXX: Guard bit not set as it should! */ - if( phys < IO_BASE || phys >= 0xffc00000 ) - return 0x02; /*0xa*/ /* wim GxPp */ - return 0x6a; /* WIm GxPp, I/O */ + return ofmem_malloc(size); } - -/************************************************************************/ -/* client interface */ -/************************************************************************/ - -static int -is_free( ucell ea, ucell size, range_t *r ) +void +free( void *ptr ) { - if( size == 0 ) - return 1; - for( ; r ; r=r->next ) { - if( r->start + r->size - 1 >= ea && r->start <= ea ) - return 0; - if( r->start >= ea && r->start <= ea + size - 1 ) - return 0; - } - return 1; + return ofmem_free(ptr); } -static void -add_entry_( ucell ea, ucell size, range_t **r ) +void * +realloc( void *ptr, size_t size ) { - range_t *nr; - - for( ; *r && (**r).start < ea; r=&(**r).next ) - ; - nr = (range_t*)malloc( sizeof(range_t) ); - nr->next = *r; - nr->start = ea; - nr->size = size; - *r = nr; + return ofmem_realloc(ptr, size); } -static int -add_entry( ucell ea, ucell size, range_t **r ) -{ - if( !is_free( ea, size, *r ) ) { - printk("add_entry: range not free!\n"); - return -1; - } - add_entry_( ea, size, r ); - return 0; -} -static void -join_ranges( range_t **rr ) -{ - range_t *n, *r = *rr; - while( r ) { - if( !(n=r->next) ) - break; - - if( r->start + r->size - 1 >= n->start -1 ) { - int s = n->size + (n->start - r->start - r->size); - if( s > 0 ) - r->size += s; - r->next = n->next; - free( n ); - continue; - } - r=r->next; - } -} - -static void -fill_range( ucell ea, ucell size, range_t **rr ) -{ - add_entry_( ea, size, rr ); - join_ranges( rr ); -} - -static ucell -find_area( ucell align, ucell size, range_t *r, ucell min, ucell max, int reverse ) -{ - ucell base = min; - range_t *r2; - - if( (align & (align-1)) ) { - printk("bad alignment " FMT_ucell "\n", align); - align = 0x1000; - } - if( !align ) - align = 0x1000; - - base = reverse ? max - size : min; - r2 = reverse ? NULL : r; - - for( ;; ) { - if( !reverse ) { - base = (base + align - 1) & ~(align-1); - if( base < min ) - base = min; - if( base + size - 1 >= max -1 ) - break; - } else { - if( base > max - size ) - base = max - size; - base -= base & (align-1); - } - if( is_free( base, size, r ) ) - return base; - - if( !reverse ) { - if( !r2 ) - break; - base = r2->start + r2->size; - r2 = r2->next; - } else { - range_t *rp; - for( rp=r; rp && rp->next != r2 ; rp=rp->next ) - ; - r2 = rp; - if( !r2 ) - break; - base = r2->start - size; - } - } - return (ucell)-1; -} - -static ucell -ofmem_claim_phys_( ucell phys, ucell size, ucell align, ucell min, ucell max, int reverse ) -{ - ofmem_t *ofmem = OFMEM; - if( !align ) { - if( !is_free( phys, size, ofmem->phys_range ) ) { - printk("Non-free physical memory claimed!\n"); - return -1; - } - add_entry( phys, size, &ofmem->phys_range ); - return phys; - } - phys = find_area( align, size, ofmem->phys_range, min, max, reverse ); - if( phys == (ucell)-1 ) { - printk("ofmem_claim_phys - out of space\n"); - return -1; - } - add_entry( phys, size, &ofmem->phys_range ); - return phys; -} - -/* if align != 0, phys is ignored. Returns -1 on error */ -ucell -ofmem_claim_phys( ucell phys, ucell size, ucell align ) -{ - /* printk("+ ofmem_claim phys %08lx %lx %ld\n", phys, size, align ); */ - return ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); -} - -static ucell -ofmem_claim_virt_( ucell virt, ucell size, ucell align, ucell min, ucell max, int reverse ) -{ - ofmem_t *ofmem = OFMEM; - if( !align ) { - if( !is_free( virt, size, ofmem->virt_range ) ) { - printk("Non-free physical memory claimed!\n"); - return -1; - } - add_entry( virt, size, &ofmem->virt_range ); - return virt; - } - - virt = find_area( align, size, ofmem->virt_range, min, max, reverse ); - if( virt == (ucell)-1 ) { - printk("ofmem_claim_virt - out of space\n"); - return -1; - } - add_entry( virt, size, &ofmem->virt_range ); - return virt; -} - -ucell -ofmem_claim_virt( ucell virt, ucell size, ucell align ) -{ - /* printk("+ ofmem_claim virt %08lx %lx %ld\n", virt, size, align ); */ - return ofmem_claim_virt_( virt, size, align, get_ram_size() , IO_BASE, 0 ); -} - - -/* allocate both physical and virtual space and add a translation */ -ucell -ofmem_claim( ucell addr, ucell size, ucell align ) -{ - ofmem_t *ofmem = OFMEM; - ucell virt, phys; - ucell offs = addr & 0xfff; - - /* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */ - virt = phys = 0; - if( !align ) { - if( is_free(addr, size, ofmem->virt_range) && - is_free(addr, size, ofmem->phys_range) ) { - ofmem_claim_phys_( addr, size, 0, 0, 0, 0 ); - ofmem_claim_virt_( addr, size, 0, 0, 0, 0 ); - virt = phys = addr; - } else { - printk("**** ofmem_claim failure ***!\n"); - return -1; - } - } else { - if( align < 0x1000 ) - align = 0x1000; - phys = ofmem_claim_phys_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); - virt = ofmem_claim_virt_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); - if( phys == (ucell)-1 || virt == (ucell)-1 ) { - printk("ofmem_claim failed\n"); - return -1; - } - /* printk("...phys = %08lX, virt = %08lX, size = %08lX\n", phys, virt, size ); */ - } - - /* align */ - if( phys & 0xfff ) { - size += (phys & 0xfff); - virt -= (phys & 0xfff); - phys &= ~0xfff; - } - if( size & 0xfff ) - size = (size + 0xfff) & ~0xfff; - - /* printk("...free memory found... phys: %08lX, virt: %08lX, size %lX\n", phys, virt, size ); */ - ofmem_map( phys, virt, size, def_memmode(phys) ); - return virt + offs; -} - - /************************************************************************/ -/* keep track of ea -> phys translations */ +/* misc */ /************************************************************************/ -static void -split_trans( ucell virt ) +ucell ofmem_arch_default_translation_mode( ucell phys ) { - ofmem_t *ofmem = OFMEM; - translation_t *t, *t2; - - for( t=ofmem->trans; t; t=t->next ) { - if( virt > t->virt && virt < t->virt + t->size-1 ) { - t2 = (translation_t*)malloc( sizeof(translation_t) ); - t2->virt = virt; - t2->size = t->size - (virt - t->virt); - t->size = virt - t->virt; - t2->phys = t->phys + t->size; - t2->mode = t->mode; - t2->next = t->next; - t->next = t2; - } - } + /* XXX: Guard bit not set as it should! */ + if( phys < IO_BASE || phys >= 0xffc00000 ) + return 0x02; /*0xa*/ /* wim GxPp */ + return 0x6a; /* WIm GxPp, I/O */ } -static int -map_page_range( ucell virt, ucell phys, ucell size, ucell mode ) -{ - ofmem_t *ofmem = OFMEM; - translation_t *t, **tt; - split_trans( virt ); - split_trans( virt + size ); - - /* detect remappings */ - for( t=ofmem->trans; t; ) { - if( virt == t->virt || (virt < t->virt && virt + size > t->virt )) { - if( t->phys + virt - t->virt != phys ) { - printk("mapping altered (ea " FMT_ucellx ")\n", t->virt ); - } else if( t->mode != mode ){ - printk("mapping mode altered\n"); - } - for( tt=&ofmem->trans; *tt != t ; tt=&(**tt).next ) - ; - *tt = t->next; - free((char*)t); - t=ofmem->trans; - continue; - } - t=t->next; - } - /* add mapping */ - for( tt=&ofmem->trans; *tt && (**tt).virt < virt ; tt=&(**tt).next ) - ; - t = (translation_t*)malloc( sizeof(translation_t) ); - t->virt = virt; - t->phys = phys; - t->size = size; - t->mode = mode; - t->next = *tt; - *tt = t; - - return 0; -} - -int -ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ) -{ - ofmem_t *ofmem = OFMEM; - /* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n", - virt, phys, size, mode ); */ - - if( (phys & 0xfff) || (virt & 0xfff) || (size & 0xfff) ) { - printk("ofmem_map: Bad parameters (" FMT_ucellX " " FMT_ucellX " " - FMT_ucellX ")\n", - phys, virt, size ); - phys &= ~0xfff; - virt &= ~0xfff; - size = (size + 0xfff) & ~0xfff; - } -#if 1 - /* claim any unclaimed virtual memory in the range */ - fill_range( virt, size, &ofmem->virt_range ); - /* hmm... we better claim the physical range too */ - fill_range( phys, size, &ofmem->phys_range ); -#endif - //printk("map_page_range %08lx -> %08lx %08lx\n", virt, phys, size ); - map_page_range( virt, phys, size, (mode==-1)? def_memmode(phys) : mode ); - return 0; -} - -/* virtual -> physical. */ -ucell -ofmem_translate( ucell virt, ucell *mode ) -{ - ofmem_t *ofmem = OFMEM; - translation_t *t; - - for( t=ofmem->trans; t && t->virt <= virt ; t=t->next ) { - ucell offs; - if( t->virt + t->size - 1 < virt ) - continue; - offs = virt - t->virt; - *mode = t->mode; - return t->phys + offs; - } - - //printk("ofmem_translate: no translation defined (%08lx)\n", virt); - //print_trans(); - return -1; -} - -/* release memory allocated by ofmem_claim */ -void -ofmem_release( ucell virt, ucell size ) -{ - /* printk("ofmem_release unimplemented (%08lx, %08lx)\n", virt, size ); */ -} - - /************************************************************************/ /* page fault handler */ /************************************************************************/ @@ -620,7 +173,7 @@ /* hardcode our translation needs */ if( ea >= OF_CODE_START && ea < FREE_BASE_2 ) { - *mode = def_memmode( ea ); + *mode = ofmem_arch_default_translation_mode( ea ); return ea; } @@ -631,7 +184,7 @@ printk("ea_to_phys: no translation for %08lx, using 1-1\n", ea ); #endif phys = ea; - *mode = def_memmode( phys ); + *mode = ofmem_arch_default_translation_mode( phys ); #ifdef I_WANT_MOLISMS forth_segv_handler( (char*)ea ); @@ -746,6 +299,8 @@ /* In case we can't rely on memory being zero initialized */ memset(ofmem, 0, sizeof(ofmem)); + ofmem->ramsize = RAMSIZE; + ofmem_claim_phys( 0, FREE_BASE_1, 0 ); ofmem_claim_virt( 0, FREE_BASE_1, 0 ); ofmem_claim_phys( OF_CODE_START, FREE_BASE_2 - OF_CODE_START, 0 ); Modified: trunk/openbios-devel/arch/ppc/qemu/init.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c 2009-08-02 11:06:13 UTC (rev 526) +++ trunk/openbios-devel/arch/ppc/qemu/init.c 2009-08-02 11:07:13 UTC (rev 527) @@ -451,6 +451,8 @@ const char *stdin_path, *stdout_path; uint32_t temp = 0; + ofmem_t *ofmem = ofmem_arch_get_private(); + modules_init(); setup_timers(); #ifdef CONFIG_DRIVER_PCI @@ -472,7 +474,7 @@ printk("CPUs: %x\n", temp); - ram_size = get_ram_size(); + ram_size = ofmem->ramsize; printk("Memory: %lldM\n", ram_size / 1024 / 1024); @@ -619,7 +621,7 @@ printk("CPU type %s\n", cpu->name); snprintf(buf, sizeof(buf), "/cpus/%s", cpu->name); - ofmem_register(find_dev(buf)); + ofmem_register(0, find_dev(buf)); node_methods_init(buf); #ifdef USE_RTAS Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c 2009-08-02 11:06:13 UTC (rev 526) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c 2009-08-02 11:07:13 UTC (rev 527) @@ -34,6 +34,7 @@ #define OF_CODE_START 0xfff00000UL #define IO_BASE 0x80000000 #define OFMEM ((ofmem_t*)FREE_BASE) + #define OF_MALLOC_BASE ((char*)OFMEM + ((sizeof(ofmem_t) + 3) & ~3)) #define HASH_SIZE (2 << 15) @@ -41,36 +42,6 @@ #define SEGR_USER BIT(2) #define SEGR_BASE 0x0400 -typedef struct alloc_desc { - struct alloc_desc *next; - ucell size; /* size (including) this struct */ -} alloc_desc_t; - -typedef struct mem_range { - struct mem_range *next; - ucell start; - ucell size; -} range_t; - -typedef struct trans { - struct trans *next; - ucell virt; /* chain is sorted by virt */ - ucell size; - ucell phys; - ucell mode; -} translation_t; - -typedef struct { - ulong ramsize; - char *next_malloc; - alloc_desc_t *mfree; /* list of free malloc blocks */ - - range_t *phys_range; - range_t *virt_range; - - translation_t *trans; /* this is really a translation_t */ -} ofmem_t; - static inline ulong get_hash_base( void ) { @@ -91,17 +62,11 @@ return ((sdr1 << 16) | 0x0000ffff) + 1; } -ulong -get_ram_size( void ) -{ - ofmem_t *ofmem = OFMEM; - return ofmem->ramsize; -} - static inline ulong get_rom_base( void ) { - return get_ram_size() - 0x00100000; + ofmem_t *ofmem = ofmem_arch_get_private(); + return ofmem->ramsize - 0x00100000; } ulong @@ -116,488 +81,84 @@ return (ulong)OF_MALLOC_BASE; } -static phandle_t cpu_handle = 0; -static void -ofmem_update_translations( void ) +static ucell get_heap_top( void ) { - ofmem_t *ofmem = OFMEM; - translation_t *t; - int ncells; - cell *props; - - if (cpu_handle == 0) - return; - - for( t = ofmem->trans, ncells = 0; t ; t=t->next, ncells++ ) - ; - - props = malloc(ncells * sizeof(cell) * 4); - if (props == NULL) - return; - - for( t = ofmem->trans, ncells = 0 ; t ; t=t->next ) { - props[ncells++] = t->virt; - props[ncells++] = t->size; - props[ncells++] = t->phys; - props[ncells++] = t->mode; - } - set_property(cpu_handle, "translations", - (char*)props, ncells * sizeof(cell)); - free(props); + return get_hash_base() - (32 + 64) * 1024; } -/************************************************************************/ -/* OF private allocations */ -/************************************************************************/ - -void * -malloc( int size ) +static inline size_t ALIGN_SIZE(size_t x, size_t a) { - ofmem_t *ofmem = OFMEM; - alloc_desc_t *d, **pp; - char *ret; - ulong top; - - if( !size ) - return NULL; - - if( !ofmem->next_malloc ) - ofmem->next_malloc = (char*)OF_MALLOC_BASE; - - if( size & 3 ) - size += 4 - (size & 3); - size += sizeof(alloc_desc_t); - - /* look in the freelist */ - for( pp=&ofmem->mfree; *pp && (**pp).size < size; pp = &(**pp).next ) - ; - - /* waste at most 4K by taking an entry from the freelist */ - if( *pp && (**pp).size < size + 0x1000 ) { - ret = (char*)*pp + sizeof(alloc_desc_t); - memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); - *pp = (**pp).next; - return ret; - } - - top = get_hash_base() - (32 + 64) * 1024; - if( (ulong)ofmem->next_malloc + size > top ) { - printk("out of malloc memory (%x)!\n", size ); - return NULL; - } - - d = (alloc_desc_t*) ofmem->next_malloc; - ofmem->next_malloc += size; - - d->next = NULL; - d->size = size; - - ret = (char*)d + sizeof(alloc_desc_t); - memset( ret, 0, size - sizeof(alloc_desc_t) ); - - return ret; + return (x + a - 1) & ~(a-1); } -void -free( void *ptr ) +ofmem_t* ofmem_arch_get_private(void) { - ofmem_t *ofmem = OFMEM; - alloc_desc_t **pp, *d; - - /* it is legal to free NULL pointers (size zero allocations) */ - if( !ptr ) - return; - - d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t)); - d->next = ofmem->mfree; - - /* insert in the (sorted) freelist */ - for( pp=&ofmem->mfree; *pp && (**pp).size < d->size ; pp = &(**pp).next ) - ; - d->next = *pp; - *pp = d; + return OFMEM; } -void * -realloc( void *ptr, size_t size ) +void* ofmem_arch_get_malloc_base(void) { - alloc_desc_t *d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t)); - char *p; - - if( !ptr ) - return malloc( size ); - if( !size ) { - free( ptr ); - return NULL; - } - p = malloc( size ); - memcpy( p, ptr, MIN(d->size - sizeof(alloc_desc_t),size) ); - free( ptr ); - return p; + return OF_MALLOC_BASE; } - -/************************************************************************/ -/* misc */ -/************************************************************************/ - -extern char _start[], _end[]; -static inline ucell -def_memmode( ucell phys ) +ucell ofmem_arch_get_heap_top(void) { - /* XXX: Guard bit not set as it should! */ - if( phys < IO_BASE ) - return 0x02; /*0xa*/ /* wim GxPp */ - return 0x6a; /* WIm GxPp, I/O */ + return get_heap_top(); } - -/************************************************************************/ -/* client interface */ -/************************************************************************/ - -static int -is_free( ucell ea, ucell size, range_t *r ) +ucell ofmem_arch_get_virt_top(void) { - if( size == 0 ) - return 1; - for( ; r ; r=r->next ) { - if( r->start + r->size - 1 >= ea && r->start <= ea ) - return 0; - if( r->start >= ea && r->start <= ea + size - 1 ) - return 0; - } - return 1; + return IO_BASE; } -static void -add_entry_( ucell ea, ucell size, range_t **r ) +void ofmem_arch_unmap_pages(ucell virt, ucell size) { - range_t *nr; - - for( ; *r && (**r).start < ea; r=&(**r).next ) - ; - nr = (range_t*)malloc( sizeof(range_t) ); - nr->next = *r; - nr->start = ea; - nr->size = size; - *r = nr; + /* kill page mappings in provided range */ } -static int -add_entry( ucell ea, ucell size, range_t **r ) +void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, ucell mode) { - if( !is_free( ea, size, *r ) ) { - printk("add_entry: range not free!\n"); - return -1; - } - add_entry_( ea, size, r ); - return 0; + /* none yet */ } -static void -join_ranges( range_t **rr ) -{ - range_t *n, *r = *rr; - while( r ) { - if( !(n=r->next) ) - break; +/************************************************************************/ +/* OF private allocations */ +/************************************************************************/ - if( r->start + r->size - 1 >= n->start -1 ) { - int s = n->size + (n->start - r->start - r->size); - if( s > 0 ) - r->size += s; - r->next = n->next; - free( n ); - continue; - } - r=r->next; - } -} - -static void -fill_range( ucell ea, ucell size, range_t **rr ) +void * +malloc( int size ) { - add_entry_( ea, size, rr ); - join_ranges( rr ); + return ofmem_malloc(size); } -static ucell -find_area( ucell align, ucell size, range_t *r, ucell min, ucell max, int reverse ) +void +free( void *ptr ) { - ucell base = min; - range_t *r2; - - if( (align & (align-1)) ) { - printk("bad alignment " FMT_ucell "\n", align); - align = 0x1000; - } - if( !align ) - align = 0x1000; - - base = reverse ? max - size : min; - r2 = reverse ? NULL : r; - - for( ;; ) { - if( !reverse ) { - base = (base + align - 1) & ~(align-1); - if( base < min ) - base = min; - if( base + size - 1 >= max -1 ) - break; - } else { - if( base > max - size ) - base = max - size; - base -= base & (align-1); - } - if( is_free( base, size, r ) ) - return base; - - if( !reverse ) { - if( !r2 ) - break; - base = r2->start + r2->size; - r2 = r2->next; - } else { - range_t *rp; - for( rp=r; rp && rp->next != r2 ; rp=rp->next ) - ; - r2 = rp; - if( !r2 ) - break; - base = r2->start - size; - } - } - return (ucell)-1; + return ofmem_free(ptr); } -static ucell -ofmem_claim_phys_( ucell phys, ucell size, ucell align, ucell min, ucell max, int reverse ) +void * +realloc( void *ptr, size_t size ) { - ofmem_t *ofmem = OFMEM; - if( !align ) { - if( !is_free( phys, size, ofmem->phys_range ) ) { - printk("Non-free physical memory claimed!\n"); - return -1; - } - add_entry( phys, size, &ofmem->phys_range ); - return phys; - } - phys = find_area( align, size, ofmem->phys_range, min, max, reverse ); - if( phys == (ucell)-1 ) { - printk("ofmem_claim_phys - out of space\n"); - return -1; - } - add_entry( phys, size, &ofmem->phys_range ); - return phys; + return ofmem_realloc(ptr, size); } -/* if align != 0, phys is ignored. Returns -1 on error */ -ucell -ofmem_claim_phys( ucell phys, ucell size, ucell align ) -{ - /* printk("+ ofmem_claim phys %08lx %lx %ld\n", phys, size, align ); */ - return ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); -} -static ucell -ofmem_claim_virt_( ucell virt, ucell size, ucell align, ucell min, ucell max, int reverse ) -{ - ofmem_t *ofmem = OFMEM; - if( !align ) { - if( !is_free( virt, size, ofmem->virt_range ) ) { - printk("Non-free physical memory claimed!\n"); - return -1; - } - add_entry( virt, size, &ofmem->virt_range ); - return virt; - } - - virt = find_area( align, size, ofmem->virt_range, min, max, reverse ); - if( virt == (ucell)-1 ) { - printk("ofmem_claim_virt - out of space\n"); - return -1; - } - add_entry( virt, size, &ofmem->virt_range ); - return virt; -} - -ucell -ofmem_claim_virt( ucell virt, ucell size, ucell align ) -{ - /* printk("+ ofmem_claim virt %08lx %lx %ld\n", virt, size, align ); */ - return ofmem_claim_virt_( virt, size, align, get_ram_size() , IO_BASE, 0 ); -} - - -/* allocate both physical and virtual space and add a translation */ -ucell -ofmem_claim( ucell addr, ucell size, ucell align ) -{ - ofmem_t *ofmem = OFMEM; - ucell virt, phys; - ucell offs = addr & 0xfff; - - /* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */ - virt = phys = 0; - if( !align ) { - if( is_free(addr, size, ofmem->virt_range) && - is_free(addr, size, ofmem->phys_range) ) { - ofmem_claim_phys_( addr, size, 0, 0, 0, 0 ); - ofmem_claim_virt_( addr, size, 0, 0, 0, 0 ); - virt = phys = addr; - } else { - printk("**** ofmem_claim failure ***!\n"); - return -1; - } - } else { - if( align < 0x1000 ) - align = 0x1000; - phys = ofmem_claim_phys_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); - virt = ofmem_claim_virt_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); - if( phys == (ucell)-1 || virt == (ucell)-1 ) { - printk("ofmem_claim failed\n"); - return -1; - } - /* printk("...phys = %08lX, virt = %08lX, size = %08lX\n", phys, virt, size ); */ - } - - /* align */ - if( phys & 0xfff ) { - size += (phys & 0xfff); - virt -= (phys & 0xfff); - phys &= ~0xfff; - } - if( size & 0xfff ) - size = (size + 0xfff) & ~0xfff; - - /* printk("...free memory found... phys: %08lX, virt: %08lX, size %lX\n", phys, virt, size ); */ - ofmem_map( phys, virt, size, def_memmode(phys) ); - return virt + offs; -} - - /************************************************************************/ -/* keep track of ea -> phys translations */ +/* misc */ /************************************************************************/ -static void -split_trans( ucell virt ) -{ - ofmem_t *ofmem = OFMEM; - translation_t *t, *t2; +extern char _start[], _end[]; - for( t=ofmem->trans; t; t=t->next ) { - if( virt > t->virt && virt < t->virt + t->size-1 ) { - t2 = (translation_t*)malloc( sizeof(translation_t) ); - t2->virt = virt; - t2->size = t->size - (virt - t->virt); - t->size = virt - t->virt; - t2->phys = t->phys + t->size; - t2->mode = t->mode; - t2->next = t->next; - t->next = t2; - } - } -} - -static int -map_page_range( ucell virt, ucell phys, ucell size, ucell mode ) +ucell ofmem_arch_default_translation_mode( ucell phys ) { - ofmem_t *ofmem = OFMEM; - translation_t *t, **tt; - - split_trans( virt ); - split_trans( virt + size ); - - /* detect remappings */ - for( t=ofmem->trans; t; ) { - if( virt == t->virt || (virt < t->virt && virt + size > t->virt )) { - if( t->phys + virt - t->virt != phys ) { - printk("mapping altered (ea " FMT_ucellx ")\n", t->virt ); - } else if( t->mode != mode ){ - printk("mapping mode altered\n"); - } - for( tt=&ofmem->trans; *tt != t ; tt=&(**tt).next ) - ; - *tt = t->next; - free((char*)t); - t=ofmem->trans; - continue; - } - t=t->next; - } - /* add mapping */ - for( tt=&ofmem->trans; *tt && (**tt).virt < virt ; tt=&(**tt).next ) - ; - t = (translation_t*)malloc( sizeof(translation_t) ); - t->virt = virt; - t->phys = phys; - t->size = size; - t->mode = mode; - t->next = *tt; - *tt = t; - - ofmem_update_translations(); - - return 0; + /* XXX: Guard bit not set as it should! */ + if( phys < IO_BASE ) + return 0x02; /*0xa*/ /* wim GxPp */ + return 0x6a; /* WIm GxPp, I/O */ } -int -ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ) -{ - ofmem_t *ofmem = OFMEM; - /* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n", - virt, phys, size, mode ); */ - if( (phys & 0xfff) || (virt & 0xfff) || (size & 0xfff) ) { - printk("ofmem_map: Bad parameters (" FMT_ucellX " " FMT_ucellX " " - FMT_ucellX ")\n", - phys, virt, size ); - phys &= ~0xfff; - virt &= ~0xfff; - size = (size + 0xfff) & ~0xfff; - } -#if 1 - /* claim any unclaimed virtual memory in the range */ - fill_range( virt, size, &ofmem->virt_range ); - /* hmm... we better claim the physical range too */ - fill_range( phys, size, &ofmem->phys_range ); -#endif - //printk("map_page_range %08lx -> %08lx %08lx\n", virt, phys, size ); - map_page_range( virt, phys, size, (mode==-1)? def_memmode(phys) : mode ); - return 0; -} - -/* virtual -> physical. */ -ucell -ofmem_translate( ucell virt, ucell *mode ) -{ - ofmem_t *ofmem = OFMEM; - translation_t *t; - - for( t=ofmem->trans; t && t->virt <= virt ; t=t->next ) { - ucell offs; - if( t->virt + t->size - 1 < virt ) - continue; - offs = virt - t->virt; - *mode = t->mode; - return t->phys + offs; - } - - //printk("ofmem_translate: no translation defined (%08lx)\n", virt); - //print_trans(); - return -1; -} - -/* release memory allocated by ofmem_claim */ -void -ofmem_release( ucell virt, ucell size ) -{ - /* printk("ofmem_release unimplemented (%08lx, %08lx)\n", virt, size ); */ -} - - /************************************************************************/ /* page fault handler */ /************************************************************************/ @@ -616,9 +177,9 @@ } phys = ofmem_translate(ea, mode); - if( phys == (ucell)-1 ) { + if( phys == -1 ) { phys = ea; - *mode = def_memmode( phys ); + *mode = ofmem_arch_default_translation_mode( phys ); /* print_virt_range(); */ /* print_phys_range(); */ @@ -824,15 +385,10 @@ void ofmem_init( void ) { + ofmem_t *ofmem = ofmem_arch_get_private(); + ofmem_claim_phys( 0, get_ram_bottom(), 0 ); ofmem_claim_virt( 0, get_ram_bottom(), 0 ); - ofmem_claim_phys( get_ram_top(), get_ram_size() - get_ram_top(), 0); - ofmem_claim_virt( get_ram_top(), get_ram_size() - get_ram_top(), 0); + ofmem_claim_phys( get_ram_top(), ofmem->ramsize - get_ram_top(), 0); + ofmem_claim_virt( get_ram_top(), ofmem->ramsize - get_ram_top(), 0); } - -void -ofmem_register( phandle_t ph ) -{ - cpu_handle = ph; - ofmem_update_translations(); -} Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-08-02 11:06:13 UTC (rev 526) +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-08-02 11:07:13 UTC (rev 527) @@ -35,6 +35,8 @@ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + <option name="CONFIG_OFMEM" type="boolean" value="true"/> + <option name="CONFIG_OFMEM_MALLOC_ALIGN" type="integer" value="4"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/>

1 0

r526 - trunk/openbios-devel/modules
by svn＠openbios.org 02 Aug '09

02 Aug '09

Author: blueswirl Date: 2009-08-02 13:06:13 +0200 (Sun, 02 Aug 2009) New Revision: 526 Added: trunk/openbios-devel/modules/ofmem_common.c Log: extract ofmem module implementation (Igor Kovalenko) Added: trunk/openbios-devel/modules/ofmem_common.c =================================================================== --- trunk/openbios-devel/modules/ofmem_common.c (rev 0) +++ trunk/openbios-devel/modules/ofmem_common.c 2009-08-02 11:06:13 UTC (rev 526) @@ -0,0 +1,725 @@ +/* + * <ofmem_sparc64.c> + * + * OF Memory manager + * + * Copyright (C) 1999-2004 Samuel Rydh (samuel(a)ibrium.se) + * Copyright (C) 2004 Stefan Reinauer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "ofmem.h" + +/* + * define OFMEM_FILL_RANGE to claim any unclaimed virtual and + * physical memory in the range for ofmem_map + * + * TODO: remove this macro and wrapped code if not needed by implementations + */ +//#define OFMEM_FILL_RANGE + + +static inline size_t ALIGN_SIZE(size_t x, size_t a) +{ + return (x + a - 1) & ~(a-1); +} + +static ucell get_ram_size( void ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + return ofmem->ramsize; +} + +/************************************************************************/ +/* debug */ +/************************************************************************/ + +#if 0 +static void +print_range( range_t *r, char *str ) +{ + printk("--- Range %s ---\n", str ); + for( ; r; r=r->next ) + printk("%08lx - %08lx\n", r->start, r->start + r->size -1 ); + printk("\n"); +} + +static void +print_phys_range() +{ + print_range( ofmem.phys_range, "phys" ); +} + +static void +print_virt_range() +{ + print_range( ofmem.virt_range, "virt" ); +} + +static void +print_trans( void ) +{ + translation_t *t = ofmem.trans; + + printk("--- Translations ---\n"); + for( ; t; t=t->next ) + printk("%08lx -> %08lx [size %lx]\n", t->virt, t->phys, t->size ); + printk("\n"); +} +#endif + +/************************************************************************/ +/* OF private allocations */ +/************************************************************************/ + +void* ofmem_malloc( size_t size ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + alloc_desc_t *d, **pp; + char *ret; + ucell top; + + if( !size ) + return NULL; + + if( !ofmem->next_malloc ) + ofmem->next_malloc = (char*)ofmem_arch_get_malloc_base(); + + size = ALIGN_SIZE(size + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); + + /* look in the freelist */ + for( pp=&ofmem->mfree; *pp && (**pp).size < size; pp = &(**pp).next ) { + } + + /* waste at most 4K by taking an entry from the freelist */ + if( *pp && (**pp).size < size + 0x1000 ) { + ret = (char*)*pp + sizeof(alloc_desc_t); + memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); + *pp = (**pp).next; + return ret; + } + + top = ofmem_arch_get_heap_top(); + + if( (ucell)ofmem->next_malloc + size > top ) { + OFMEM_TRACE("out of malloc memory (%x)!\n", size ); + return NULL; + } + + d = (alloc_desc_t*) ofmem->next_malloc; + ofmem->next_malloc += size; + + d->next = NULL; + d->size = size; + + ret = (char*)d + sizeof(alloc_desc_t); + memset( ret, 0, size - sizeof(alloc_desc_t) ); + + return ret; +} + +void ofmem_free( void *ptr ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + alloc_desc_t **pp, *d; + + /* it is legal to free NULL pointers (size zero allocations) */ + if( !ptr ) + return; + + d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t)); + d->next = ofmem->mfree; + + /* insert in the (sorted) freelist */ + for( pp=&ofmem->mfree; *pp && (**pp).size < d->size ; pp = &(**pp).next ) { + } + + d->next = *pp; + *pp = d; +} + +void* ofmem_realloc( void *ptr, size_t size ) +{ + alloc_desc_t *d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t)); + char *p; + + if( !ptr ) + return malloc( size ); + if( !size ) { + free( ptr ); + return NULL; + } + p = malloc( size ); + memcpy( p, ptr, MIN(d->size - sizeof(alloc_desc_t),size) ); + free( ptr ); + return p; +} + + +/************************************************************************/ +/* "translations" and "available" property tracking */ +/************************************************************************/ + +static phandle_t s_phandle_memory = 0; +static phandle_t s_phandle_mmu = 0; + +static void ofmem_update_mmu_translations( void ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + translation_t *t; + int ncells; + ucell *props; + + if (s_phandle_mmu == 0) + return; + + for( t = ofmem->trans, ncells = 0; t ; t=t->next, ncells++ ) { + } + + props = malloc(ncells * sizeof(ucell) * 3); + + if (props == NULL) + return; + + for( t = ofmem->trans, ncells = 0 ; t ; t=t->next ) { + props[ncells++] = t->virt; + props[ncells++] = t->size; + props[ncells++] = t->mode; + } + + set_property(s_phandle_mmu, "translations", + (char*)props, ncells * sizeof(props[0])); + + free(props); +} + +static void ofmem_update_memory_available( phandle_t ph, range_t *range, + u64 top_address ) +{ + range_t *r; + int ncells; + ucell *props; + + ucell start, size; + + if (s_phandle_memory == 0) + return; + + /* count phys_range list entries */ + for( r = range, ncells = 0; r ; r=r->next, ncells++ ) { + } + + /* inverse of phys_range list could take 2 more cells for the tail */ + props = malloc((ncells+1) * sizeof(ucell) * 2); + + if (props == NULL) { + /* out of memory! */ + return; + } + + start = 0; + ncells = 0; + + for (r = range; r; r=r->next) { + if (r->start >= top_address) { + break; + } + + size = r->start - start; + if (size) { + props[ncells++] = start; + props[ncells++] = size; + } + start = r->start + r->size; + } + + /* tail */ + if (start < top_address) { + props[ncells++] = start; + props[ncells++] = top_address - start; + } + + set_property(ph, "available", + (char*)props, ncells * sizeof(props[0])); + + free(props); +} + +static void ofmem_update_translations( void ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + + ofmem_update_memory_available(s_phandle_memory, + ofmem->phys_range, get_ram_size()); + ofmem_update_memory_available(s_phandle_mmu, + ofmem->virt_range, -1ULL); + ofmem_update_mmu_translations(); +} + + +/************************************************************************/ +/* client interface */ +/************************************************************************/ + +static int is_free( ucell ea, ucell size, range_t *r ) +{ + if( size == 0 ) + return 1; + for( ; r ; r=r->next ) { + if( r->start + r->size - 1 >= ea && r->start <= ea ) + return 0; + if( r->start >= ea && r->start <= ea + size - 1 ) + return 0; + } + return 1; +} + +static void add_entry_( ucell ea, ucell size, range_t **r ) +{ + range_t *nr; + + for( ; *r && (**r).start < ea; r=&(**r).next ) { + } + + nr = (range_t*)malloc( sizeof(range_t) ); + nr->next = *r; + nr->start = ea; + nr->size = size; + *r = nr; +} + +static int add_entry( ucell ea, ucell size, range_t **r ) +{ + if( !is_free( ea, size, *r ) ) { + OFMEM_TRACE("add_entry: range not free!\n"); + return -1; + } + add_entry_( ea, size, r ); + return 0; +} + +#if defined(OFMEM_FILL_RANGE) +static void join_ranges( range_t **rr ) +{ + range_t *n, *r = *rr; + while( r ) { + if( !(n=r->next) ) + break; + + if( r->start + r->size - 1 >= n->start -1 ) { + int s = n->size + (n->start - r->start - r->size); + if( s > 0 ) + r->size += s; + r->next = n->next; + free( n ); + continue; + } + r=r->next; + } +} + +static void fill_range( ucell ea, ucell size, range_t **rr ) +{ + add_entry_( ea, size, rr ); + join_ranges( rr ); +} +#endif + +static ucell find_area( ucell align, ucell size, range_t *r, + ucell min, ucell max, int reverse ) +{ + ucell base = min; + range_t *r2; + + if( (align & (align-1)) ) { + OFMEM_TRACE("bad alignment " FMT_ucell "\n", align); + align = 0x1000; + } + if( !align ) + align = 0x1000; + + base = reverse ? max - size : min; + r2 = reverse ? NULL : r; + + for( ;; ) { + if( !reverse ) { + base = (base + align - 1) & ~(align-1); + if( base < min ) + base = min; + if( base + size - 1 >= max -1 ) + break; + } else { + if( base > max - size ) + base = max - size; + base -= base & (align-1); + } + if( is_free( base, size, r ) ) + return base; + + if( !reverse ) { + if( !r2 ) + break; + base = r2->start + r2->size; + r2 = r2->next; + } else { + range_t *rp; + + for( rp=r; rp && rp->next != r2 ; rp=rp->next ) { + } + + r2 = rp; + if( !r2 ) + break; + base = r2->start - size; + } + } + return -1; +} + +static ucell ofmem_claim_phys_( ucell phys, ucell size, ucell align, + ucell min, ucell max, int reverse ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + if( !align ) { + if( !is_free( phys, size, ofmem->phys_range ) ) { + OFMEM_TRACE("Non-free physical memory claimed!\n"); + return -1; + } + add_entry( phys, size, &ofmem->phys_range ); + return phys; + } + phys = find_area( align, size, ofmem->phys_range, min, max, reverse ); + if( phys == -1 ) { + OFMEM_TRACE("ofmem_claim_phys - out of space\n"); + return -1; + } + add_entry( phys, size, &ofmem->phys_range ); + + ofmem_update_translations(); + + return phys; +} + +/* if align != 0, phys is ignored. Returns -1 on error */ +ucell ofmem_claim_phys( ucell phys, ucell size, ucell align ) +{ + OFMEM_TRACE("ofmem_claim phys=" FMT_ucellx " size=" FMT_ucellx + " align=" FMT_ucellx "\n", + phys, size, align); + + return ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); +} + +static ucell ofmem_claim_virt_( ucell virt, ucell size, ucell align, + ucell min, ucell max, int reverse ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + if( !align ) { + if( !is_free( virt, size, ofmem->virt_range ) ) { + OFMEM_TRACE("Non-free virtual memory claimed!\n"); + return -1; + } + add_entry( virt, size, &ofmem->virt_range ); + return virt; + } + + virt = find_area( align, size, ofmem->virt_range, min, max, reverse ); + if( virt == -1 ) { + OFMEM_TRACE("ofmem_claim_virt - out of space\n"); + return -1; + } + add_entry( virt, size, &ofmem->virt_range ); + return virt; +} + +ucell ofmem_claim_virt( ucell virt, ucell size, ucell align ) +{ + OFMEM_TRACE("ofmem_claim_virt virt=" FMT_ucellx " size=" FMT_ucellx + " align=" FMT_ucellx "\n", + virt, size, align); + + /* printk("+ ofmem_claim virt %08lx %lx %ld\n", virt, size, align ); */ + return ofmem_claim_virt_( virt, size, align, + get_ram_size(), ofmem_arch_get_virt_top(), 0 ); +} + + +/* allocate both physical and virtual space and add a translation */ +ucell ofmem_claim( ucell addr, ucell size, ucell align ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + ucell virt, phys; + ucell offs = addr & 0xfff; + + /* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */ + virt = phys = 0; + if( !align ) { + if( is_free(addr, size, ofmem->virt_range) && + is_free(addr, size, ofmem->phys_range) ) { + ofmem_claim_phys_( addr, size, 0, 0, 0, 0 ); + ofmem_claim_virt_( addr, size, 0, 0, 0, 0 ); + virt = phys = addr; + } else { + OFMEM_TRACE("**** ofmem_claim failure ***!\n"); + return -1; + } + } else { + if( align < 0x1000 ) + align = 0x1000; + phys = ofmem_claim_phys_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); + virt = ofmem_claim_virt_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); + if( phys == -1 || virt == -1 ) { + OFMEM_TRACE("ofmem_claim failed\n"); + return -1; + } + /* printk("...phys = %08lX, virt = %08lX, size = %08lX\n", phys, virt, size ); */ + } + + /* align */ + if( phys & 0xfff ) { + size += (phys & 0xfff); + virt -= (phys & 0xfff); + phys &= ~0xfff; + } + if( size & 0xfff ) + size = (size + 0xfff) & ~0xfff; + + /* printk("...free memory found... phys: %08lX, virt: %08lX, size %lX\n", phys, virt, size ); */ + ofmem_map( phys, virt, size, -1 ); + return virt + offs; +} + + +/************************************************************************/ +/* keep track of ea -> phys translations */ +/************************************************************************/ + +static void split_trans( ucell virt ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + translation_t *t, *t2; + + for( t=ofmem->trans; t; t=t->next ) { + if( virt > t->virt && virt < t->virt + t->size-1 ) { + t2 = (translation_t*)malloc( sizeof(translation_t) ); + t2->virt = virt; + t2->size = t->size - (virt - t->virt); + t->size = virt - t->virt; + t2->phys = t->phys + t->size; + t2->mode = t->mode; + t2->next = t->next; + t->next = t2; + } + } +} + +int ofmem_map_page_range( ucell phys, ucell virt, ucell size, ucell mode ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + translation_t *t, **tt; + + OFMEM_TRACE("ofmem_map_page_range " FMT_ucellx + " -> " FMT_ucellx " " FMT_ucellx " mode " FMT_ucellx "\n", + virt, phys, size, mode ); + + split_trans( virt ); + split_trans( virt + size ); + + /* detect remappings */ + for( t=ofmem->trans; t; ) { + if( virt == t->virt || (virt < t->virt && virt + size > t->virt )) { + if( t->phys + virt - t->virt != phys ) { + OFMEM_TRACE("mapping altered virt=" FMT_ucellx ")\n", t->virt ); + } else if( t->mode != mode ){ + OFMEM_TRACE("mapping mode altered virt=" FMT_ucellx + " old mode=" FMT_ucellx " new mode=" FMT_ucellx "\n", + t->virt, t->mode, mode); + } + + for( tt=&ofmem->trans; *tt != t ; tt=&(**tt).next ) { + } + + *tt = t->next; + + /* really unmap these pages */ + ofmem_arch_unmap_pages(t->virt, t->size); + + free((char*)t); + + t=ofmem->trans; + continue; + } + t=t->next; + } + + /* add mapping */ + for( tt=&ofmem->trans; *tt && (**tt).virt < virt ; tt=&(**tt).next ) { + } + + t = (translation_t*)malloc( sizeof(translation_t) ); + t->virt = virt; + t->phys = phys; + t->size = size; + t->mode = mode; + t->next = *tt; + *tt = t; + + ofmem_update_translations(); + + return 0; +} + +static int unmap_page_range( ucell virt, ucell size ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + translation_t **plink; + + /* make sure there is exactly one matching translation entry */ + + split_trans( virt ); + split_trans( virt + size ); + + /* find and unlink entries in range */ + plink = &ofmem->trans; + + while (*plink && (*plink)->virt < virt+size) { + translation_t **plinkentry = plink; + translation_t *t = *plink; + + /* move ahead */ + plink = &t->next; + + if (t->virt >= virt && t->virt + t->size <= virt+size) { + + /* unlink entry */ + *plinkentry = t->next; + + OFMEM_TRACE("unmap_page_range found " + FMT_ucellx " -> " FMT_ucellx " " FMT_ucellx + " mode " FMT_ucellx "\n", + t->virt, t->phys, t->size, t->mode ); + + // really map these pages + ofmem_arch_unmap_pages(t->virt, t->size); + + free((char*)t); + } + } + + ofmem_update_translations(); + + return 0; +} + +int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ) +{ + /* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n", + virt, phys, size, mode ); */ + + if( (phys & 0xfff) || (virt & 0xfff) || (size & 0xfff) ) { + + OFMEM_TRACE("ofmem_map: Bad parameters (" + FMT_ucellX " " FMT_ucellX " " FMT_ucellX ")\n", + phys, virt, size ); + + phys &= ~0xfff; + virt &= ~0xfff; + size = (size + 0xfff) & ~0xfff; + } + +#if defined(OFMEM_FILL_RANGE) + { + ofmem_t *ofmem = ofmem_arch_get_private(); + /* claim any unclaimed virtual memory in the range */ + fill_range( virt, size, &ofmem->virt_range ); + /* hmm... we better claim the physical range too */ + fill_range( phys, size, &ofmem->phys_range ); + } +#endif + + if (mode==-1) { + mode = ofmem_arch_default_translation_mode(phys); + } + + /* install translations */ + ofmem_map_page_range(phys, virt, size, mode); + + /* allow arch to install mappings early, e.g. for locked mappings */ + ofmem_arch_early_map_pages(phys, virt, size, mode); + + return 0; +} + +int ofmem_unmap( ucell virt, ucell size ) +{ + OFMEM_TRACE("ofmem_unmap " FMT_ucellx " " FMT_ucellx "\n", + virt, size ); + + if( (virt & 0xfff) || (size & 0xfff) ) { + /* printk("ofmem_unmap: Bad parameters (%08lX %08lX)\n", + virt, size ); */ + virt &= ~0xfff; + size = (size + 0xfff) & ~0xfff; + } + + /* remove translations and unmap pages */ + unmap_page_range(virt, size); + + return 0; +} + +/* virtual -> physical. */ +ucell ofmem_translate( ucell virt, ucell *mode ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + translation_t *t; + + for( t=ofmem->trans; t && t->virt <= virt ; t=t->next ) { + ucell offs; + if( t->virt + t->size - 1 < virt ) + continue; + offs = virt - t->virt; + *mode = t->mode; + return t->phys + offs; + } + + /*printk("ofmem_translate: no translation defined (%08lx)\n", virt);*/ + /*print_trans();*/ + return -1; +} + +/* release memory allocated by ofmem_claim_phys */ +void ofmem_release_phys( ucell phys, ucell size ) +{ + OFMEM_TRACE("ofmem_release_phys addr=" FMT_ucellx " size=" FMT_ucellx "\n", + phys, size); + + OFMEM_TRACE("ofmem_release_phys not implemented"); +} + +/* release memory allocated by ofmem_claim_virt */ +void ofmem_release_virt( ucell virt, ucell size ) +{ + OFMEM_TRACE("ofmem_release_virt addr=" FMT_ucellx " size=" FMT_ucellx "\n", + virt, size); + + OFMEM_TRACE("ofmem_release_virt not implemented"); +} + +/************************************************************************/ +/* init / cleanup */ +/************************************************************************/ + +void ofmem_register( phandle_t ph_memory, phandle_t ph_mmu ) +{ + s_phandle_memory = ph_memory; + s_phandle_mmu = ph_mmu; + + ofmem_update_translations(); +}

1 0

r525 - in trunk/openbios-devel: include modules
by svn＠openbios.org 02 Aug '09

02 Aug '09

Author: blueswirl Date: 2009-08-02 13:05:16 +0200 (Sun, 02 Aug 2009) New Revision: 525 Modified: trunk/openbios-devel/include/ofmem.h trunk/openbios-devel/modules/build.xml Log: extract ofmem module implementation (Igor Kovalenko) Modified: trunk/openbios-devel/include/ofmem.h =================================================================== --- trunk/openbios-devel/include/ofmem.h 2009-08-02 11:05:00 UTC (rev 524) +++ trunk/openbios-devel/include/ofmem.h 2009-08-02 11:05:16 UTC (rev 525) @@ -17,25 +17,88 @@ #ifndef _H_OFMEM #define _H_OFMEM +#include "openbios/stack.h" + +typedef struct alloc_desc { + struct alloc_desc *next; + ucell size; /* size (including) this struct */ +} alloc_desc_t; + +typedef struct mem_range { + struct mem_range *next; + ucell start; + ucell size; +} range_t; + +typedef struct trans { + struct trans *next; + ucell virt; /* chain is sorted by virt */ + ucell size; + ucell phys; + ucell mode; +} translation_t; + +/* ofmem private data */ +typedef struct { + ucell ramsize; + char *next_malloc; + alloc_desc_t *mfree; /* list of free malloc blocks */ + + range_t *phys_range; + range_t *virt_range; + + translation_t *trans; /* this is really a translation_t */ +} ofmem_t; + +/* TODO: temporary migration interface */ +extern ofmem_t* ofmem_arch_get_private(void); +extern void* ofmem_arch_get_malloc_base(void); +extern ucell ofmem_arch_get_heap_top(void); +extern ucell ofmem_arch_get_virt_top(void); +extern ucell ofmem_arch_default_translation_mode( ucell phys ); +extern void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, + ucell mode); +extern void ofmem_arch_unmap_pages(ucell virt, ucell size); +/* sparc64 uses this method */ +extern int ofmem_map_page_range( ucell phys, ucell virt, ucell size, + ucell mode ); + +/* malloc interface */ +extern void* ofmem_malloc( size_t size ); +extern void ofmem_free( void *ptr ); +extern void* ofmem_realloc( void *ptr, size_t size ); + +/* ofmem_common.c */ + extern void ofmem_cleanup( void ); extern void ofmem_init( void ); -extern ucell ofmem_claim( ucell addr, ucell size, ucell align ); -extern ucell ofmem_claim_phys( ucell mphys, ucell size, ucell align ); -extern ucell ofmem_claim_virt( ucell mvirt, ucell size, ucell align ); +/* + * register /memory and /virtual-memory handles + * ofmem module will update "available" and "translations" properties + * using these handles + * + * to disable updating /memory properties pass zero memory handle + */ +extern void ofmem_register( phandle_t ph_memory, phandle_t ph_mmu ); -extern int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ); +extern ucell ofmem_claim( ucell addr, ucell size, ucell align ); +extern ucell ofmem_claim_phys( ucell mphys, ucell size, ucell align ); +extern ucell ofmem_claim_virt( ucell mvirt, ucell size, ucell align ); -extern void ofmem_release( ucell virt, ucell size ); -extern ucell ofmem_translate( ucell virt, ucell *ret_mode ); +extern int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ); +extern int ofmem_unmap( ucell virt, ucell size ); +extern void ofmem_release_phys( ucell phys, ucell size ); +extern void ofmem_release_virt( ucell virt, ucell size ); +extern ucell ofmem_translate( ucell virt, ucell *ret_mode ); + #ifdef CONFIG_PPC #define PAGE_SHIFT 12 -ulong get_ram_size( void ); ulong get_ram_top( void ); ulong get_ram_bottom( void ); -void ofmem_register( phandle_t ph ); + #elif defined(CONFIG_SPARC32) #define PAGE_SHIFT 12 Modified: trunk/openbios-devel/modules/build.xml =================================================================== --- trunk/openbios-devel/modules/build.xml 2009-08-02 11:05:00 UTC (rev 524) +++ trunk/openbios-devel/modules/build.xml 2009-08-02 11:05:16 UTC (rev 525) @@ -23,6 +23,7 @@ <object source="sun-parts.c" condition="SUN_PARTS"/> <object source="font_8x8.c" condition="FONT_8X8"/> <object source="font_8x16.c" condition="FONT_8X16"/> + <object source="ofmem_common.c" condition="OFMEM"/> </library> <dictionary name="openbios" target="forth">

1 0

r524 - in trunk/openbios-devel/arch/ppc: . qemu
by svn＠openbios.org 02 Aug '09

02 Aug '09

Author: blueswirl Date: 2009-08-02 13:05:00 +0200 (Sun, 02 Aug 2009) New Revision: 524 Modified: trunk/openbios-devel/arch/ppc/ofmem.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c Log: unify ppc ofmem implementations (Igor Kovalenko) Modified: trunk/openbios-devel/arch/ppc/ofmem.c =================================================================== --- trunk/openbios-devel/arch/ppc/ofmem.c 2009-08-02 11:04:27 UTC (rev 523) +++ trunk/openbios-devel/arch/ppc/ofmem.c 2009-08-02 11:05:00 UTC (rev 524) @@ -88,7 +88,7 @@ ucell mode; } translation_t; -static struct { +typedef struct { char *next_malloc; alloc_desc_t *mfree; /* list of free malloc blocks */ @@ -96,9 +96,31 @@ range_t *virt_range; translation_t *trans; /* this is really a translation_t */ -} ofmem; +} ofmem_t; +static ofmem_t s_ofmem; +#define IO_BASE 0x80000000 +#define OFMEM (&s_ofmem) + +static inline ulong +get_hash_base( void ) +{ + return HASH_BASE; +} + +static inline ulong +get_hash_size( void ) +{ + return HASH_SIZE; +} + +ulong +get_ram_size( void ) +{ + return RAMSIZE; +} + /************************************************************************/ /* OF private allocations */ /************************************************************************/ @@ -106,21 +128,23 @@ void * malloc( int size ) { + ofmem_t *ofmem = OFMEM; alloc_desc_t *d, **pp; char *ret; + ulong top; if( !size ) return NULL; - if( !ofmem.next_malloc ) - ofmem.next_malloc = (char*)OF_MALLOC_BASE; + if( !ofmem->next_malloc ) + ofmem->next_malloc = (char*)OF_MALLOC_BASE; if( size & 3 ) size += 4 - (size & 3); size += sizeof(alloc_desc_t); /* look in the freelist */ - for( pp=&ofmem.mfree; *pp && (**pp).size < size; pp = &(**pp).next ) + for( pp=&ofmem->mfree; *pp && (**pp).size < size; pp = &(**pp).next ) ; /* waste at most 4K by taking an entry from the freelist */ @@ -131,24 +155,28 @@ return ret; } - if( (ulong)ofmem.next_malloc + size > HASH_BASE ) { + top = HASH_BASE; + if( (ulong)ofmem->next_malloc + size > top ) { printk("out of malloc memory (%x)!\n", size ); return NULL; } - d = (alloc_desc_t*) ofmem.next_malloc; - ofmem.next_malloc += size; + d = (alloc_desc_t*) ofmem->next_malloc; + ofmem->next_malloc += size; + d->next = NULL; d->size = size; ret = (char*)d + sizeof(alloc_desc_t); memset( ret, 0, size - sizeof(alloc_desc_t) ); + return ret; } void free( void *ptr ) { + ofmem_t *ofmem = OFMEM; alloc_desc_t **pp, *d; /* it is legal to free NULL pointers (size zero allocations) */ @@ -156,10 +184,10 @@ return; d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t)); - d->next = ofmem.mfree; + d->next = ofmem->mfree; /* insert in the (sorted) freelist */ - for( pp=&ofmem.mfree; *pp && (**pp).size < d->size ; pp = &(**pp).next ) + for( pp=&ofmem->mfree; *pp && (**pp).size < d->size ; pp = &(**pp).next ) ; d->next = *pp; *pp = d; @@ -231,7 +259,7 @@ def_memmode( ucell phys ) { /* XXX: Guard bit not set as it should! */ - if( phys < 0x80000000 || phys >= 0xffc00000 ) + if( phys < IO_BASE || phys >= 0xffc00000 ) return 0x02; /*0xa*/ /* wim GxPp */ return 0x6a; /* WIm GxPp, I/O */ } @@ -359,20 +387,21 @@ static ucell ofmem_claim_phys_( ucell phys, ucell size, ucell align, ucell min, ucell max, int reverse ) { + ofmem_t *ofmem = OFMEM; if( !align ) { - if( !is_free( phys, size, ofmem.phys_range ) ) { + if( !is_free( phys, size, ofmem->phys_range ) ) { printk("Non-free physical memory claimed!\n"); return -1; } - add_entry( phys, size, &ofmem.phys_range ); + add_entry( phys, size, &ofmem->phys_range ); return phys; } - phys = find_area( align, size, ofmem.phys_range, min, max, reverse ); + phys = find_area( align, size, ofmem->phys_range, min, max, reverse ); if( phys == (ucell)-1 ) { printk("ofmem_claim_phys - out of space\n"); return -1; } - add_entry( phys, size, &ofmem.phys_range ); + add_entry( phys, size, &ofmem->phys_range ); return phys; } @@ -381,27 +410,28 @@ ofmem_claim_phys( ucell phys, ucell size, ucell align ) { /* printk("+ ofmem_claim phys %08lx %lx %ld\n", phys, size, align ); */ - return ofmem_claim_phys_( phys, size, align, 0, RAMSIZE, 0 ); + return ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); } static ucell ofmem_claim_virt_( ucell virt, ucell size, ucell align, ucell min, ucell max, int reverse ) { + ofmem_t *ofmem = OFMEM; if( !align ) { - if( !is_free( virt, size, ofmem.virt_range ) ) { + if( !is_free( virt, size, ofmem->virt_range ) ) { printk("Non-free physical memory claimed!\n"); return -1; } - add_entry( virt, size, &ofmem.virt_range ); + add_entry( virt, size, &ofmem->virt_range ); return virt; } - virt = find_area( align, size, ofmem.virt_range, min, max, reverse ); + virt = find_area( align, size, ofmem->virt_range, min, max, reverse ); if( virt == (ucell)-1 ) { printk("ofmem_claim_virt - out of space\n"); return -1; } - add_entry( virt, size, &ofmem.virt_range ); + add_entry( virt, size, &ofmem->virt_range ); return virt; } @@ -409,7 +439,7 @@ ofmem_claim_virt( ucell virt, ucell size, ucell align ) { /* printk("+ ofmem_claim virt %08lx %lx %ld\n", virt, size, align ); */ - return ofmem_claim_virt_( virt, size, align, RAMSIZE, 0x80000000, 0 ); + return ofmem_claim_virt_( virt, size, align, get_ram_size() , IO_BASE, 0 ); } @@ -417,13 +447,15 @@ ucell ofmem_claim( ucell addr, ucell size, ucell align ) { + ofmem_t *ofmem = OFMEM; ucell virt, phys; ucell offs = addr & 0xfff; /* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */ virt = phys = 0; if( !align ) { - if( is_free(addr, size, ofmem.virt_range) && is_free(addr, size, ofmem.phys_range) ) { + if( is_free(addr, size, ofmem->virt_range) && + is_free(addr, size, ofmem->phys_range) ) { ofmem_claim_phys_( addr, size, 0, 0, 0, 0 ); ofmem_claim_virt_( addr, size, 0, 0, 0, 0 ); virt = phys = addr; @@ -434,8 +466,8 @@ } else { if( align < 0x1000 ) align = 0x1000; - phys = ofmem_claim_phys_( addr, size, align, 0, RAMSIZE, 1 /* reverse */ ); - virt = ofmem_claim_virt_( addr, size, align, 0, RAMSIZE, 1 /* reverse */ ); + phys = ofmem_claim_phys_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); + virt = ofmem_claim_virt_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); if( phys == (ucell)-1 || virt == (ucell)-1 ) { printk("ofmem_claim failed\n"); return -1; @@ -465,9 +497,10 @@ static void split_trans( ucell virt ) { + ofmem_t *ofmem = OFMEM; translation_t *t, *t2; - for( t=ofmem.trans; t; t=t->next ) { + for( t=ofmem->trans; t; t=t->next ) { if( virt > t->virt && virt < t->virt + t->size-1 ) { t2 = (translation_t*)malloc( sizeof(translation_t) ); t2->virt = virt; @@ -484,30 +517,31 @@ static int map_page_range( ucell virt, ucell phys, ucell size, ucell mode ) { + ofmem_t *ofmem = OFMEM; translation_t *t, **tt; split_trans( virt ); split_trans( virt + size ); /* detect remappings */ - for( t=ofmem.trans; t; ) { + for( t=ofmem->trans; t; ) { if( virt == t->virt || (virt < t->virt && virt + size > t->virt )) { if( t->phys + virt - t->virt != phys ) { printk("mapping altered (ea " FMT_ucellx ")\n", t->virt ); } else if( t->mode != mode ){ printk("mapping mode altered\n"); } - for( tt=&ofmem.trans; *tt != t ; tt=&(**tt).next ) + for( tt=&ofmem->trans; *tt != t ; tt=&(**tt).next ) ; *tt = t->next; free((char*)t); - t=ofmem.trans; + t=ofmem->trans; continue; } t=t->next; } /* add mapping */ - for( tt=&ofmem.trans; *tt && (**tt).virt < virt ; tt=&(**tt).next ) + for( tt=&ofmem->trans; *tt && (**tt).virt < virt ; tt=&(**tt).next ) ; t = (translation_t*)malloc( sizeof(translation_t) ); t->virt = virt; @@ -523,6 +557,7 @@ int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ) { + ofmem_t *ofmem = OFMEM; /* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n", virt, phys, size, mode ); */ @@ -536,9 +571,9 @@ } #if 1 /* claim any unclaimed virtual memory in the range */ - fill_range( virt, size, &ofmem.virt_range ); + fill_range( virt, size, &ofmem->virt_range ); /* hmm... we better claim the physical range too */ - fill_range( phys, size, &ofmem.phys_range ); + fill_range( phys, size, &ofmem->phys_range ); #endif //printk("map_page_range %08lx -> %08lx %08lx\n", virt, phys, size ); map_page_range( virt, phys, size, (mode==-1)? def_memmode(phys) : mode ); @@ -549,9 +584,10 @@ ucell ofmem_translate( ucell virt, ucell *mode ) { + ofmem_t *ofmem = OFMEM; translation_t *t; - for( t=ofmem.trans; t && t->virt <= virt ; t=t->next ) { + for( t=ofmem->trans; t && t->virt <= virt ; t=t->next ) { ucell offs; if( t->virt + t->size - 1 < virt ) continue; @@ -587,7 +623,9 @@ *mode = def_memmode( ea ); return ea; } - if( (phys=ofmem_translate(ea, mode)) == (ucell)-1 ) { + + phys = ofmem_translate(ea, mode); + if( phys == (ucell)-1 ) { #ifdef I_WANT_MOLISMS if( ea != 0x80816c00 ) printk("ea_to_phys: no translation for %08lx, using 1-1\n", ea ); @@ -619,9 +657,9 @@ hash1 = vsid; hash1 ^= (ea >> 12) & 0xffff; - hash1 &= (HASH_SIZE-1) >> 6; + hash1 &= (get_hash_size() - 1) >> 6; - pp = (mPTE_t*)(HASH_BASE + (hash1 << 6)); + pp = (mPTE_t*)(get_hash_base() + (hash1 << 6)); upte = (ulong*)pp; /* replace old translation */ @@ -651,11 +689,15 @@ { ulong dar, dsisr; ucell mode; + ucell phys; asm volatile("mfdar %0" : "=r" (dar) : ); asm volatile("mfdsisr %0" : "=r" (dsisr) : ); + //printk("dsi-exception @ %08lx <%08lx>\n", dar, dsisr ); - hash_page( dar, ea_to_phys(dar, &mode), mode ); + + phys = ea_to_phys(dar, &mode); + hash_page( dar, phys, mode ); } void @@ -663,12 +705,15 @@ { ulong nip, srr1; ucell mode; + ucell phys; asm volatile("mfsrr0 %0" : "=r" (nip) : ); asm volatile("mfsrr1 %0" : "=r" (srr1) : ); //printk("isi-exception @ %08lx <%08lx>\n", nip, srr1 ); - hash_page( nip, ea_to_phys(nip, &mode), mode ); + + phys = ea_to_phys(nip, &mode); + hash_page( nip, phys, mode ); } @@ -697,8 +742,9 @@ void ofmem_init( void ) { + ofmem_t *ofmem = OFMEM; /* In case we can't rely on memory being zero initialized */ - memset(&ofmem, 0, sizeof(ofmem)); + memset(ofmem, 0, sizeof(ofmem)); ofmem_claim_phys( 0, FREE_BASE_1, 0 ); ofmem_claim_virt( 0, FREE_BASE_1, 0 ); Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c 2009-08-02 11:04:27 UTC (rev 523) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c 2009-08-02 11:05:00 UTC (rev 524) @@ -31,6 +31,7 @@ extern void setup_mmu( ulong code_base ); #define FREE_BASE 0x00004000 +#define OF_CODE_START 0xfff00000UL #define IO_BASE 0x80000000 #define OFMEM ((ofmem_t*)FREE_BASE) #define OF_MALLOC_BASE ((char*)OFMEM + ((sizeof(ofmem_t) + 3) & ~3)) @@ -446,7 +447,7 @@ ofmem_claim_virt_( addr, size, 0, 0, 0, 0 ); virt = phys = addr; } else { - /* printk("**** ofmem_claim failure ***!\n"); */ + printk("**** ofmem_claim failure ***!\n"); return -1; } } else { @@ -550,8 +551,9 @@ virt, phys, size, mode ); */ if( (phys & 0xfff) || (virt & 0xfff) || (size & 0xfff) ) { - /* printk("ofmem_map: Bad parameters (%08lX %08lX %08lX)\n", - phys, virt, size ); */ + printk("ofmem_map: Bad parameters (" FMT_ucellX " " FMT_ucellX " " + FMT_ucellX ")\n", + phys, virt, size ); phys &= ~0xfff; virt &= ~0xfff; size = (size + 0xfff) & ~0xfff; @@ -585,7 +587,7 @@ //printk("ofmem_translate: no translation defined (%08lx)\n", virt); //print_trans(); - return -1UL; + return -1; } /* release memory allocated by ofmem_claim */ @@ -605,16 +607,16 @@ { ucell phys; - if (ea >= 0xfff00000UL) { + if (ea >= OF_CODE_START) { /* ROM into RAM */ - ea -= 0xfff00000UL; + ea -= OF_CODE_START; phys = get_rom_base() + ea; *mode = 0x02; return phys; } phys = ofmem_translate(ea, mode); - if( phys == -1UL ) { + if( phys == (ucell)-1 ) { phys = ea; *mode = def_memmode( phys );

1 0

r523 - in trunk/openbios-devel/arch/ppc: briq mol pearpc
by svn＠openbios.org 02 Aug '09

02 Aug '09

Author: blueswirl Date: 2009-08-02 13:04:27 +0200 (Sun, 02 Aug 2009) New Revision: 523 Modified: trunk/openbios-devel/arch/ppc/briq/methods.c trunk/openbios-devel/arch/ppc/mol/methods.c trunk/openbios-devel/arch/ppc/pearpc/methods.c Log: update briq/mol/pearpc client interface to use ucell type (Igor Kovalenko) Modified: trunk/openbios-devel/arch/ppc/briq/methods.c =================================================================== --- trunk/openbios-devel/arch/ppc/briq/methods.c 2009-08-02 11:03:26 UTC (rev 522) +++ trunk/openbios-devel/arch/ppc/briq/methods.c 2009-08-02 11:04:27 UTC (rev 523) @@ -260,15 +260,15 @@ static void mmu_translate( void ) { - ulong mode; - int virt = POP(); - int phys = ofmem_translate( virt, &mode ); + ucell mode; + ucell virt = POP(); + ucell phys = ofmem_translate( virt, &mode ); if( phys == -1 ) { PUSH( 0 ); } else { PUSH( phys ); - PUSH( (int)mode ); + PUSH( mode ); PUSH( -1 ); } } Modified: trunk/openbios-devel/arch/ppc/mol/methods.c =================================================================== --- trunk/openbios-devel/arch/ppc/mol/methods.c 2009-08-02 11:03:26 UTC (rev 522) +++ trunk/openbios-devel/arch/ppc/mol/methods.c 2009-08-02 11:04:27 UTC (rev 523) @@ -323,10 +323,10 @@ static void mem_claim( void ) { - int align = POP(); - int size = POP(); - int phys = POP(); - int ret = ofmem_claim_phys( phys, size, align ); + ucell align = POP(); + ucell size = POP(); + ucell phys = POP(); + ucell ret = ofmem_claim_phys( phys, size, align ); if( ret == -1 ) { printk("MEM: claim failure\n"); @@ -347,10 +347,10 @@ static void mmu_claim( void ) { - int align = POP(); - int size = POP(); - int phys = POP(); - int ret = ofmem_claim_virt( phys, size, align ); + ucell align = POP(); + ucell size = POP(); + ucell phys = POP(); + ucell ret = ofmem_claim_virt( phys, size, align ); if( ret == -1 ) { printk("MMU: CLAIM failure\n"); @@ -371,11 +371,11 @@ static void mmu_map( void ) { - int mode = POP(); - int size = POP(); - int virt = POP(); - int phys = POP(); - int ret; + ucell mode = POP(); + ucell size = POP(); + ucell virt = POP(); + ucell phys = POP(); + ucell ret; /* printk("mmu_map: %x %x %x %x\n", phys, virt, size, mode ); */ ret = ofmem_map( phys, virt, size, mode ); @@ -398,15 +398,15 @@ static void mmu_translate( void ) { - ulong mode; - int virt = POP(); - int phys = ofmem_translate( virt, &mode ); + ucell mode; + ucell virt = POP(); + ucell phys = ofmem_translate( virt, &mode ); if( phys == -1 ) { PUSH( 0 ); } else { PUSH( phys ); - PUSH( (int)mode ); + PUSH( mode ); PUSH( -1 ); } } @@ -415,10 +415,10 @@ static void ciface_claim( void ) { - int align = POP(); - int size = POP(); - int virt = POP(); - int ret = ofmem_claim( virt, size, align ); + ucell align = POP(); + ucell size = POP(); + ucell virt = POP(); + ucell ret = ofmem_claim( virt, size, align ); /* printk("ciface_claim: %08x %08x %x\n", virt, size, align ); */ PUSH( ret ); Modified: trunk/openbios-devel/arch/ppc/pearpc/methods.c =================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/methods.c 2009-08-02 11:03:26 UTC (rev 522) +++ trunk/openbios-devel/arch/ppc/pearpc/methods.c 2009-08-02 11:04:27 UTC (rev 523) @@ -187,12 +187,12 @@ static void mem_claim( void ) { - int align = POP(); - int size = POP(); - int phys = POP(); - int ret = ofmem_claim_phys( phys, size, align ); + ucell align = POP(); + ucell size = POP(); + ucell phys = POP(); + ucell ret = ofmem_claim_phys( phys, size, align ); - if( ret == -1 ) { + if( ret == (ucell)-1 ) { printk("MEM: claim failure\n"); throw( -13 ); return; @@ -211,10 +211,10 @@ static void mmu_claim( void ) { - int align = POP(); - int size = POP(); - int phys = POP(); - int ret = ofmem_claim_virt( phys, size, align ); + ucell align = POP(); + ucell size = POP(); + ucell phys = POP(); + ucell ret = ofmem_claim_virt( phys, size, align ); if( ret == -1 ) { printk("MMU: CLAIM failure\n"); @@ -235,11 +235,11 @@ static void mmu_map( void ) { - int mode = POP(); - int size = POP(); - int virt = POP(); - int phys = POP(); - int ret; + ucell mode = POP(); + ucell size = POP(); + ucell virt = POP(); + ucell phys = POP(); + ucell ret; /* printk("mmu_map: %x %x %x %x\n", phys, virt, size, mode ); */ ret = ofmem_map( phys, virt, size, mode ); @@ -262,15 +262,15 @@ static void mmu_translate( void ) { - ulong mode; - int virt = POP(); - int phys = ofmem_translate( virt, &mode ); + ucell mode; + ucell virt = POP(); + ucell phys = ofmem_translate( virt, &mode ); if( phys == -1 ) { PUSH( 0 ); } else { PUSH( phys ); - PUSH( (int)mode ); + PUSH( mode ); PUSH( -1 ); } } @@ -279,10 +279,10 @@ static void ciface_claim( void ) { - int align = POP(); - int size = POP(); - int virt = POP(); - int ret = ofmem_claim( virt, size, align ); + ucell align = POP(); + ucell size = POP(); + ucell virt = POP(); + ucell ret = ofmem_claim( virt, size, align ); /* printk("ciface_claim: %08x %08x %x\n", virt, size, align ); */ PUSH( ret );

1 0

r522 - trunk/openbios-devel/arch/ppc
by svn＠openbios.org 02 Aug '09

02 Aug '09

Author: blueswirl Date: 2009-08-02 13:03:26 +0200 (Sun, 02 Aug 2009) New Revision: 522 Modified: trunk/openbios-devel/arch/ppc/ofmem.c Log: migrate ppc briq/mol/pearpc ofmem implementation to ucell type (Igor Kovalenko) Modified: trunk/openbios-devel/arch/ppc/ofmem.c =================================================================== --- trunk/openbios-devel/arch/ppc/ofmem.c 2009-08-02 11:02:32 UTC (rev 521) +++ trunk/openbios-devel/arch/ppc/ofmem.c 2009-08-02 11:03:26 UTC (rev 522) @@ -71,21 +71,21 @@ typedef struct alloc_desc { struct alloc_desc *next; - int size; /* size (including) this struct */ + ucell size; /* size (including) this struct */ } alloc_desc_t; typedef struct mem_range { struct mem_range *next; - ulong start; - ulong size; + ucell start; + ucell size; } range_t; typedef struct trans { struct trans *next; - ulong virt; /* chain is sorted by virt */ - ulong size; - ulong phys; - int mode; + ucell virt; /* chain is sorted by virt */ + ucell size; + ucell phys; + ucell mode; } translation_t; static struct { @@ -227,8 +227,8 @@ /* misc */ /************************************************************************/ -static inline int -def_memmode( ulong phys ) +static inline ucell +def_memmode( ucell phys ) { /* XXX: Guard bit not set as it should! */ if( phys < 0x80000000 || phys >= 0xffc00000 ) @@ -242,7 +242,7 @@ /************************************************************************/ static int -is_free( ulong ea, ulong size, range_t *r ) +is_free( ucell ea, ucell size, range_t *r ) { if( size == 0 ) return 1; @@ -256,7 +256,7 @@ } static void -add_entry_( ulong ea, ulong size, range_t **r ) +add_entry_( ucell ea, ucell size, range_t **r ) { range_t *nr; @@ -270,7 +270,7 @@ } static int -add_entry( ulong ea, ulong size, range_t **r ) +add_entry( ucell ea, ucell size, range_t **r ) { if( !is_free( ea, size, *r ) ) { printk("add_entry: range not free!\n"); @@ -301,20 +301,20 @@ } static void -fill_range( ulong ea, int size, range_t **rr ) +fill_range( ucell ea, ucell size, range_t **rr ) { add_entry_( ea, size, rr ); join_ranges( rr ); } -static ulong -find_area( ulong align, ulong size, range_t *r, ulong min, ulong max, int reverse ) +static ucell +find_area( ucell align, ucell size, range_t *r, ucell min, ucell max, int reverse ) { - ulong base = min; + ucell base = min; range_t *r2; if( (align & (align-1)) ) { - printk("bad alignment %ld\n", align); + printk("bad alignment " FMT_ucell "\n", align); align = 0x1000; } if( !align ) @@ -353,11 +353,11 @@ base = r2->start - size; } } - return (ulong)-1; + return (ucell)-1; } -static ulong -ofmem_claim_phys_( ulong phys, ulong size, ulong align, int min, int max, int reverse ) +static ucell +ofmem_claim_phys_( ucell phys, ucell size, ucell align, ucell min, ucell max, int reverse ) { if( !align ) { if( !is_free( phys, size, ofmem.phys_range ) ) { @@ -368,7 +368,7 @@ return phys; } phys = find_area( align, size, ofmem.phys_range, min, max, reverse ); - if( phys == (ulong)-1 ) { + if( phys == (ucell)-1 ) { printk("ofmem_claim_phys - out of space\n"); return -1; } @@ -377,15 +377,15 @@ } /* if align != 0, phys is ignored. Returns -1 on error */ -ulong -ofmem_claim_phys( ulong phys, ulong size, ulong align ) +ucell +ofmem_claim_phys( ucell phys, ucell size, ucell align ) { /* printk("+ ofmem_claim phys %08lx %lx %ld\n", phys, size, align ); */ return ofmem_claim_phys_( phys, size, align, 0, RAMSIZE, 0 ); } -static ulong -ofmem_claim_virt_( ulong virt, ulong size, ulong align, int min, int max, int reverse ) +static ucell +ofmem_claim_virt_( ucell virt, ucell size, ucell align, ucell min, ucell max, int reverse ) { if( !align ) { if( !is_free( virt, size, ofmem.virt_range ) ) { @@ -397,7 +397,7 @@ } virt = find_area( align, size, ofmem.virt_range, min, max, reverse ); - if( virt == (ulong)-1 ) { + if( virt == (ucell)-1 ) { printk("ofmem_claim_virt - out of space\n"); return -1; } @@ -405,8 +405,8 @@ return virt; } -ulong -ofmem_claim_virt( ulong virt, ulong size, ulong align ) +ucell +ofmem_claim_virt( ucell virt, ucell size, ucell align ) { /* printk("+ ofmem_claim virt %08lx %lx %ld\n", virt, size, align ); */ return ofmem_claim_virt_( virt, size, align, RAMSIZE, 0x80000000, 0 ); @@ -414,11 +414,11 @@ /* allocate both physical and virtual space and add a translation */ -ulong -ofmem_claim( ulong addr, ulong size, ulong align ) +ucell +ofmem_claim( ucell addr, ucell size, ucell align ) { - ulong virt, phys; - ulong offs = addr & 0xfff; + ucell virt, phys; + ucell offs = addr & 0xfff; /* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */ virt = phys = 0; @@ -436,7 +436,7 @@ align = 0x1000; phys = ofmem_claim_phys_( addr, size, align, 0, RAMSIZE, 1 /* reverse */ ); virt = ofmem_claim_virt_( addr, size, align, 0, RAMSIZE, 1 /* reverse */ ); - if( phys == (ulong)-1 || virt == (ulong)-1 ) { + if( phys == (ucell)-1 || virt == (ucell)-1 ) { printk("ofmem_claim failed\n"); return -1; } @@ -463,7 +463,7 @@ /************************************************************************/ static void -split_trans( ulong virt ) +split_trans( ucell virt ) { translation_t *t, *t2; @@ -482,7 +482,7 @@ } static int -map_page_range( ulong virt, ulong phys, ulong size, int mode ) +map_page_range( ucell virt, ucell phys, ucell size, ucell mode ) { translation_t *t, **tt; @@ -493,7 +493,7 @@ for( t=ofmem.trans; t; ) { if( virt == t->virt || (virt < t->virt && virt + size > t->virt )) { if( t->phys + virt - t->virt != phys ) { - printk("mapping altered (ea %08lx)\n", t->virt ); + printk("mapping altered (ea " FMT_ucellx ")\n", t->virt ); } else if( t->mode != mode ){ printk("mapping mode altered\n"); } @@ -521,13 +521,15 @@ } int -ofmem_map( ulong phys, ulong virt, ulong size, int mode ) +ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ) { /* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n", virt, phys, size, mode ); */ if( (phys & 0xfff) || (virt & 0xfff) || (size & 0xfff) ) { - printk("ofmem_map: Bad parameters (%08lX %08lX %08lX)\n", phys, virt, size ); + printk("ofmem_map: Bad parameters (" FMT_ucellX " " FMT_ucellX " " + FMT_ucellX ")\n", + phys, virt, size ); phys &= ~0xfff; virt &= ~0xfff; size = (size + 0xfff) & ~0xfff; @@ -544,13 +546,13 @@ } /* virtual -> physical. */ -ulong -ofmem_translate( ulong virt, ulong *mode ) +ucell +ofmem_translate( ucell virt, ucell *mode ) { translation_t *t; for( t=ofmem.trans; t && t->virt <= virt ; t=t->next ) { - ulong offs; + ucell offs; if( t->virt + t->size - 1 < virt ) continue; offs = virt - t->virt; @@ -565,7 +567,7 @@ /* release memory allocated by ofmem_claim */ void -ofmem_release( ulong virt, ulong size ) +ofmem_release( ucell virt, ucell size ) { /* printk("ofmem_release unimplemented (%08lx, %08lx)\n", virt, size ); */ } @@ -575,17 +577,17 @@ /* page fault handler */ /************************************************************************/ -static ulong -ea_to_phys( ulong ea, int *mode ) +static ucell +ea_to_phys( ucell ea, ucell *mode ) { - ulong phys; + ucell phys; /* hardcode our translation needs */ if( ea >= OF_CODE_START && ea < FREE_BASE_2 ) { *mode = def_memmode( ea ); return ea; } - if( (phys=ofmem_translate(ea, (ulong*)mode)) == (ulong)-1 ) { + if( (phys=ofmem_translate(ea, mode)) == (ucell)-1 ) { #ifdef I_WANT_MOLISMS if( ea != 0x80816c00 ) printk("ea_to_phys: no translation for %08lx, using 1-1\n", ea ); @@ -605,7 +607,7 @@ } static void -hash_page( ulong ea, ulong phys, int mode ) +hash_page( ucell ea, ucell phys, ucell mode ) { static int next_grab_slot=0; ulong *upte, cmp, hash1; @@ -648,7 +650,7 @@ dsi_exception( void ) { ulong dar, dsisr; - int mode; + ucell mode; asm volatile("mfdar %0" : "=r" (dar) : ); asm volatile("mfdsisr %0" : "=r" (dsisr) : ); @@ -660,7 +662,7 @@ isi_exception( void ) { ulong nip, srr1; - int mode; + ucell mode; asm volatile("mfsrr0 %0" : "=r" (nip) : ); asm volatile("mfsrr1 %0" : "=r" (srr1) : );

1 0

r521 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 02 Aug '09

02 Aug '09

Author: blueswirl Date: 2009-08-02 13:02:32 +0200 (Sun, 02 Aug 2009) New Revision: 521 Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c Log: migrate ppc/qemu ofmem implementation to ucell parameter type (Igor Kovalenko) Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c 2009-08-02 11:01:23 UTC (rev 520) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c 2009-08-02 11:02:32 UTC (rev 521) @@ -37,8 +37,8 @@ static void rtas_instantiate( void ) { - int physbase = POP(); - int s=0x1000, size = (int)of_rtas_end - (int)of_rtas_start; + ucell physbase = POP(); + ucell s=0x1000, size = (ucell)of_rtas_end - (ucell)of_rtas_start; ulong virt; while( s < size ) @@ -166,10 +166,10 @@ static void mem_claim( void ) { - int align = POP(); - int size = POP(); - int phys = POP(); - int ret = ofmem_claim_phys( phys, size, align ); + ucell align = POP(); + ucell size = POP(); + ucell phys = POP(); + ucell ret = ofmem_claim_phys( phys, size, align ); if( ret == -1 ) { printk("MEM: claim failure\n"); @@ -190,10 +190,10 @@ static void mmu_claim( void ) { - int align = POP(); - int size = POP(); - int phys = POP(); - int ret = ofmem_claim_virt( phys, size, align ); + ucell align = POP(); + ucell size = POP(); + ucell phys = POP(); + ucell ret = ofmem_claim_virt( phys, size, align ); if( ret == -1 ) { printk("MMU: CLAIM failure\n"); @@ -214,11 +214,11 @@ static void mmu_map( void ) { - int mode = POP(); - int size = POP(); - int virt = POP(); - int phys = POP(); - int ret; + ucell mode = POP(); + ucell size = POP(); + ucell virt = POP(); + ucell phys = POP(); + ucell ret; /* printk("mmu_map: %x %x %x %x\n", phys, virt, size, mode ); */ ret = ofmem_map( phys, virt, size, mode ); @@ -258,10 +258,10 @@ static void ciface_claim( void ) { - int align = POP(); - int size = POP(); - int virt = POP(); - int ret = ofmem_claim( virt, size, align ); + ucell align = POP(); + ucell size = POP(); + ucell virt = POP(); + ucell ret = ofmem_claim( virt, size, align ); /* printk("ciface_claim: %08x %08x %x\n", virt, size, align ); */ PUSH( ret ); Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c 2009-08-02 11:01:23 UTC (rev 520) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c 2009-08-02 11:02:32 UTC (rev 521) @@ -315,7 +315,7 @@ } static void -fill_range( ulong ea, ucell size, range_t **rr ) +fill_range( ucell ea, ucell size, range_t **rr ) { add_entry_( ea, size, rr ); join_ranges( rr ); @@ -328,7 +328,7 @@ range_t *r2; if( (align & (align-1)) ) { - printk("bad alignment %d\n", align); + printk("bad alignment " FMT_ucell "\n", align); align = 0x1000; } if( !align ) @@ -383,8 +383,8 @@ return phys; } phys = find_area( align, size, ofmem->phys_range, min, max, reverse ); - if( phys == (ulong)-1 ) { - printk("ofmem->claim_phys - out of space\n"); + if( phys == (ucell)-1 ) { + printk("ofmem_claim_phys - out of space\n"); return -1; } add_entry( phys, size, &ofmem->phys_range ); @@ -413,7 +413,7 @@ } virt = find_area( align, size, ofmem->virt_range, min, max, reverse ); - if( virt == (ulong)-1 ) { + if( virt == (ucell)-1 ) { printk("ofmem_claim_virt - out of space\n"); return -1; } @@ -454,7 +454,7 @@ align = 0x1000; phys = ofmem_claim_phys_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); virt = ofmem_claim_virt_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); - if( phys == (ulong)-1 || virt == (ulong)-1 ) { + if( phys == (ucell)-1 || virt == (ucell)-1 ) { printk("ofmem_claim failed\n"); return -1; } @@ -481,7 +481,7 @@ /************************************************************************/ static void -split_trans( ulong virt ) +split_trans( ucell virt ) { ofmem_t *ofmem = OFMEM; translation_t *t, *t2; @@ -513,7 +513,7 @@ for( t=ofmem->trans; t; ) { if( virt == t->virt || (virt < t->virt && virt + size > t->virt )) { if( t->phys + virt - t->virt != phys ) { - printk("mapping altered (ea %08x)\n", t->virt ); + printk("mapping altered (ea " FMT_ucellx ")\n", t->virt ); } else if( t->mode != mode ){ printk("mapping mode altered\n"); }

1 0

r520 - in trunk/openbios-devel/include: ppc sparc64
by svn＠openbios.org 02 Aug '09

02 Aug '09

Author: blueswirl Date: 2009-08-02 13:01:23 +0200 (Sun, 02 Aug 2009) New Revision: 520 Modified: trunk/openbios-devel/include/ppc/types.h trunk/openbios-devel/include/sparc64/types.h Log: add more cell type formatting macros for ppc and sparc64 (Igor Kovalenko) Modified: trunk/openbios-devel/include/ppc/types.h =================================================================== --- trunk/openbios-devel/include/ppc/types.h 2009-08-02 10:59:49 UTC (rev 519) +++ trunk/openbios-devel/include/ppc/types.h 2009-08-02 11:01:23 UTC (rev 520) @@ -35,6 +35,11 @@ typedef int64_t dcell; typedef uint64_t ducell; +#define FMT_cell "%d" +#define FMT_ucell "%u" +#define FMT_ucellx "%08x" +#define FMT_ucellX "%08X" + #define bitspercell (sizeof(cell)<<3) #define bitsperdcell (sizeof(dcell)<<3) Modified: trunk/openbios-devel/include/sparc64/types.h =================================================================== --- trunk/openbios-devel/include/sparc64/types.h 2009-08-02 10:59:49 UTC (rev 519) +++ trunk/openbios-devel/include/sparc64/types.h 2009-08-02 11:01:23 UTC (rev 520) @@ -32,9 +32,10 @@ typedef int64_t cell; typedef uint64_t ucell; -#define FMT_cell "%lld" +#define FMT_cell "%lld" #define FMT_ucell "%llu" #define FMT_ucellx "%016llx" +#define FMT_ucellX "%016llX" #ifdef NEED_FAKE_INT128_T typedef struct {

1 0

r519 - in trunk/openbios-devel: arch/ppc/qemu include
by svn＠openbios.org 02 Aug '09

02 Aug '09

Author: blueswirl Date: 2009-08-02 12:59:49 +0200 (Sun, 02 Aug 2009) New Revision: 519 Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/include/ofmem.h Log: move ppc internal prototypes to arch-specific implementation (Igor Kovalenko) Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c 2009-08-02 10:58:33 UTC (rev 518) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c 2009-08-02 10:59:49 UTC (rev 519) @@ -25,6 +25,11 @@ #define BIT(n) (1U<<(31-(n))) +/* called from assembly */ +extern void dsi_exception( void ); +extern void isi_exception( void ); +extern void setup_mmu( ulong code_base ); + #define FREE_BASE 0x00004000 #define IO_BASE 0x80000000 #define OFMEM ((ofmem_t*)FREE_BASE) Modified: trunk/openbios-devel/include/ofmem.h =================================================================== --- trunk/openbios-devel/include/ofmem.h 2009-08-02 10:58:33 UTC (rev 518) +++ trunk/openbios-devel/include/ofmem.h 2009-08-02 10:59:49 UTC (rev 519) @@ -35,9 +35,6 @@ ulong get_ram_size( void ); ulong get_ram_top( void ); ulong get_ram_bottom( void ); -void dsi_exception( void ); -void isi_exception( void ); -void setup_mmu( ulong ramsize ); void ofmem_register( phandle_t ph ); #elif defined(CONFIG_SPARC32) #define PAGE_SHIFT 12

1 0

r518 - in trunk/openbios-devel: include/openbios modules
by svn＠openbios.org 02 Aug '09

02 Aug '09

Author: blueswirl Date: 2009-08-02 12:58:33 +0200 (Sun, 02 Aug 2009) New Revision: 518 Modified: trunk/openbios-devel/include/openbios/nvram.h trunk/openbios-devel/modules/nvram.c Log: const qualifier for nvram_init parameter (Igor Kovalenko) Modified: trunk/openbios-devel/include/openbios/nvram.h =================================================================== --- trunk/openbios-devel/include/openbios/nvram.h 2009-07-31 11:16:24 UTC (rev 517) +++ trunk/openbios-devel/include/openbios/nvram.h 2009-08-02 10:58:33 UTC (rev 518) @@ -22,7 +22,7 @@ extern void arch_nvram_put( char *buf ); extern void nvconf_init( void ); -extern void nvram_init( char *path ); +extern void nvram_init( const char *path ); extern void update_nvram( void ); #endif /* _H_NVRAM */ Modified: trunk/openbios-devel/modules/nvram.c =================================================================== --- trunk/openbios-devel/modules/nvram.c 2009-07-31 11:16:24 UTC (rev 517) +++ trunk/openbios-devel/modules/nvram.c 2009-08-02 10:58:33 UTC (rev 518) @@ -297,7 +297,7 @@ void -nvram_init( char *path ) +nvram_init( const char *path ) { nvconf_init();

1 0

[PATCH 0/8] extract OF memory manager module
by Igor Kovalenko 02 Aug '09

02 Aug '09

Hi! This patch series moves OF memory manager code to separate module. New OFMEM module is used by sparc64 and all ppc configurations. Since ppc briq/mol/pearpc are not buildable for years I used local build hack to verify this change does not make those even worse. Boot-tested on sparc64 and ppc/qemu. Signed-off-by: igor.v.kovalenko(a)gmail.com -- Kind regards, Igor V. Kovalenko

2 14

[PATCH 0/5] sparc64: implement OF memory manager
by Igor Kovalenko 31 Jul '09

31 Jul '09

Hi! This patch series implement OF memory manager. I used arch/ppc/qemu/ofmem.c as a starting point, future plans in ofmem area would be to migrate common parts from working implementations (ppc and sparc64) into shared module. Since ofmem declarations are to be used by different architectures it appears that using ucell type in ofmem.h is appropriate. This required changes to ppc/qemu code. Unfortunately mol, briq and pearpc configurations does not build in my setup so I did not touched those parts, and this change may be incomplete. It seems useful to introduce CONFIG_OFMEM_OPTION to conditionally trace ofmem operations, so this is implemented as well. Also I introduce FMT_cell and other macros to help formatting log messages easily. Client interface handler now uses ofmem implementation instead of walking hardware translation tables. Since setup code in entry.S does install it's own translations ofmem initialization routine simply copies entries from hardware. Properties "available" and "translations" are then populated as needed. This implementation passes boot test with no visible changes on screen for HelenOS-0.4.0-sparc64.iso Linux boot does not improve with this patch due to conflicts with memory mappings in low memory region. Also there is an issue with lazy conditional codes evaluation by qemu. If disrupting trap is taken before conditional branch is executed then upon return from trap conditional codes are not evaluated correctly. Visible effect is that with this patch series silo is no longer gets into second stage, stopping at SIL output. Patch for this issue is already posted to qemu-devel mailing list. Signed-off-by: igor.v.kovalenko(a)gmail.com -- Kind regards, Igor V. Kovalenko

3 9

r517 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 31 Jul '09

31 Jul '09

Author: blueswirl Date: 2009-07-31 13:16:24 +0200 (Fri, 31 Jul 2009) New Revision: 517 Modified: trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/sparc64/tree.fs trunk/openbios-devel/arch/sparc64/vectors.S Log: Switch sparc64 to ofmem (Igor Kovalenko) Initialize ofmem at startup. Switch malloc/realloc/free to use ofmem. Implement runtime migration of startup mappings to ofmem. Implement mmu miss handlers to install tlb entries based on ofmem translations list. Modified: trunk/openbios-devel/arch/sparc64/lib.c =================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c 2009-07-31 11:15:30 UTC (rev 516) +++ trunk/openbios-devel/arch/sparc64/lib.c 2009-07-31 11:16:24 UTC (rev 517) @@ -34,32 +34,19 @@ return i; } -#define MEMSIZE ((128 + 256 + 512) * 1024) -static char memory[MEMSIZE]; -static void *memptr=memory; -static int memsize=MEMSIZE; - - void *malloc(int size) { - void *ret=(void *)0; + return ofmem_malloc(size); +} - if( !size ) - return NULL; - - size = (size + 7) & ~7; - - if(memsize>=size) { - memsize-=size; - ret=memptr; - memptr = (void *)((unsigned long)memptr + size); - } - return ret; +void* realloc( void *ptr, size_t size ) +{ + return ofmem_realloc(ptr, size); } void free(void *ptr) { - /* Nothing yet */ + ofmem_free(ptr); } #define PAGE_SIZE_4M (4 * 1024 * 1024) @@ -84,50 +71,44 @@ void ofmem_walk_boot_map(translation_entry_cb cb) { -} - -static int -spitfire_translate(unsigned long virt, unsigned long *p_phys, - unsigned long *p_data, unsigned long *p_size) -{ - unsigned long phys, tag, data, mask, size; + unsigned long phys, virt, size, mode, data, mask; unsigned int i; for (i = 0; i < 64; i++) { data = spitfire_get_dtlb_data(i); - if (data & 0x8000000000000000ULL) { // Valid entry? + if (data & SPITFIRE_TTE_VALID) { switch ((data >> 61) & 3) { default: - case 0x0: // 8k + case 0x0: /* 8k */ mask = 0xffffffffffffe000ULL; size = PAGE_SIZE_8K; break; - case 0x1: // 64k + case 0x1: /* 64k */ mask = 0xffffffffffff0000ULL; size = PAGE_SIZE_64K; break; - case 0x2: // 512k + case 0x2: /* 512k */ mask = 0xfffffffffff80000ULL; size = PAGE_SIZE_512K; break; - case 0x3: // 4M + case 0x3: /* 4M */ mask = 0xffffffffffc00000ULL; size = PAGE_SIZE_4M; break; } - tag = spitfire_get_dtlb_tag(i); - if ((virt & mask) == (tag & mask)) { - phys = data & mask & 0x000001fffffff000ULL; - phys |= virt & ~mask; - *p_phys = phys; - *p_data = data & 0xfff; - *p_size = size; - return -1; - } + + virt = spitfire_get_dtlb_tag(i); + virt &= mask; + + /* extract 41bit physical address */ + phys = data & 0x000001fffffff000ULL; + phys &= mask; + + mode = data & 0xfff; + + cb(phys, virt, size, mode); } } - - return 0; } /* @@ -137,18 +118,21 @@ static void mmu_translate(void) { - unsigned long virt, phys, data, size; + ucell virt, phys, mode; virt = POP(); - if (spitfire_translate(virt, &phys, &data, &size)) { - PUSH(phys & 0xffffffff); - PUSH(phys >> 32); - PUSH(data); - PUSH(-1); - return; + phys = ofmem_translate(virt, &mode); + + if (phys != -1UL) { + PUSH(phys & 0xffffffff); + PUSH(phys >> 32); + PUSH(mode); + PUSH(-1); } - PUSH(0); + else { + PUSH(0); + } } static void @@ -218,13 +202,15 @@ } static void -map_pages(unsigned long virt, unsigned long size, unsigned long phys, - unsigned long mode) +map_pages(unsigned long phys, unsigned long virt, + unsigned long size, unsigned long mode) { - unsigned long tte_data, currsize; + unsigned long tte_data, currsize; - size = (size + PAGE_MASK_8K) & ~PAGE_MASK_8K; - while (size >= PAGE_SIZE_8K) { + /* aligned to 8k page */ + size = (size + PAGE_MASK_8K) & ~PAGE_MASK_8K; + + while (size > 0) { currsize = size; if (currsize >= PAGE_SIZE_4M && (virt & PAGE_MASK_4M) == 0 && @@ -248,8 +234,9 @@ tte_data |= phys | mode | SPITFIRE_TTE_VALID; - dtlb_load2(virt, tte_data); itlb_load2(virt, tte_data); + dtlb_load2(virt, tte_data); + size -= currsize; phys += currsize; virt += currsize; @@ -268,7 +255,7 @@ static void mmu_map(void) { - unsigned long virt, size, mode, phys; + ucell virt, size, mode, phys; mode = POP(); size = POP(); @@ -276,7 +263,8 @@ phys = POP(); phys <<= 32; phys |= POP(); - map_pages(virt, size, phys, mode); + + ofmem_map(phys, virt, size, mode); } static void @@ -294,22 +282,19 @@ } static void -unmap_pages(unsigned long virt, unsigned long size) +unmap_pages(ucell virt, ucell size) { - unsigned long phys, data; + ucell va; - unsigned long currsize; + /* align address to 8k */ + virt &= ~PAGE_MASK_8K; - // align size + /* align size to 8k */ size = (size + PAGE_MASK_8K) & ~PAGE_MASK_8K; - while (spitfire_translate(virt, &phys, &data, &currsize)) { - - itlb_demap(virt & ~0x1fffULL); - dtlb_demap(virt & ~0x1fffULL); - - size -= currsize; - virt += currsize; + for (va = virt; va < virt + size; va += PAGE_SIZE_8K) { + itlb_demap(va); + dtlb_demap(va); } } @@ -325,11 +310,11 @@ static void mmu_unmap(void) { - unsigned long virt, size; + ucell virt, size; size = POP(); virt = POP(); - unmap_pages(virt, size); + ofmem_unmap(virt, size); } /* @@ -339,13 +324,23 @@ static void mmu_claim(void) { - unsigned long virt, size, align; + ucell virt=-1UL, size, align; align = POP(); size = POP(); - virt = POP(); - printk("claim virt = %lx size = %lx align = %lx\n", virt, size, align); - PUSH(virt); // XXX + if (!align) { + virt = POP(); + } + + printk("claim virt=" FMT_ucellx " size=" FMT_ucellx " align=" FMT_ucellx + "\n", + virt, size, align); + + virt = ofmem_claim_virt(virt, size, align); + + printk("claimed virt=" FMT_ucellx "\n", virt); + + PUSH(virt); } /* @@ -355,14 +350,63 @@ static void mmu_release(void) { - unsigned long virt, size; + ucell virt, size; size = POP(); virt = POP(); - printk("release virt = %lx size = %lx\n", virt, size); - // XXX + printk("release virt=" FMT_ucellx " size=" FMT_ucellx "\n", virt, size); + + ofmem_release(virt, size); } +/* ( phys size align --- base ) */ +static void +mem_claim( void ) +{ + ucell phys=-1UL, size, align; + + align = POP(); + size = POP(); + if (!align) { + phys = POP(); + phys <<= 32; + phys |= POP(); + } + + printk("mem_claim phys=" FMT_ucellx " size=" FMT_ucellx + " align=" FMT_ucellx "\n", + phys, size, align); + + phys = ofmem_claim_phys(phys, size, align); + + printk("ofmem_claim_phys result phys=" FMT_ucellx "\n", phys); + + ofmem_map(phys, phys, size, -1); + + PUSH(phys >> 32); + PUSH(phys & 0xffffffffUL); +} + +/* ( phys size --- ) */ +static void +mem_release( void ) +{ + ucell phys, size; + + size = POP(); + phys = POP(); + printk("release virt=" FMT_ucellx " size=" FMT_ucellx "\n", phys, size); + + ofmem_release(phys, size); +} + +DECLARE_NODE(memory, INSTALL_OPEN, 0, "/memory"); + +NODE_METHODS( memory ) = { + { "claim", mem_claim }, + { "release", mem_release }, +}; + DECLARE_UNNAMED_NODE(mmu, INSTALL_OPEN, 0); NODE_METHODS(mmu) = { @@ -381,7 +425,10 @@ { char nodebuff[256]; - // MMU node + /* memory node */ + REGISTER_NODE_METHODS(memory, "/memory"); + + /* MMU node */ snprintf(nodebuff, sizeof(nodebuff), "/%s", cpuname); push_str(nodebuff); fword("find-device"); @@ -397,6 +444,8 @@ REGISTER_NODE_METHODS(mmu, nodebuff); + ofmem_register(find_dev("/memory"), find_dev("/virtual-memory")); + push_str("/chosen"); fword("find-device"); @@ -409,7 +458,7 @@ push_str("/memory"); fword("find-device"); - // All memory: 0 to RAM_size + /* All memory: 0 to RAM_size */ PUSH(0); fword("encode-int"); PUSH(0); @@ -424,108 +473,6 @@ push_str("reg"); fword("property"); - // Available memory: 0 to va2pa(_start) - PUSH(0); - fword("encode-int"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH((va2pa((unsigned long)&_data) - 8192) >> 32); - fword("encode-int"); - fword("encode+"); - PUSH((va2pa((unsigned long)&_data) - 8192) & 0xffffffff); - fword("encode-int"); - fword("encode+"); - push_str("available"); - fword("property"); - - // XXX - // Translations - push_str("/virtual-memory"); - fword("find-device"); - - // 0 to 16M: 1:1 - PUSH(0); - fword("encode-int"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH(16 * 1024 * 1024); - fword("encode-int"); - fword("encode+"); - PUSH(0x80000000); - fword("encode-int"); - fword("encode+"); - PUSH(0x00000036); - fword("encode-int"); - fword("encode+"); - - // _start to _data: ROM used - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH((unsigned long)&_start); - fword("encode-int"); - fword("encode+"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH((unsigned long)&_data - (unsigned long)&_start); - fword("encode-int"); - fword("encode+"); - PUSH(0x800001ff); - fword("encode-int"); - fword("encode+"); - PUSH(0xf0000074); - fword("encode-int"); - fword("encode+"); - - // _data to _end: end of RAM - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH((unsigned long)&_data); - fword("encode-int"); - fword("encode+"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH((unsigned long)&_data - (unsigned long)&_start); - fword("encode-int"); - fword("encode+"); - PUSH(((va2pa((unsigned long)&_data) - 8192) >> 32) | 0x80000000); - fword("encode-int"); - fword("encode+"); - PUSH(((va2pa((unsigned long)&_data) - 8192) & 0xffffffff) | 0x36); - fword("encode-int"); - fword("encode+"); - - // VGA buffer (128k): 1:1 - PUSH(0x1ff); - fword("encode-int"); - fword("encode+"); - PUSH(0x004a0000); - fword("encode-int"); - fword("encode+"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH(128 * 1024); - fword("encode-int"); - fword("encode+"); - PUSH(0x800001ff); - fword("encode-int"); - fword("encode+"); - PUSH(0x004a0076); - fword("encode-int"); - fword("encode+"); - - push_str("translations"); - fword("property"); - push_str("/openprom/client-services"); fword("find-device"); bind_func("claim", mmu_claim); Modified: trunk/openbios-devel/arch/sparc64/openbios.c =================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c 2009-07-31 11:15:30 UTC (rev 516) +++ trunk/openbios-devel/arch/sparc64/openbios.c 2009-07-31 11:16:24 UTC (rev 517) @@ -20,6 +20,7 @@ #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" #include "video_subr.h" +#include "ofmem.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" @@ -495,6 +496,8 @@ printk("OpenBIOS for Sparc64\n"); #endif + ofmem_init(); + collect_sys_info(&sys_info); dict = malloc(DICTIONARY_SIZE); Modified: trunk/openbios-devel/arch/sparc64/tree.fs =================================================================== --- trunk/openbios-devel/arch/sparc64/tree.fs 2009-07-31 11:15:30 UTC (rev 516) +++ trunk/openbios-devel/arch/sparc64/tree.fs 2009-07-31 11:16:24 UTC (rev 517) @@ -27,11 +27,12 @@ new-device " memory" device-name + " memory" device-type external : open true ; : close ; \ claim ( phys size align -- base ) - : claim 2drop ; +\ : claim 2drop ; \ release ( phys size -- ) finish-device @@ -41,7 +42,7 @@ : open true ; : close ; \ claim ( phys size align -- base ) - : claim 2drop ; +\ : claim 2drop ; \ release ( phys size -- ) finish-device Modified: trunk/openbios-devel/arch/sparc64/vectors.S =================================================================== --- trunk/openbios-devel/arch/sparc64/vectors.S 2009-07-31 11:15:30 UTC (rev 516) +++ trunk/openbios-devel/arch/sparc64/vectors.S 2009-07-31 11:16:24 UTC (rev 517) @@ -101,6 +101,8 @@ ba bug; mov lvl, %g1; nop; nop; nop; nop; nop; nop; #define BTRAPTL1(lvl) BTRAP(lvl) #define BTRAPS(x) BTRAP(x) BTRAP(x+1) BTRAP(x+2) BTRAP(x+3) BTRAP(x+4) BTRAP(x+5) BTRAP(x+6) BTRAP(x+7) +#define BTRAPS4(x) BTRAP(x) BTRAP(x+1) BTRAP(x+2) BTRAP(x+3) +#define TRAP_HANDLER(routine) ba routine; nop; nop; nop; nop; nop; nop; nop; #define STACK_BIAS 2047 .globl sparc64_ttable_tl0, sparc64_ttable_tl1 @@ -131,7 +133,16 @@ BTRAPS(0x40) BTRAPS(0x48) #endif BTRAPS(0x50) BTRAPS(0x58) - BTRAPS(0x60) BTRAPS(0x68) + BTRAPS4(0x60) + TRAP_HANDLER(reload_IMMU_tlb) ! 0x64 : instruction_access_MMU_miss + TRAP_HANDLER(reload_IMMU_tlb) ! 0x65 : instruction_access_MMU_miss + TRAP_HANDLER(reload_IMMU_tlb) ! 0x66 : instruction_access_MMU_miss + TRAP_HANDLER(reload_IMMU_tlb) ! 0x67 : instruction_access_MMU_miss + TRAP_HANDLER(reload_DMMU_tlb) ! 0x68 : data_access_MMU_miss + TRAP_HANDLER(reload_DMMU_tlb) ! 0x69 : data_access_MMU_miss + TRAP_HANDLER(reload_DMMU_tlb) ! 0x6A : data_access_MMU_miss + TRAP_HANDLER(reload_DMMU_tlb) ! 0x6B : data_access_MMU_miss + BTRAPS4(0x6C) ! data_access_protection BTRAPS(0x70) BTRAPS(0x78) tl0_s0n: SPILL_WINDOW tl0_s1n: SPILL_WINDOW @@ -206,7 +217,16 @@ BTRAPS(0x40) BTRAPS(0x48) #endif BTRAPS(0x50) BTRAPS(0x58) - BTRAPS(0x60) BTRAPS(0x68) + BTRAPS4(0x60) + TRAP_HANDLER(reload_IMMU_tlb) ! 0x64 : instruction_access_MMU_miss + TRAP_HANDLER(reload_IMMU_tlb) ! 0x65 : instruction_access_MMU_miss + TRAP_HANDLER(reload_IMMU_tlb) ! 0x66 : instruction_access_MMU_miss + TRAP_HANDLER(reload_IMMU_tlb) ! 0x67 : instruction_access_MMU_miss + TRAP_HANDLER(reload_DMMU_tlb) ! 0x68 : data_access_MMU_miss + TRAP_HANDLER(reload_DMMU_tlb) ! 0x69 : data_access_MMU_miss + TRAP_HANDLER(reload_DMMU_tlb) ! 0x6A : data_access_MMU_miss + TRAP_HANDLER(reload_DMMU_tlb) ! 0x6B : data_access_MMU_miss + BTRAPS4(0x6C) ! data_access_protection BTRAPS(0x70) BTRAPS(0x78) tl1_s0n: SPILL_WINDOW tl1_s1n: SPILL_WINDOW @@ -300,6 +320,86 @@ restored retry + .globl reload_DMMU_tlb, reload_IMMU_tlb + +reload_DMMU_tlb: + mov 6 << 3, %g2 ! va = fault virtual address + ldxa [%g2] ASI_DMMU, %g1 ! from tag access register + + srlx %g1, 13, %g1 ! %g1 = va rounded to 8k page + sllx %g1, 13, %g1 ! + + setx g_ofmem_translations, %g7, %g3 + ldx [%g3], %g3 ! translation_t* t = *g_ofmem_translations +dmmu_next_trans: + ldx [%g3], %g3 + brz %g3, bug ! NULL pointer + nop + ldx [%g3+0x08], %g4 ! t->virt + sub %g1, %g4, %g7 ! %g7 offset = va - t->virt + brlz %g7, dmmu_next_trans ! va < t->virt ? + nop + ldx [%g3+0x10], %g4 ! t->size + sub %g7, %g4, %g4 ! va >= t->virt - t->size ? + brgez %g4, dmmu_next_trans + nop + + ! install 8k tlb entry + + ldx [%g3+0x18], %g4 ! t->phys + add %g4, %g7, %g4 ! %g4 page physical address = t->phys + offset + ldx [%g3+0x20], %g5 ! t->mode + + set 0x80000000, %g2 ! valid tte, 8k size + sllx %g2, 32, %g2 + or %g2, %g5, %g2 ! mix in translation mode + or %g2, %g4, %g3 ! mix in phys addr mode + + mov 6 << 3, %g2 ! page virtual address + stxa %g1, [%g2] ASI_DMMU ! + stxa %g3, [%g0] ASI_DTLB_DATA_IN + + retry + +reload_IMMU_tlb: + mov 6 << 3, %g2 ! va = fault virtual address + ldxa [%g2] ASI_IMMU, %g1 ! from tag access register + + srlx %g1, 13, %g1 ! %g1 = va rounded to 8k page + sllx %g1, 13, %g1 ! + + setx g_ofmem_translations, %g7, %g3 + ldx [%g3], %g3 ! translation_t* t = *g_ofmem_translations +immu_next_trans: + ldx [%g3], %g3 + brz %g3, bug ! NULL pointer + nop + ldx [%g3+0x08], %g4 ! t->virt + sub %g1, %g4, %g7 ! %g7 offset = va - t->virt + brlz %g7, immu_next_trans ! va < t->virt ? + nop + ldx [%g3+0x10], %g4 ! t->size + sub %g7, %g4, %g4 ! va >= t->virt - t->size ? + brgez %g4, immu_next_trans + nop + + ! install 8k tlb entry + + ldx [%g3+0x18], %g4 ! t->phys + add %g4, %g7, %g4 ! %g4 page physical address = t->phys + offset + ldx [%g3+0x20], %g5 ! t->mode + + set 0x80000000, %g2 ! valid tte, 8k size + sllx %g2, 32, %g2 + or %g2, %g5, %g2 ! mix in translation mode + or %g2, %g4, %g3 ! mix in phys addr mode + + mov 6 << 3, %g2 ! page virtual address + stxa %g1, [%g2] ASI_IMMU ! + stxa %g3, [%g0] ASI_ITLB_DATA_IN + + retry + __divide_error: bug: /* Dump the exception and its context */

1 0

r516 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 31 Jul '09

31 Jul '09

Author: blueswirl Date: 2009-07-31 13:15:30 +0200 (Fri, 31 Jul 2009) New Revision: 516 Added: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h Modified: trunk/openbios-devel/arch/sparc64/build.xml trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/arch/sparc64/spitfire.h Log: Sparc64 ofmem implementation (Igor Kovalenko) Add sparc64 ofmem implementation. Modified: trunk/openbios-devel/arch/sparc64/build.xml =================================================================== --- trunk/openbios-devel/arch/sparc64/build.xml 2009-07-31 11:13:16 UTC (rev 515) +++ trunk/openbios-devel/arch/sparc64/build.xml 2009-07-31 11:15:30 UTC (rev 516) @@ -19,6 +19,7 @@ <object source="forthload.c"/> <object source="fcodeload.c"/> <object source="loadfs.c"/> + <object source="ofmem_sparc64.c"/> </library> <executable name="target/arch/sparc64/entry.o" target="target"> Modified: trunk/openbios-devel/arch/sparc64/lib.c =================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c 2009-07-31 11:13:16 UTC (rev 515) +++ trunk/openbios-devel/arch/sparc64/lib.c 2009-07-31 11:15:30 UTC (rev 516) @@ -14,6 +14,8 @@ #include "sys_info.h" #include "boot.h" +#include "ofmem_sparc64.h" + /* Format a string and print it on the screen, just like the libc * function printf. */ @@ -80,6 +82,10 @@ { } +void ofmem_walk_boot_map(translation_entry_cb cb) +{ +} + static int spitfire_translate(unsigned long virt, unsigned long *p_phys, unsigned long *p_data, unsigned long *p_size) @@ -212,7 +218,8 @@ } static void -map_pages(unsigned long virt, unsigned long size, unsigned long phys) +map_pages(unsigned long virt, unsigned long size, unsigned long phys, + unsigned long mode) { unsigned long tte_data, currsize; @@ -238,7 +245,9 @@ currsize = PAGE_SIZE_8K; tte_data = 0; } - tte_data |= phys | 0x8000000000000036ULL; + + tte_data |= phys | mode | SPITFIRE_TTE_VALID; + dtlb_load2(virt, tte_data); itlb_load2(virt, tte_data); size -= currsize; @@ -247,6 +256,11 @@ } } +void ofmem_map_pages(ucell phys, ucell virt, ucell size, ucell mode) +{ + return map_pages(phys, virt, size, mode); +} + /* 3.6.5 map ( phys.lo ... phys.hi virt size mode -- ) @@ -262,7 +276,7 @@ phys = POP(); phys <<= 32; phys |= POP(); - map_pages(virt, size, phys); + map_pages(virt, size, phys, mode); } static void @@ -299,6 +313,11 @@ } } +void ofmem_unmap_pages(ucell virt, ucell size) +{ + unmap_pages(virt, size); +} + /* 3.6.5 unmap ( virt size -- ) Added: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c =================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c (rev 0) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c 2009-07-31 11:15:30 UTC (rev 516) @@ -0,0 +1,664 @@ +/* + * <ofmem_sparc64.c> + * + * OF Memory manager + * + * Copyright (C) 1999-2004 Samuel Rydh (samuel(a)ibrium.se) + * Copyright (C) 2004 Stefan Reinauer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "libc/string.h" +#include "ofmem_sparc64.h" +#include "spitfire.h" + +static inline uint64_t ALIGN_SIZE(uint64_t x, uint64_t a) +{ + return (x + a - 1) & ~(a-1); +} + +#define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) + +#define MEMSIZE ((128 + 256 + 512) * 1024) +static union { + char memory[MEMSIZE]; + ofmem_t ofmem; +} s_ofmem_data; + +#define OFMEM (&s_ofmem_data.ofmem) +#define TOP_OF_RAM (s_ofmem_data.memory + MEMSIZE) + +translation_t **g_ofmem_translations = &s_ofmem_data.ofmem.trans; + +ulong get_ram_size( void ) +{ + ofmem_t *ofmem = OFMEM; + return ofmem->ramsize; +} + +static phandle_t s_phandle_memory = 0; +static phandle_t s_phandle_mmu = 0; + +static void ofmem_update_mmu_translations( void ) +{ + ofmem_t *ofmem = OFMEM; + translation_t *t; + int ncells; + ucell *props; + + if (s_phandle_mmu == 0) + return; + + for( t = ofmem->trans, ncells = 0; t ; t=t->next, ncells++ ) { + } + + props = malloc(ncells * sizeof(ucell) * 3); + + if (props == NULL) + return; + + for( t = ofmem->trans, ncells = 0 ; t ; t=t->next ) { + props[ncells++] = t->virt; + props[ncells++] = t->size; + props[ncells++] = t->mode; + } + + set_property(s_phandle_mmu, "translations", + (char*)props, ncells * sizeof(props[0])); + + free(props); +} + +static void ofmem_update_memory_available( phandle_t ph, range_t *range, + u64 top_address ) +{ + range_t *r; + int ncells; + ucell *props; + + ucell start, size; + + if (s_phandle_memory == 0) + return; + + /* count phys_range list entries */ + for( r = range, ncells = 0; r ; r=r->next, ncells++ ) { + } + + /* inverse of phys_range list could take 2 more cells for the tail */ + props = malloc((ncells+1) * sizeof(ucell) * 2); + + if (props == NULL) { + /* out of memory! */ + return; + } + + start = 0; + ncells = 0; + + for (r = range; r; r=r->next) { + if (r->start >= top_address) { + break; + } + + size = r->start - start; + if (size) { + props[ncells++] = start; + props[ncells++] = size; + } + start = r->start + r->size; + } + + /* tail */ + if (start < top_address) { + props[ncells++] = start; + props[ncells++] = top_address - start; + } + + set_property(ph, "available", + (char*)props, ncells * sizeof(props[0])); + + free(props); +} + +static void ofmem_update_translations( void ) +{ + ofmem_t *ofmem = OFMEM; + + ofmem_update_memory_available(s_phandle_memory, + ofmem->phys_range, ofmem->ramsize); + ofmem_update_memory_available(s_phandle_mmu, + ofmem->virt_range, -1ULL); + ofmem_update_mmu_translations(); +} + +/************************************************************************/ +/* OF private allocations */ +/************************************************************************/ + +void* ofmem_malloc( size_t size ) +{ + ofmem_t *ofmem = OFMEM; + alloc_desc_t *d, **pp; + char *ret; + + if( !size ) + return NULL; + + if( !ofmem->next_malloc ) + ofmem->next_malloc = (char*)OF_MALLOC_BASE; + + /* assuming sizeof(alloc_desc_t) is multiple of 8 */ + size = ALIGN_SIZE(size + sizeof(alloc_desc_t), 8); + + /* look in the freelist */ + for( pp=&ofmem->mfree; *pp && (**pp).size < size; pp = &(**pp).next ) { + } + + /* waste at most 4K by taking an entry from the freelist */ + if( *pp && (**pp).size < size + 0x1000 ) { + ret = (char*)*pp + sizeof(alloc_desc_t); + memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); + *pp = (**pp).next; + return ret; + } + + if( ofmem->next_malloc + size >= TOP_OF_RAM ) { + printk("out of malloc memory (%x)!\n", size ); + return NULL; + } + + d = (alloc_desc_t*) ofmem->next_malloc; + ofmem->next_malloc += size; + + d->next = NULL; + d->size = size; + + ret = (char*)d + sizeof(alloc_desc_t); + memset( ret, 0, size - sizeof(alloc_desc_t) ); + + return ret; +} + +void ofmem_free( void *ptr ) +{ + ofmem_t *ofmem = OFMEM; + alloc_desc_t **pp, *d; + + /* it is legal to free NULL pointers (size zero allocations) */ + if( !ptr ) + return; + + d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t)); + d->next = ofmem->mfree; + + /* insert in the (sorted) freelist */ + for( pp=&ofmem->mfree; *pp && (**pp).size < d->size ; pp = &(**pp).next ) { + } + + d->next = *pp; + *pp = d; +} + +void* ofmem_realloc( void *ptr, size_t size ) +{ + alloc_desc_t *d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t)); + char *p; + + if( !ptr ) + return malloc( size ); + if( !size ) { + free( ptr ); + return NULL; + } + p = malloc( size ); + memcpy( p, ptr, MIN(d->size - sizeof(alloc_desc_t),size) ); + free( ptr ); + return p; +} + + +/************************************************************************/ +/* misc */ +/************************************************************************/ + +static inline ucell def_memmode( ucell phys ) +{ + /* Writable, cacheable */ + /* not privileged and not locked */ + return SPITFIRE_TTE_CP | SPITFIRE_TTE_CV | SPITFIRE_TTE_WRITABLE; +} + + +/************************************************************************/ +/* client interface */ +/************************************************************************/ + +static int is_free( ucell ea, ucell size, range_t *r ) +{ + if( size == 0 ) + return 1; + for( ; r ; r=r->next ) { + if( r->start + r->size - 1 >= ea && r->start <= ea ) + return 0; + if( r->start >= ea && r->start <= ea + size - 1 ) + return 0; + } + return 1; +} + +static void add_entry_( ucell ea, ucell size, range_t **r ) +{ + range_t *nr; + + for( ; *r && (**r).start < ea; r=&(**r).next ) { + } + + nr = (range_t*)malloc( sizeof(range_t) ); + nr->next = *r; + nr->start = ea; + nr->size = size; + *r = nr; +} + +static int add_entry( ucell ea, ucell size, range_t **r ) +{ + if( !is_free( ea, size, *r ) ) { + printk("add_entry: range not free!\n"); + return -1; + } + add_entry_( ea, size, r ); + return 0; +} + +static ucell find_area( ucell align, ucell size, range_t *r, + ucell min, ucell max, int reverse ) +{ + ucell base = min; + range_t *r2; + + if( (align & (align-1)) ) { + printk("bad alignment " FMT_ucell "\n", align); + align = 0x1000; + } + if( !align ) + align = 0x1000; + + base = reverse ? max - size : min; + r2 = reverse ? NULL : r; + + for( ;; ) { + if( !reverse ) { + base = (base + align - 1) & ~(align-1); + if( base < min ) + base = min; + if( base + size - 1 >= max -1 ) + break; + } else { + if( base > max - size ) + base = max - size; + base -= base & (align-1); + } + if( is_free( base, size, r ) ) + return base; + + if( !reverse ) { + if( !r2 ) + break; + base = r2->start + r2->size; + r2 = r2->next; + } else { + range_t *rp; + + for( rp=r; rp && rp->next != r2 ; rp=rp->next ) { + } + + r2 = rp; + if( !r2 ) + break; + base = r2->start - size; + } + } + return (ucell)-1; +} + +static ucell ofmem_claim_phys_( ucell phys, ucell size, ucell align, + ucell min, ucell max, int reverse ) +{ + ofmem_t *ofmem = OFMEM; + if( !align ) { + if( !is_free( phys, size, ofmem->phys_range ) ) { + printk("Non-free physical memory claimed!\n"); + return -1; + } + add_entry( phys, size, &ofmem->phys_range ); + return phys; + } + phys = find_area( align, size, ofmem->phys_range, min, max, reverse ); + if( phys == (ucell)-1 ) { + printk("ofmem->claim_phys - out of space\n"); + return -1; + } + add_entry( phys, size, &ofmem->phys_range ); + + ofmem_update_translations(); + + return phys; +} + +/* if align != 0, phys is ignored. Returns -1 on error */ +ucell ofmem_claim_phys( ucell phys, ucell size, ucell align ) +{ + /* printk("+ ofmem_claim phys %08lx %lx %ld\n", phys, size, align ); */ + return ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); +} + +static ucell ofmem_claim_virt_( ucell virt, ucell size, ucell align, + ucell min, ucell max, int reverse ) +{ + ofmem_t *ofmem = OFMEM; + if( !align ) { + if( !is_free( virt, size, ofmem->virt_range ) ) { + printk("Non-free physical memory claimed!\n"); + return -1; + } + add_entry( virt, size, &ofmem->virt_range ); + return virt; + } + + virt = find_area( align, size, ofmem->virt_range, min, max, reverse ); + if( virt == -1UL ) { + printk("ofmem_claim_virt - out of space\n"); + return -1UL; + } + add_entry( virt, size, &ofmem->virt_range ); + return virt; +} + +ucell ofmem_claim_virt( ucell virt, ucell size, ucell align ) +{ + /* printk("+ ofmem_claim virt %08lx %lx %ld\n", virt, size, align ); */ + return ofmem_claim_virt_( virt, size, align, get_ram_size(), (ucell)TOP_OF_RAM, 0 ); +} + + +/* allocate both physical and virtual space and add a translation */ +ucell ofmem_claim( ucell addr, ucell size, ucell align ) +{ + ofmem_t *ofmem = OFMEM; + ucell virt, phys; + ucell offs = addr & 0xfff; + + /* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */ + virt = phys = 0; + if( !align ) { + if( is_free(addr, size, ofmem->virt_range) && + is_free(addr, size, ofmem->phys_range) ) { + ofmem_claim_phys_( addr, size, 0, 0, 0, 0 ); + ofmem_claim_virt_( addr, size, 0, 0, 0, 0 ); + virt = phys = addr; + } else { + /* printk("**** ofmem_claim failure ***!\n"); */ + return -1; + } + } else { + if( align < 0x1000 ) + align = 0x1000; + phys = ofmem_claim_phys_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); + virt = ofmem_claim_virt_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); + if( phys == (ucell)-1 || virt == (ucell)-1 ) { + printk("ofmem_claim failed\n"); + return -1; + } + /* printk("...phys = %08lX, virt = %08lX, size = %08lX\n", phys, virt, size ); */ + } + + /* align */ + if( phys & 0xfff ) { + size += (phys & 0xfff); + virt -= (phys & 0xfff); + phys &= ~0xfff; + } + if( size & 0xfff ) + size = (size + 0xfff) & ~0xfff; + + /* printk("...free memory found... phys: %08lX, virt: %08lX, size %lX\n", phys, virt, size ); */ + ofmem_map( phys, virt, size, -1 ); + return virt + offs; +} + + +/************************************************************************/ +/* keep track of ea -> phys translations */ +/************************************************************************/ + +static void split_trans( ucell virt ) +{ + ofmem_t *ofmem = OFMEM; + translation_t *t, *t2; + + for( t=ofmem->trans; t; t=t->next ) { + if( virt > t->virt && virt < t->virt + t->size-1 ) { + t2 = (translation_t*)malloc( sizeof(translation_t) ); + t2->virt = virt; + t2->size = t->size - (virt - t->virt); + t->size = virt - t->virt; + t2->phys = t->phys + t->size; + t2->mode = t->mode; + t2->next = t->next; + t->next = t2; + } + } +} + +static int map_page_range( ucell phys, ucell virt, ucell size, ucell mode ) +{ + ofmem_t *ofmem = OFMEM; + translation_t *t, **tt; + + OFMEM_TRACE("map_page_range " FMT_ucellx + " -> " FMT_ucellx " " FMT_ucellx " mode " FMT_ucellx "\n", + virt, phys, size, mode ); + + split_trans( virt ); + split_trans( virt + size ); + + /* detect remappings */ + for( t=ofmem->trans; t; ) { + if( virt == t->virt || (virt < t->virt && virt + size > t->virt )) { + if( t->phys + virt - t->virt != phys ) { + OFMEM_TRACE("mapping altered virt=" FMT_ucellx ")\n", t->virt ); + } else if( t->mode != mode ){ + OFMEM_TRACE("mapping mode altered virt=" FMT_ucellx + " old mode=" FMT_ucellx " new mode=" FMT_ucellx "\n", + t->virt, t->mode, mode); + } + + for( tt=&ofmem->trans; *tt != t ; tt=&(**tt).next ) { + } + + *tt = t->next; + + /* really unmap these pages */ + ofmem_unmap_pages(t->virt, t->size); + + free((char*)t); + + t=ofmem->trans; + continue; + } + t=t->next; + } + + /* add mapping */ + for( tt=&ofmem->trans; *tt && (**tt).virt < virt ; tt=&(**tt).next ) { + } + + t = (translation_t*)malloc( sizeof(translation_t) ); + t->virt = virt; + t->phys = phys; + t->size = size; + t->mode = mode; + t->next = *tt; + *tt = t; + + ofmem_update_translations(); + + return 0; +} + +static int unmap_page_range( ucell virt, ucell size ) +{ + ofmem_t *ofmem = OFMEM; + translation_t **plink; + + /* make sure there is exactly one matching translation entry */ + + split_trans( virt ); + split_trans( virt + size ); + + /* find and unlink entries in range */ + plink = &ofmem->trans; + + while (*plink && (*plink)->virt < virt+size) { + translation_t **plinkentry = plink; + translation_t *t = *plink; + + /* move ahead */ + plink = &t->next; + + if (t->virt >= virt && t->virt + t->size <= virt+size) { + + /* unlink entry */ + *plinkentry = t->next; + + printk("unmap_page_range found " FMT_ucellx + " -> " FMT_ucellx " " FMT_ucellx " mode " FMT_ucellx "\n", + t->virt, t->phys, t->size, t->mode ); + + // really map these pages + ofmem_unmap_pages(t->virt, t->size); + + free((char*)t); + } + } + + ofmem_update_translations(); + + return 0; +} + +int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ) +{ + /* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n", + virt, phys, size, mode ); */ + + if( (phys & 0xfff) || (virt & 0xfff) || (size & 0xfff) ) { + /* printk("ofmem_map: Bad parameters (%08lX %08lX %08lX)\n", + phys, virt, size ); */ + phys &= ~0xfff; + virt &= ~0xfff; + size = (size + 0xfff) & ~0xfff; + } + + if (mode==-1) { + mode = def_memmode(phys); + } + + // install translations + map_page_range(phys, virt, size, mode); + + if (mode & SPITFIRE_TTE_LOCKED) { + // install locked tlb entries now + ofmem_map_pages(phys, virt, size, mode); + } + + return 0; +} + +int ofmem_unmap( ucell virt, ucell size ) +{ + OFMEM_TRACE("ofmem_unmap " FMT_ucellx " " FMT_ucellx "\n", + virt, size ); + + if( (virt & 0xfff) || (size & 0xfff) ) { + /* printk("ofmem_unmap: Bad parameters (%08lX %08lX)\n", + virt, size ); */ + virt &= ~0xfff; + size = (size + 0xfff) & ~0xfff; + } + + /* remove translations and unmap pages */ + unmap_page_range(virt, size); + + return 0; +} + +/* virtual -> physical. */ +ucell ofmem_translate( ucell virt, ucell *mode ) +{ + ofmem_t *ofmem = OFMEM; + translation_t *t; + + for( t=ofmem->trans; t && t->virt <= virt ; t=t->next ) { + ucell offs; + if( t->virt + t->size - 1 < virt ) + continue; + offs = virt - t->virt; + *mode = t->mode; + return t->phys + offs; + } + + /*printk("ofmem_translate: no translation defined (%08lx)\n", virt);*/ + /*print_trans();*/ + return -1UL; +} + +/* release memory allocated by ofmem_claim */ +void ofmem_release( ucell virt, ucell size ) +{ + printk("ofmem_release unimplemented (" FMT_ucellx ", " FMT_ucellx ")\n", + virt, size ); +} + + +/************************************************************************/ +/* init / cleanup */ +/************************************************************************/ + +extern uint64_t qemu_mem_size; + +static int remap_page_range( ucell phys, ucell virt, ucell size, ucell mode ) +{ + map_page_range(phys, virt, size, mode); + if (!(mode & SPITFIRE_TTE_LOCKED)) { + OFMEM_TRACE("remap_page_range clearing translation " FMT_ucellx + " -> " FMT_ucellx " " FMT_ucellx " mode " FMT_ucellx "\n", + virt, phys, size, mode ); + ofmem_unmap_pages(virt, size); + } + return 0; +} + +void ofmem_init( void ) +{ + memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); + s_ofmem_data.ofmem.ramsize = qemu_mem_size; + + /* inherit translations set up by entry.S */ + ofmem_walk_boot_map(remap_page_range); +} + +void ofmem_register( phandle_t ph_memory, phandle_t ph_mmu ) +{ + s_phandle_memory = ph_memory; + s_phandle_mmu = ph_mmu; + + ofmem_update_translations(); +} Added: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h =================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h (rev 0) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h 2009-07-31 11:15:30 UTC (rev 516) @@ -0,0 +1,69 @@ +/* + * <ofmem_sparc64.h> + * + * OF Memory manager + * + * Copyright (C) 1999, 2002 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#ifndef _H_OFMEM_SPARC64 +#define _H_OFMEM_SPARC64 + +#include "ofmem.h" + +extern void* ofmem_malloc( size_t size ); +extern void ofmem_free( void *ptr ); +extern void* ofmem_realloc( void *ptr, size_t size ); + +extern int ofmem_unmap(ucell virt, ucell size); + +ulong get_ram_size( void ); +ulong get_ram_top( void ); +ulong get_ram_bottom( void ); +extern void ofmem_register( phandle_t ph_memory, phandle_t ph_mmu ); +extern void ofmem_map_pages(ucell phys, ucell virt, ucell size, ucell mode); +extern void ofmem_unmap_pages(ucell virt, ucell size); + +typedef int (*translation_entry_cb)(ucell phys, ucell virt, + ucell size, ucell mode); + +extern void ofmem_walk_boot_map(translation_entry_cb cb); + +typedef struct alloc_desc { + struct alloc_desc *next; + ucell size; /* size (including) this struct */ +} alloc_desc_t; + +typedef struct mem_range { + struct mem_range *next; + ucell start; + ucell size; +} range_t; + +typedef struct trans { + struct trans *next; + ucell virt; /* chain is sorted by virt */ + ucell size; + ucell phys; + ucell mode; +} translation_t; + +typedef struct { + uint64_t ramsize; + char *next_malloc; + alloc_desc_t *mfree; /* list of free malloc blocks */ + + range_t *phys_range; + range_t *virt_range; + + translation_t *trans; /* this is really a translation_t */ +} ofmem_t; + +extern translation_t **g_ofmem_translations; + +#endif /* _H_OFMEM_SPARC64 */ Modified: trunk/openbios-devel/arch/sparc64/spitfire.h =================================================================== --- trunk/openbios-devel/arch/sparc64/spitfire.h 2009-07-31 11:13:16 UTC (rev 515) +++ trunk/openbios-devel/arch/sparc64/spitfire.h 2009-07-31 11:15:30 UTC (rev 516) @@ -35,6 +35,14 @@ #define SPITFIRE_HIGHEST_LOCKED_TLBENT (64 - 1) +/* translation table entry bits */ +#define SPITFIRE_TTE_WRITABLE 0x02 +#define SPITFIRE_TTE_PRIVILEGED 0x04 +#define SPITFIRE_TTE_CV 0x10 +#define SPITFIRE_TTE_CP 0x20 +#define SPITFIRE_TTE_LOCKED 0x40 +#define SPITFIRE_TTE_VALID 0x8000000000000000ULL + #ifndef __ASSEMBLY__ enum ultra_tlb_layout {

1 0

r515 - trunk/openbios-devel/include/sparc64
by svn＠openbios.org 31 Jul '09

31 Jul '09

Author: blueswirl Date: 2009-07-31 13:13:16 +0200 (Fri, 31 Jul 2009) New Revision: 515 Modified: trunk/openbios-devel/include/sparc64/types.h Log: Sparc64 cell based types (Igor Kovalenko) Use int64_t for cell and uint64_t for ucell. Define printf-style format macros to ease writing cell-type-independend log traces. Modified: trunk/openbios-devel/include/sparc64/types.h =================================================================== --- trunk/openbios-devel/include/sparc64/types.h 2009-07-31 11:12:18 UTC (rev 514) +++ trunk/openbios-devel/include/sparc64/types.h 2009-07-31 11:13:16 UTC (rev 515) @@ -29,9 +29,13 @@ #include "autoconf.h" /* cell based types */ -typedef long long cell; -typedef unsigned long long ucell; +typedef int64_t cell; +typedef uint64_t ucell; +#define FMT_cell "%lld" +#define FMT_ucell "%llu" +#define FMT_ucellx "%016llx" + #ifdef NEED_FAKE_INT128_T typedef struct { uint64_t hi;

1 0

r514 - in trunk/openbios-devel: config/examples include
by svn＠openbios.org 31 Jul '09

31 Jul '09

Author: blueswirl Date: 2009-07-31 13:12:18 +0200 (Fri, 31 Jul 2009) New Revision: 514 Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/cross-sparc32_config.xml trunk/openbios-devel/config/examples/cross-sparc64_config.xml trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/config/examples/sparc32_config.xml trunk/openbios-devel/config/examples/sparc64_config.xml trunk/openbios-devel/include/ofmem.h Log: Introduce CONFIG_DEBUG_OFMEM option (Igor Kovalenko) Add CONFIG_DEBUG_OFMEM option to configurations which implement OF memory manager. Implement DEBUG_OFMEM macro to be used by debug traces in OF memory manager code. Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-07-31 11:10:38 UTC (rev 513) +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-07-31 11:12:18 UTC (rev 514) @@ -27,6 +27,7 @@ <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_OFMEM" type="boolean" value="false"/>  Modified: trunk/openbios-devel/config/examples/cross-sparc32_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-sparc32_config.xml 2009-07-31 11:10:38 UTC (rev 513) +++ trunk/openbios-devel/config/examples/cross-sparc32_config.xml 2009-07-31 11:12:18 UTC (rev 514) @@ -33,6 +33,7 @@ <option name="CONFIG_DEBUG_IOMMU" type="boolean" value="false"/> <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="9600"/> + <option name="CONFIG_DEBUG_OFMEM" type="boolean" value="false"/>  Modified: trunk/openbios-devel/config/examples/cross-sparc64_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-sparc64_config.xml 2009-07-31 11:10:38 UTC (rev 513) +++ trunk/openbios-devel/config/examples/cross-sparc64_config.xml 2009-07-31 11:12:18 UTC (rev 514) @@ -30,6 +30,7 @@ <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_OFMEM" type="boolean" value="false"/>  Modified: trunk/openbios-devel/config/examples/ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml 2009-07-31 11:10:38 UTC (rev 513) +++ trunk/openbios-devel/config/examples/ppc_config.xml 2009-07-31 11:12:18 UTC (rev 514) @@ -27,6 +27,7 @@ <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_OFMEM" type="boolean" value="false"/>  Modified: trunk/openbios-devel/config/examples/sparc32_config.xml =================================================================== --- trunk/openbios-devel/config/examples/sparc32_config.xml 2009-07-31 11:10:38 UTC (rev 513) +++ trunk/openbios-devel/config/examples/sparc32_config.xml 2009-07-31 11:12:18 UTC (rev 514) @@ -33,6 +33,7 @@ <option name="CONFIG_DEBUG_IOMMU" type="boolean" value="false"/> <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="9600"/> + <option name="CONFIG_DEBUG_OFMEM" type="boolean" value="false"/>  Modified: trunk/openbios-devel/config/examples/sparc64_config.xml =================================================================== --- trunk/openbios-devel/config/examples/sparc64_config.xml 2009-07-31 11:10:38 UTC (rev 513) +++ trunk/openbios-devel/config/examples/sparc64_config.xml 2009-07-31 11:12:18 UTC (rev 514) @@ -30,6 +30,7 @@ <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_OFMEM" type="boolean" value="false"/>  Modified: trunk/openbios-devel/include/ofmem.h =================================================================== --- trunk/openbios-devel/include/ofmem.h 2009-07-31 11:10:38 UTC (rev 513) +++ trunk/openbios-devel/include/ofmem.h 2009-07-31 11:12:18 UTC (rev 514) @@ -58,4 +58,10 @@ #define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK) #endif +#if defined(CONFIG_DEBUG_OFMEM) +# define OFMEM_TRACE(fmt, ...) do { printk("OFMEM: " fmt, ## __VA_ARGS__); } while (0) +#else +# define OFMEM_TRACE(fmt, ...) do {} while(0) +#endif + #endif /* _H_OFMEM */

1 0

r513 - in trunk/openbios-devel: arch/ppc/qemu include
by svn＠openbios.org 31 Jul '09

31 Jul '09

Author: blueswirl Date: 2009-07-31 13:10:38 +0200 (Fri, 31 Jul 2009) New Revision: 513 Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/include/ofmem.h Log: Use ucell type to pass ofmem arguments (Igor Kovalenko) Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c 2009-07-20 06:52:23 UTC (rev 512) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c 2009-07-31 11:10:38 UTC (rev 513) @@ -241,9 +241,9 @@ static void mmu_translate( void ) { - int mode; - int virt = POP(); - int phys = ofmem_translate( virt, &mode ); + ucell mode; + ucell virt = POP(); + ucell phys = ofmem_translate( virt, &mode ); if( phys == -1 ) { PUSH( 0 ); Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c 2009-07-20 06:52:23 UTC (rev 512) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c 2009-07-31 11:10:38 UTC (rev 513) @@ -37,21 +37,21 @@ typedef struct alloc_desc { struct alloc_desc *next; - int size; /* size (including) this struct */ + ucell size; /* size (including) this struct */ } alloc_desc_t; typedef struct mem_range { struct mem_range *next; - ulong start; - ulong size; + ucell start; + ucell size; } range_t; typedef struct trans { struct trans *next; - ulong virt; /* chain is sorted by virt */ - ulong size; - ulong phys; - int mode; + ucell virt; /* chain is sorted by virt */ + ucell size; + ucell phys; + ucell mode; } translation_t; typedef struct { @@ -236,8 +236,8 @@ /************************************************************************/ extern char _start[], _end[]; -static inline int -def_memmode( ulong phys ) +static inline ucell +def_memmode( ucell phys ) { /* XXX: Guard bit not set as it should! */ if( phys < IO_BASE ) @@ -251,7 +251,7 @@ /************************************************************************/ static int -is_free( ulong ea, ulong size, range_t *r ) +is_free( ucell ea, ucell size, range_t *r ) { if( size == 0 ) return 1; @@ -265,7 +265,7 @@ } static void -add_entry_( ulong ea, ulong size, range_t **r ) +add_entry_( ucell ea, ucell size, range_t **r ) { range_t *nr; @@ -279,7 +279,7 @@ } static int -add_entry( ulong ea, ulong size, range_t **r ) +add_entry( ucell ea, ucell size, range_t **r ) { if( !is_free( ea, size, *r ) ) { printk("add_entry: range not free!\n"); @@ -310,20 +310,20 @@ } static void -fill_range( ulong ea, int size, range_t **rr ) +fill_range( ulong ea, ucell size, range_t **rr ) { add_entry_( ea, size, rr ); join_ranges( rr ); } -static ulong -find_area( ulong align, ulong size, range_t *r, ulong min, ulong max, int reverse ) +static ucell +find_area( ucell align, ucell size, range_t *r, ucell min, ucell max, int reverse ) { - ulong base = min; + ucell base = min; range_t *r2; if( (align & (align-1)) ) { - printk("bad alignment %ld\n", align); + printk("bad alignment %d\n", align); align = 0x1000; } if( !align ) @@ -362,11 +362,11 @@ base = r2->start - size; } } - return (ulong)-1; + return (ucell)-1; } -static ulong -ofmem_claim_phys_( ulong phys, ulong size, ulong align, int min, int max, int reverse ) +static ucell +ofmem_claim_phys_( ucell phys, ucell size, ucell align, ucell min, ucell max, int reverse ) { ofmem_t *ofmem = OFMEM; if( !align ) { @@ -387,15 +387,15 @@ } /* if align != 0, phys is ignored. Returns -1 on error */ -ulong -ofmem_claim_phys( ulong phys, ulong size, ulong align ) +ucell +ofmem_claim_phys( ucell phys, ucell size, ucell align ) { /* printk("+ ofmem_claim phys %08lx %lx %ld\n", phys, size, align ); */ return ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); } -static ulong -ofmem_claim_virt_( ulong virt, ulong size, ulong align, int min, int max, int reverse ) +static ucell +ofmem_claim_virt_( ucell virt, ucell size, ucell align, ucell min, ucell max, int reverse ) { ofmem_t *ofmem = OFMEM; if( !align ) { @@ -416,8 +416,8 @@ return virt; } -ulong -ofmem_claim_virt( ulong virt, ulong size, ulong align ) +ucell +ofmem_claim_virt( ucell virt, ucell size, ucell align ) { /* printk("+ ofmem_claim virt %08lx %lx %ld\n", virt, size, align ); */ return ofmem_claim_virt_( virt, size, align, get_ram_size() , IO_BASE, 0 ); @@ -425,12 +425,12 @@ /* allocate both physical and virtual space and add a translation */ -ulong -ofmem_claim( ulong addr, ulong size, ulong align ) +ucell +ofmem_claim( ucell addr, ucell size, ucell align ) { ofmem_t *ofmem = OFMEM; - ulong virt, phys; - ulong offs = addr & 0xfff; + ucell virt, phys; + ucell offs = addr & 0xfff; /* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */ virt = phys = 0; @@ -496,7 +496,7 @@ } static int -map_page_range( ulong virt, ulong phys, ulong size, int mode ) +map_page_range( ucell virt, ucell phys, ucell size, ucell mode ) { ofmem_t *ofmem = OFMEM; translation_t *t, **tt; @@ -508,7 +508,7 @@ for( t=ofmem->trans; t; ) { if( virt == t->virt || (virt < t->virt && virt + size > t->virt )) { if( t->phys + virt - t->virt != phys ) { - printk("mapping altered (ea %08lx)\n", t->virt ); + printk("mapping altered (ea %08x)\n", t->virt ); } else if( t->mode != mode ){ printk("mapping mode altered\n"); } @@ -538,7 +538,7 @@ } int -ofmem_map( ulong phys, ulong virt, ulong size, int mode ) +ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ) { ofmem_t *ofmem = OFMEM; /* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n", @@ -563,14 +563,14 @@ } /* virtual -> physical. */ -ulong -ofmem_translate( ulong virt, int *mode ) +ucell +ofmem_translate( ucell virt, ucell *mode ) { ofmem_t *ofmem = OFMEM; translation_t *t; for( t=ofmem->trans; t && t->virt <= virt ; t=t->next ) { - ulong offs; + ucell offs; if( t->virt + t->size - 1 < virt ) continue; offs = virt - t->virt; @@ -585,7 +585,7 @@ /* release memory allocated by ofmem_claim */ void -ofmem_release( ulong virt, ulong size ) +ofmem_release( ucell virt, ucell size ) { /* printk("ofmem_release unimplemented (%08lx, %08lx)\n", virt, size ); */ } @@ -595,10 +595,10 @@ /* page fault handler */ /************************************************************************/ -static ulong -ea_to_phys( ulong ea, int *mode ) +static ucell +ea_to_phys( ucell ea, ucell *mode ) { - ulong phys; + ucell phys; if (ea >= 0xfff00000UL) { /* ROM into RAM */ @@ -621,7 +621,7 @@ } static void -hash_page_64( ulong ea, ulong phys, int mode ) +hash_page_64( ucell ea, ucell phys, ucell mode ) { static int next_grab_slot=0; uint64_t vsid_mask, page_mask, pgidx, hash; @@ -687,7 +687,7 @@ } static void -hash_page_32( ulong ea, ulong phys, int mode ) +hash_page_32( ucell ea, ucell phys, ucell mode ) { static int next_grab_slot=0; ulong *upte, cmp, hash1; @@ -734,7 +734,7 @@ return ((pvr >= 0x330000) && (pvr < 0x70330000)); } -static void hash_page( ulong ea, ulong phys, int mode ) +static void hash_page( ulong ea, ulong phys, ucell mode ) { if ( is_ppc64() ) hash_page_64(ea, phys, mode); @@ -746,8 +746,8 @@ dsi_exception( void ) { ulong dar, dsisr; - int mode; - ulong phys; + ucell mode; + ucell phys; asm volatile("mfdar %0" : "=r" (dar) : ); asm volatile("mfdsisr %0" : "=r" (dsisr) : ); @@ -760,8 +760,8 @@ isi_exception( void ) { ulong nip, srr1; - int mode; - ulong phys; + ucell mode; + ucell phys; asm volatile("mfsrr0 %0" : "=r" (nip) : ); asm volatile("mfsrr1 %0" : "=r" (srr1) : ); Modified: trunk/openbios-devel/include/ofmem.h =================================================================== --- trunk/openbios-devel/include/ofmem.h 2009-07-20 06:52:23 UTC (rev 512) +++ trunk/openbios-devel/include/ofmem.h 2009-07-31 11:10:38 UTC (rev 513) @@ -20,14 +20,14 @@ extern void ofmem_cleanup( void ); extern void ofmem_init( void ); -extern ulong ofmem_claim( ulong addr, ulong size, ulong align ); -extern ulong ofmem_claim_phys( ulong mphys, ulong size, ulong align ); -extern ulong ofmem_claim_virt( ulong mvirt, ulong size, ulong align ); +extern ucell ofmem_claim( ucell addr, ucell size, ucell align ); +extern ucell ofmem_claim_phys( ucell mphys, ucell size, ucell align ); +extern ucell ofmem_claim_virt( ucell mvirt, ucell size, ucell align ); -extern int ofmem_map( ulong phys, ulong virt, ulong size, int mode ); +extern int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ); -extern void ofmem_release( ulong virt, ulong size ); -extern ulong ofmem_translate( ulong virt, int *ret_mode ); +extern void ofmem_release( ucell virt, ucell size ); +extern ucell ofmem_translate( ucell virt, ucell *ret_mode ); #ifdef CONFIG_PPC #define PAGE_SHIFT 12

1 0

[PATCH 0/5] sparc64: implement OF memory manager
by Igor Kovalenko 31 Jul '09

31 Jul '09

Hi! This patch series implements OF memory manager. I used arch/ppc/qemu/ofmem.c as a starting point, future plans in ofmem area would be to migrate common parts from working implementations (ppc and sparc64) into shared ofmem module. I decided to switch ofmem.h declarations to use ucell type while passing arguments so ofmem declarations can be used by all architectures. Client interface handler now uses ofmem implementation instead of walking hardware translation tables. Since setup code in entry.S does install it's own translations ofmem initialization routine simply copies entries from hardware. Properties "available" and "translations" are then populated as needed. This implementation passes boot test with no visible changes on screen for HelenOS-0.4.0-sparc64.iso Linux boot does not really improve this time due to conflicts with memory mappings in low memory region. Also there is a problem in qemu with evaluation of conditional codes in case disrupting trap is taken before conditional branch is executed. This precludes silo second-stage code from working. Patch fixing that is posted to qemu-devel list. Signed-off-by: igor.v.kovalenko(a)gmail.com -- Kind regards, Igor V. Kovalenko

1 6

RFC: Best way to implement debugging support
by Mark Cave-Ayland 30 Jul '09

30 Jul '09

Hi all, Over the past few weeks, I've been experimenting with different approaches to allow me to break and single-step through certain code sections to help me debug issues with Sparc64. Sadly, after a reasonable amount of experimentation, I haven't managed to come up with anything that works 100% per specification and so thought I'd ask the list to see if there are any better ideas. My aim has been to implement a subset of the OF spec 7.5.3.4 "Forth source-level debugger" commands to enable me to step through various code sections. The main problem I have at the moment is that there doesn't seem to be an easy way to determine which word is currently being executed in order to decide whether to execute the word normally or single step through it. The nearest I have managed so far is to append a debug marker to the return stack indicating whether words executed in the current stack frame should executed normally or single-stepped. This works for the majority of words, except for those which push/pop items from the return stack during execution - as soon as the return stack is popped, the marker is lost and so debug disappears part way through a word :( Can anyone else come up with a better idea of implementing this so that it can work with words that modify the return stack? ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063

1 0

qemu-system-ppc: cdrom:0, \ppc\chrp\yaboot.conf: Unknown or corrupt filesystem
by Marcus Mae 29 Jul '09

29 Jul '09

Hi, Openbios dev list, I'm wondering if it is possible to run ppc virtual machine on x86_64. I execute the following: qemu-system-ppc64 -vga std -cdrom /home/marcusmae/Download/OS/Fedora-11-ppc-DVD.iso -hda f11_ppc.qcow2 -m 1024 , and this brings me to coffee-colored openbios room, inviting to boot from somewhere. I type: boot cdrom which gives me cdrom:0,\ppc\chrp\yaboot.conf: Unknown or corrupt filesystem Welcome to yaboot version 1.3.14 (Red Hat 1.3.14-12.fc11) What's the problem with it? I'm sure that it's an iso of ppc build of fedora. Thanks!

2 1

[PATCH] sparc64: implement OF memory manager
by Igor Kovalenko 28 Jul '09

28 Jul '09

This patch implements OF memory manager. I used arch/ppc/qemu/ofmem.c as a starting point, future plans in ofmem area would be to migrate common parts from working implementations (ppc and sparc64) into common module. Client interface handler now uses ofmem implementation instead of walking hardware translation tables. Since setup code in entry.S does install it's own translations ofmem initialization routine simply copies entries from hardware. Properties "available" and "translations" are then populated as needed. This implementation passes boot test with no visible changes on screen for HelenOS-0.4.0-sparc64.iso Linux boot does not get any further with this patch due to conflicts with memory mappings in low memory region. Signed-off-by: igor.v.kovalenko(a)gmail.com -- Kind regards, Igor V. Kovalenko

2 4

r512 - in trunk/openbios-devel: arch/sparc32 drivers
by svn＠openbios.org 20 Jul '09

20 Jul '09

Author: blueswirl Date: 2009-07-20 08:52:23 +0200 (Mon, 20 Jul 2009) New Revision: 512 Modified: trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/drivers/esp.c Log: Fix build errors with debugging enabled Modified: trunk/openbios-devel/arch/sparc32/romvec.c =================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c 2009-07-12 20:16:39 UTC (rev 511) +++ trunk/openbios-devel/arch/sparc32/romvec.c 2009-07-20 06:52:23 UTC (rev 512) @@ -101,7 +101,7 @@ } #ifdef CONFIG_DEBUG_OBP -static int looks_like_string(char *str, int len) +static int looks_like_string(const char *str, int len) { int i; int ret = (str[len-1] == '\0'); Modified: trunk/openbios-devel/drivers/esp.c =================================================================== --- trunk/openbios-devel/drivers/esp.c 2009-07-12 20:16:39 UTC (rev 511) +++ trunk/openbios-devel/drivers/esp.c 2009-07-20 06:52:23 UTC (rev 512) @@ -139,8 +139,8 @@ static int ob_sd_read_sector(esp_private_t *esp, sd_private_t *sd, int offset) { - DPRINTF("ob_sd_read_sector id %d %lx sector=%d\n", - sd->id, (unsigned long)dest, offset); + DPRINTF("ob_sd_read_sector id %d sector=%d\n", + sd->id, offset); // Setup command = Read(10) memset(esp->buffer, 0, 10);

1 0

Checksum error on dictionary files
by Ed Stafford 15 Jul '09

15 Jul '09

I built OpenBIOS v1.0 on my Fedora 10 PPC system using gcc 4.3.2. After changing a couple of assembly instructions from 'ba' to 'b', I was able to compile openbios into a binary. The problem is, when I try to run the openbios-unix program with the supplied dict file, I get the following: bash-3.2$ ./openbios-unix openbios-unix.dict Checksum invalid (65a824b7)! not supported. bash-3.2$ Any idea what corrupted the file? Ed

3 2

PATCH: Minor tweaks to dump word output
by Mark Cave-Ayland 12 Jul '09

12 Jul '09

Hi everyone, This small patch improves the output of the dump word by adding a preceding carriage return to the dump output, and forcing addresses to be displayed unsigned. Without the unsigned output fix, addresses tend to be displayed as negative numbers working with openbios-unix. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063

2 1

r511 - trunk/openbios-devel/forth/bootstrap
by svn＠openbios.org 12 Jul '09

12 Jul '09

Author: blueswirl Date: 2009-07-12 22:16:39 +0200 (Sun, 12 Jul 2009) New Revision: 511 Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs Log: Minor tweaks to dump word output (Mark Cave-Ayland) Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs =================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-07-12 10:13:39 UTC (rev 510) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-07-12 20:16:39 UTC (rev 511) @@ -1310,7 +1310,8 @@ : dump ( addr len -- ) over + swap - do i . space + cr + do i u. space 10 0 do j i + c@ dup 10 / todigit emit

1 0

[PATCH] sparc64: fix registers dealing with client
by Igor Kovalenko 12 Jul '09

12 Jul '09

Hi! This patch improves previous proposal and adds: - save/restore global registers across client interface calls. Since OS kernel generally has it's own idea of what the ABI is we have to follow this requirement. - adjust stack to allow using unoptimized openbios build with linux kernel. Linux provides only 128 bytes on stack which is not enough to save arguments by code generated with gcc -O0 - fix switch_to so it actually could be used to switch to client image. context pointer must be volatile to prevent gcc optimizing out stores to it. Signed-off-by: igor.v.kovalenko(a)gmail.com -- Kind regards, Igor V. Kovalenko

2 6

r510 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 12 Jul '09

12 Jul '09

Author: blueswirl Date: 2009-07-12 12:13:39 +0200 (Sun, 12 Jul 2009) New Revision: 510 Added: trunk/openbios-devel/arch/sparc64/call-client.S Log: Add a file missing from r508 Added: trunk/openbios-devel/arch/sparc64/call-client.S =================================================================== --- trunk/openbios-devel/arch/sparc64/call-client.S (rev 0) +++ trunk/openbios-devel/arch/sparc64/call-client.S 2009-07-12 10:13:39 UTC (rev 510) @@ -0,0 +1,44 @@ + .globl sparc64_of_client_interface + + .data + .align 8 +client_globals: + .skip 64 + + .text + .align 4 + .register %g2, #scratch + .register %g3, #scratch + .register %g6, #scratch + .register %g7, #scratch +/* + make some more space on stack since linux kernel only provides 128 bytes + without memory to spill registers (used by gcc in -O0 mode) +*/ + +sparc64_of_client_interface: + /* make sure caller's windows are on caller's stack */ + flushw + save %sp, -248, %sp + stx %g1, [%sp + 2047 + 192 + 0] + stx %g2, [%sp + 2047 + 192 + 16] + stx %g3, [%sp + 2047 + 192 + 24] + stx %g4, [%sp + 2047 + 192 + 32] + stx %g5, [%sp + 2047 + 192 + 40] + stx %g6, [%sp + 2047 + 192 + 48] + stx %g7, [%sp + 2047 + 192 + 56] + + call of_client_interface + mov %i0, %o0 + mov %o0, %i0 + + ldx [%sp + 2047 + 192 + 0], %g1 + ldx [%sp + 2047 + 192 + 16], %g2 + ldx [%sp + 2047 + 192 + 24], %g3 + ldx [%sp + 2047 + 192 + 32], %g4 + ldx [%sp + 2047 + 192 + 40], %g5 + ldx [%sp + 2047 + 192 + 48], %g6 + ldx [%sp + 2047 + 192 + 56], %g7 + return %i7+8 + nop +

1 0

[PATCH] handle ide model name string
by Igor Kovalenko 12 Jul '09

12 Jul '09

Hi! This handles fixed-size ide model name string without trailing zero. Not sure if I have a test case left, still please apply. -- Kind regards, Igor V. Kovalenko

2 1

r509 - trunk/openbios-devel/drivers
by svn＠openbios.org 12 Jul '09

12 Jul '09

Author: blueswirl Date: 2009-07-12 10:15:38 +0200 (Sun, 12 Jul 2009) New Revision: 509 Modified: trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/ide.h Log: Handle ide model name string (Igor Kovalenko) This handles fixed-size ide model name string without trailing zero. Modified: trunk/openbios-devel/drivers/ide.c =================================================================== --- trunk/openbios-devel/drivers/ide.c 2009-07-11 12:25:26 UTC (rev 508) +++ trunk/openbios-devel/drivers/ide.c 2009-07-12 08:15:38 UTC (rev 509) @@ -980,7 +980,8 @@ drive->sect = id.sectors; } - strcpy(drive->model, (char *)id.model); + strncpy(drive->model, (char*)id.model, sizeof(id.model)); + drive->model[40] = '\0'; return 0; } Modified: trunk/openbios-devel/drivers/ide.h =================================================================== --- trunk/openbios-devel/drivers/ide.h 2009-07-11 12:25:26 UTC (rev 508) +++ trunk/openbios-devel/drivers/ide.h 2009-07-12 08:15:38 UTC (rev 509) @@ -146,7 +146,7 @@ char media; /* disk, cdrom, etc */ char addressing; /* chs/lba28/lba48 */ - char model[40]; /* name */ + char model[41]; /* name */ int nr; unsigned long sectors;

1 0

r508 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 11 Jul '09

11 Jul '09

Author: blueswirl Date: 2009-07-11 14:25:26 +0200 (Sat, 11 Jul 2009) New Revision: 508 Modified: trunk/openbios-devel/arch/sparc64/aoutload.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/boot.h trunk/openbios-devel/arch/sparc64/build.xml trunk/openbios-devel/arch/sparc64/context.c trunk/openbios-devel/arch/sparc64/context.h trunk/openbios-devel/arch/sparc64/switch.S Log: sparc64: fix registers dealing with client (Igor Kovalenko) Signed-off-by: igor.v.kovalenko(a)gmail.com Modified: trunk/openbios-devel/arch/sparc64/aoutload.c =================================================================== --- trunk/openbios-devel/arch/sparc64/aoutload.c 2009-07-11 12:23:24 UTC (rev 507) +++ trunk/openbios-devel/arch/sparc64/aoutload.c 2009-07-11 12:25:26 UTC (rev 508) @@ -125,19 +125,10 @@ debug("entry point is %#lx\n", start); printf("Jumping to entry point...\n"); -#if 1 { - int (*entry)(unsigned long p1, unsigned long p2, unsigned long p3, - unsigned long p4, unsigned long p5); - extern int of_client_interface( int *params ); - - entry = (void *) addr_fixup(start); - - __asm__ __volatile__("clr %i3\n"); - - image_retval = entry(0, 0, 0, 0, (unsigned long)&of_client_interface); + extern int sparc64_of_client_interface( int *params ); + image_retval = start_client_image(addr_fixup(start), (uint64_t)&sparc64_of_client_interface); } -#endif printf("Image returned with return value %#x\n", image_retval); retval = 0; Modified: trunk/openbios-devel/arch/sparc64/boot.c =================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c 2009-07-11 12:23:24 UTC (rev 507) +++ trunk/openbios-devel/arch/sparc64/boot.c 2009-07-11 12:25:26 UTC (rev 508) @@ -26,11 +26,11 @@ if (kernel_size) { void (*entry)(unsigned long p1, unsigned long p2, unsigned long p3, unsigned long p4, unsigned long p5); - extern int of_client_interface( int *params ); + extern int sparc64_of_client_interface( int *params ); printk("[sparc64] Kernel already loaded\n"); entry = (void *) (unsigned long)kernel_image; - entry(0, 0, 0, 0, (unsigned long)&of_client_interface); + entry(0, 0, 0, 0, (unsigned long)&sparc64_of_client_interface); } if(!path) { Modified: trunk/openbios-devel/arch/sparc64/boot.h =================================================================== --- trunk/openbios-devel/arch/sparc64/boot.h 2009-07-11 12:23:24 UTC (rev 507) +++ trunk/openbios-devel/arch/sparc64/boot.h 2009-07-11 12:25:26 UTC (rev 508) @@ -22,8 +22,9 @@ int fcode_load(const char *filename); // context.c -extern struct context *__context; +extern struct context * volatile __context; uint64_t start_elf(uint64_t entry_point, uint64_t param); +uint64_t start_client_image(uint64_t entry_point, uint64_t cif_handler); // boot.c extern struct sys_info sys_info; Modified: trunk/openbios-devel/arch/sparc64/build.xml =================================================================== --- trunk/openbios-devel/arch/sparc64/build.xml 2009-07-11 12:23:24 UTC (rev 507) +++ trunk/openbios-devel/arch/sparc64/build.xml 2009-07-11 12:25:26 UTC (rev 508) @@ -29,6 +29,10 @@ <rule><![CDATA[ $(SRCDIR)/arch/sparc64/vectors.S $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> + <executable name="target/arch/sparc64/call-client.o" target="target"> + <rule><![CDATA[ $(SRCDIR)/arch/sparc64/call-client.S + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> + </executable> <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> <rule> @@ -39,6 +43,7 @@ <object source="plainboot.c"/> <external-object source="target/arch/sparc64/vectors.o"/> <external-object source="target/arch/sparc64/entry.o"/> + <external-object source="target/arch/sparc64/call-client.o"/> <external-object source="libsparc64.a"/> <external-object source="libbootstrap.a"/> <external-object source="libdrivers.a"/> @@ -77,6 +82,7 @@ <external-object source="target/arch/sparc64/vectors.o"/> <external-object source="target/arch/sparc64/entry.o"/> <external-object source="target/arch/sparc64/builtin.o"/> + <external-object source="target/arch/sparc64/call-client.o"/> <external-object source="libsparc64.a"/> <external-object source="libbootstrap.a"/> <external-object source="libdrivers.a"/> Modified: trunk/openbios-devel/arch/sparc64/context.c =================================================================== --- trunk/openbios-devel/arch/sparc64/context.c 2009-07-11 12:23:24 UTC (rev 507) +++ trunk/openbios-devel/arch/sparc64/context.c 2009-07-11 12:25:26 UTC (rev 508) @@ -10,7 +10,7 @@ #include "boot.h" #define MAIN_STACK_SIZE 16384 -#define IMAGE_STACK_SIZE 4096 +#define IMAGE_STACK_SIZE 4096*2 #define debug printk @@ -23,7 +23,7 @@ * to start us up. */ static struct context main_ctx = { - .regs[REG_SP] = (uint64_t) &_estack - 2047 - 96, + .regs[REG_SP] = (uint64_t) &_estack - STACK_BIAS - 96, .pc = (uint64_t) start_main, .npc = (uint64_t) start_main + 4, .return_addr = (uint64_t) __exit_context, @@ -31,7 +31,7 @@ /* This is used by assembly routine to load/store the context which * it is to switch/switched. */ -struct context *__context = &main_ctx; +struct context * volatile __context = &main_ctx; /* Stack for loaded ELF image */ static uint8_t image_stack[IMAGE_STACK_SIZE]; @@ -62,19 +62,25 @@ __context = boot_ctx; } +static uint64_t ALIGN_SIZE(uint64_t x, uint64_t a) +{ + return (x + a - 1) & ~(a-1); +} + /* Setup a new context using the given stack. */ struct context * init_context(uint8_t *stack, uint64_t stack_size, int num_params) { struct context *ctx; + uint8_t *stack_top = stack + stack_size; ctx = (struct context *) - (stack + stack_size - (sizeof(*ctx) + num_params*sizeof(uint32_t))); + (stack_top - ALIGN_SIZE(sizeof(*ctx) + num_params*sizeof(uint64_t), sizeof(uint64_t))); memset(ctx, 0, sizeof(*ctx)); /* Fill in reasonable default for flat memory model */ - ctx->regs[REG_SP] = virt_to_phys(SP_LOC(ctx)); + ctx->regs[REG_SP] = virt_to_phys(stack_top - STACK_BIAS - 192); ctx->return_addr = virt_to_phys(__exit_context); return ctx; @@ -85,10 +91,11 @@ { struct context *save, *ret; - debug("switching to new context:\n"); + debug("switching to new context: entry point %#llx stack 0x%016llx\n", ctx->pc, ctx->regs[REG_SP]); save = __context; __context = ctx; //asm ("pushl %cs; call __switch_context"); + asm ("call __switch_context_nosave; nop"); ret = __context; __context = save; return ret; @@ -109,3 +116,18 @@ //return ctx->eax; return 0; } + +/* Start client image */ +uint64_t start_client_image(uint64_t entry_point, uint64_t cif_handler) +{ + struct context *ctx; + + ctx = init_context(image_stack, sizeof image_stack, 0); + ctx->pc = entry_point; + ctx->npc = entry_point+4; + ctx->regs[REG_O0+4] = cif_handler; + + ctx = switch_to(ctx); + + return 0; +} Modified: trunk/openbios-devel/arch/sparc64/context.h =================================================================== --- trunk/openbios-devel/arch/sparc64/context.h 2009-07-11 12:23:24 UTC (rev 507) +++ trunk/openbios-devel/arch/sparc64/context.h 2009-07-11 12:25:26 UTC (rev 508) @@ -1,6 +1,8 @@ #ifndef SPARC64_CONTEXT_H #define SPARC64_CONTEXT_H +#define STACK_BIAS 2047 + struct context { /* General registers */ uint64_t regs[32]; Modified: trunk/openbios-devel/arch/sparc64/switch.S =================================================================== --- trunk/openbios-devel/arch/sparc64/switch.S 2009-07-11 12:23:24 UTC (rev 507) +++ trunk/openbios-devel/arch/sparc64/switch.S 2009-07-11 12:25:26 UTC (rev 508) @@ -24,7 +24,12 @@ /* XXX: totally bogus for sparc, need to save and restore all windows */ __switch_context: + + /* make sure caller's windows are on caller's stack */ + flushw; + /* Save everything in current stack */ + setx __context, %g2, %g1 stx %g3, [%g1 + 24] stx %g4, [%g1 + 32] @@ -61,7 +66,8 @@ __switch_context_nosave: /* Interrupts are not allowed... */ - + /* make sure caller's windows are on caller's stack */ + flushw /* Load all registers */ setx __context, %g2, %g1

1 0

r507 - trunk/openbios-devel/drivers
by svn＠openbios.org 11 Jul '09

11 Jul '09

Author: blueswirl Date: 2009-07-11 14:23:24 +0200 (Sat, 11 Jul 2009) New Revision: 507 Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/pci.h Log: Improve PCI BAR handling (Igor Kovalenko) Signed-off-by: igor.v.kovalenko(a)gmail.com Modified: trunk/openbios-devel/drivers/pci.c =================================================================== --- trunk/openbios-devel/drivers/pci.c 2009-07-11 12:20:20 UTC (rev 506) +++ trunk/openbios-devel/drivers/pci.c 2009-07-11 12:23:24 UTC (rev 507) @@ -323,7 +323,7 @@ ncells * sizeof(cell)); } -static void pci_set_assigned_addresses(const pci_config_t *config) +static void pci_set_assigned_addresses(const pci_config_t *config, int num_bars) { phandle_t dev = get_cur_dev(); u32 props[32]; @@ -333,7 +333,7 @@ int flags, space_code; ncells = 0; - for (i = 0; i < 6; i++) { + for (i = 0; i < num_bars; i++) { if (!config->assigned[i] || !config->sizes[i]) continue; pci_decode_pci_addr(config->assigned[i], @@ -353,7 +353,7 @@ ncells * sizeof(props[0])); } -static void pci_set_reg(const pci_config_t *config) +static void pci_set_reg(const pci_config_t *config, int num_bars) { phandle_t dev = get_cur_dev(); u32 props[38]; @@ -370,7 +370,7 @@ props[ncells++] = 0x00000000; props[ncells++] = 0x00000000; - for (i = 0; i < 6; i++) { + for (i = 0; i < num_bars; i++) { if (!config->assigned[i] || !config->sizes[i]) continue; @@ -474,7 +474,7 @@ } static void ob_pci_add_properties(pci_addr addr, const pci_dev_t *pci_dev, - const pci_config_t *config) + const pci_config_t *config, int num_bars) { phandle_t dev=get_cur_dev(); int status,id; @@ -553,8 +553,8 @@ pci_dev->icells); } - pci_set_reg(config); - pci_set_assigned_addresses(config); + pci_set_reg(config, num_bars); + pci_set_assigned_addresses(config, num_bars); OLDWORLD(pci_set_AAPL_address(config)); #ifdef CONFIG_DEBUG_PCI @@ -604,91 +604,112 @@ } #endif -static void -ob_pci_configure(pci_addr addr, pci_config_t *config, unsigned long *mem_base, - unsigned long *io_base) - +static void ob_pci_configure_bar(pci_addr addr, pci_config_t *config, + int reg, int config_addr, + uint32_t *p_omask, + unsigned long *mem_base, + unsigned long *io_base) { - uint32_t smask, omask, amask, size, reloc, min_align; + uint32_t smask, amask, size, reloc, min_align; unsigned long base; - pci_addr config_addr; - int reg; - uint8_t irq_pin, irq_line; - irq_pin = pci_config_read8(addr, PCI_INTERRUPT_PIN); - if (irq_pin) { - config->irq_pin = irq_pin; - irq_pin = (((config->dev >> 11) & 0x1F) + irq_pin - 1) & 3; - irq_line = arch->irqs[irq_pin]; - pci_config_write8(addr, PCI_INTERRUPT_LINE, irq_line); - config->irq_line = irq_line; - } else - config->irq_line = -1; + config->assigned[reg] = 0x00000000; + config->sizes[reg] = 0x00000000; - omask = 0x00000000; - for (reg = 0; reg < 7; reg++) { + if ((*p_omask & 0x0000000f) == 0x4) { + /* 64 bits memory mapping */ + return; + } - config->assigned[reg] = 0x00000000; - config->sizes[reg] = 0x00000000; + config->regions[reg] = pci_config_read32(addr, config_addr); - if ((omask & 0x0000000f) == 0x4) { - /* 64 bits memory mapping */ - continue; - } + /* get region size */ - if (reg == 6) - config_addr = PCI_ROM_ADDRESS; - else - config_addr = PCI_BASE_ADDR_0 + reg * 4; + pci_config_write32(addr, config_addr, 0xffffffff); + smask = pci_config_read32(addr, config_addr); + if (smask == 0x00000000 || smask == 0xffffffff) + return; - config->regions[reg] = pci_config_read32(addr, config_addr); + if (smask & 0x00000001 && reg != 6) { + /* I/O space */ + base = *io_base; + min_align = 1 << 7; + amask = 0x00000001; + pci_config_write16(addr, PCI_COMMAND, + pci_config_read16(addr, + PCI_COMMAND) | + PCI_COMMAND_IO); + } else { + /* Memory Space */ + base = *mem_base; + min_align = 1 << 16; + amask = 0x0000000F; + if (reg == 6) { + smask |= 1; /* ROM */ + } + pci_config_write16(addr, PCI_COMMAND, + pci_config_read16(addr, + PCI_COMMAND) | + PCI_COMMAND_MEMORY); + } + *p_omask = smask & amask; + smask &= ~amask; + size = (~smask) + 1; + config->sizes[reg] = size; + reloc = base; + if (size < min_align) + size = min_align; + reloc = (reloc + size -1) & ~(size - 1); + if (*io_base == base) { + *io_base = reloc + size; + reloc -= arch->io_base; + } else { + *mem_base = reloc + size; + } + pci_config_write32(addr, config_addr, reloc | *p_omask); + config->assigned[reg] = reloc | *p_omask; +} - /* get region size */ +static void ob_pci_configure_irq(pci_addr addr, pci_config_t *config) +{ + uint8_t irq_pin, irq_line; - pci_config_write32(addr, config_addr, 0xffffffff); - smask = pci_config_read32(addr, config_addr); - if (smask == 0x00000000 || smask == 0xffffffff) - continue; + irq_pin = pci_config_read8(addr, PCI_INTERRUPT_PIN); + if (irq_pin) { + config->irq_pin = irq_pin; + irq_pin = (((config->dev >> 11) & 0x1F) + irq_pin - 1) & 3; + irq_line = arch->irqs[irq_pin]; + pci_config_write8(addr, PCI_INTERRUPT_LINE, irq_line); + config->irq_line = irq_line; + } else + config->irq_line = -1; +} - if (smask & 0x00000001 && reg != 6) { - /* I/O space */ - base = *io_base; - min_align = 1 << 7; - amask = 0x00000001; - pci_config_write16(addr, PCI_COMMAND, - pci_config_read16(addr, - PCI_COMMAND) | - PCI_COMMAND_IO); - } else { - /* Memory Space */ - base = *mem_base; - min_align = 1 << 16; - amask = 0x0000000F; - if (reg == 6) { - smask |= 1; /* ROM */ - } - pci_config_write16(addr, PCI_COMMAND, - pci_config_read16(addr, - PCI_COMMAND) | - PCI_COMMAND_MEMORY); - } - omask = smask & amask; - smask &= ~amask; - size = (~smask) + 1; - config->sizes[reg] = size; - reloc = base; - if (size < min_align) - size = min_align; - reloc = (reloc + size -1) & ~(size - 1); - if (*io_base == base) { - *io_base = reloc + size; - reloc -= arch->io_base; - } else { - *mem_base = reloc + size; - } - pci_config_write32(addr, config_addr, reloc | omask); - config->assigned[reg] = reloc | omask; - } +static void +ob_pci_configure(pci_addr addr, pci_config_t *config, int num_regs, int rom_bar, + unsigned long *mem_base, unsigned long *io_base) + +{ + uint32_t omask; + int reg; + pci_addr config_addr; + + ob_pci_configure_irq(addr, config); + + omask = 0x00000000; + for (reg = 0; reg < num_regs; ++reg) { + config_addr = PCI_BASE_ADDR_0 + reg * 4; + + ob_pci_configure_bar(addr, config, reg, config_addr, + &omask, mem_base, + io_base); + } + + if (rom_bar) { + config_addr = rom_bar; + ob_pci_configure_bar(addr, config, reg, config_addr, + &omask, mem_base, io_base); + } } static void ob_scan_pci_bus(int bus, unsigned long *mem_base, @@ -701,6 +722,7 @@ const pci_dev_t *pci_dev; uint32_t ccode; uint8_t class, subclass, iface, rev; + int num_bars, rom_bar; activate_device("/"); for (devnum = 0; devnum < 32; devnum++) { @@ -754,9 +776,18 @@ activate_device(config.path); - ob_pci_configure(addr, &config, mem_base, io_base); - ob_pci_add_properties(addr, pci_dev, &config); + if (htype & PCI_HEADER_TYPE_BRIDGE) { + num_bars = 2; + rom_bar = PCI_ROM_ADDRESS1; + } else { + num_bars = 6; + rom_bar = PCI_ROM_ADDRESS; + } + ob_pci_configure(addr, &config, num_bars, rom_bar, + mem_base, io_base); + ob_pci_add_properties(addr, pci_dev, &config, num_bars); + if (class == PCI_BASE_CLASS_BRIDGE && (subclass == PCI_SUBCLASS_BRIDGE_HOST || subclass == PCI_SUBCLASS_BRIDGE_PCI)) { Modified: trunk/openbios-devel/drivers/pci.h =================================================================== --- trunk/openbios-devel/drivers/pci.h 2009-07-11 12:20:20 UTC (rev 506) +++ trunk/openbios-devel/drivers/pci.h 2009-07-11 12:23:24 UTC (rev 507) @@ -48,6 +48,7 @@ #define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */ #define PCI_ROM_ADDRESS_ENABLE 0x01 #define PCI_ROM_ADDRESS_MASK (~0x7ffUL) +#define PCI_ROM_ADDRESS1 0x38 /* ROM_ADDRESS in bridge header */ #define PCI_INTERRUPT_LINE 0x3c /* 8 bits */ #define PCI_INTERRUPT_PIN 0x3d /* 8 bits */

1 0

r506 - trunk/openbios-devel/drivers
by svn＠openbios.org 11 Jul '09

11 Jul '09

Author: blueswirl Date: 2009-07-11 14:20:20 +0200 (Sat, 11 Jul 2009) New Revision: 506 Modified: trunk/openbios-devel/drivers/pci.c Log: Revert r505 Modified: trunk/openbios-devel/drivers/pci.c =================================================================== --- trunk/openbios-devel/drivers/pci.c 2009-07-05 18:32:50 UTC (rev 505) +++ trunk/openbios-devel/drivers/pci.c 2009-07-11 12:20:20 UTC (rev 506) @@ -747,19 +747,24 @@ if (class == PCI_BASE_CLASS_BRIDGE && (subclass == PCI_SUBCLASS_BRIDGE_HOST || - subclass == PCI_SUBCLASS_BRIDGE_PCI)) { + subclass == PCI_SUBCLASS_BRIDGE_PCI)) REGISTER_NAMED_NODE(ob_pci_bus_node, config.path); - /* host or bridge */ - activate_device(config.path); - ob_pci_add_properties(addr, pci_dev, &config); - free(*path); - *path = strdup(config.path); - } else { + else REGISTER_NAMED_NODE(ob_pci_simple_node, config.path); - activate_device(config.path); - ob_pci_configure(addr, &config, mem_base, io_base); - ob_pci_add_properties(addr, pci_dev, &config); - } + + activate_device(config.path); + + ob_pci_configure(addr, &config, mem_base, io_base); + ob_pci_add_properties(addr, pci_dev, &config); + + if (class == PCI_BASE_CLASS_BRIDGE && + (subclass == PCI_SUBCLASS_BRIDGE_HOST || + subclass == PCI_SUBCLASS_BRIDGE_PCI)) { + /* host or bridge */ + free(*path); + *path = strdup(config.path); + } + } } device_end();

1 0

Re: [OpenBIOS] r505 - trunk/openbios-devel/drivers
by Igor Kovalenko 05 Jul '09

05 Jul '09

On Sun, Jul 5, 2009 at 10:32 PM, <svn(a)openbios.org> wrote: > Author: blueswirl > Date: 2009-07-05 20:32:50 +0200 (Sun, 05 Jul 2009) > New Revision: 505 > > Modified: > trunk/openbios-devel/drivers/pci.c > Log: > Don't try to configure non-existent BARs of bridge devices > > QEMU commit b7ee1603c16c1feb0d439d2ddf6cf824119d0aab improved the PCI bridge > device handling. PCI bridges use different header format from ordinary PCI > devices, especially BAR registers do not exist. OpenBIOS tried to configure > the bridges based on the non-BAR data which was assumed to be BARs. I stumbled across this as well. My solution was inspired by linux code, please see attached sparc64-pci-bridge patch. The difference is actually small. Added value is dealing with ROM bars in other header type, also irq setup function and pci bar setup function are extracted. This patch is against r504. In case this looks better here is my sign-off Signed-off-by: igor.v.kovalenko(a)gmail.com -- Kind regards, Igor V. Kovalenko

2 3

r505 - trunk/openbios-devel/drivers
by svn＠openbios.org 05 Jul '09

05 Jul '09

Author: blueswirl Date: 2009-07-05 20:32:50 +0200 (Sun, 05 Jul 2009) New Revision: 505 Modified: trunk/openbios-devel/drivers/pci.c Log: Don't try to configure non-existent BARs of bridge devices QEMU commit b7ee1603c16c1feb0d439d2ddf6cf824119d0aab improved the PCI bridge device handling. PCI bridges use different header format from ordinary PCI devices, especially BAR registers do not exist. OpenBIOS tried to configure the bridges based on the non-BAR data which was assumed to be BARs. Modified: trunk/openbios-devel/drivers/pci.c =================================================================== --- trunk/openbios-devel/drivers/pci.c 2009-06-14 16:05:27 UTC (rev 504) +++ trunk/openbios-devel/drivers/pci.c 2009-07-05 18:32:50 UTC (rev 505) @@ -747,24 +747,19 @@ if (class == PCI_BASE_CLASS_BRIDGE && (subclass == PCI_SUBCLASS_BRIDGE_HOST || - subclass == PCI_SUBCLASS_BRIDGE_PCI)) + subclass == PCI_SUBCLASS_BRIDGE_PCI)) { REGISTER_NAMED_NODE(ob_pci_bus_node, config.path); - else + /* host or bridge */ + activate_device(config.path); + ob_pci_add_properties(addr, pci_dev, &config); + free(*path); + *path = strdup(config.path); + } else { REGISTER_NAMED_NODE(ob_pci_simple_node, config.path); - - activate_device(config.path); - - ob_pci_configure(addr, &config, mem_base, io_base); - ob_pci_add_properties(addr, pci_dev, &config); - - if (class == PCI_BASE_CLASS_BRIDGE && - (subclass == PCI_SUBCLASS_BRIDGE_HOST || - subclass == PCI_SUBCLASS_BRIDGE_PCI)) { - /* host or bridge */ - free(*path); - *path = strdup(config.path); - } - + activate_device(config.path); + ob_pci_configure(addr, &config, mem_base, io_base); + ob_pci_add_properties(addr, pci_dev, &config); + } } } device_end();

1 0

Re: [OpenBIOS] OpenBios on UltraSPARC
by Blue Swirl 15 Jun '09

15 Jun '09

On 6/15/09, Dvir Yitzchaki <dvir.yitzchaki(a)horizonsemi.com> wrote: > Is OpenBios UltraSPARC compatible? Currently we only support the Sparc64 CPU types emulated by QEMU, not real hardware. The CPUs types are: Sparc Fujitsu Sparc64 IU 0004000200000000 FPU 00000000 MMU 00000000 NWINS 4 Sparc Fujitsu Sparc64 III IU 0004000300000000 FPU 00000000 MMU 00000000 NWINS 5 Sparc Fujitsu Sparc64 IV IU 0004000400000000 FPU 00000000 MMU 00000000 NWINS 8 Sparc Fujitsu Sparc64 V IU 0004000551000000 FPU 00000000 MMU 00000000 NWINS 8 Sparc TI UltraSparc I IU 0017001040000000 FPU 00000000 MMU 00000000 NWINS 8 Sparc TI UltraSparc II IU 0017001120000000 FPU 00000000 MMU 00000000 NWINS 8 Sparc TI UltraSparc IIi IU 0017001291000000 FPU 00000000 MMU 00000000 NWINS 8 Sparc TI UltraSparc IIe IU 0017001314000000 FPU 00000000 MMU 00000000 NWINS 8 Sparc Sun UltraSparc III IU 003e001434000000 FPU 00000000 MMU 00000000 NWINS 8 Sparc Sun UltraSparc III Cu IU 003e001541000000 FPU 00000000 MMU 00000001 NWINS 8 Sparc Sun UltraSparc IIIi IU 003e001634000000 FPU 00000000 MMU 00000000 NWINS 8 Sparc Sun UltraSparc IV IU 003e001831000000 FPU 00000000 MMU 00000002 NWINS 8 Sparc Sun UltraSparc IV+ IU 003e001922000000 FPU 00000000 MMU 00000000 NWINS 8 +cmt Sparc Sun UltraSparc IIIi+ IU 003e002200000000 FPU 00000000 MMU 00000001 NWINS 8 Sparc Sun UltraSparc T1 IU 003e002302000000 FPU 00000000 MMU 00000003 NWINS 8 +hypv +cmt +gl Sparc Sun UltraSparc T2 IU 003e002402000000 FPU 00000000 MMU 00000003 NWINS 8 +hypv +cmt +gl Sparc NEC UltraSparc I IU 0022001040000000 FPU 00000000 MMU 00000000 NWINS 8 Some of these are not fully emulated by QEMU or supported by OpenBIOS (IV*, T*).

1 0

OpenBios on UltraSPARC
by Dvir Yitzchaki 15 Jun '09

15 Jun '09

Is OpenBios UltraSPARC compatible? Dvir Yitzchaki Staff Engineer ,Software [cid:image001.jpg@01C9EDD1.46181160] 10 Abba Eban Ave. POB 2192, Herzliya 46121 Israel. Tel +972-77-2020464, Fax +972-77-2020401 Mail to: dvir.yitzchaki(a)horizonsemi.com<mailto:User.Name@horizonsemi.com>, Web: http://www.horizonsemi.com<http://www.horizonsemi.com/> CONFIDENTIALITY NOTICE: This e-mail transmission, and any documents, files or previous e-mail messages attached to it may contain confidential information or information that is legally privileged. If you are not the intended recipient, or a person responsible for delivering it to the intended recipient, you are hereby notified that any disclosure, copying, distribution or use of any of the information contained in or attached to this transmission is STRICTLY PROHIBITED. If you have received this transmission in error, please immediately notify us by reply e-mail or by telephone at (972)-77-2020400 and destroy the original transmission and its attachments without reading or saving in any manner. Thank you.

1 0

r504 - trunk/openbios-devel/config/examples
by svn＠openbios.org 14 Jun '09

14 Jun '09

Author: blueswirl Date: 2009-06-14 18:05:27 +0200 (Sun, 14 Jun 2009) New Revision: 504 Modified: trunk/openbios-devel/config/examples/cross-sparc32_rules.xml trunk/openbios-devel/config/examples/cross-sparc64_rules.xml trunk/openbios-devel/config/examples/sparc32_rules.xml trunk/openbios-devel/config/examples/sparc64_rules.xml Log: Enable -Werror for Sparc32 and Sparc64 Modified: trunk/openbios-devel/config/examples/cross-sparc32_rules.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-sparc32_rules.xml 2009-06-13 07:36:56 UTC (rev 503) +++ trunk/openbios-devel/config/examples/cross-sparc32_rules.xml 2009-06-14 16:05:27 UTC (rev 504) @@ -28,7 +28,7 @@ CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g CFLAGS+= -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Werror INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v8 -Wa,-32 -g Modified: trunk/openbios-devel/config/examples/cross-sparc64_rules.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-sparc64_rules.xml 2009-06-13 07:36:56 UTC (rev 503) +++ trunk/openbios-devel/config/examples/cross-sparc64_rules.xml 2009-06-14 16:05:27 UTC (rev 504) @@ -29,7 +29,7 @@ CFLAGS+= -Wa,-xarch=v9b -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany CFLAGS+= -fno-builtin -nostdlib -ffreestanding CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Werror INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v9b -Wa,-64 -g Modified: trunk/openbios-devel/config/examples/sparc32_rules.xml =================================================================== --- trunk/openbios-devel/config/examples/sparc32_rules.xml 2009-06-13 07:36:56 UTC (rev 503) +++ trunk/openbios-devel/config/examples/sparc32_rules.xml 2009-06-14 16:05:27 UTC (rev 504) @@ -33,7 +33,7 @@ CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g CFLAGS+= -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Werror INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v8 -Wa,-32 -g Modified: trunk/openbios-devel/config/examples/sparc64_rules.xml =================================================================== --- trunk/openbios-devel/config/examples/sparc64_rules.xml 2009-06-13 07:36:56 UTC (rev 503) +++ trunk/openbios-devel/config/examples/sparc64_rules.xml 2009-06-14 16:05:27 UTC (rev 504) @@ -34,7 +34,7 @@ CFLAGS := -Os -Wall -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g CFLAGS+= -Wa,-xarch=v9b -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes +CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Werror INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v9b -Wa,-64 -g

1 0

[PATCH] sparc64 video.pal fix memory corruption
by Igor Kovalenko 13 Jun '09

13 Jun '09

Writing to the end of video.pal on sparc64 corrupts memory due to pal array allocation size mismatch Please apply. -- Kind regards, Igor V. Kovalenko

2 1

r503 - trunk/openbios-devel/modules
by svn＠openbios.org 13 Jun '09

13 Jun '09

Author: blueswirl Date: 2009-06-13 09:36:56 +0200 (Sat, 13 Jun 2009) New Revision: 503 Modified: trunk/openbios-devel/modules/video.c Log: sparc64 video.pal fix memory corruption (Igor Kovalenko) Modified: trunk/openbios-devel/modules/video.c =================================================================== --- trunk/openbios-devel/modules/video.c 2009-06-06 14:57:25 UTC (rev 502) +++ trunk/openbios-devel/modules/video.c 2009-06-13 07:36:56 UTC (rev 503) @@ -322,7 +322,7 @@ set_property( ph, "address", (char*)&video.fb.mphys, 4 ); } video.has_video = 1; - video.pal = malloc( 256 * sizeof(int) ); + video.pal = malloc( 256 * sizeof(ulong) ); s = (video.fb.mphys & 0xfff); size = ((video.fb.h * video.fb.rb + s) + 0xfff) & ~0xfff;

1 0

Re: [OpenBIOS] r502 - trunk/openbios-devel/forth/bootstrap
by Stefan Reinauer 07 Jun '09

07 Jun '09

On 06.06.2009 16:57 Uhr, svn(a)openbios.org wrote: > Author: blueswirl > Date: 2009-06-06 16:57:25 +0200 (Sat, 06 Jun 2009) > New Revision: 502 > > Modified: > trunk/openbios-devel/forth/bootstrap/bootstrap.fs > Log: > Don't add padding spaces when evaluating headerless words (Mark Cave-Ayland) > > Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs > =================================================================== > --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-06-06 09:58:11 UTC (rev 501) > +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-06-06 14:57:25 UTC (rev 502) > @@ -1073,7 +1073,14 @@ > begin @ > ?dup while > dup lfa2name > - type space > + > + \ Don't print spaces for headerless words > + dup if > + type space > + else > + type > + then > + > Since the second type does nothing, this could also be written as ?dup if type space else drop then It's at most a cosmetical difference though > repeat > cr > ; > > > -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/ Registergericht: Amtsgericht Freiburg • HRB 7656 Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866

2 1

PATCH: Don't add padding spaces when evaluating headerless words
by Mark Cave-Ayland 06 Jun '09

06 Jun '09

Hi everyone, When executing "words" in order to see the word list for a current package, if any headerless words have been created during Fcode evaluation then even though they have no name field, the padding space is still added. This causes excessive space padding between headered word entries with headerless words between them within the dictionary. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063

2 1

r502 - trunk/openbios-devel/forth/bootstrap
by svn＠openbios.org 06 Jun '09

06 Jun '09

Author: blueswirl Date: 2009-06-06 16:57:25 +0200 (Sat, 06 Jun 2009) New Revision: 502 Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs Log: Don't add padding spaces when evaluating headerless words (Mark Cave-Ayland) Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs =================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-06-06 09:58:11 UTC (rev 501) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-06-06 14:57:25 UTC (rev 502) @@ -1073,7 +1073,14 @@ begin @ ?dup while dup lfa2name - type space + + \ Don't print spaces for headerless words + dup if + type space + else + type + then + repeat cr ;

1 0

r501 - trunk/openbios-devel/modules
by svn＠openbios.org 06 Jun '09

06 Jun '09

Author: blueswirl Date: 2009-06-06 11:58:11 +0200 (Sat, 06 Jun 2009) New Revision: 501 Modified: trunk/openbios-devel/modules/client.c Log: Improve client interface debugging Modified: trunk/openbios-devel/modules/client.c =================================================================== --- trunk/openbios-devel/modules/client.c 2009-05-30 07:43:58 UTC (rev 500) +++ trunk/openbios-devel/modules/client.c 2009-06-06 09:58:11 UTC (rev 501) @@ -18,6 +18,9 @@ #include "openbios/bindings.h" #include "openbios/of.h" +/* Uncomment to enable debug printout of client interface calls */ +//#define DEBUG_CIF + /* OF client interface. r3 points to the argument array. On return, * r3 should contain 0==true or -1==false. r4-r12,cr0,cr1 may * be modified freely. @@ -39,8 +42,12 @@ handle_calls( prom_args_t *pb ) { int i, dstacksave = dstackcnt; + long val; - /* printk("%s ([%d] -- [%d])\n", pb->service, pb->nargs, pb->nret ); */ +#ifdef DEBUG_CIF + printk("%s %s ([%ld] -- [%ld])\n", pb->service, (char *)pb->args[0], + pb->nargs, pb->nret); +#endif for( i=pb->nargs-1; i>=0; i-- ) PUSH( pb->args[i] ); @@ -49,21 +56,26 @@ fword("client-call-iface"); for( i=0; i<pb->nret && dstackcnt > dstacksave; i++ ) { - int val = POP(); + val = POP(); pb->args[pb->nargs + i] = val; /* don't pop args if an exception occured */ if( !i && val ) break; } -#if 0 +#ifdef DEBUG_CIF /* useful for debug but not necessarily an error */ if( i != pb->nret || dstacksave != dstacksave ) { - printk("%s '%s': possible argument error (%d--%d) got %d\n", + printk("%s '%s': possible argument error (%ld--%ld) got %d\n", pb->service, (char*)pb->args[0], pb->nargs-2, pb->nret, i ); } + + printk("handle_calls return: "); + for (i = 0; i < pb->nret; i++) { + printk("%lx ", pb->args[pb->nargs + i]); + } + printk("\n"); #endif - dstackcnt = dstacksave; return 0; } @@ -76,7 +88,7 @@ if( pb->nargs < 0 || pb->nret < 0 ) return -1; -#if 0 +#ifdef DEBUG_CIF printk("of_client_interface: %s ", pb->service ); for( i=0; i<pb->nargs; i++ ) printk("%lx ", pb->args[i] ); @@ -105,10 +117,18 @@ for( i=0; i<pb->nret && dstackcnt > dstacksave ; i++ ) pb->args[pb->nargs + i] = POP(); +#ifdef DEBUG_CIF if( i != pb->nret || dstackcnt != dstacksave ) { printk("service %s: argument count error (%d %d)\n", pb->service, i, dstackcnt - dstacksave ); dstackcnt = dstacksave; } + + printk("of_client_interface return:"); + for (i = 0; i < pb->nret; i++) { + printk("%lx ", pb->args[pb->nargs + i]); + } + printk("\n"); +#endif return 0; }

1 0

[PATCH] sparc64: clear unused registers when calling client image
by Igor Kovalenko 30 May '09

30 May '09

This change seems to fix the problem here with silo not being able to deal with bss data. The problem is that silo does access to an address which is calculated from %i3 + bss offset, so %i3 must be somehow initialized. To do this I created start_client_image() helper which initializes clear context, fills it with stack pointer and client interface handler pointer then switches to it. According to docs all registers not used to convey data to client code must be cleared. Since my sparc64-elf-gcc cross compiler managed to discard stores to __context in switch_to() I had to make __context a volatile pointer. Signed-off-by: Igor Kovalenko <igor.v.kovalenko(a)gmail.com> -- Kind regards, Igor V. Kovalenko

2 3

r500 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 30 May '09

30 May '09

Author: blueswirl Date: 2009-05-30 09:43:58 +0200 (Sat, 30 May 2009) New Revision: 500 Modified: trunk/openbios-devel/arch/sparc64/aoutload.c Log: sparc64: clear unused registers when calling client image (Igor Kovalenko) Modified: trunk/openbios-devel/arch/sparc64/aoutload.c =================================================================== --- trunk/openbios-devel/arch/sparc64/aoutload.c 2009-05-30 07:41:48 UTC (rev 499) +++ trunk/openbios-devel/arch/sparc64/aoutload.c 2009-05-30 07:43:58 UTC (rev 500) @@ -132,6 +132,9 @@ extern int of_client_interface( int *params ); entry = (void *) addr_fixup(start); + + __asm__ __volatile__("clr %i3\n"); + image_retval = entry(0, 0, 0, 0, (unsigned long)&of_client_interface); } #endif

1 0

PATH: Fix b(field) Fcode evaluation
by Mark Cave-Ayland 30 May '09

30 May '09

Hi everyone, This patch fixes the Fcode evaluation of b(field) which was implemented incorrectly. With this patch applied, corruption seen in several of the package words for Milax/Martux has now disappeared. Included below are the Fcode test cases I used (courtesy of Milax): \ Test Fcode struct...field...constant (no headers) \ Forth: struct /x field >filesize /x field >offset /x field >block0 constant /file-record 0 >offset . here cc c, \ offset16 a5 c, \ 0 02 c, 48 c, \ /x b5 c, 08 c, 00 c, \ new-token be c, \ b(field) 02 c, 48 c, \ /x b5 c, 08 c, 01 c, \ new-token be c, \ b(field) 02 c, 48 c, \ /x b5 c, 08 c, 02 c, \ new-token be c, \ b(field) b5 c, 08 c, 03 c, \ new-token ba c, \ b(constant) a5 c, \ 0 08 c, 01 c, \ Fcode #801 9d c, \ Display stack 00 c, \ End \ Headers version here cc c, \ offset16 a5 c, \ 0 02 c, 48 c, \ /x b6 c, 09 c, 3e c, 66 c, 69 c, 6c c, 65 c, 73 c, 69 c, 7a c, 65 c, \ named-token (>filesize) 08 c, 00 c, be c, \ b(field) 02 c, 48 c, \ /x b6 c, 07 c, 3e c, 6f c, 66 c, 66 c, 73 c, 65 c, 74 c, \ named-token (>offset) 08 c, 01 c, be c, \ b(field) 02 c, 48 c, \ /x b6 c, 07 c, 3e c, 62 c, 6c c, 6f c, 63 c, 6b c, 30 c, \ named-token (>block0) 08 c, 02 c, be c, \ b(field) b6 c, 0c c, 2f c, 66 c, 69 c, 6c c, 65 c, 2d c, 72 c, 65 c, 63 c, 6f c, \ named-token (/file-record) 72 c, 64 c, 08 c, 03 c, ba c, \ b(constant) a5 c, \ 0 08 c, 01 c, \ Fcode #801 9d c, \ Display stack 00 c, \ End ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063

2 1

r499 - trunk/openbios-devel/forth/device
by svn＠openbios.org 30 May '09

30 May '09

Author: blueswirl Date: 2009-05-30 09:41:48 +0200 (Sat, 30 May 2009) New Revision: 499 Modified: trunk/openbios-devel/forth/device/fcode.fs Log: Fix b(field) Fcode evaluation (Mark Cave-Ayland) Modified: trunk/openbios-devel/forth/device/fcode.fs =================================================================== --- trunk/openbios-devel/forth/device/fcode.fs 2009-05-24 11:15:48 UTC (rev 498) +++ trunk/openbios-devel/forth/device/fcode.fs 2009-05-30 07:41:48 UTC (rev 499) @@ -307,7 +307,9 @@ \ Defines type of new FCode function as field. : b(field) - $create + 6 , + ['] noop , + reveal over , + does>

1 0

PATCH: Fix b(case)...b(of)...b(endof)...b(endcase)
by Mark Cave-Ayland 25 May '09

25 May '09

Hi everyone, It seems that b(case)...b(of)...b(endof)...b(endcase) was broken in exactly the same way as the b(do)...b(loop) commands during Fcode evaluation. This patch fixes this, which now allows the Martux/Milax CDROM images to fail gracefully rather than segfaulting: OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 CPUs: 1 x SUNW,UltraSPARC-II UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.0 built on May 24 2009 10:37 Type 'help' for detailed information [sparc64] Booting file 'disk' with parameters '' Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Loading FCode image... Loaded 7392 bytes entry point is 0x4000 Evaluating FCode... isn't unique. isn't unique. claim virt = ffffffffffffffff size = 0 align = 0 seek failed Can't mount root byte-load: exception caught! 0 > ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063

2 2

r498 - trunk/openbios-devel/forth/bootstrap
by svn＠openbios.org 24 May '09

24 May '09

Author: blueswirl Date: 2009-05-24 13:15:48 +0200 (Sun, 24 May 2009) New Revision: 498 Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs Log: Fix b(case)...b(of)...b(endof)...b(endcase) (Mark Cave-Ayland) Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs =================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-05-24 11:04:06 UTC (rev 497) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-05-24 11:15:48 UTC (rev 498) @@ -318,7 +318,7 @@ ['] then execute loop execute-tmp-comp -; compile-only +; immediate : of 1 + >r @@ -327,13 +327,13 @@ ['] if execute ['] drop , r> - ; compile-only + ; immediate : endof >r ['] else execute r> - ; compile-only + ; immediate \

1 0

PATCH: Implement push-package/pop-package
by Mark Cave-Ayland 24 May '09

24 May '09

Hi everyone, This patch implements the missing push-package/pop-package words which seem to be included in various Fcode bootloaders (even though they are not part of the official spec). With this patch applied, I now get the following on my Solaris image/Qemu boot: OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 CPUs: 1 x SUNW,UltraSPARC-II UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.0 built on May 24 2009 10:08 Type 'help' for detailed information [sparc64] Booting file 'disk' with parameters '' Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Loading FCode image... Loaded 5936 bytes entry point is 0x4000 Evaluating FCode... Loading package 1.4 04 Aug 1995 13:02:54. open isn't unique. FCode UFS Reader 1.12 00/07/17 15:48:16. Loading: /platform//ufsboot claim virt = 1 size = 200 align = 0 Loading: /platform/sun4u/ufsboot Boot load failed. ok 0 > So it looks as if we're now at the point where we need to start implementing the client interface claim/release functions. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063

3 5

r497 - trunk/openbios-devel/forth/device
by svn＠openbios.org 24 May '09

24 May '09

Author: blueswirl Date: 2009-05-24 13:04:06 +0200 (Sun, 24 May 2009) New Revision: 497 Modified: trunk/openbios-devel/forth/device/package.fs trunk/openbios-devel/forth/device/table.fs Log: Implement push-package/pop-package (Mark Cave-Ayland) Modified: trunk/openbios-devel/forth/device/package.fs =================================================================== --- trunk/openbios-devel/forth/device/package.fs 2009-05-23 16:03:20 UTC (rev 496) +++ trunk/openbios-devel/forth/device/package.fs 2009-05-24 11:04:06 UTC (rev 497) @@ -252,3 +252,32 @@ then s" map-out" $call-parent ; + + +\ Deprecated functions (required for compatibility with older loaders) + +variable package-stack-pos 0 package-stack-pos ! +create package-stack 8 cells allot + +: push-package ( phandle -- ) + \ Throw an error if we attempt to push a full stack + package-stack-pos @ 8 >= if + ." cannot push-package onto full stack" cr + -99 throw + then + active-package + package-stack-pos @ /n * package-stack + ! + package-stack-pos @ 1 + package-stack-pos ! + active-package! + ; + +: pop-package ( -- ) + \ Throw an error if we attempt to pop an empty stack + package-stack-pos @ 0 = if + ." cannot pop-package from empty stack" cr + -99 throw + then + package-stack-pos @ 1 - package-stack-pos ! + package-stack-pos @ /n * package-stack + @ + active-package! + ; Modified: trunk/openbios-devel/forth/device/table.fs =================================================================== --- trunk/openbios-devel/forth/device/table.fs 2009-05-23 16:03:20 UTC (rev 496) +++ trunk/openbios-devel/forth/device/table.fs 2009-05-24 11:04:06 UTC (rev 497) @@ -280,7 +280,8 @@ ['], ms ['], finish-device ['], decode-phys \ 128 - 2 n['], reserved-fcode + ['], push-package + ['], pop-package ['], interpose \ extension (recommended practice) 4 n['], reserved-fcode ['], map-low

1 0

r496 - trunk/openbios-devel/arch/sparc64
by svn＠openbios.org 23 May '09

23 May '09

Author: blueswirl Date: 2009-05-23 18:03:20 +0200 (Sat, 23 May 2009) New Revision: 496 Modified: trunk/openbios-devel/arch/sparc64/lib.c Log: Add claim and release client methods Modified: trunk/openbios-devel/arch/sparc64/lib.c =================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c 2009-05-23 15:31:31 UTC (rev 495) +++ trunk/openbios-devel/arch/sparc64/lib.c 2009-05-23 16:03:20 UTC (rev 496) @@ -325,6 +325,7 @@ align = POP(); size = POP(); virt = POP(); + printk("claim virt = %lx size = %lx align = %lx\n", virt, size, align); PUSH(virt); // XXX } @@ -339,6 +340,7 @@ size = POP(); virt = POP(); + printk("release virt = %lx size = %lx\n", virt, size); // XXX } @@ -504,4 +506,9 @@ push_str("translations"); fword("property"); + + push_str("/openprom/client-services"); + fword("find-device"); + bind_func("claim", mmu_claim); + bind_func("release", mmu_release); }

1 0

r495 - in trunk/openbios-devel: forth/device kernel
by svn＠openbios.org 23 May '09

23 May '09

Author: blueswirl Date: 2009-05-23 17:31:31 +0200 (Sat, 23 May 2009) New Revision: 495 Modified: trunk/openbios-devel/forth/device/table.fs trunk/openbios-devel/kernel/bootstrap.c Log: Implement /x FCode (Mark Cave-Ayland) Modified: trunk/openbios-devel/forth/device/table.fs =================================================================== --- trunk/openbios-devel/forth/device/table.fs 2009-05-22 17:15:48 UTC (rev 494) +++ trunk/openbios-devel/forth/device/table.fs 2009-05-23 15:31:31 UTC (rev 495) @@ -397,6 +397,8 @@ ['], byte-load ['], set-args ['], left-parse-string \ 240 + 7 n['], reserved-fcode \ 241-247 (Part of IEEE1275 64-bit draft standard) + ['], /x here fcode-master-table - constant fcode-master-table-size Modified: trunk/openbios-devel/kernel/bootstrap.c =================================================================== --- trunk/openbios-devel/kernel/bootstrap.c 2009-05-22 17:15:48 UTC (rev 494) +++ trunk/openbios-devel/kernel/bootstrap.c 2009-05-23 15:31:31 UTC (rev 495) @@ -723,6 +723,7 @@ buildconstant("/w", sizeof(u16)); buildconstant("/l", sizeof(u32)); buildconstant("/n", sizeof(ucell)); + buildconstant("/x", sizeof(u64)); reveal(); printk("Dictionary initialization finished.\n");

1 0

[PATCH] forth: add more pockets
by Igor Kovalenko 22 May '09

22 May '09

This changes pocket index calculation to support more than two pockets. As an example default number of pockets is set to 4. This should ease nesting more than two levels using pockets as temporary storage. Signed-off-by: Igor Kovalenko <igor.v.kovalenko(a)gmail.com> -- Kind regards, Igor V. Kovalenko

3 3

r494 - trunk/openbios-devel/forth/bootstrap
by svn＠openbios.org 22 May '09

22 May '09

Author: blueswirl Date: 2009-05-22 19:15:48 +0200 (Fri, 22 May 2009) New Revision: 494 Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs Log: forth: add more pockets This changes pocket index calculation to support more than two pockets. As an example default number of pockets is set to 4. This should ease nesting more than two levels using pockets as temporary storage. Signed-off-by: Igor Kovalenko <igor.v.kovalenko(a)gmail.com> Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs =================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-05-22 17:14:10 UTC (rev 493) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-05-22 17:15:48 UTC (rev 494) @@ -622,18 +622,19 @@ \ pockets implementation for 7.3.4.1 100 constant pocketsize +4 constant numpockets variable pockets 0 pockets ! variable whichpocket 0 whichpocket ! -\ allocate 2 pockets to begin with +\ allocate 4 pockets to begin with : init-pockets ( -- ) - pocketsize 2* alloc-mem pockets ! + pocketsize numpockets * alloc-mem pockets ! ; : pocket ( ?? -- ?? ) pocketsize whichpocket @ * pockets @ + - 1 whichpocket @ - + whichpocket @ 1 + numpockets mod whichpocket ! ;

1 0

[PATCH] fix regprop int encoding
by Igor Kovalenko 22 May '09

22 May '09

Wrong encoding of "#address-cells" property can lead to a failure fetching correct value in my-#acells method. According to docs properties must be encoded with "encode-int". I spent some time looking at the docs and it is clear that encode-int produces quad-sized result (of size /l bytes). This patch fixes pci helpers to encode to 32bit instead of 64bit values, and correctes my-address and my-unit methods to read 32bit data to match encode-int rules modules/bindings.c: also fixed set_int_property and get_int_property to match encode-int rules Signed-off-by: Igor Kovalenko <igor.v.kovalenko(a)gmail.com> -- Kind regards, Igor V. Kovalenko

2 2

r493 - in trunk/openbios-devel: drivers forth/device include/openbios modules
by svn＠openbios.org 22 May '09

22 May '09

Author: blueswirl Date: 2009-05-22 19:14:10 +0200 (Fri, 22 May 2009) New Revision: 493 Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/forth/device/package.fs trunk/openbios-devel/include/openbios/bindings.h trunk/openbios-devel/modules/bindings.c Log: Fix regprop int encoding (Igor Kovalenko) Wrong encoding of "#address-cells" property can lead to a failure fetching correct value in my-#acells method. According to docs properties must be encoded with "encode-int". I spent some time looking at the docs and it is clear that encode-int produces quad-sized result (of size /l bytes). This patch fixes pci helpers to encode to 32bit instead of 64bit values, and correctes my-address and my-unit methods to read 32bit data to match encode-int rules modules/bindings.c: also fixed set_int_property and get_int_property to match encode-int rules Signed-off-by: Igor Kovalenko <igor.v.kovalenko(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci.c =================================================================== --- trunk/openbios-devel/drivers/pci.c 2009-05-22 17:09:52 UTC (rev 492) +++ trunk/openbios-devel/drivers/pci.c 2009-05-22 17:14:10 UTC (rev 493) @@ -52,7 +52,7 @@ MEMORY_SPACE_64 = 3, }; -static inline void pci_encode_phys_addr(cell *phys, int flags, int space_code, +static inline void pci_encode_phys_addr(u32 *phys, int flags, int space_code, pci_addr dev, uint8_t reg, uint64_t addr) { @@ -174,27 +174,27 @@ static void pci_set_bus_range(const pci_config_t *config) { phandle_t dev = get_cur_dev(); - cell props[2]; + u32 props[2]; props[0] = (config->dev >> 16) & 0xFF; props[1] = 1; - set_property(dev, "bus-range", (char *)props, 2 * sizeof(cell)); + set_property(dev, "bus-range", (char *)props, 2 * sizeof(props[0])); } static void pci_host_set_reg(const pci_config_t *config) { phandle_t dev = get_cur_dev(); - cell props[2]; + u32 props[2]; props[0] = arch->cfg_base; props[1] = arch->cfg_len; - set_property(dev, "reg", (char *)props, 2 * sizeof(cell)); + set_property(dev, "reg", (char *)props, 2 * sizeof(props[0])); } static void pci_host_set_ranges(const pci_config_t *config) { phandle_t dev = get_cur_dev(); - cell props[32]; + u32 props[32]; int ncells; ncells = 0; @@ -222,7 +222,7 @@ props[ncells++] = 0x00000000; props[ncells++] = arch->mem_len; } - set_property(dev, "ranges", (char *)props, ncells * sizeof(cell)); + set_property(dev, "ranges", (char *)props, ncells * sizeof(props[0])); } int host_config_cb(const pci_config_t *config) @@ -234,6 +234,7 @@ set_property(aliases, "pci", config->path, strlen(config->path) + 1); + //XXX this overrides "reg" property pci_host_set_reg(config); pci_host_set_ranges(config); pci_set_bus_range(config); @@ -265,7 +266,7 @@ int eth_config_cb (const pci_config_t *config) { - phandle_t ph = get_cur_dev();; + phandle_t ph = get_cur_dev(); set_property(ph, "network-type", "ethernet", 9); set_property(ph, "removable", "network", 8); @@ -325,7 +326,7 @@ static void pci_set_assigned_addresses(const pci_config_t *config) { phandle_t dev = get_cur_dev(); - cell props[32]; + u32 props[32]; int ncells; int i; uint32_t mask; @@ -349,13 +350,13 @@ } if (ncells) set_property(dev, "assigned-addresses", (char *)props, - ncells * sizeof(cell)); + ncells * sizeof(props[0])); } static void pci_set_reg(const pci_config_t *config) { phandle_t dev = get_cur_dev(); - cell props[38]; + u32 props[38]; int ncells; int i; uint32_t mask; @@ -387,14 +388,14 @@ props[ncells++] = 0x00000000; props[ncells++] = config->sizes[i]; } - set_property(dev, "reg", (char *)props, ncells * sizeof(cell)); + set_property(dev, "reg", (char *)props, ncells * sizeof(props[0])); } static void pci_set_ranges(const pci_config_t *config) { phandle_t dev = get_cur_dev(); - cell props[32]; + u32 props[32]; int ncells; int i; uint32_t mask; @@ -423,7 +424,7 @@ props[ncells++] = config->sizes[i]; } - set_property(dev, "ranges", (char *)props, ncells * sizeof(cell)); + set_property(dev, "ranges", (char *)props, ncells * sizeof(props[0])); } int macio_heathrow_config_cb (const pci_config_t *config) Modified: trunk/openbios-devel/forth/device/package.fs =================================================================== --- trunk/openbios-devel/forth/device/package.fs 2009-05-22 17:09:52 UTC (rev 492) +++ trunk/openbios-devel/forth/device/package.fs 2009-05-22 17:14:10 UTC (rev 493) @@ -175,9 +175,9 @@ : my-address ( -- phys.lo ... ) ?my-self >in.device-node @ >dn.probe-addr - my-#acells tuck cells + swap 1- 0 + my-#acells tuck /l* + swap 1- 0 ?do - cell - dup @ swap + /l - dup l@ swap loop drop ; @@ -189,8 +189,8 @@ : my-unit ( -- phys.lo ... phys.hi ) ?my-self >in.my-unit - my-#acells tuck cells + swap 0 ?do - cell - dup @ swap + my-#acells tuck /l* + swap 0 ?do + /l - dup l@ swap loop drop ; Modified: trunk/openbios-devel/include/openbios/bindings.h =================================================================== --- trunk/openbios-devel/include/openbios/bindings.h 2009-05-22 17:09:52 UTC (rev 492) +++ trunk/openbios-devel/include/openbios/bindings.h 2009-05-22 17:14:10 UTC (rev 493) @@ -61,8 +61,8 @@ extern void set_property( phandle_t ph, const char *name, const char *buf, int len ); extern void set_int_property( phandle_t ph, const char *name, - cell val ); -extern cell get_int_property( phandle_t ph, const char *name, + u32 val ); +extern u32 get_int_property( phandle_t ph, const char *name, int *retlen ); extern char *get_property( phandle_t ph, const char *name, int *retlen ); Modified: trunk/openbios-devel/modules/bindings.c =================================================================== --- trunk/openbios-devel/modules/bindings.c 2009-05-22 17:09:52 UTC (rev 492) +++ trunk/openbios-devel/modules/bindings.c 2009-05-22 17:14:10 UTC (rev 493) @@ -287,10 +287,10 @@ } void -set_int_property( phandle_t ph, const char *name, cell val ) +set_int_property( phandle_t ph, const char *name, u32 val ) { - cell swapped=__cpu_to_becell(val); - set_property( ph, name, (char*)&swapped, sizeof(cell) ); + u32 swapped=__cpu_to_be32(val); + set_property( ph, name, (char*)&swapped, sizeof(swapped) ); } char * @@ -312,14 +312,14 @@ return (char*)POP(); } -cell +u32 get_int_property( phandle_t ph, const char *name, int *retlen ) { - cell *p; + u32 *p; - if( !(p=(cell *)get_property(ph, name, retlen)) ) + if( !(p=(u32 *)get_property(ph, name, retlen)) ) return 0; - return __becell_to_cpu(*p); + return __be32_to_cpu(*p); }

1 0

PATCH: Fix b(do) ... b(leaves) ... b(loop)/b(+loop)
by Mark Cave-Ayland 22 May '09

22 May '09

Hi everyone, This patch fixes the b(do)...b(leaves)...b(loop)/b(+loop) structures by marking them as immediate rather then compile-only. Without this in place, the loop addresses would be calculated incorrectly which would cause the Fcode evaluator to jump to the wrong location for each loop iteration. I've confirmed that this change does not break do...leaves...loop in immediate mode either. For reference, here are the test cases I used: \ Test Fcode do...loop \ Forth: 3 0 do i . cr loop here cc c, \ offset16 a8 c, \ 3 a5 c, \ 0 17 c, 00 c, 08 c, \ b(do) 19 c, \ i 9d c, \ . 92 c, \ cr 15 c, ff c, fc c, \ b(loop) 00 c, \ end \ Test Fcode do...+loop \ Forth: 10 0 do i . cr 2 +loop here cc c, \ offset16 10 c, 00 c, 00 c, 00 c, 10 c, \ b(lit) 0x10 a5 c, \ 0 17 c, 00 c, 09 c, \ b(do) 19 c, \ i 9d c, \ . 92 c, \ cr a7 c, \ 2 16 c, ff c, fb c, \ b(+loop) 00 c, \ end \ Test Fcode do...leave...loop \ Forth: a 0 do i dup . 3 = if leave then loop here cc c, \ offset16 10 c, 00 c, 00 c, 00 c, 0a c, \ b(lit) 0xA a5 c, \ 0 17 c, 00 c, 0f c, \ b(do) 19 c, \ i 47 c, \ dup 9d c, \ . a8 c, \ 3 3c c, \ = 14 c, 00 c, 04 c, \ b?branch 1b c, \ b(leave) b2 c, \ b(>resolve) 15 c, ff c, f5 c, \ b(loop) 00 c, \ end With these last 2 patches and diag-switch? set to true, the Fcode evaluator will now finish executing my SPARC64 disk image without crashing giving the following output: OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 CPUs: 1 x SUNW,UltraSPARC-II UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.0 built on May 21 2009 19:09 Type 'help' for detailed information [sparc64] Booting file 'disk' with parameters '' Not a bootable ELF image Not a Linux kernel image Not a bootable a.out image Loading FCode image... Loaded 5936 bytes entry point is 0x4000 Evaluating FCode... reserved fcode word. Loading package 1.4 04 Aug 1995 13:02:54. reserved fcode word. reserved fcode word. reserved fcode word. FCode UFS Reader 1.12 00/07/17 15:48:16. Loading: /platform//ufsboot Loading: /platform/sun4u/ufsboot Boot load failed. byte-load: stack overflow, diff -2 0 > It looks as if the next stage is to implement the missing push-package/pop-package forth words to ensure that the ufs-file-system package is located at the correct point in the tree - I'll see if I can come up with something over the next few days. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063

3 3

PATCH: Read the diagnostic mode setting from NVRAM
by Mark Cave-Ayland 22 May '09

22 May '09

Hi everyone, When trying to boot a SPARC64 disk image under QEMU, extra diagnostic information can be made available on the console if diagnostic-mode? returns true. This patch implements the simple step of reading the diag-switch? NVRAM parameter and using this to determine whether diagnostic mode is enabled or disabled. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063

2 1

r492 - trunk/openbios-devel/forth/bootstrap
by svn＠openbios.org 22 May '09

22 May '09

Author: blueswirl Date: 2009-05-22 19:09:52 +0200 (Fri, 22 May 2009) New Revision: 492 Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs Log: Fix b(do) ... b(leaves) ... b(loop)/b(+loop) (Mark Cave-Ayland) Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs =================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-05-22 17:09:05 UTC (rev 491) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs 2009-05-22 17:09:52 UTC (rev 492) @@ -278,13 +278,13 @@ ['] (loop) , resolve-loop execute-tmp-comp - ; compile-only + ; immediate : +loop ['] (+loop) , resolve-loop execute-tmp-comp - ; compile-only + ; immediate \ Using primitive versions of i and j \ speeds up loops by 300% @@ -299,7 +299,7 @@ leaves @ here leaves ! , - ; compile-only + ; immediate : ?leave if leave then ;

1 0

r491 - in trunk/openbios-devel/forth: admin device
by svn＠openbios.org 22 May '09

22 May '09

Author: blueswirl Date: 2009-05-22 19:09:05 +0200 (Fri, 22 May 2009) New Revision: 491 Modified: trunk/openbios-devel/forth/admin/nvram.fs trunk/openbios-devel/forth/device/other.fs Log: Read the diagnostic mode setting from NVRAM (Mark Cave-Ayland) Modified: trunk/openbios-devel/forth/admin/nvram.fs =================================================================== --- trunk/openbios-devel/forth/admin/nvram.fs 2009-05-20 18:07:09 UTC (rev 490) +++ trunk/openbios-devel/forth/admin/nvram.fs 2009-05-22 17:09:05 UTC (rev 491) @@ -364,3 +364,4 @@ \ defers ['] fcode-debug? to _fcode-debug? +['] diag-switch? to _diag-switch? Modified: trunk/openbios-devel/forth/device/other.fs =================================================================== --- trunk/openbios-devel/forth/device/other.fs 2009-05-20 18:07:09 UTC (rev 490) +++ trunk/openbios-devel/forth/device/other.fs 2009-05-22 17:09:05 UTC (rev 491) @@ -8,6 +8,10 @@ \ the copyright and warranty status of this work. \ +\ The current diagnostic setting +defer _diag-switch? + + \ \ 5.3.7 Other FCode functions \ @@ -89,6 +93,8 @@ ; : diagnostic-mode? ( -- diag? ) + \ Return the NVRAM diag-switch? setting + _diag-switch? ; \ 5.3.7.6 Start and end.

1 0

r490 - in trunk/openbios-devel: include/libc libc
by svn＠openbios.org 20 May '09

20 May '09

Author: blueswirl Date: 2009-05-20 20:07:09 +0200 (Wed, 20 May 2009) New Revision: 490 Modified: trunk/openbios-devel/include/libc/string.h trunk/openbios-devel/libc/misc.c Log: Fix stack protector problems with newer GCC versions Modified: trunk/openbios-devel/include/libc/string.h =================================================================== --- trunk/openbios-devel/include/libc/string.h 2009-05-17 18:59:32 UTC (rev 489) +++ trunk/openbios-devel/include/libc/string.h 2009-05-20 18:07:09 UTC (rev 490) @@ -103,5 +103,6 @@ extern long __guard[8]; void __stack_smash_handler(const char *func, int damaged); +void __stack_chk_fail(void); #endif /* _H_STRING */ Modified: trunk/openbios-devel/libc/misc.c =================================================================== --- trunk/openbios-devel/libc/misc.c 2009-05-17 18:59:32 UTC (rev 489) +++ trunk/openbios-devel/libc/misc.c 2009-05-20 18:07:09 UTC (rev 490) @@ -86,13 +86,24 @@ 0, 0, 0, 0, 0, 0, 0 }; -void __stack_smash_handler(const char *func, int damaged) +static void freeze(void) { - printk("Propolice detected a stack smashing attack %x at function %s," - " freezing\n", damaged, func); - // Freeze // XXX: Disable interrupts? for(;;) ; } + +void __stack_smash_handler(const char *func, int damaged) +{ + printk("Propolice detected a stack smashing attack %x at function %s," + " freezing\n", damaged, func); + freeze(); +} + +void __stack_chk_fail(void) +{ + printk("Propolice detected a stack smashing attack, freezing\n"); + + freeze(); +}

1 0

"Error 7: Loading below 1MB is not supported"
by FORTH 20 May '09

20 May '09

Dear Sirs, with my openbios tests I find a propblem (look at subject). I think the cause of this is in "arch/x86/ldscript", but I'm not shure. My doing on Debian/Lenny was: - Error: "undefined reference to `__stack_chk_fail' " ==> obj-x86/Makefile "CFLAGS+= -fno-stack-protector" - Stopped on GRUB-Bootloader: "Error 7: Loading below 1MB is not supported" mbchk obj-x86/openbios.multiboot openbios.multiboot: The Multiboot header is found at the offset 184 openbios.multiboot: Page alignment openbios.multiboot: Memory information is turned on openbios.multiboot: Address fields is turned on ==> openbios.multiboot: header_addr is less than load_addr (0x0 > 0x8) Can you help particularly with regard to the second point ? Best regards gerd /"\ \ / ASCII Ribbon Campaign X Against HTML Mail / \

2 1

.. Boot XP in 1sec Boot from RAM, by making Virtual HDD on RAM
by Alex Street 19 May '09

19 May '09

Can we boot Pure XP on RAM, (RAM limitation is 4GB RAM) using XPlite & NLite XP could be reduce to less about 1GB. it can be done by making VIRTUAL HDD on RAM, using *.img files from USB flashdisk, IDE CompactFlash, SD MMC to IDE (All are Slow Storage, has limited Read/Write ability) With this, GAME would be Bloddy FAST. turning on PC like turning on a TV. Sound GREATS. Ps. Grub4Dos, could do something like this, but it destroy whole geometry structure AFTER Win XP Started.

1 0

[PATCH 1/5] Remove struct ata_sector and all references to it
by Pavel Roskin 17 May '09

17 May '09

struct ata_sector was meant to facilitate taking upper and lower byte of the sector. However, the implementation is incorrect, as "struct" and "union" are swapped in the definition. What's worse, it's an overkill for that simple task. The code should be transparent without knowing how struct ata_sector is defined. --- drivers/ide.c | 10 +++------- drivers/ide.h | 14 -------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/drivers/ide.c b/drivers/ide.c index 1166f57..4d1e58c 100644 --- a/drivers/ide.c +++ b/drivers/ide.c @@ -764,7 +764,6 @@ ob_ide_read_ata_chs(struct ide_drive *drive, unsigned long long block, unsigned int sect = (block % drive->sect) + 1; unsigned int head = (track % drive->head); unsigned int cyl = (track / drive->head); - struct ata_sector ata_sector; /* * fill in chs command to read from disk at given location @@ -772,8 +771,7 @@ ob_ide_read_ata_chs(struct ide_drive *drive, unsigned long long block, cmd->buffer = buf; cmd->buflen = sectors * 512; - ata_sector.all = sectors; - cmd->nsector = ata_sector.low; + cmd->nsector = sectors & 0xff; cmd->sector = sect; cmd->lcyl = cyl; cmd->hcyl = cyl >> 8; @@ -815,19 +813,17 @@ ob_ide_read_ata_lba48(struct ide_drive *drive, unsigned long long block, unsigned char *buf, unsigned int sectors) { struct ata_command *cmd = &drive->channel->ata_cmd; - struct ata_sector ata_sector; memset(cmd, 0, sizeof(*cmd)); cmd->buffer = buf; cmd->buflen = sectors * 512; - ata_sector.all = sectors; /* * we are using tasklet addressing here */ - cmd->task[2] = ata_sector.low; - cmd->task[3] = ata_sector.high; + cmd->task[2] = sectors & 0xff; + cmd->task[3] = (sectors >> 8) & 0xff; cmd->task[4] = block; cmd->task[5] = block >> 8; cmd->task[6] = block >> 16; diff --git a/drivers/ide.h b/drivers/ide.h index fec0e0e..da79a71 100644 --- a/drivers/ide.h +++ b/drivers/ide.h @@ -208,20 +208,6 @@ enum { atapi_ddir_write, }; -struct ata_sector { - u16 all; - union { -#ifdef CONFIG_BIG_ENDIAN - u8 high; - u8 low; -#endif -#ifdef CONFIG_LITTLE_ENDIAN - u8 low; - u8 high; -#endif - }; -}; - static int ob_ide_atapi_request_sense(struct ide_drive *drive); #endif

3 10

r489 - trunk/openbios-devel/drivers
by svn＠openbios.org 17 May '09

17 May '09

Author: laurent Date: 2009-05-17 20:59:32 +0200 (Sun, 17 May 2009) New Revision: 489 Modified: trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/ide.h Log: Author: Pavel Roskin <proski(a)gnu.org> struct ata_sector was meant to facilitate taking upper and lower byte of the sector. However, the implementation is incorrect, as "struct" and "union" are swapped in the definition. What's worse, it's an overkill for that simple task. The code should be transparent without knowing how struct ata_sector is defined. [laurent: Original patch modified to remove useless "& 0xff"] Modified: trunk/openbios-devel/drivers/ide.c =================================================================== --- trunk/openbios-devel/drivers/ide.c 2009-05-17 17:14:01 UTC (rev 488) +++ trunk/openbios-devel/drivers/ide.c 2009-05-17 18:59:32 UTC (rev 489) @@ -764,7 +764,6 @@ unsigned int sect = (block % drive->sect) + 1; unsigned int head = (track % drive->head); unsigned int cyl = (track / drive->head); - struct ata_sector ata_sector; /* * fill in chs command to read from disk at given location @@ -772,8 +771,7 @@ cmd->buffer = buf; cmd->buflen = sectors * 512; - ata_sector.all = sectors; - cmd->nsector = ata_sector.low; + cmd->nsector = sectors & 0xff; cmd->sector = sect; cmd->lcyl = cyl; cmd->hcyl = cyl >> 8; @@ -815,19 +813,17 @@ unsigned char *buf, unsigned int sectors) { struct ata_command *cmd = &drive->channel->ata_cmd; - struct ata_sector ata_sector; memset(cmd, 0, sizeof(*cmd)); cmd->buffer = buf; cmd->buflen = sectors * 512; - ata_sector.all = sectors; /* * we are using tasklet addressing here */ - cmd->task[2] = ata_sector.low; - cmd->task[3] = ata_sector.high; + cmd->task[2] = sectors; + cmd->task[3] = sectors >> 8; cmd->task[4] = block; cmd->task[5] = block >> 8; cmd->task[6] = block >> 16; Modified: trunk/openbios-devel/drivers/ide.h =================================================================== --- trunk/openbios-devel/drivers/ide.h 2009-05-17 17:14:01 UTC (rev 488) +++ trunk/openbios-devel/drivers/ide.h 2009-05-17 18:59:32 UTC (rev 489) @@ -208,20 +208,6 @@ atapi_ddir_write, }; -struct ata_sector { - u16 all; - union { -#ifdef CONFIG_BIG_ENDIAN - u8 high; - u8 low; -#endif -#ifdef CONFIG_LITTLE_ENDIAN - u8 low; - u8 high; -#endif - }; -}; - static int ob_ide_atapi_request_sense(struct ide_drive *drive); #endif

1 0

r488 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 17 May '09

17 May '09

Author: laurent Date: 2009-05-17 19:14:01 +0200 (Sun, 17 May 2009) New Revision: 488 Modified: trunk/openbios-devel/arch/ppc/qemu/ldscript Log: Author: Pavel Roskin <proski(a)gnu.org> This is needed on Fedora 11 (GNU ld 2.19.51.0.2). Otherwise, qemu reports on statup: invalid/unsupported opcode: 00 - 18 - 01 (00004070) 00000004 1 invalid/unsupported opcode: 00 - 04 - 17 (000095c8) 000095ec 0 I checked Linux sources (arch/powerpc/kernel/vmlinux.lds.S) and I see that .sbss is put to the .bss section in front of .bss itself. The problem is discussed at https://bugzilla.redhat.com/show_bug.cgi?id=494075 Modified: trunk/openbios-devel/arch/ppc/qemu/ldscript =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ldscript 2009-05-12 18:38:03 UTC (rev 487) +++ trunk/openbios-devel/arch/ppc/qemu/ldscript 2009-05-17 17:14:01 UTC (rev 488) @@ -46,6 +46,8 @@ .bss ALIGN(4096): { _bss = .; + *(.sbss) + *(.sbss.*) *(.bss) *(.bss.*) *(COMMON)

1 0

r487 - trunk/openbios-devel/drivers
by svn＠openbios.org 12 May '09

12 May '09

Author: blueswirl Date: 2009-05-12 20:38:03 +0200 (Tue, 12 May 2009) New Revision: 487 Modified: trunk/openbios-devel/drivers/pci.c Log: Fix typo (Igor Kovalenko) Modified: trunk/openbios-devel/drivers/pci.c =================================================================== --- trunk/openbios-devel/drivers/pci.c 2009-05-05 17:57:18 UTC (rev 486) +++ trunk/openbios-devel/drivers/pci.c 2009-05-12 18:38:03 UTC (rev 487) @@ -110,7 +110,7 @@ n = hi & IS_NOT_RELOCATABLE; p = hi & IS_PREFETCHABLE; t = hi & IS_ALIASED; - ss = (hi >> 24) && 0x03; + ss = (hi >> 24) & 0x03; bus = (hi >> 16) & 0xFF; dev = (hi >> 11) & 0x1F;

1 0

OpenBios compatibility...
by Jav 09 May '09

09 May '09

Hi everyone, I'm really interested on your project, I was trying to figure out if I can flash my laptop with your openbios but I couldn't find any compatibility list of something like that. I have an Acer Aspire 5100 with AMD Turion X2 64 and an Ati Radeon Xpress 1100 chipset. I would apreciate your help. Greetings from Mexico... -- Mi Blog: <a href="http://manoinvisibleinexistente.blogspot.com">La mano invisible e inexistente de Adam Smith</a>

2 1

r486 - trunk/openbios-devel/drivers
by svn＠openbios.org 05 May '09

05 May '09

Author: blueswirl Date: 2009-05-05 19:57:18 +0200 (Tue, 05 May 2009) New Revision: 486 Modified: trunk/openbios-devel/drivers/floppy.c Log: Fix device_type property Modified: trunk/openbios-devel/drivers/floppy.c =================================================================== --- trunk/openbios-devel/drivers/floppy.c 2009-04-28 16:40:49 UTC (rev 485) +++ trunk/openbios-devel/drivers/floppy.c 2009-05-05 17:57:18 UTC (rev 486) @@ -1076,8 +1076,7 @@ int props[3]; phandle_t ph = find_dev(path); - push_str("block"); - fword("device-type"); + set_property(ph, "device_type", "block", sizeof("block")); // Set dummy reg properties props[0] = __cpu_to_be32(0); props[1] = __cpu_to_be32(0); props[2] = __cpu_to_be32(0);

1 0

PATCH: Fix various bugs in bbranch and b?branch implementations
by Mark Cave-Ayland 28 Apr '09

28 Apr '09

Hi folks, The attached patch fixes all of the various combinations of forwards and backwards branches for both bbranch and b?branch. With this patch applied to the latest openbios-svn, I can now run OpenBIOS to the point where it crashes out Qemu checked out a few weeks back. Nice :) A couple of the fixes in this patch are for bugs introduced in my last commit. Whilst continuing to dig deeper into various bugs, I didn't appreciate at the time that it is not necessarily the description of the branch words that matters, more how they are tokenized by the Fcode evaluator. For reference, here are the branch test cases I used to verify this behaviour: \ Testing forward b?branch/bbranch (if/else/then equivalent) \ Forth: 1 if .s else abort then here cc c, \ offset16 a6 c, \ 1 (change to a5 for 0 to pick the else clause) 14 c, 0 c, 7 c, \ b?branch (if) 13 c, 0 c, 4 c, \ bbranch (else) b2 c, \ b(>resolve) 02 c, 16 c, \ abort b2 c, \ b(>resolve) 9f c, \ show stack 00 c, \ end \ Test backwards b?branch (begin/until equivalent) \ Forth: 0 begin 1 + dup . dup 3 = until drop here cc c, \ offset16 a5 c, \ 0 b1 c, \ b(<mark) (begin) a6 c, 1e c, \ +1 47 c, \ dup 9d c, 92 c, \ display the number 47 c, \ dup a8 c, \ count to 3 3c c, \ = 14 c, ff c, f7 c, \ b?branch (until) 46 c, \ drop (clear up stack) 0 c, \ End \ Test backwards bbranch (begin/while/repeat equivalent) \ Forth: 3 begin dup . dup while 1 - repeat drop here cc c, \ offset16 a8 c, \ 3 b1 c, \ b(<mark) (begin) 47 c, \ dup 9d c, 92 c, \ display the number 47 c, \ dup 14 c, 00 c, 06 c, \ b?branch (while) a6 c, 1f c, \ -1 13 c, ff c, f6 c, \ bbranch (repeat) b2 c, \ b(>resolve) 46 c, \ drop 00 c, \ end ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063

2 1

r485 - trunk/openbios-devel/forth/device
by svn＠openbios.org 28 Apr '09

28 Apr '09

Author: blueswirl Date: 2009-04-28 18:40:49 +0200 (Tue, 28 Apr 2009) New Revision: 485 Modified: trunk/openbios-devel/forth/device/fcode.fs Log: Fix various bugs in bbranch and b?branch implementations (Mark Cave-Ayland) Modified: trunk/openbios-devel/forth/device/fcode.fs =================================================================== --- trunk/openbios-devel/forth/device/fcode.fs 2009-04-13 17:05:41 UTC (rev 484) +++ trunk/openbios-devel/forth/device/fcode.fs 2009-04-28 16:40:49 UTC (rev 485) @@ -438,22 +438,27 @@ \ Unconditional branch FCode. Followed by FCode-offset. : bbranch - ['] dobranch , fcode-offset 0< if \ if we jump backwards, we can forsee where it goes + ['] dobranch , + swap resolve-dest + execute-tmp-comp else + setup-tmp-comp ['] dobranch , here 0 , + swap then ; immediate - + \ b?branch ( continue? -- ) \ Conditional branch FCode. Followed by FCode-offset. : b?branch fcode-offset 0< if \ if we jump backwards, we can forsee where it goes - resolve-orig + ['] do?branch , + resolve-dest execute-tmp-comp else setup-tmp-comp ['] do?branch , @@ -468,10 +473,7 @@ : b(<mark) setup-tmp-comp - ['] invert , - ['] do?branch , here - 0 , ; immediate

1 0

Tokenizer (fcode-utils 1.0.2) support for 64-bit constants.
by Asif Haswarey 27 Apr '09

27 Apr '09

Hi, I have been using the tokenizer "toke" fcode-utils version 1.0.2 from: http://www.openfirmware.info/FCODE_suite I found out recently that toke does not support 64-bit constants. It simply truncates the upper 32-bits. Do we want 64-bit constant support? - Äsif

5 5

Re: [OpenBIOS] [Qemu-devel] Re: QEMU OpenBIOS booting?
by Laurent Vivier 20 Apr '09

20 Apr '09

>In message: <f43fc5580904191144y1fd8e4d6m3321855d0c558250(a)mail.gmail.com> > Blue Swirl <blauwirbel(a)gmail.com> writes: >: On 4/19/09, M. Warner Losh <imp(a)bsdimp.com> wrote: >: > In message: <f488382f0904190128l4383a56eu67a2f16eb338e61c(a)mail.gmail.com> >: > >: > Steven Noonan <steven(a)uplinklabs.net> writes: >: > : I eventually decided it made more >: > : sense to get QEMU working instead. I did notice that the pre-OpenBIOS >: > : version of QEMU was able to boot Mac OS X via Open Hack'Ware, so I was >: > : annoyed to find that OpenBIOS didn't have such support. So, I might as >: > : well add it. >: > >: > >: > Open Hackware was barely enough to boot older versions of Linux. >: > Other operating systems that needed more extensive properties from the >: > OpenFirmware device tree failed to boot because they weren't present. >: > I was involved in a large effort to get FreeBSD/powerpc booting on >: > QEMU only to have it fail utterly because the amount of hacking on >: > OpenHackWare needed was rather large and mysterious... >: >: This is what I get with OpenBIOS: >: >> *** Boot failure! No secondary bootloader specified *** >: >: 0 > boot cd:,\boot\loader cd:0 >: Consoles: Open Firmware console >: >: FreeBSD/Open Firmware/PowerPC bootstrap loader, Revision 0.1 >: (root(a)xserve.lan.xcllnt.net, Thu Apr 16 18:47:58 UTC 2009) >: Memory: 131072KB >: Booted from: cd >: >: Loading /boot/defaults/loader.conf >: /boot/kernel/kernel data=0x4a4ce0+0x3d4e4 syms=[0x4+0x454f0+0x4+0x5a4b9] >: / >: Hit [Enter] to boot immediately, or any other key for command prompt. >: Booting [/boot/kernel/kernel]... >: Kernel entry at 0x13dac0 ... >: panic: moea_bootstrap: no space to copy translations >: Uptime: 1s > >That's similar to the one that I've seen as well. The problem with >this one, IIRC, is that FreeBSD/powerpc is trying to setup the memory >translations for the MMU and the 'translations' property length is >zero, or something like that... > It seems there is the same problem with the Haiku bootloader, I have a patch to correct this. Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

2 2

qemu/openbios boot failure - gcc-4.4 problem?
by Mark McLoughlin 20 Apr '09

20 Apr '09

Hi, openbios r463 built with gcc-4.4 doesn't boot: https://bugzilla.redhat.com/494075 $ qemu-system-ppc Fedora-10-ppc-DVD.iso invalid/unsupported opcode: 00 - 18 - 01 (00004070) 00000004 1 invalid/unsupported opcode: 00 - 04 - 17 (000095c8) 000095ec 0 >From https://bugzilla.redhat.com/494075#c11 it appears that r463 built with gcc-4.3 works just fine. Could someone perhaps compare the gcc-4.4 build[1] to a working build and confirm that its a mis-compilation? Thanks, Mark. [1] - http://markmc.fedorapeople.org/openbios-ppc.r463.gcc44

1 0

make unoptimized sparc64 build usable with linux kernel
by Igor Kovalenko 17 Apr '09

17 Apr '09

Hi! After doing some homework with sparc64-elf-gcc -O0 :) I made this local change in sparc64-call-client.diff It allocates larger stack frame so unoptimized code could save arguments on stack, and then calls of_client_interface(). This at least allows me to use debugger with qemu and unoptimized sparc64 openbios build. -- Kind regards, Igor V. Kovalenko

2 1

PATCH: Display more information when ?fcode-verbose enabled
by Mark Cave-Ayland 13 Apr '09

13 Apr '09

Hi all, Please find the enclosed patch which enhances the information displayed on the console when ?fcode-verbose is enabled and the Fcode evaluator is running. This is proving to be useful whilst trying to get Qemu to boot a SPARC64 image, and so I think it should be added to the repository. This patch adds the following information to the console display: - The current address of the Fcode evaluator - An optional (compile) prefix if in compile mode - Any strings specified by b(") with a (const) prefix - Any fcode numbers with a (fcode#) prefix - Any branch offsets with an (offset) prefix An example output from this patch gives output similar to the following when trying to boot a SPARC64 disk image: ... ... 4ff4 : named-token [ 0xb6 ] (const) get-devname (fcode#) 87f 5003 : b(:) [ 0xb7 ] 5005 : (compile) [ 0x87c ] 5006 : (compile) b(") [ 0x12 ] (const) bootpath 5011 : (compile) [ 0x87e ] 5012 : (compile) b?branch [ 0x14 ] (offset) 1b 5015 : (compile) b(") [ 0x12 ] (const) Can't find bootpath 502a : (compile) type [ 0x90 ] 502c : (compile) abort [ 0x216 ] 502d : (compile) b(>resolve) [ 0xb2 ] 502f : (compile) [ 0x87d ] 5031 : (compile) [ 0x802 ] 5032 : (compile) b(;) [ 0xc2 ] 5034 : [ 0x87f ] Can't find bootpath byte-load: exception caught! 0 > This is much more helpful when it comes to tracing the results of fcode evaluation and trying to work out why a particular piece of code is failing. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063

2 1

r484 - trunk/openbios-devel/forth/device
by svn＠openbios.org 13 Apr '09

13 Apr '09

Author: blueswirl Date: 2009-04-13 19:05:41 +0200 (Mon, 13 Apr 2009) New Revision: 484 Modified: trunk/openbios-devel/forth/device/fcode.fs trunk/openbios-devel/forth/device/feval.fs Log: Display more information when ?fcode-verbose enabled (Mark Cave-Ayland) Modified: trunk/openbios-devel/forth/device/fcode.fs =================================================================== --- trunk/openbios-devel/forth/device/fcode.fs 2009-04-12 18:53:37 UTC (rev 483) +++ trunk/openbios-devel/forth/device/fcode.fs 2009-04-13 17:05:41 UTC (rev 484) @@ -135,6 +135,11 @@ else fcode-num8-signed then + + \ Display offset in verbose mode + ?fcode-verbose if + dup ." (offset) " . cr + then ; \ fcode-string @@ -147,6 +152,11 @@ 2dup bounds ?do fcode-num8 i c! loop + + \ Display string in verbose mode + ?fcode-verbose if + 2dup ." (const) " type cr + then ; \ fcode-header @@ -171,7 +181,13 @@ \ : fcode! ( F:FCode# -- ) - here fcode# fcode-ptr ! + here fcode# + + \ Display fcode# in verbose mode + ?fcode-verbose if + dup ." (fcode#) " . cr + then + fcode-ptr ! ; Modified: trunk/openbios-devel/forth/device/feval.fs =================================================================== --- trunk/openbios-devel/forth/device/feval.fs 2009-04-12 18:53:37 UTC (rev 483) +++ trunk/openbios-devel/forth/device/feval.fs 2009-04-13 17:05:41 UTC (rev 484) @@ -25,6 +25,13 @@ ; : (debug-feval) ( fcode# -- fcode# ) + \ Address + fcode-stream 1 - . ." : " + + \ Indicate if word is compiled + state @ 0<> if + ." (compile) " + then dup fcode>xt cell - lfa2name type dup ." [ 0x" . ." ]" cr ;

1 0

PATCH: Correct b?branch for negative offset branches
by Mark Cave-Ayland 12 Apr '09

12 Apr '09

Hi everyone, Please find enclosed a patch against current SVN that allows b?branch to work for negative offset branches. With this patch applied, the following output can be seen under openbios-unix on x86 (32-bit): For the non-branch case (flags is set to -1): 0 > here ok 1 > 10 c, ff c, ff c, ff c, ff c, ok 1 > b1 c, ok 1 > 10 c, aa c, aa c, aa c, aa c, ok 1 > 9d c, ok 1 > 02 c, 16 c, ok 1 > 14 c, f7 c, ok 1 > 02 c, 16 c, ok 1 > 00 c, ok 1 > dup 1 byte-load byte-load: exception caught! ok For the branch case (flags is set to 0): 0 > here ok 1 > 10 c, 00 c, 00 c, 00 c, 00 c, ok 1 > b1 c, ok 1 > 10 c, aa c, aa c, aa c, aa c, ok 1 > 9d c, ok 1 > 02 c, 16 c, ok 1 > 14 c, f7 c, ok 1 > 02 c, 16 c, ok 1 > 00 c, ok 1 > dup 1 byte-load -55555556 byte-load: exception caught! ok Note that in terms of docbranch, the branch action being taken is actually the opposite to what you may expect due to the use of setup-tmp-comp (hence the extra invert is required). So as an example, if flags is set to 0 then docbranch does not change the PC, and so we execute the contents of the temporary buffer which contains everything from b(<mark) to b(>resolve). On the other hand, if flags is non-zero then docbranch will branch back to the b(>resolve), and so the temporary buffer contents are ignored. AFAICT the behaviour is correct from the above examples, but again I'd suggest that someone with more OpenBIOS experience should verify to make sure that this is the right approach. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063

2 1

r483 - trunk/openbios-devel/forth/device
by svn＠openbios.org 12 Apr '09

12 Apr '09

Author: blueswirl Date: 2009-04-12 20:53:37 +0200 (Sun, 12 Apr 2009) New Revision: 483 Modified: trunk/openbios-devel/forth/device/fcode.fs Log: Correct b?branch for negative offset branches (Mark Cave-Ayland) Modified: trunk/openbios-devel/forth/device/fcode.fs =================================================================== --- trunk/openbios-devel/forth/device/fcode.fs 2009-03-28 14:28:16 UTC (rev 482) +++ trunk/openbios-devel/forth/device/fcode.fs 2009-04-12 18:53:37 UTC (rev 483) @@ -436,10 +436,11 @@ \ Conditional branch FCode. Followed by FCode-offset. : b?branch - setup-tmp-comp ['] do?branch , fcode-offset 0< if \ if we jump backwards, we can forsee where it goes - resolve-dest + resolve-orig + execute-tmp-comp else + setup-tmp-comp ['] do?branch , here 0 , then @@ -450,7 +451,11 @@ \ Target of backward branches. : b(<mark) + setup-tmp-comp + ['] invert , + ['] do?branch , here + 0 , ; immediate

1 0

sparc32 boot breakage on ppc host
by Andreas Färber 10 Apr '09

10 Apr '09

Hello, As mentioned on qemu-devel, sparc32 softmmu is no longer booting on OSX/ppc host. This applies to both harddisk and DVD images, all Debian Etch. It hangs after "Booting file ... with parameters '' Trying ..." (before "Not a bootable ELF image"). These are the results of my bisection: r482 (QEMU r6962) nope r479 (QEMU r6777) nope 1.0 (QEMU r6658 + 9794f74f9c1dd0fbef30ded9e5c14c28a6fa579b) nope ??? (QEMU r6563 + 9794f74f9c1dd0fbef30ded9e5c14c28a6fa579b) nope ??? (QEMU r6273 + e58ffeb322e2ef88cc23e9505366418bf793316d w/ -- disable-aio) works r237 (QEMU r5262) works Has anyone recently been successful booting on ppc, could this be some endianness issue? It works fine on OpenSolaris/amd64 host. Thanks, Andreas

2 5

Re: [OpenBIOS] [Qemu-devel] svn 6658 broke powerpc.
by Rob Landley 28 Mar '09

28 Mar '09

On Saturday 21 March 2009 04:32:30 Blue Swirl wrote: > I accidentally (by using a wrong variable in a more complex patch) > found out a workaround for the bug, now -nographic boot works. But > still the other nodes have the same problem as before and the > workaround removes the "reg" node which is present on real tree. > > Now the escc node doesn't have the address appended: > 1bfac /pci@80000000/mac-io@4/nvram@0 (nvram) > 1c1c0 /pci@80000000/mac-io@4/escc (escc) > 1c2ac /pci@80000000/mac-io@4/escc/ch-a@13020 (serial) > 1c52c /pci@80000000/mac-io@4/escc/ch-b@13000 (serial) > > Maybe nodes under /pci/mac-io should use custom > encode-unit/decode-unit methods instead of PCI ones? My workaround at this end is to just revert openbios-ppc to the earlier version. I still think that bisecting to find the specific commit that broke it would be informative, but your repository's move to /trunk at commit 470 essentially wiped all repository history before that. Your development page doesn't say how to download the old versions, just the ones under "trunk": http://www.openfirmware.info/OpenBIOS Nor does your repository viewer view anything before 470 from the little pull- down menu: http://tracker.coreboot.org/trac/openbios/browser/trunk/openbios-devel?rev=… http://tracker.coreboot.org/trac/openbios/browser/trunk/openbios-devel?rev=… I guessed how to get the repository viewer to show me the earlier versions: http://tracker.coreboot.org/trac/openbios/browser/openbios-devel?rev=469 But this doesn't work: $ svn co -r 469 svn://openbios.org/openbios/openbios-devel svn: File not found: revision 480, path '/openbios-devel' Then again, I can always bisect by downloading tarballs from your repository viewer... Eh, why not. For easy cut and pasting, my build reproduction sequence is: chmod +x config/scripts/switch-arch config/scripts/switch-arch cross-ppc PATH=~/firmware/firmware/build/cross-compiler-powerpc/bin:$PATH \ make TARGET=powerpc- sudo cp obj-ppc/openbios-qemu.elf /usr/local/share/qemu/openbios-ppc 469 exhibits the bug, so it's before that. I believe 450 is the "known good" version, so let's try 460... Bug. 455... Bug. 452... Bug. 451... Works. So the bug was introduced (or at least triggered) by revision 452: http://tracker.coreboot.org/trac/openbios/changeset/452/openbios-devel Anything in there look broken to you? Rob P.S. Please at least put up a link to this on your development page: http://tracker.coreboot.org/trac/openbios/browser/openbios-devel?rev=469 Right now earlier versions of your repository are completely inaccessible to newbies like me...

4 9

r482 - in trunk/openbios-devel: arch/ppc/qemu drivers fs/grubfs modules
by svn＠openbios.org 28 Mar '09

28 Mar '09

Author: blueswirl Date: 2009-03-28 15:28:16 +0100 (Sat, 28 Mar 2009) New Revision: 482 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c trunk/openbios-devel/fs/grubfs/fsys_iso9660.c trunk/openbios-devel/modules/console_common.c Log: Delete some unused macros detected with -Wp,-Wunused-macros use Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-03-22 16:49:34 UTC (rev 481) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-03-28 14:28:16 UTC (rev 482) @@ -34,10 +34,6 @@ #define ELF_DPRINTF(fmt, args...) do { } while (0) #endif -#define NVRAM_ADDR_LO 0x74 -#define NVRAM_ADDR_HI 0x75 -#define NVRAM_DATA 0x77 - static void transfer_control_to_elf( ulong elf_entry ) { Modified: trunk/openbios-devel/drivers/escc.c =================================================================== --- trunk/openbios-devel/drivers/escc.c 2009-03-22 16:49:34 UTC (rev 481) +++ trunk/openbios-devel/drivers/escc.c 2009-03-28 14:28:16 UTC (rev 482) @@ -23,7 +23,6 @@ /* Conversion routines to/from brg time constants from/to bits * per second. */ -#define BRG_TO_BPS(brg, freq) ((freq) / 2 / ((brg) + 2)) #define BPS_TO_BRG(bps, freq) ((((freq) + (bps)) / (2 * (bps))) - 2) #ifdef CONFIG_DRIVER_ESCC_SUN Modified: trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c =================================================================== --- trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c 2009-03-22 16:49:34 UTC (rev 481) +++ trunk/openbios-devel/fs/grubfs/fsys_ext2fs.c 2009-03-28 14:28:16 UTC (rev 482) @@ -170,9 +170,6 @@ osd2; /* OS dependent 2 */ }; -/* linux/limits.h */ -#define NAME_MAX 255 /* # chars in a file name */ - /* linux/posix_type.h */ typedef long linux_off_t; @@ -187,18 +184,6 @@ char name[EXT2_NAME_LEN]; /* File name */ }; -/* linux/ext2fs.h */ -/* - * EXT2_DIR_PAD defines the directory entries boundaries - * - * NOTE: It must be a multiple of 4 - */ -#define EXT2_DIR_PAD 4 -#define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1) -#define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \ - ~EXT2_DIR_ROUND) - - /* ext2/super.c */ #define EXT2_SUPER_MAGIC 0xEF53 /* include/linux/ext2_fs.h */ #define EXT2_ROOT_INO 2 /* include/linux/ext2_fs.h */ Modified: trunk/openbios-devel/fs/grubfs/fsys_iso9660.c =================================================================== --- trunk/openbios-devel/fs/grubfs/fsys_iso9660.c 2009-03-22 16:49:34 UTC (rev 481) +++ trunk/openbios-devel/fs/grubfs/fsys_iso9660.c 2009-03-28 14:28:16 UTC (rev 482) @@ -40,7 +40,6 @@ #include "shared.h" #include "filesys.h" #include "iso9660.h" -#define DEBUG_THIS 1 #include "debug.h" #if defined(__sparc__) || defined(__PPC__) Modified: trunk/openbios-devel/modules/console_common.c =================================================================== --- trunk/openbios-devel/modules/console_common.c 2009-03-22 16:49:34 UTC (rev 481) +++ trunk/openbios-devel/modules/console_common.c 2009-03-28 14:28:16 UTC (rev 482) @@ -18,8 +18,6 @@ #include "video_subr.h" #define FONT_ADJ_HEIGHT (FONT_HEIGHT + 2) -#define NCOLS 80 -#define NROWS 48 // Warning: will hang on purpose when encountering unknown codes //#define DEBUG_CONSOLE

1 0

r481 - trunk/openbios-devel/drivers
by svn＠openbios.org 22 Mar '09

22 Mar '09

Author: blueswirl Date: 2009-03-22 17:49:34 +0100 (Sun, 22 Mar 2009) New Revision: 481 Modified: trunk/openbios-devel/drivers/pci.c Log: Fix PPC nographic mode Modified: trunk/openbios-devel/drivers/pci.c =================================================================== --- trunk/openbios-devel/drivers/pci.c 2009-03-19 17:51:02 UTC (rev 480) +++ trunk/openbios-devel/drivers/pci.c 2009-03-22 16:49:34 UTC (rev 481) @@ -36,7 +36,8 @@ /* DECLARE data structures for the nodes. */ -DECLARE_UNNAMED_NODE( ob_pci_node, INSTALL_OPEN, 2*sizeof(int) ); +DECLARE_UNNAMED_NODE( ob_pci_bus_node, INSTALL_OPEN, 2*sizeof(int) ); +DECLARE_UNNAMED_NODE( ob_pci_simple_node, INSTALL_OPEN, 2*sizeof(int) ); const pci_arch_t *arch; @@ -156,7 +157,7 @@ push_str(buf); } -NODE_METHODS(ob_pci_node) = { +NODE_METHODS(ob_pci_bus_node) = { { NULL, ob_pci_initialize }, { "open", ob_pci_open }, { "close", ob_pci_close }, @@ -164,6 +165,12 @@ { "encode-unit", ob_pci_encode_unit }, }; +NODE_METHODS(ob_pci_simple_node) = { + { NULL, ob_pci_initialize }, + { "open", ob_pci_open }, + { "close", ob_pci_close }, +}; + static void pci_set_bus_range(const pci_config_t *config) { phandle_t dev = get_cur_dev(); @@ -737,7 +744,12 @@ #endif config.dev = addr & 0x00FFFFFF; - REGISTER_NAMED_NODE(ob_pci_node, config.path); + if (class == PCI_BASE_CLASS_BRIDGE && + (subclass == PCI_SUBCLASS_BRIDGE_HOST || + subclass == PCI_SUBCLASS_BRIDGE_PCI)) + REGISTER_NAMED_NODE(ob_pci_bus_node, config.path); + else + REGISTER_NAMED_NODE(ob_pci_simple_node, config.path); activate_device(config.path);

1 0

Diagnostics support
by Robert Reif 20 Mar '09

20 Mar '09

How much diagnostics support is already in OpenBIOS and what would it take to add something like sun's OBDiag. Has anyone ever tried running a sparc32 OpenBIOS image on real hardware?

2 2

Re: [OpenBIOS] [Qemu-devel] svn 6658 broke powerpc.
by Blue Swirl 19 Mar '09

19 Mar '09

On 3/18/09, Rob Landley <rob(a)landley.net> wrote: > On Wednesday 18 March 2009 03:41:05 Alexander Graf wrote: > > On 18.03.2009, at 00:57, Rob Landley wrote: > > > Up through svn 6657, I could boot a powerpc kernel with -kernel. > > > That commit > > > changed it so now it says: > > > invalid/unsupported opcode: 00 - 00 - 00 (00000000) fff18f00 1 > > > invalid/unsupported opcode: 00 - 00 - 00 (00000000) fff18f04 1 > > > invalid/unsupported opcode: 00 - 0c - 06 (00009198) 00009214 0 > > > > > > And dies. > > > > > > You can grab a test kernel from http://landley.net/zImage-powerpc > > > and try > > > booting it (out of the qemu source directory, this is assuming > > > you've built it > > > but haven't installed it yet) via: > > > > > > ppc-softmmu/qemu-system-ppc -kernel zImage-powerpc \ > > > -append "console=ttyS0 panic=1" -nographic -no-reboot -L pc-bios > > > > > > With svn 6657, it works. (You get kernel boot messages up until it > > > panics and > > > dies because it can't find the root filesystem). With 6658 it dies > > > immediately with the above error message. > > > > > > Unfortunately, this means that the 0.10.0 release doesn't work for > > > powerpc for > > > me, but svn a couple days _before_ the release did. > > > > That specific commit shouldn't have changed anything with respect to > > ppc32 emulation. The one where your command broken is the openBIOS > > update. > > > The commit I pointed to is the openbios update, yes. > > > > Please try again without -nographic. > > > It does indeed work without nographic. (It doesn't do anything _useful_ for > me without nographic, since I'm scripting the emulated kernel's behavior > through stdin and stdout, but allowing it to pop up an SDL window does make it > out of openbios and into the kernel.) The kernel makes the equivalent of the following calls to OF interface: finddevice("/") = 0x11d5c finddevice("/chosen") = 0x1197c finddevice("/openprom") = 0x11b3c getprop(0x11b3c, "model", 0x78efeb0, 0x40) = 0xf getprop(0x11d5c, "stdout", 0x78efea0, 0x4) = 0x4 instance-to-path(0x86ea0, 0x12ad0dc, 0xff) where it crashes because memmove overwrites all memory. But where does this 0x86ea0 come from?

2 4

r480 - trunk/openbios-devel
by svn＠openbios.org 19 Mar '09

19 Mar '09

Author: blueswirl Date: 2009-03-19 18:51:02 +0100 (Thu, 19 Mar 2009) New Revision: 480 Modified: trunk/openbios-devel/Makefile Log: Fix build error log problem, spotted by Rob Landley Modified: trunk/openbios-devel/Makefile =================================================================== --- trunk/openbios-devel/Makefile 2009-03-08 09:45:25 UTC (rev 479) +++ trunk/openbios-devel/Makefile 2009-03-19 17:51:02 UTC (rev 480) @@ -21,7 +21,7 @@ @printf "Building..." @for dir in $(ODIRS); do \ $(MAKE) -C $$dir > $$dir/build.log 2>&1 && echo "ok." || \ - ( echo "error:"; tail -15 $$$dir/build.log; exit 1 ) \ + ( echo "error:"; tail -15 $$dir/build.log; exit 1 ) \ done build-verbose:

1 0

Re: [OpenBIOS] r470 - / trunk
by Stefan Reinauer 08 Mar '09

08 Mar '09

On 08.03.2009 8:51 Uhr, svn(a)openbios.org wrote: > Author: blueswirl > Date: 2009-03-08 08:51:18 +0100 (Sun, 08 Mar 2009) > New Revision: 470 > > Added: > trunk/openbios-devel/ > Removed: > openbios-devel/ > Log: > Move openbios-devel under /trunk > > Thank you, blueswirl, for cleaning up the repository. A small hint for anyone with existing modified trees: When you want to bring over your checked-out openbios-devel repository, you can do: $ cd openbios-devel $ svn switch svn://openbios.org/openbios/trunk/openbios-devel . Stefan -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/ Registergericht: Amtsgericht Freiburg • HRB 7656 Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866

1 0

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

08 Mar '09

Author: blueswirl Date: 2009-03-08 10:45:25 +0100 (Sun, 08 Mar 2009) New Revision: 479 Removed: trunk/openbios-devel/include/openbios/firmware_abi.h Modified: trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/drivers/obio.c Log: Use firmware configuration instead of NVRAM (initial patch by Aurelien Jarno) Use firmware configuration device for boot device, kernel, initrd and kernel command line parameters on PPC, Sparc32 and Sparc64. Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-03-08 09:39:53 UTC (rev 478) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-03-08 09:45:25 UTC (rev 479) @@ -22,6 +22,8 @@ #include "libc/vsprintf.h" #include "kernel.h" #include "ofmem.h" +#define NO_QEMU_PROTOS +#include "openbios/fw_cfg.h" //#define DEBUG_ELF @@ -319,24 +321,6 @@ close_io( fd ); } -static uint8_t nvram_read(uint16_t offset) -{ - outb(offset & 0xff, NVRAM_ADDR_LO); - outb(offset >> 8, NVRAM_ADDR_HI); - return inb(NVRAM_DATA); -} - -static uint32_t nvram_read_be32(uint16_t offset) -{ - uint32_t ret; - - ret = nvram_read(offset) << 24; - ret |= nvram_read(offset + 1) << 16; - ret |= nvram_read(offset + 2) << 8; - ret |= nvram_read(offset + 3); - return ret; -} - #define QUIK_SECOND_BASEADDR 0x3e0000 #define QUIK_FIRST_BASEADDR 0x3f4000 #define QUIK_SECOND_SIZE (QUIK_FIRST_BASEADDR - QUIK_SECOND_BASEADDR) @@ -446,8 +430,7 @@ try_path(path, param); try_bootinfo(path, param); } else { - char boot_device = nvram_read(0x34); - + uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); switch (boot_device) { case 'c': path = strdup("hd:0"); @@ -474,21 +457,22 @@ { unsigned long kernel_image, kernel_size; unsigned long initrd_image, initrd_size; - unsigned long cmdline, cmdline_len; + const char * kernel_cmdline; - kernel_size = nvram_read_be32(0x3c); + kernel_size = fw_cfg_read_i32(FW_CFG_KERNEL_SIZE); if (kernel_size) { - kernel_image = nvram_read_be32(0x38); - cmdline = nvram_read_be32(0x40); - cmdline_len = nvram_read_be32(0x44); - initrd_image = nvram_read_be32(0x48); - initrd_size = nvram_read_be32(0x4c); + kernel_image = fw_cfg_read_i32(FW_CFG_KERNEL_ADDR); + kernel_cmdline = (const char *) fw_cfg_read_i32(FW_CFG_KERNEL_CMDLINE); + initrd_image = fw_cfg_read_i32(FW_CFG_INITRD_ADDR); + initrd_size = fw_cfg_read_i32(FW_CFG_INITRD_SIZE); printk("[ppc] Kernel already loaded (0x%8.8lx + 0x%8.8lx) " "(initrd 0x%8.8lx + 0x%8.8lx)\n", kernel_image, kernel_size, initrd_image, initrd_size); - if (cmdline_len > 0) { - phandle_t ph = find_dev("/chosen"); - set_property(ph, "bootargs", strdup((char *)cmdline), cmdline_len + 1); + if (kernel_cmdline) { + phandle_t ph; + printk("[ppc] Kernel command line: %s\n", kernel_cmdline); + ph = find_dev("/chosen"); + set_property(ph, "bootargs", strdup(kernel_cmdline), strlen(kernel_cmdline) + 1); } call_elf(initrd_image, initrd_size, kernel_image); } @@ -501,7 +485,8 @@ void boot( void ) { - char boot_device = nvram_read(0x34); + uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); + fword("update-chosen"); if (boot_device == 'm') { check_preloaded_kernel(); Modified: trunk/openbios-devel/arch/sparc64/openbios.c =================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c 2009-03-08 09:39:53 UTC (rev 478) +++ trunk/openbios-devel/arch/sparc64/openbios.c 2009-03-08 09:45:25 UTC (rev 479) @@ -15,9 +15,6 @@ #include "openbios.h" #include "openbios/pci.h" #include "asm/pci.h" -#include "libc/byteorder.h" -#define cpu_to_be16(x) __cpu_to_be16(x) -#include "openbios/firmware_abi.h" #include "boot.h" #include "../../drivers/timer.h" // XXX #define NO_QEMU_PROTOS @@ -42,11 +39,9 @@ #define NVRAM_SIZE 0x2000 #define NVRAM_IDPROM 0x1fd8 #define NVRAM_IDPROM_SIZE 32 -#define NVRAM_OB_START (sizeof(ohwcfg_v3_t) + sizeof(struct sparc_arch_cfg)) +#define NVRAM_OB_START (0) #define NVRAM_OB_SIZE ((0x1fd0 - NVRAM_OB_START) & ~15) -static ohwcfg_v3_t nv_info; - #define OBIO_CMDLINE_MAX 256 static char obio_cmdline[OBIO_CMDLINE_MAX]; @@ -275,7 +270,7 @@ void arch_nvram_get(char *data) { - uint32_t size; + uint32_t size = 0; const struct cpudef *cpu; const char *bootpath; char buf[256]; @@ -284,9 +279,8 @@ uint32_t clock_frequency; uint16_t machine_id; const char *stdin_path, *stdout_path; + const char *kernel_cmdline; - nvram_read(0, (char *)&nv_info, sizeof(ohwcfg_v3_t)); - fw_cfg_init(); fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); @@ -304,16 +298,20 @@ for(;;); } - kernel_image = nv_info.kernel_image; - kernel_size = nv_info.kernel_size; - size = nv_info.cmdline_size; - if (size > OBIO_CMDLINE_MAX - 1) - size = OBIO_CMDLINE_MAX - 1; - memcpy(&obio_cmdline, (void *)(long)nv_info.cmdline, size); + kernel_size = fw_cfg_read_i32(FW_CFG_KERNEL_SIZE); + if (kernel_size) + kernel_image = fw_cfg_read_i64(FW_CFG_KERNEL_ADDR); + kernel_cmdline = (const char *) fw_cfg_read_i64(FW_CFG_KERNEL_CMDLINE); + if (kernel_cmdline) { + size = strlen(kernel_cmdline); + if (size > OBIO_CMDLINE_MAX - 1) + size = OBIO_CMDLINE_MAX - 1; + memcpy(&obio_cmdline, kernel_cmdline, size); + } obio_cmdline[size] = '\0'; qemu_cmdline = (uint64_t)obio_cmdline; cmdline_size = size; - boot_device = nv_info.boot_devices[0]; + boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); if (kernel_size) printk("kernel addr %llx size %llx\n", kernel_image, kernel_size); @@ -372,7 +370,7 @@ push_str("/chosen"); fword("find-device"); - if (nv_info.boot_devices[0] == 'c') + if (boot_device == 'c') bootpath = "disk:a"; else bootpath = "cdrom:a"; Modified: trunk/openbios-devel/drivers/obio.c =================================================================== --- trunk/openbios-devel/drivers/obio.c 2009-03-08 09:39:53 UTC (rev 478) +++ trunk/openbios-devel/drivers/obio.c 2009-03-08 09:45:25 UTC (rev 479) @@ -20,8 +20,6 @@ #include "openbios/nvram.h" #include "ofmem.h" #include "obio.h" -#define cpu_to_be16(x) __cpu_to_be16(x) -#include "openbios/firmware_abi.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" #include "escc.h" @@ -157,9 +155,8 @@ } static unsigned char *nvram; -static ohwcfg_v3_t nv_info; -#define NVRAM_OB_START (sizeof(ohwcfg_v3_t) + sizeof(struct sparc_arch_cfg)) +#define NVRAM_OB_START (0) #define NVRAM_OB_SIZE ((NVRAM_IDPROM - NVRAM_OB_START) & ~15) void @@ -654,14 +651,14 @@ const char *stdin, *stdout; unsigned int i; char nographic; - uint32_t size; + uint32_t size = 0; uint16_t machine_id; const struct cpudef *cpu; const struct machdef *mach; - ohwcfg_v3_t *header; char buf[256]; uint32_t temp; phandle_t chosen; + const char *kernel_cmdline; ob_new_obio_device("eeprom", NULL); @@ -694,23 +691,21 @@ for(;;); } - memcpy(&nv_info, nvram, sizeof(nv_info)); - kernel_image = nv_info.kernel_image; - kernel_size = nv_info.kernel_size; - size = nv_info.cmdline_size; - if (size > OBIO_CMDLINE_MAX - 1) - size = OBIO_CMDLINE_MAX - 1; - memcpy(&obio_cmdline, (void *)(long)nv_info.cmdline, size); + kernel_size = fw_cfg_read_i32(FW_CFG_KERNEL_SIZE); + if (kernel_size) + kernel_image = fw_cfg_read_i32(FW_CFG_KERNEL_ADDR); + kernel_cmdline = (const char *) fw_cfg_read_i32(FW_CFG_KERNEL_CMDLINE); + if (kernel_cmdline) { + size = strlen(kernel_cmdline); + if (size > OBIO_CMDLINE_MAX - 1) + size = OBIO_CMDLINE_MAX - 1; + memcpy(&obio_cmdline, kernel_cmdline, size); + } obio_cmdline[size] = '\0'; qemu_cmdline = (uint32_t) &obio_cmdline; cmdline_size = size; - header = (ohwcfg_v3_t *)nvram; - header->kernel_image = 0; - header->kernel_size = 0; - header->cmdline_size = 0; - header->crc = OHW_compute_crc(header, 0x00, 0xF8); + boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); - boot_device = nv_info.boot_devices[0]; fw_cfg_read(FW_CFG_NOGRAPHIC, &nographic, 1); graphic_depth = fw_cfg_read_i16(FW_CFG_SUN4M_DEPTH); Deleted: trunk/openbios-devel/include/openbios/firmware_abi.h =================================================================== --- trunk/openbios-devel/include/openbios/firmware_abi.h 2009-03-08 09:39:53 UTC (rev 478) +++ trunk/openbios-devel/include/openbios/firmware_abi.h 2009-03-08 09:45:25 UTC (rev 479) @@ -1,198 +0,0 @@ -#ifndef FIRMWARE_ABI_H -#define FIRMWARE_ABI_H - -#ifndef __ASSEMBLY__ -/* Open Hack'Ware NVRAM configuration structure */ - -/* Version 3 */ -typedef struct ohwcfg_v3_t ohwcfg_v3_t; -struct ohwcfg_v3_t { - /* 0x00: structure identifier */ - uint8_t struct_ident[0x10]; - /* 0x10: structure version and NVRAM description */ - uint32_t struct_version; - uint16_t nvram_size; - uint16_t pad0; - uint16_t nvram_arch_ptr; - uint16_t nvram_arch_size; - uint16_t nvram_arch_crc; - uint8_t pad1[0x02]; - /* 0x20: host architecture */ - uint8_t arch[0x10]; - /* 0x30: RAM/ROM description */ - uint64_t RAM0_base; - uint64_t RAM0_size; - uint64_t RAM1_base; - uint64_t RAM1_size; - uint64_t RAM2_base; - uint64_t RAM2_size; - uint64_t RAM3_base; - uint64_t RAM3_size; - uint64_t ROM_base; - uint64_t ROM_size; - /* 0x80: Kernel description */ - uint64_t kernel_image; - uint64_t kernel_size; - /* 0x90: Kernel command line */ - uint64_t cmdline; - uint64_t cmdline_size; - /* 0xA0: Kernel boot image */ - uint64_t initrd_image; - uint64_t initrd_size; - /* 0xB0: NVRAM image */ - uint64_t NVRAM_image; - uint8_t pad2[8]; - /* 0xC0: graphic configuration */ - uint16_t width; - uint16_t height; - uint16_t depth; - uint16_t graphic_flags; - /* 0xC8: CPUs description */ - uint8_t nb_cpus; - uint8_t boot_cpu; - uint8_t nboot_devices; - uint8_t pad3[5]; - /* 0xD0: boot devices */ - uint8_t boot_devices[0x10]; - /* 0xE0 */ - uint8_t pad4[0x1C]; /* 28 */ - /* 0xFC: checksum */ - uint16_t crc; - uint8_t pad5[0x02]; -} __attribute__ (( packed )); - -#define OHW_GF_NOGRAPHICS 0x0001 - -static inline uint16_t -OHW_crc_update (uint16_t prev, uint16_t value) -{ - uint16_t tmp; - uint16_t pd, pd1, pd2; - - tmp = prev >> 8; - pd = prev ^ value; - pd1 = pd & 0x000F; - pd2 = ((pd >> 4) & 0x000F) ^ pd1; - tmp ^= (pd1 << 3) | (pd1 << 8); - tmp ^= pd2 | (pd2 << 7) | (pd2 << 12); - - return tmp; -} - -static inline uint16_t -OHW_compute_crc (ohwcfg_v3_t *header, uint32_t start, uint32_t count) -{ - uint32_t i; - uint16_t crc = 0xFFFF; - uint8_t *ptr = (uint8_t *)header; - int odd; - - odd = count & 1; - count &= ~1; - for (i = 0; i != count; i++) { - crc = OHW_crc_update(crc, (ptr[start + i] << 8) | ptr[start + i + 1]); - } - if (odd) { - crc = OHW_crc_update(crc, ptr[start + i] << 8); - } - - return crc; -} - -/* Sparc32 runtime NVRAM structure for SMP CPU boot */ -struct sparc_arch_cfg { - uint32_t smp_ctx; - uint32_t smp_ctxtbl; - uint32_t smp_entry; - uint8_t valid; - uint8_t unused[51]; -}; - -/* OpenBIOS NVRAM partition */ -struct OpenBIOS_nvpart_v1 { - uint8_t signature; - uint8_t checksum; - uint16_t len; // BE, length divided by 16 - char name[12]; -}; - -#define OPENBIOS_PART_SYSTEM 0x70 -#define OPENBIOS_PART_FREE 0x7f - -static inline void -OpenBIOS_finish_partition(struct OpenBIOS_nvpart_v1 *header, uint32_t size) -{ - unsigned int i, sum; - uint8_t *tmpptr; - - // Length divided by 16 - header->len = cpu_to_be16(size >> 4); - - // Checksum - tmpptr = (uint8_t *)header; - sum = *tmpptr; - for (i = 0; i < 14; i++) { - sum += tmpptr[2 + i]; - sum = (sum + ((sum & 0xff00) >> 8)) & 0xff; - } - header->checksum = sum & 0xff; -} - -static inline uint32_t -OpenBIOS_set_var(uint8_t *nvram, uint32_t addr, const char *str) -{ - uint32_t len; - - len = strlen(str) + 1; - memcpy(&nvram[addr], str, len); - - return addr + len; -} - -/* Sun IDPROM structure at the end of NVRAM */ -struct Sun_nvram { - uint8_t type; - uint8_t machine_id; - uint8_t macaddr[6]; - uint8_t unused[7]; - uint8_t checksum; -}; - -static inline void -Sun_init_header(struct Sun_nvram *header, const uint8_t *macaddr, int machine_id) -{ - uint8_t tmp, *tmpptr; - unsigned int i; - - header->type = 1; - header->machine_id = machine_id & 0xff; - memcpy(&header->macaddr, macaddr, 6); - /* Calculate checksum */ - tmp = 0; - tmpptr = (uint8_t *)header; - for (i = 0; i < 15; i++) - tmp ^= tmpptr[i]; - - header->checksum = tmp; -} - -#else /* __ASSEMBLY__ */ - -/* Structure offsets for asm use */ - -/* Open Hack'Ware NVRAM configuration structure */ -#define OHW_ARCH_PTR 0x18 -#define OHW_RAM_SIZE 0x38 -#define OHW_BOOT_CPU 0xC9 - -/* Sparc32 runtime NVRAM structure for SMP CPU boot */ -#define SPARC_SMP_CTX 0x0 -#define SPARC_SMP_CTXTBL 0x4 -#define SPARC_SMP_ENTRY 0x8 -#define SPARC_SMP_VALID 0xc - -/* Sun IDPROM structure at the end of NVRAM */ -#define SPARC_MACHINE_ID 0x1fd9 - -#endif /* __ASSEMBLY__ */ -#endif /* FIRMWARE_ABI_H */

1 0

r478 - trunk/openbios-devel/include/openbios
by svn＠openbios.org 08 Mar '09

08 Mar '09

Author: blueswirl Date: 2009-03-08 10:39:53 +0100 (Sun, 08 Mar 2009) New Revision: 478 Modified: trunk/openbios-devel/include/openbios/fw_cfg.h Log: Add new entries to firmware configuration device Signed-off-by: Aurelien Jarno <aurelien(a)aurel32.net> Modified: trunk/openbios-devel/include/openbios/fw_cfg.h =================================================================== --- trunk/openbios-devel/include/openbios/fw_cfg.h 2009-03-08 08:17:55 UTC (rev 477) +++ trunk/openbios-devel/include/openbios/fw_cfg.h 2009-03-08 09:39:53 UTC (rev 478) @@ -8,6 +8,12 @@ #define FW_CFG_NOGRAPHIC 0x04 #define FW_CFG_NB_CPUS 0x05 #define FW_CFG_MACHINE_ID 0x06 +#define FW_CFG_KERNEL_ADDR 0x07 +#define FW_CFG_KERNEL_SIZE 0x08 +#define FW_CFG_KERNEL_CMDLINE 0x09 +#define FW_CFG_INITRD_ADDR 0x0a +#define FW_CFG_INITRD_SIZE 0x0b +#define FW_CFG_BOOT_DEVICE 0x0c #define FW_CFG_MAX_ENTRY 0x10 #define FW_CFG_WRITE_CHANNEL 0x4000

1 0

r477 - tags
by svn＠openbios.org 08 Mar '09

08 Mar '09

Author: blueswirl Date: 2009-03-08 09:17:55 +0100 (Sun, 08 Mar 2009) New Revision: 477 Added: tags/fcode-utils-1.0.2/ Log: Add tag for fcode-utils release 1.0.2 (r197)

1 0

r476 - tags
by svn＠openbios.org 08 Mar '09

08 Mar '09

Author: blueswirl Date: 2009-03-08 09:17:17 +0100 (Sun, 08 Mar 2009) New Revision: 476 Removed: tags/fcode-utils-1.0.2/ Log: Wrong revision, sorry

1 0

r475 - tags
by svn＠openbios.org 08 Mar '09

08 Mar '09

Author: blueswirl Date: 2009-03-08 09:11:57 +0100 (Sun, 08 Mar 2009) New Revision: 475 Added: tags/fcode-utils-1.0.2/ Log: Add tag for fcode-utils release 1.0.2 (r107)

1 0

r474 - tags
by svn＠openbios.org 08 Mar '09

08 Mar '09

Author: blueswirl Date: 2009-03-08 09:10:50 +0100 (Sun, 08 Mar 2009) New Revision: 474 Added: tags/fcode-utils-1.0.1/ Log: Add tag for fcode-utils release 1.0.1 (r95)

1 0

r473 - tags
by svn＠openbios.org 08 Mar '09

08 Mar '09

Author: blueswirl Date: 2009-03-08 09:10:03 +0100 (Sun, 08 Mar 2009) New Revision: 473 Added: tags/fcode-utils-1.0.0/ Log: Add tag for fcode-utils release 1.0.0 (r91)

1 0

r472 - tags
by svn＠openbios.org 08 Mar '09

08 Mar '09

Author: blueswirl Date: 2009-03-08 08:58:36 +0100 (Sun, 08 Mar 2009) New Revision: 472 Added: tags/openbios-1.0/ Log: Add tag openbios-1.0 (r463)

1 0

r471 - / trunk
by svn＠openbios.org 08 Mar '09

08 Mar '09

Author: blueswirl Date: 2009-03-08 08:54:36 +0100 (Sun, 08 Mar 2009) New Revision: 471 Added: trunk/fcode-utils-devel/ Removed: fcode-utils/ Log: Move fcode-utils under /trunk and rename to fcode-utils-devel

1 0

r470 - / trunk
by svn＠openbios.org 08 Mar '09

08 Mar '09

Author: blueswirl Date: 2009-03-08 08:51:18 +0100 (Sun, 08 Mar 2009) New Revision: 470 Added: trunk/openbios-devel/ Removed: openbios-devel/ Log: Move openbios-devel under /trunk

1 0

r469 - /
by svn＠openbios.org 08 Mar '09

08 Mar '09

Author: blueswirl Date: 2009-03-08 08:48:58 +0100 (Sun, 08 Mar 2009) New Revision: 469 Added: tags/ Log: Add /tags

1 0

r468 - /
by svn＠openbios.org 08 Mar '09

08 Mar '09

Author: blueswirl Date: 2009-03-08 08:48:15 +0100 (Sun, 08 Mar 2009) New Revision: 468 Added: branches/ Log: Add /branches

1 0

r467 - /
by svn＠openbios.org 08 Mar '09

08 Mar '09

Author: blueswirl Date: 2009-03-08 08:47:49 +0100 (Sun, 08 Mar 2009) New Revision: 467 Added: trunk/ Log: Add /trunk

1 0

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

[PATCH] PPC64: Make OpenBIOS interrupt handlers 64bit aware v2
by Alexander Graf 28 Feb '09

28 Feb '09

While booting a 64bit kernel, there is a small timeframe where OF and the kernel communicate with each other. Within that timeframe, DSI/ISI interrupts may occur, because some memory is not mapped yet. Right now in case that happens, we jump into the DSI/ISI interrupt handler which clobbers the high 32 bits of the kernel's registers. In order to circumvent that, let's save/restore all 64 bits of all kernel registers when we get a DSI/ISI interrupt. This patch enables a PPC64 Linux kernel to boot up to the point where it tries to set up the SLB entries (slbmte), which is not yet implemented in qemu. v2 implements handling for the HIOR register, bringing interrupt handlers to RAM. Signed-off-by: Alexander Graf <alex(a)csgraf.de>

2 1

r462 - in openbios-devel: arch/ppc/qemu include/ppc
by svn＠openbios.org 28 Feb '09

28 Feb '09

Author: blueswirl Date: 2009-02-28 19:38:55 +0100 (Sat, 28 Feb 2009) New Revision: 462 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/start.S openbios-devel/include/ppc/processor.h Log: Make OpenBIOS interrupt handlers 64bit aware v2 While booting a 64bit kernel, there is a small timeframe where OF and the kernel communicate with each other. Within that timeframe, DSI/ISI interrupts may occur, because some memory is not mapped yet. Right now in case that happens, we jump into the DSI/ISI interrupt handler which clobbers the high 32 bits of the kernel's registers. In order to circumvent that, let's save/restore all 64 bits of all kernel registers when we get a DSI/ISI interrupt. This patch enables a PPC64 Linux kernel to boot up to the point where it tries to set up the SLB entries (slbmte), which is not yet implemented in qemu. v2 implements handling for the HIOR register, bringing interrupt handlers to RAM. Signed-off-by: Alexander Graf <alex(a)csgraf.de> Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-02-27 22:13:34 UTC (rev 461) +++ openbios-devel/arch/ppc/qemu/init.c 2009-02-28 18:38:55 UTC (rev 462) @@ -32,6 +32,7 @@ #include "libc/vsprintf.h" #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" +#include "ppc/processor.h" #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" @@ -238,7 +239,27 @@ fword("finish-device"); } +/* In order to get 64 bit aware handlers that rescue all our + GPRs from getting truncated to 32 bits, we need to patch the + existing handlers so they jump to our 64 bit aware ones. */ static void +ppc64_patch_handlers(void) +{ + uint32_t *dsi = (uint32_t *)0x300UL; + uint32_t *isi = (uint32_t *)0x400UL; + + // Patch the first DSI handler instruction to: ba 0x2000 + *dsi = 0x48002002; + + // Patch the first ISI handler instruction to: ba 0x2200 + *isi = 0x48002202; + + // Invalidate the cache lines + asm ( "icbi 0, %0" : : "r"(dsi) ); + asm ( "icbi 0, %0" : : "r"(isi) ); +} + +static void cpu_970_init(const struct cpudef *cpu) { cpu_generic_init(cpu); @@ -249,6 +270,15 @@ fword("property"); fword("finish-device"); + + /* The 970 is a PPC64 CPU, so we need to activate + * 64bit aware interrupt handlers */ + + ppc64_patch_handlers(); + + /* The 970 also implements the HIOR which we need to set to 0 */ + + mtspr(S_HIOR, 0); } static const struct cpudef ppc_defs[] = { Modified: openbios-devel/arch/ppc/qemu/start.S =================================================================== --- openbios-devel/arch/ppc/qemu/start.S 2009-02-27 22:13:34 UTC (rev 461) +++ openbios-devel/arch/ppc/qemu/start.S 2009-02-28 18:38:55 UTC (rev 462) @@ -24,39 +24,155 @@ #define ILLEGAL_VECTOR( v ) .org __vectors + v ; bl trap_error ; #define VECTOR( v, dummystr ) .org __vectors + v ; vector__##v -#define EXCEPTION_PREAMBLE \ - mtsprg1 r1 ; /* scratch */ \ - mfsprg0 r1 ; /* exception stack in sprg0 */ \ - addi r1,r1,-80 ; /* push exception frame */ \ +/* We're trying to use the same code for the ppc32 and ppc64 handlers here. + * On ppc32 we only save/restore the registers, C considers volatile. + * + * On ppc64 on the other hand, we have to save/restore all registers, because + * all OF code is 32 bits, which only saves/restores the low 32 bits of the + * registers it clobbers. + */ + +#define EXCEPTION_PREAMBLE_TEMPLATE \ + mtsprg1 r1 ; /* scratch */ \ + mfsprg0 r1 ; /* exception stack in sprg0 */ \ +.ifc ULONG_SIZE, 8 ; \ + addi r1,r1,-(40 * ULONG_SIZE) ; /* push exception frame */ \ +.else ; \ + addi r1,r1,-(20 * ULONG_SIZE) ; /* push exception frame */ \ +.endif ; \ \ - stw r0,0(r1) ; /* save r0 */ \ + stl r0,(0 * ULONG_SIZE)(r1) ; /* save r0 */ \ mfsprg1 r0 ; \ - stw r0,4(r1) ; /* save r1 */ \ - stw r2,8(r1) ; /* save r2 */ \ - stw r3,12(r1) ; /* save r3 */ \ - stw r4,16(r1) ; \ - stw r5,20(r1) ; \ - stw r6,24(r1) ; \ - stw r7,28(r1) ; \ - stw r8,32(r1) ; \ - stw r9,36(r1) ; \ - stw r10,40(r1) ; \ - stw r11,44(r1) ; \ - stw r12,48(r1) ; \ + stl r0,(1 * ULONG_SIZE)(r1) ; /* save r1 */ \ + stl r2,(2 * ULONG_SIZE)(r1) ; /* save r2 */ \ + stl r3,(3 * ULONG_SIZE)(r1) ; /* save r3 */ \ + stl r4,(4 * ULONG_SIZE)(r1) ; \ + stl r5,(5 * ULONG_SIZE)(r1) ; \ + stl r6,(6 * ULONG_SIZE)(r1) ; \ + stl r7,(7 * ULONG_SIZE)(r1) ; \ + stl r8,(8 * ULONG_SIZE)(r1) ; \ + stl r9,(9 * ULONG_SIZE)(r1) ; \ + stl r10,(10 * ULONG_SIZE)(r1) ; \ + stl r11,(11 * ULONG_SIZE)(r1) ; \ + stl r12,(12 * ULONG_SIZE)(r1) ; \ +.ifc ULONG_SIZE, 8 ; \ + stl r13,(17 * ULONG_SIZE)(r1) ; \ + stl r14,(18 * ULONG_SIZE)(r1) ; \ + stl r15,(19 * ULONG_SIZE)(r1) ; \ + stl r16,(20 * ULONG_SIZE)(r1) ; \ + stl r17,(21 * ULONG_SIZE)(r1) ; \ + stl r18,(22 * ULONG_SIZE)(r1) ; \ + stl r19,(23 * ULONG_SIZE)(r1) ; \ + stl r20,(24 * ULONG_SIZE)(r1) ; \ + stl r21,(25 * ULONG_SIZE)(r1) ; \ + stl r22,(26 * ULONG_SIZE)(r1) ; \ + stl r23,(27 * ULONG_SIZE)(r1) ; \ + stl r24,(28 * ULONG_SIZE)(r1) ; \ + stl r25,(29 * ULONG_SIZE)(r1) ; \ + stl r26,(30 * ULONG_SIZE)(r1) ; \ + stl r27,(31 * ULONG_SIZE)(r1) ; \ + stl r28,(32 * ULONG_SIZE)(r1) ; \ + stl r29,(33 * ULONG_SIZE)(r1) ; \ + stl r30,(34 * ULONG_SIZE)(r1) ; \ + stl r31,(35 * ULONG_SIZE)(r1) ; \ +.endif ; \ \ mflr r0 ; \ - stw r0,52(r1) ; \ + stl r0,(13 * ULONG_SIZE)(r1) ; \ mfcr r0 ; \ - stw r0,56(r1) ; \ + stl r0,(14 * ULONG_SIZE)(r1) ; \ mfctr r0 ; \ - stw r0,60(r1) ; \ + stl r0,(15 * ULONG_SIZE)(r1) ; \ mfxer r0 ; \ - stw r0,64(r1) ; \ + stl r0,(16 * ULONG_SIZE)(r1) ; \ \ /* 76(r1) unused */ \ - addi r1,r1,-16 ; /* call conventions uses 0(r1) and 4(r1)... */ + addi r1,r1,-16 ; /* C ABI uses 0(r1) and 4(r1)... */ +#define EXCEPTION_EPILOGUE_TEMPLATE \ + addi r1,r1,16 ; /* pop ABI frame */ \ +\ + ll r0,(13 * ULONG_SIZE)(r1) ; \ + mtlr r0 ; \ + ll r0,(14 * ULONG_SIZE)(r1) ; \ + mtcr r0 ; \ + ll r0,(15 * ULONG_SIZE)(r1) ; \ + mtctr r0 ; \ + ll r0,(16 * ULONG_SIZE)(r1) ; \ + mtxer r0 ; \ +\ + ll r0,(0 * ULONG_SIZE)(r1) ; \ + ll r2,(2 * ULONG_SIZE)(r1) ; \ + ll r3,(3 * ULONG_SIZE)(r1) ; \ + ll r4,(4 * ULONG_SIZE)(r1) ; \ + ll r5,(5 * ULONG_SIZE)(r1) ; \ + ll r6,(6 * ULONG_SIZE)(r1) ; \ + ll r7,(7 * ULONG_SIZE)(r1) ; \ + ll r8,(8 * ULONG_SIZE)(r1) ; \ + ll r9,(9 * ULONG_SIZE)(r1) ; \ + ll r10,(10 * ULONG_SIZE)(r1) ; \ + ll r11,(11 * ULONG_SIZE)(r1) ; \ + ll r12,(12 * ULONG_SIZE)(r1) ; \ +.ifc ULONG_SIZE, 8 ; \ + ll r13,(17 * ULONG_SIZE)(r1) ; \ + ll r14,(18 * ULONG_SIZE)(r1) ; \ + ll r15,(19 * ULONG_SIZE)(r1) ; \ + ll r16,(20 * ULONG_SIZE)(r1) ; \ + ll r17,(21 * ULONG_SIZE)(r1) ; \ + ll r18,(22 * ULONG_SIZE)(r1) ; \ + ll r19,(23 * ULONG_SIZE)(r1) ; \ + ll r20,(24 * ULONG_SIZE)(r1) ; \ + ll r21,(25 * ULONG_SIZE)(r1) ; \ + ll r22,(26 * ULONG_SIZE)(r1) ; \ + ll r23,(27 * ULONG_SIZE)(r1) ; \ + ll r24,(28 * ULONG_SIZE)(r1) ; \ + ll r25,(29 * ULONG_SIZE)(r1) ; \ + ll r26,(30 * ULONG_SIZE)(r1) ; \ + ll r27,(31 * ULONG_SIZE)(r1) ; \ + ll r28,(32 * ULONG_SIZE)(r1) ; \ + ll r29,(33 * ULONG_SIZE)(r1) ; \ + ll r30,(34 * ULONG_SIZE)(r1) ; \ + ll r31,(35 * ULONG_SIZE)(r1) ; \ +.endif ; \ + ll r1,(1 * ULONG_SIZE)(r1) ; /* restore stack at last */ \ + rfi +// PPC32 + +#define ULONG_SIZE 4 +#define stl stw +#define ll lwz + +.macro EXCEPTION_PREAMBLE + EXCEPTION_PREAMBLE_TEMPLATE +.endm + +.macro EXCEPTION_EPILOGUE + EXCEPTION_EPILOGUE_TEMPLATE +.endm + +#undef ULONG_SIZE +#undef stl +#undef ll + +// PPC64 + +#define ULONG_SIZE 8 +#define stl std +#define ll ld + +.macro EXCEPTION_PREAMBLE_64 + EXCEPTION_PREAMBLE_TEMPLATE +.endm + +.macro EXCEPTION_EPILOGUE_64 + EXCEPTION_EPILOGUE_TEMPLATE +.endm + +#undef ULONG_SIZE +#undef stl +#undef ll + /************************************************************************/ /* vectors */ /************************************************************************/ @@ -68,32 +184,8 @@ b 1b exception_return: - addi r1,r1,16 // pop ABI frame + EXCEPTION_EPILOGUE - lwz r0,52(r1) - mtlr r0 - lwz r0,56(r1) - mtcr r0 - lwz r0,60(r1) - mtctr r0 - lwz r0,64(r1) - mtxer r0 - - lwz r0,0(r1) // restore r0 - lwz r2,8(r1) // restore r2 - lwz r3,12(r1) // restore r3 - lwz r4,16(r1) - lwz r5,20(r1) - lwz r6,24(r1) - lwz r7,28(r1) - lwz r8,32(r1) - lwz r9,36(r1) - lwz r10,40(r1) - lwz r11,44(r1) - lwz r12,48(r1) - lwz r1,4(r1) // restore r1 - rfi - .globl __divide_error __divide_error: trap_error: @@ -150,6 +242,22 @@ ILLEGAL_VECTOR( 0x1600 ) ILLEGAL_VECTOR( 0x1700 ) +VECTOR( 0x2000, "DSI_64" ): + EXCEPTION_PREAMBLE_64 + lis r3,HA(dsi_exception) + addi r3,r3,LO(dsi_exception) + mtctr r3 + bctrl + EXCEPTION_EPILOGUE_64 + +VECTOR( 0x2200, "ISI_64" ): + EXCEPTION_PREAMBLE_64 + lis r3,HA(isi_exception) + addi r3,r3,LO(isi_exception) + mtctr r3 + bctrl + EXCEPTION_EPILOGUE_64 + GLOBL(__vectors_end): /************************************************************************/ Modified: openbios-devel/include/ppc/processor.h =================================================================== --- openbios-devel/include/ppc/processor.h 2009-02-27 22:13:34 UTC (rev 461) +++ openbios-devel/include/ppc/processor.h 2009-02-28 18:38:55 UTC (rev 462) @@ -92,6 +92,7 @@ #define S_TBWL 284 /* Time base Upper/Lower (Writing) */ #define S_TBWU 285 #define S_PVR 287 /* Processor Version Register */ +#define S_HIOR 311 /* Hardware Interrupt Offset Register */ #define S_IBAT0U 528 #define S_IBAT0L 529 #define S_IBAT1U 530 @@ -400,4 +401,10 @@ #define SPRNUM_FLIP( v ) ( (((v)>>5) & 0x1f) | (((v)<<5) & 0x3e0) ) +/* C helpers */ + +#define __stringify_1(x) #x +#define __stringify(x) __stringify_1(x) +#define mtspr(rn, v) asm volatile("mtspr " __stringify(rn) ",%0" : : "r" (v)) + #endif /* _H_PROCESSOR */

1 0

[PATCH] PPC64: Make OpenBIOS interrupt handlers 64bit aware
by Alexander Graf 28 Feb '09

28 Feb '09

While booting a 64bit kernel, there is a small timeframe where OF and the kernel communicate with each other. Within that timeframe, DSI/ISI interrupts may occur, because some memory is not mapped yet. Right now in case that happens, we jump into the DSI/ISI interrupt handler which clobbers the high 32 bits of the kernel's registers. In order to circumvent that, let's save/restore all 64 bits of all kernel registers when we get a DSI/ISI interrupt. In order to make use of this patch in qemu, a separate patch is required that makes qemu not run the interrupt handlers from ROM, but from RAM. It will follow on the qemu list shortly. This patch enables a PPC64 Linux kernel to boot up to the point where it tries to set up the SLB entries (slbmte), which is not yet implemented in qemu. Signed-off-by: Alexander Graf <alex(a)csgraf.de>

1 0

[PATCH] Enable support for PPC64 on qemu target v2
by Alexander Graf 28 Feb '09

28 Feb '09

This patch enables OpenBIOS to initialize on PPC64, enabling support for -cpu 970fx. It gets up to the boot prompt and works rather good so far, though I haven't been able to run a kernel yet. For more recent PowerPC CPUs the PTE layout has changed, so we need to take that into account and create PTEs according to the new layout and at the new physical positions. v2 takes Laurent's comments into account Signed-off-by: Alexander Graf <alex(a)csgraf.de>

3 6

r461 - in openbios-devel: arch/ppc/qemu include
by svn＠openbios.org 27 Feb '09

27 Feb '09

Author: laurent Date: 2009-02-27 23:13:34 +0100 (Fri, 27 Feb 2009) New Revision: 461 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/mmutypes.h openbios-devel/arch/ppc/qemu/ofmem.c openbios-devel/include/ofmem.h Log: This patch enables OpenBIOS to initialize on PPC64, enabling support for -cpu 970fx. It gets up to the boot prompt and works rather good so far, though I haven't been able to run a kernel yet. For more recent PowerPC CPUs the PTE layout has changed, so we need to take that into account and create PTEs according to the new layout and at the new physical positions. 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-02-27 21:04:01 UTC (rev 460) +++ openbios-devel/arch/ppc/qemu/init.c 2009-02-27 22:13:34 UTC (rev 461) @@ -238,6 +238,19 @@ fword("finish-device"); } +static void +cpu_970_init(const struct cpudef *cpu) +{ + cpu_generic_init(cpu); + + PUSH(0); + fword("encode-int"); + push_str("reg"); + fword("property"); + + fword("finish-device"); +} + static const struct cpudef ppc_defs[] = { { .iu_version = 0x00040000, @@ -359,6 +372,18 @@ .clock_frequency = 0x1dcd6500, .initfn = cpu_g4_init, }, + { // XXX find out real values + .iu_version = 0x003C0000, + .name = "PowerPC,970FX", + .icache_size = 0x8000, + .dcache_size = 0x8000, + .icache_sets = 0x80, + .dcache_sets = 0x80, + .icache_block_size = 0x80, + .dcache_block_size = 0x80, + .clock_frequency = 0x1dcd6500, + .initfn = cpu_970_init, + }, }; static const struct cpudef * Modified: openbios-devel/arch/ppc/qemu/mmutypes.h =================================================================== --- openbios-devel/arch/ppc/qemu/mmutypes.h 2009-02-27 21:04:01 UTC (rev 460) +++ openbios-devel/arch/ppc/qemu/mmutypes.h 2009-02-27 22:13:34 UTC (rev 461) @@ -38,7 +38,28 @@ unsigned long pp:2; /* Page protection */ } mPTE_t; +typedef struct mPTE_64 { + uint32_t avpn_low; /* Abbreviated Virtual Page Number (unused) */ + uint32_t avpn:25; /* Abbreviated Virtual Page Number */ + uint32_t sw:4; /* Software Use */ + uint32_t :1; /* Reserved */ + uint32_t h:1; /* Hash algorithm indicator */ + uint32_t v:1; /* Entry is valid */ + uint32_t rpn_low; /* Real (physical) page number (unused) */ + uint32_t rpn:20; /* Real (physical) page number */ + uint32_t :2; /* Reserved */ + uint32_t ac:1; /* Address Compare*/ + uint32_t r:1; /* Referenced */ + uint32_t c:1; /* Changed */ + uint32_t w:1; /* Write-thru cache mode */ + uint32_t i:1; /* Cache inhibited */ + uint32_t m:1; /* Memory coherence */ + uint32_t g:1; /* Guarded */ + uint32_t n:1; /* No-Execute */ + uint32_t pp:2; /* Page protection */ +} mPTE_64_t; + typedef struct _mBATU { /* Upper part of BAT (all except 601) */ unsigned long bepi:15; /* Effective page index (virtual address) */ unsigned long :4; /* Unused */ Modified: openbios-devel/arch/ppc/qemu/ofmem.c =================================================================== --- openbios-devel/arch/ppc/qemu/ofmem.c 2009-02-27 21:04:01 UTC (rev 460) +++ openbios-devel/arch/ppc/qemu/ofmem.c 2009-02-27 22:13:34 UTC (rev 461) @@ -621,9 +621,75 @@ } static void -hash_page( ulong ea, ulong phys, int mode ) +hash_page_64( ulong ea, ulong phys, int mode ) { static int next_grab_slot=0; + uint64_t vsid_mask, page_mask, pgidx, hash; + uint64_t htab_mask, mask, avpn; + ulong pgaddr; + int i, found; + unsigned int vsid, vsid_sh, sdr, sdr_sh, sdr_mask; + mPTE_64_t *pp; + + vsid = (ea >> 28) + SEGR_BASE; + vsid_sh = 7; + vsid_mask = 0x00003FFFFFFFFF80ULL; + asm ( "mfsdr1 %0" : "=r" (sdr) ); + sdr_sh = 18; + sdr_mask = 0x3FF80; + page_mask = 0x0FFFFFFF; // XXX correct? + pgidx = (ea & page_mask) >> PAGE_SHIFT; + avpn = (vsid << 12) | ((pgidx >> 4) & 0x0F80);; + + hash = ((vsid ^ pgidx) << vsid_sh) & vsid_mask; + htab_mask = 0x0FFFFFFF >> (28 - (sdr & 0x1F)); + mask = (htab_mask << sdr_sh) | sdr_mask; + pgaddr = sdr | (hash & mask); + pp = (mPTE_64_t *)pgaddr; + + /* replace old translation */ + for( found=0, i=0; !found && i<8; i++ ) + if( pp[i].avpn == avpn ) + found=1; + + /* otherwise use a free slot */ + for( i=0; !found && i<8; i++ ) + if( !pp[i].v ) + found=1; + + /* out of slots, just evict one */ + if( !found ) { + i = next_grab_slot + 1; + next_grab_slot = (next_grab_slot + 1) % 8; + } + i--; + { + mPTE_64_t p = { + // .avpn_low = avpn, + .avpn = avpn >> 7, + .h = 0, + .v = 1, + + .rpn = (phys & ~0xfff) >> 12, + .r = mode & (1 << 8) ? 1 : 0, + .c = mode & (1 << 7) ? 1 : 0, + .w = mode & (1 << 6) ? 1 : 0, + .i = mode & (1 << 5) ? 1 : 0, + .m = mode & (1 << 4) ? 1 : 0, + .g = mode & (1 << 3) ? 1 : 0, + .n = mode & (1 << 2) ? 1 : 0, + .pp = mode & 3, + }; + pp[i] = p; + } + + asm volatile( "tlbie %0" :: "r"(ea) ); +} + +static void +hash_page_32( ulong ea, ulong phys, int mode ) +{ + static int next_grab_slot=0; ulong *upte, cmp, hash1; int i, vsid, found; mPTE_t *pp; @@ -660,6 +726,22 @@ asm volatile( "tlbie %0" :: "r"(ea) ); } +static int is_ppc64(void) +{ + unsigned int pvr; + asm volatile("mfspr %0, 0x11f" : "=r" (pvr) ); + + return ((pvr >= 0x330000) && (pvr < 0x70330000)); +} + +static void hash_page( ulong ea, ulong phys, int mode ) +{ + if ( is_ppc64() ) + hash_page_64(ea, phys, mode); + else + hash_page_32(ea, phys, mode); +} + void dsi_exception( void ) { @@ -699,6 +781,7 @@ ofmem_t *ofmem = OFMEM; ulong sdr1, sr_base, msr; ulong hash_base; + ulong hash_mask = 0xffff0000; int i; memset(ofmem, 0, sizeof(ofmem_t)); @@ -706,7 +789,10 @@ /* SDR1: Storage Description Register 1 */ - hash_base = (ramsize - 0x00100000 - HASH_SIZE) & 0xffff0000; + if(is_ppc64()) + hash_mask = 0xfff00000; + + hash_base = (ramsize - 0x00100000 - HASH_SIZE) & hash_mask; memset((void *)hash_base, 0, HASH_SIZE); sdr1 = hash_base | ((HASH_SIZE-1) >> 16); asm volatile("mtsdr1 %0" :: "r" (sdr1) ); Modified: openbios-devel/include/ofmem.h =================================================================== --- openbios-devel/include/ofmem.h 2009-02-27 21:04:01 UTC (rev 460) +++ openbios-devel/include/ofmem.h 2009-02-27 22:13:34 UTC (rev 461) @@ -30,6 +30,8 @@ extern ulong ofmem_translate( ulong virt, int *ret_mode ); #ifdef CONFIG_PPC +#define PAGE_SHIFT 12 + ulong get_ram_size( void ); ulong get_ram_top( void ); ulong get_ram_bottom( void ); @@ -39,9 +41,6 @@ void ofmem_register( phandle_t ph ); #elif defined(CONFIG_SPARC32) #define PAGE_SHIFT 12 -#define PAGE_SIZE (1 << PAGE_SHIFT) -#define PAGE_MASK (~(PAGE_SIZE - 1)) -#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK) /* arch/sparc32/lib.c */ struct mem; @@ -53,4 +52,10 @@ void *map_io(uint64_t pa, int size); #endif +#ifdef PAGE_SHIFT +#define PAGE_SIZE (1 << PAGE_SHIFT) +#define PAGE_MASK (~(PAGE_SIZE - 1)) +#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK) +#endif + #endif /* _H_OFMEM */

1 0

Re: [OpenBIOS] [Qemu-devel] How are we looking for a release?
by Blue Swirl 27 Feb '09

27 Feb '09

On 2/27/09, Anthony Liguori <anthony(a)codemonkey.ws> wrote: > Hi, > > I wanted to see how we look from a release perspective. For x86, I think > things are looking pretty good. There are a couple outstanding patches that > need more review (like the CVE fix) but I think we'll be ready in a few > days. > > How are the other architectures looking? Are there any major bug fixes > people are working on? PPC is now fully converted to OpenBIOS, right? Yes, except for PREP. There are recent patches to make PPC64 work that should be committed in the coming days. That would be a nice addition but not critical. We have also discussed about making also an OpenBIOS (1.0) release, the previous release candidate (1.0RC1) is more than year old. It would be great to release Qemu with 1.0 OpenBIOS. Overall, there should be an update of the OpenBIOS images, otherwise Sparc32 and I think PPC32 are ready. Sparc64 will not be without major miracles in any case. PPC64 case may be interesting.

3 3

r460 - openbios-devel/forth/device
by svn＠openbios.org 27 Feb '09

27 Feb '09

Author: blueswirl Date: 2009-02-27 22:04:01 +0100 (Fri, 27 Feb 2009) New Revision: 460 Modified: openbios-devel/forth/device/fcode.fs Log: Fix fcode-offset sign extension problem (Mark Cave-Ayland) Modified: openbios-devel/forth/device/fcode.fs =================================================================== --- openbios-devel/forth/device/fcode.fs 2009-02-21 17:13:41 UTC (rev 459) +++ openbios-devel/forth/device/fcode.fs 2009-02-27 21:04:01 UTC (rev 460) @@ -80,6 +80,16 @@ fcode-c@ ; +\ fcode-num8-signed ( -- c ) ( F: c -- ) +\ get 8bit signed from FCode stream + +: fcode-num8-signed + fcode-num8 + dup 80 and 0> if + ff invert or + then + ; + \ fcode-num16 \ get 16bit from FCode stream @@ -87,6 +97,16 @@ fcode-num8 fcode-num8 swap bwjoin ; +\ fcode-num16-signed ( -- c ) ( F: c -- ) +\ get 16bit signed from FCode stream + +: fcode-num16-signed + fcode-num16 + dup 8000 and 0> if + ffff invert or + then + ; + \ fcode-num32 \ get 32bit from FCode stream @@ -111,9 +131,9 @@ : fcode-offset ( -- offset ) ?fcode-offset16 if - fcode-num16 + fcode-num16-signed else - fcode-num8 + fcode-num8-signed then ;

1 0

[PATCH] Enable support for PPC64 on qemu target
by Alexander Graf 26 Feb '09

26 Feb '09

This patch enables OpenBIOS to initialize on PPC64, enabling support for -cpu 970fx. It gets up to the boot prompt and works rather good so far, though I haven't been able to run a kernel yet. For more recent PowerPC CPUs the PTE layout has changed, so we need to take that into account and create PTEs according to the new layout and at the new physical positions. Signed-off-by: Alexander Graf <alex(a)csgraf.de>

1 0

Re: [OpenBIOS] [Qemu-devel] building openbios-qemu.elf?
by Hollis Blanchard 26 Feb '09

26 Feb '09

On Tue, 2009-02-24 at 22:27 +0200, Blue Swirl wrote: > > Would this patch fix the problem? Doesn't look like it. After patching and make clean, I see the same warning from strip, and basically the same output: # tail obj-ppc/build.log [...] powerpc-440-linux-gnu-ld --warn-common -N -T ../arch/ppc/qemu/ldscript target/arch/ppc/qemu/start.o target/arch/ppc/timebase.o libqemu.a libbootstrap.a libdrivers.a libmodules.a liblibc.a libfs.a libgcc.a -o openbios-qemu.elf powerpc-440-linux-gnu-nm openbios-qemu.elf | sort > ./openbios-qemu.syms cp openbios-qemu.elf openbios-qemu.elf.nostrip powerpc-440-linux-gnu-strip openbios-qemu.elf BFD: stzD2J6q: warning: allocated section `.bss' not in segment BFD: stzD2J6q: warning: allocated section `.sbss' not in segment # readelf -l obj-ppc/openbios-qemu.elf* File: obj-ppc/openbios-qemu.elf Elf file type is EXEC (Executable file) Entry point 0xfff08000 There are 3 program headers, starting at offset 52 Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align LOAD 0x000094 0xfff00000 0xfff00000 0x100000 0x100000 RWE 0x4 LOAD 0x100094 0xfffffffc 0xfffffffc 0x00004 0x00004 R E 0x1 GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RWE 0x4 Section to Segment mapping: Segment Sections... 00 .text.vectors .text .rodata .data .bss .sbss 01 .romentry 02 File: obj-ppc/openbios-qemu.elf.nostrip Elf file type is EXEC (Executable file) Entry point 0xfff08000 There are 3 program headers, starting at offset 52 Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align LOAD 0x000094 0xfff00000 0xfff00000 0x42044 0x4bcb4 RWE 0x4 LOAD 0x0420d8 0xfffffffc 0xfffffffc 0x00004 0x00004 R E 0x1 GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RWE 0x4 Section to Segment mapping: Segment Sections... 00 .text.vectors .text .rodata .data 01 .romentry 02 -- Hollis Blanchard IBM Linux Technology Center

3 2

building openbios-qemu.elf?
by Hollis Blanchard 24 Feb '09

24 Feb '09

Hi, I just tried to build openbios-qemu.elf, but it is a little too big (1MB + 4 bytes): Elf file type is EXEC (Executable file) Entry point 0xfff08000 There are 3 program headers, starting at offset 52 Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align LOAD 0x000094 0xfff00000 0xfff00000 0x100000 0x100000 RWE 0x4 LOAD 0x100094 0xfffffffc 0xfffffffc 0x00004 0x00004 R E 0x1 GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RWE 0x4 Section to Segment mapping: Segment Sections... 00 .text.vectors .text .rodata .data .sdata .bss .sbss 01 .romentry 02 In contrast, the openbios-ppc binary in qemu looks like this: Elf file type is EXEC (Executable file) Entry point 0xfff08000 There are 2 program headers, starting at offset 52 Program Headers: Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align LOAD 0x000074 0xfff00000 0xfff00000 0x41044 0x4bc44 RWE 0x4 LOAD 0x0410b8 0xfffffffc 0xfffffffc 0x00004 0x00004 R E 0x1 Section to Segment mapping: Segment Sections... 00 .text.vectors .text .rodata .data .sdata .bss .sbss.1 .sbss.2 .sbss.3 .sbss.4 .sbss.5 .sbss.6 .sbss.7 .sbss.8 01 .romentry I'm building with gcc 4.2.3. Any ideas? -- Hollis Blanchard IBM Linux Technology Center

3 3

Re: [OpenBIOS] [Qemu-devel] Re: building openbios-qemu.elf?
by Laurent Vivier 24 Feb '09

24 Feb '09

>On Tue, 2009-02-24 at 00:07 +0100, Laurent Vivier wrote: >> Hi, >> >> Do you use source from SVN head ? > >Yes. > >> Do you have any information in obj-ppc/build.log ? > >This is somewhat interesting: > >powerpc-440-linux-gnu-strip openbios-qemu.elf >BFD: st4PszLi: warning: allocated section `.bss' not in segment >BFD: st4PszLi: warning: allocated section `.sbss' not in segment > >The "nostrip" version of openbios-qemu.elf looks much better: > >Program Headers: > Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align > LOAD 0x000094 0xfff00000 0xfff00000 0x42044 0x4bcb4 RWE 0x4 > LOAD 0x0420d8 0xfffffffc 0xfffffffc 0x00004 0x00004 R E 0x1 > GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RWE 0x4 > > Section to Segment mapping: > Segment Sections... > 00 .text.vectors .text .rodata .data .sdata > 01 .romentry > 02 > >So something goes wrong in the strip process. > What is the version of your binutils ? (I use 2.18.0.20080103) You can also try the native strip of your host if you have installed binutils-multiarch (for a debian system). Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

2 1

r459 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 21 Feb '09

21 Feb '09

Author: blueswirl Date: 2009-02-21 18:13:41 +0100 (Sat, 21 Feb 2009) New Revision: 459 Modified: openbios-devel/arch/ppc/qemu/init.c Log: Postpone serial console use until PCI probe, fixes reset Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-02-21 16:27:51 UTC (rev 458) +++ openbios-devel/arch/ppc/qemu/init.c 2009-02-21 17:13:41 UTC (rev 459) @@ -103,7 +103,7 @@ entry( void ) { uint32_t temp = 0; - char buf[5], qemu_uuid[16]; + char buf[5]; arch = &known_arch[ARCH_HEATHROW]; @@ -121,37 +121,11 @@ isa_io_base = arch->io_base; - uart_init(0x80013000ULL + (CONFIG_SERIAL_PORT ? 0 : 0x20), - CONFIG_SERIAL_SPEED); - - printk("\n"); - printk("=============================================================\n"); - printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); - - if (temp != 1) { printk("Incompatible configuration device version, freezing\n"); for(;;); } - printk("Configuration device id %s", buf); - printk(" version %d machine id %d\n", temp, machine_id); - - temp = fw_cfg_read_i32(FW_CFG_NB_CPUS); - - printk("CPUs: %x\n", temp); - - temp = fw_cfg_read_i32(FW_CFG_RAM_SIZE); - printk("Memory: %dM\n", temp / 1024 / 1024); - - fw_cfg_read(FW_CFG_UUID, qemu_uuid, 16); - - printk("UUID: " UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], qemu_uuid[2], - qemu_uuid[3], qemu_uuid[4], qemu_uuid[5], qemu_uuid[6], - qemu_uuid[7], qemu_uuid[8], qemu_uuid[9], qemu_uuid[10], - qemu_uuid[11], qemu_uuid[12], qemu_uuid[13], qemu_uuid[14], - qemu_uuid[15]); - ofmem_init(); initialize_forth(); /* won't return */ @@ -413,9 +387,43 @@ #endif uint64_t ram_size; const struct cpudef *cpu; - char buf[64]; + char buf[64], qemu_uuid[16]; const char *stdin_path, *stdout_path; + uint32_t temp = 0; + modules_init(); + setup_timers(); +#ifdef CONFIG_DRIVER_PCI + ob_pci_init(); +#endif + + printk("\n"); + printk("=============================================================\n"); + printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); + + fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); + buf[4] = '\0'; + printk("Configuration device id %s", buf); + + temp = fw_cfg_read_i32(FW_CFG_ID); + printk(" version %d machine id %d\n", temp, machine_id); + + temp = fw_cfg_read_i32(FW_CFG_NB_CPUS); + + printk("CPUs: %x\n", temp); + + ram_size = get_ram_size(); + + printk("Memory: %lldM\n", ram_size / 1024 / 1024); + + fw_cfg_read(FW_CFG_UUID, qemu_uuid, 16); + + printk("UUID: " UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], qemu_uuid[2], + qemu_uuid[3], qemu_uuid[4], qemu_uuid[5], qemu_uuid[6], + qemu_uuid[7], qemu_uuid[8], qemu_uuid[9], qemu_uuid[10], + qemu_uuid[11], qemu_uuid[12], qemu_uuid[13], qemu_uuid[14], + qemu_uuid[15]); + /* set device tree root info */ push_str("/"); @@ -505,8 +513,6 @@ /* all memory */ - ram_size = get_ram_size(); - PUSH(ram_size >> 32); fword("encode-int"); PUSH(ram_size & 0xffffffff); @@ -541,11 +547,6 @@ cpu->initfn(cpu); printk("CPU type %s\n", cpu->name); - modules_init(); - setup_timers(); -#ifdef CONFIG_DRIVER_PCI - ob_pci_init(); -#endif snprintf(buf, sizeof(buf), "/cpus/%s", cpu->name); ofmem_register(find_dev(buf)); node_methods_init(buf);

1 0

r458 - openbios-devel/forth/device
by svn＠openbios.org 21 Feb '09

21 Feb '09

Author: blueswirl Date: 2009-02-21 17:27:51 +0100 (Sat, 21 Feb 2009) New Revision: 458 Modified: openbios-devel/forth/device/fcode.fs Log: Fix b?branch (Mark Cave-Ayland) Modified: openbios-devel/forth/device/fcode.fs =================================================================== --- openbios-devel/forth/device/fcode.fs 2009-02-21 11:11:56 UTC (rev 457) +++ openbios-devel/forth/device/fcode.fs 2009-02-21 16:27:51 UTC (rev 458) @@ -416,7 +416,7 @@ \ Conditional branch FCode. Followed by FCode-offset. : b?branch - ['] do?branch , + setup-tmp-comp ['] do?branch , fcode-offset 0< if \ if we jump backwards, we can forsee where it goes resolve-dest else @@ -439,6 +439,7 @@ : b(>resolve) resolve-orig + execute-tmp-comp ; immediate

1 0

r457 - openbios-devel/arch/sparc64
by svn＠openbios.org 21 Feb '09

21 Feb '09

Author: blueswirl Date: 2009-02-21 12:11:56 +0100 (Sat, 21 Feb 2009) New Revision: 457 Modified: openbios-devel/arch/sparc64/entry.S Log: Clear TLBs on reset Modified: openbios-devel/arch/sparc64/entry.S =================================================================== --- openbios-devel/arch/sparc64/entry.S 2009-02-18 13:58:35 UTC (rev 456) +++ openbios-devel/arch/sparc64/entry.S 2009-02-21 11:11:56 UTC (rev 457) @@ -76,6 +76,23 @@ bne bad_conf nop + ! Clear ITLB + mov 6 << 3, %g1 + stxa %g0, [%g1] ASI_IMMU + stxa %g0, [%g1] ASI_DMMU + mov 63 << 3, %g1 +1: stxa %g0, [%g1] ASI_ITLB_DATA_ACCESS + subcc %g1, 1 << 3, %g1 + bne 1b + nop + + ! Clear DTLB + mov 63 << 3, %g1 +1: stxa %g0, [%g1] ASI_DTLB_DATA_ACCESS + subcc %g1, 1 << 3, %g1 + bne 1b + nop + ! Get memory size from configuration device ! NB: little endian format mov FW_CFG_RAM_SIZE, %g2

1 0

r456 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 18 Feb '09

18 Feb '09

Author: laurent Date: 2009-02-18 14:58:35 +0100 (Wed, 18 Feb 2009) New Revision: 456 Modified: openbios-devel/arch/ppc/qemu/main.c Log: Extract "bootargs" from "boot" command line. It is needed to boot Fedora-10 as we must specify the path to the yaboot.conf. To boot Fedora: boot cd: conf=cd:,\ppc\ppc32\yaboot.conf so "bootpath" is "cd:", and "bootargs" is "conf=cd:,\ppc\ppc32\yaboot.conf" Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2009-02-17 22:45:41 UTC (rev 455) +++ openbios-devel/arch/ppc/qemu/main.c 2009-02-18 13:58:35 UTC (rev 456) @@ -182,7 +182,8 @@ ELF_DPRINTF("bootpath %s bootargs %s\n", path, args); set_property( chosen_ph, "bootpath", path, strlen(spec)+1 ); - set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); + if (args) + set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); } /************************************************************************/ @@ -224,7 +225,7 @@ http://playground.sun.com/1275/bindings/chrp/chrp1_7a.ps */ static void -try_bootinfo(const char *path) +try_bootinfo(const char *path, const char *param) { int fd, len, tag, taglen, script, scriptlen, entity; char tagbuf[256], bootscript[256], c; @@ -311,6 +312,8 @@ ELF_DPRINTF("got bootscript %s\n", bootscript); + encode_bootpath(path, param); + feval(bootscript); badf: close_io( fd ); @@ -412,6 +415,12 @@ char *path = pop_fstr_copy(), *param; int i; + param = strchr(path, ' '); + if (param) { + *param = 0; + param++; + } + if (!path) { ELF_DPRINTF("Entering boot, no path\n"); push_str("boot-device"); @@ -435,7 +444,7 @@ param = pop_fstr_copy(); } try_path(path, param); - try_bootinfo(path); + try_bootinfo(path, param); } else { char boot_device = nvram_read(0x34); @@ -448,12 +457,12 @@ path = strdup("cd:0"); break; } - try_bootinfo(path); + try_bootinfo(path, NULL); } } else { ELF_DPRINTF("Entering boot, path %s\n", path); - try_path(path, ""); - try_bootinfo(path); + try_path(path, param); + try_bootinfo(path, param); } for( i=0; i < sizeof(paths) / sizeof(paths[0]); i++ ) { try_path(paths[i], args[i]);

1 0

r455 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 17 Feb '09

17 Feb '09

Author: laurent Date: 2009-02-17 23:45:41 +0100 (Tue, 17 Feb 2009) New Revision: 455 Modified: openbios-devel/arch/ppc/qemu/start.S Log: remove unused function timer_calib_start Modified: openbios-devel/arch/ppc/qemu/start.S =================================================================== --- openbios-devel/arch/ppc/qemu/start.S 2009-02-16 18:38:07 UTC (rev 454) +++ openbios-devel/arch/ppc/qemu/start.S 2009-02-17 22:45:41 UTC (rev 455) @@ -410,16 +410,6 @@ GLOBL(of_rtas_end): - /* used in a hack to the newworld calibration */ -GLOBL(nw_dec_calibration): - .long 0 -GLOBL(timer_calib_start): - lis r3,HA(nw_dec_calibration) - addi r3,r3,LO(nw_dec_calibration) - lwz r3,0(r3) - blr -GLOBL(timer_calib_end): - #define CACHE_LINE_SIZE 32 #define LG_CACHE_LINE_SIZE 5

1 0

r454 - openbios-devel/kernel
by svn＠openbios.org 16 Feb '09

16 Feb '09

Author: blueswirl Date: 2009-02-16 19:38:07 +0100 (Mon, 16 Feb 2009) New Revision: 454 Modified: openbios-devel/kernel/bootstrap.c Log: Fix gcc 4.3 warning Modified: openbios-devel/kernel/bootstrap.c =================================================================== --- openbios-devel/kernel/bootstrap.c 2009-02-15 20:20:55 UTC (rev 453) +++ openbios-devel/kernel/bootstrap.c 2009-02-16 18:38:07 UTC (rev 454) @@ -178,9 +178,6 @@ .length = target_ulong((uint32_t)dicthead), .last = target_ucell((ucell)((unsigned long)last - (unsigned long)dict)), - .reserved[0] = 0, - .reserved[1] = 0, - .reserved[2] = 0, }; /*

1 0

r453 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 15 Feb '09

15 Feb '09

Author: laurent Date: 2009-02-15 21:20:55 +0100 (Sun, 15 Feb 2009) New Revision: 453 Modified: openbios-devel/arch/ppc/qemu/main.c Log: In "<boot-script>", from bootinfo.txt, decode all bootinfo entities: device, partition, directory, filename, full-path. (as defined in "PowerPC Microprocessor CHRP binding r1.8", chapter 3.1.6.1.) Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2009-02-14 09:44:55 UTC (rev 452) +++ openbios-devel/arch/ppc/qemu/main.c 2009-02-15 20:20:55 UTC (rev 453) @@ -14,7 +14,6 @@ * */ - #include "openbios/config.h" #include "openbios/bindings.h" #include "openbios/elfload.h" @@ -135,15 +134,18 @@ } static char * -get_filename( const char * path ) +get_filename( const char * path , char **dirname) { static char buf[1024]; + char *filename; while ( *path && *path != ':' ) path++; - if (!*path) + if (!*path) { + *dirname = NULL; return NULL; + } path++; while ( *path && isdigit(*path) ) @@ -155,7 +157,16 @@ strncpy(buf, path, sizeof(buf)); buf[sizeof(buf) - 1] = 0; - return buf; + filename = strrchr(buf, '\\'); + if (filename) { + *dirname = buf; + (*filename++) = 0; + } else { + *dirname = NULL; + filename = buf; + } + + return filename; } static void @@ -163,9 +174,11 @@ { char path[1024]; phandle_t chosen_ph = find_dev("/chosen"); + char *filename, *directory; - snprintf(path, sizeof(path), "%s:%d,%s", get_device(spec), - get_partition(spec), get_filename(spec)); + filename = get_filename(spec, &directory); + snprintf(path, sizeof(path), "%s:%d,%s\\%s", get_device(spec), + get_partition(spec), directory, filename); ELF_DPRINTF("bootpath %s bootargs %s\n", path, args); set_property( chosen_ph, "bootpath", path, strlen(spec)+1 ); @@ -215,11 +228,12 @@ { int fd, len, tag, taglen, script, scriptlen, entity; char tagbuf[256], bootscript[256], c; - char *device; + char *device, *filename, *directory; int partition; device = get_device(path); partition = get_partition(path); + filename = get_filename(path, &directory); /* read boot script */ @@ -272,6 +286,15 @@ } else if (strcasecmp(tagbuf, "partition") == 0) { sprintf(bootscript + scriptlen, "%d", partition); scriptlen = strlen(bootscript); + } else if (strcasecmp(tagbuf, "directory") == 0) { + strcpy(bootscript + scriptlen, directory); + scriptlen += strlen(directory); + } else if (strcasecmp(tagbuf, "filename") == 0) { + strcpy(bootscript + scriptlen, filename); + scriptlen += strlen(filename); + } else if (strcasecmp(tagbuf, "full-path") == 0) { + strcpy(bootscript + scriptlen, path); + scriptlen += strlen(path); } else { /* unknown, keep it */ bootscript[scriptlen] = '&'; strcpy(bootscript + scriptlen + 1, tagbuf);

1 0

r452 - in openbios-devel: arch/ppc/qemu drivers
by svn＠openbios.org 14 Feb '09

14 Feb '09

Author: blueswirl Date: 2009-02-14 10:44:55 +0100 (Sat, 14 Feb 2009) New Revision: 452 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/qemu.fs openbios-devel/drivers/escc.c Log: Support for Qemu -nographic flag Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-02-12 19:39:47 UTC (rev 451) +++ openbios-devel/arch/ppc/qemu/init.c 2009-02-14 09:44:55 UTC (rev 452) @@ -414,6 +414,7 @@ uint64_t ram_size; const struct cpudef *cpu; char buf[64]; + const char *stdin_path, *stdout_path; /* set device tree root info */ @@ -560,6 +561,50 @@ } #endif + if (fw_cfg_read_i16(FW_CFG_NOGRAPHIC)) { + if (CONFIG_SERIAL_PORT) { + stdin_path = "scca"; + stdout_path = "scca"; + } else { + stdin_path = "sccb"; + stdout_path = "sccb"; + } + } else { + stdin_path = "adb-keyboard"; + stdout_path = "screen"; + } + + push_str("/chosen"); + fword("find-device"); + + push_str(stdin_path); + fword("open-dev"); + fword("encode-int"); + push_str("stdin"); + fword("property"); + + push_str(stdout_path); + fword("open-dev"); + fword("encode-int"); + push_str("stdout"); + fword("property"); + + push_str(stdin_path); + fword("pathres-resolve-aliases"); + push_str("input-device"); + fword("$setenv"); + + push_str(stdout_path); + fword("pathres-resolve-aliases"); + push_str("output-device"); + fword("$setenv"); + + push_str(stdin_path); + fword("input"); + + push_str(stdout_path); + fword("output"); + #if 0 if( getbool("tty-interface?") == 1 ) #endif Modified: openbios-devel/arch/ppc/qemu/qemu.fs =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.fs 2009-02-12 19:39:47 UTC (rev 451) +++ openbios-devel/arch/ppc/qemu/qemu.fs 2009-02-14 09:44:55 UTC (rev 452) @@ -37,26 +37,15 @@ :noname " rtc" " rtc" preopen " memory" " /memory" preopen - \ " stdout" " /packages/terminal-emulator" preopen - " stdout" " screen" preopen - " stdin" " adb-keyboard" preopen - ; SYSTEM-initializer \ use the tty interface if available : activate-tty-interface " /packages/terminal-emulator" find-dev if drop - " adb-keyboard" " input-device" $setenv - " screen" " output-device" $setenv then ; -:noname - " keyboard" input -; CONSOLE-IN-initializer - - \ ------------------------------------------------------------------------- \ pre-booting \ ------------------------------------------------------------------------- Modified: openbios-devel/drivers/escc.c =================================================================== --- openbios-devel/drivers/escc.c 2009-02-12 19:39:47 UTC (rev 451) +++ openbios-devel/drivers/escc.c 2009-02-14 09:44:55 UTC (rev 452) @@ -140,7 +140,7 @@ len = POP(); addr = (char *)POP(); - if (len != 1) + if (len < 1) printk("escc_read: bad len, addr %x len %x\n", (unsigned int)addr, len); if (uart_charav(*address)) { @@ -175,19 +175,17 @@ static void escc_open(unsigned long *address) { +#ifdef CONFIG_DRIVER_ESCC_SUN int len; phandle_t ph; unsigned long *prop; -#ifdef CONFIG_DRIVER_ESCC_SUN char *args; -#endif fword("my-self"); fword("ihandle>phandle"); ph = (phandle_t)POP(); prop = (unsigned long *)get_property(ph, "address", &len); *address = *prop; -#ifdef CONFIG_DRIVER_ESCC_SUN fword("my-args"); args = pop_fstr_copy(); if (args) { @@ -196,6 +194,8 @@ //printk("escc_open: address %lx, args %s\n", *address, args); free(args); } +#else + *address = (unsigned long)serial_dev; // XXX #endif RET ( -1 ); } @@ -295,7 +295,7 @@ len = POP(); addr = (unsigned char *)POP(); - if (len != 1) + if (len < 1) printk("escc_read: bad len, addr %x len %x\n", (unsigned int)addr, len); if (keyboard_dataready()) {

1 0

Re: [OpenBIOS] [coreboot] OpenBIOS SVN r416 breaks coreboot-v3
by Mark Cave-Ayland 14 Feb '09

14 Feb '09

Blue Swirl wrote: > How about this patch instead? Unfortunately no - qemu trunk still panics with "qemu: hardware error: register_ioport_write: invalid opaque". Some extra debugging shows that the IO address causing the problem in qemu is still 0x510 :( ATB, Mark. -- Mark Cave-Ayland Sirius Corporation - The Open Source Experts http://www.siriusit.co.uk T: +44 870 608 0063

1 0

r451 - openbios-devel/arch/sparc32
by svn＠openbios.org 12 Feb '09

12 Feb '09

Author: blueswirl Date: 2009-02-12 20:39:47 +0100 (Thu, 12 Feb 2009) New Revision: 451 Modified: openbios-devel/arch/sparc32/ldscript openbios-devel/arch/sparc32/openbios.c Log: Increase Forth memory for FCode tables Modified: openbios-devel/arch/sparc32/ldscript =================================================================== --- openbios-devel/arch/sparc32/ldscript 2009-02-08 15:45:15 UTC (rev 450) +++ openbios-devel/arch/sparc32/ldscript 2009-02-12 19:39:47 UTC (rev 451) @@ -12,7 +12,8 @@ /* 16KB stack */ STACK_SIZE = 16384; -VMEM_SIZE = (256 + 256 + 16) * 1024; +/* 256k general alloc + 256k Forth dictionary + 128k Forth memory */ +VMEM_SIZE = (256 + 256 + 128) * 1024; IOMEM_SIZE = 256 * 1024 + 768 * 1024; SECTIONS Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2009-02-08 15:45:15 UTC (rev 450) +++ openbios-devel/arch/sparc32/openbios.c 2009-02-12 19:39:47 UTC (rev 451) @@ -20,7 +20,7 @@ #include "boot.h" #include "video_subr.h" -#define MEMORY_SIZE (16*1024) /* 16K ram for hosted system */ +#define MEMORY_SIZE (128*1024) /* 16K ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ static ucell *memory;

1 0

Re: [OpenBIOS] [coreboot] OpenBIOS SVN r416 breaks coreboot-v3
by Mark Cave-Ayland 12 Feb '09

12 Feb '09

Blue Swirl wrote: > Would this patch fix the problem? Yes. Applying this patch to OpenBIOS trunk allows QEMU SVN to run a coreboot-v3/openbios SVN payload correctly without a panic. Many thanks, Mark. -- Mark Cave-Ayland Sirius Corporation - The Open Source Experts http://www.siriusit.co.uk T: +44 870 608 0063

2 4

How does one use the partition access functions
by lsorense＠csclub.uwaterloo.ca 09 Feb '09

09 Feb '09

I see there are functions for accessing partition info in modules/mac-parts.[ch] among others. I do not see any of the code using any of these functions however. I am trying to fix booting on powermac's under qemu so that it actually looks at each partition entry and determines if it is flagged as bootable, and if so looks at the load size and load address specified there and boots that. The idea is to replace the broken quik boot code, with something that actually does what the boot loader says to do, not what the openbios assumes it wants to do. Does anyone have any hint as to how to actually use these nice partition access functions so I can look at each partition table entry until I find the bootable one (if any)? -- Len Sorensen

3 6

r450 - openbios-devel/fs/grubfs
by svn＠openbios.org 08 Feb '09

08 Feb '09

Author: blueswirl Date: 2009-02-08 16:45:15 +0100 (Sun, 08 Feb 2009) New Revision: 450 Modified: openbios-devel/fs/grubfs/fsys_iso9660.c openbios-devel/fs/grubfs/iso9660.h Log: Fix endianess bug in Rock Ridge extensions Modified: openbios-devel/fs/grubfs/fsys_iso9660.c =================================================================== --- openbios-devel/fs/grubfs/fsys_iso9660.c 2009-02-08 12:22:04 UTC (rev 449) +++ openbios-devel/fs/grubfs/fsys_iso9660.c 2009-02-08 15:45:15 UTC (rev 450) @@ -192,16 +192,16 @@ rr_ptr.rr->signature >> 8); #endif } - else if (rr_ptr.rr->signature == RRMAGIC('R', 'R') + else if (CHECK2(&rr_ptr.rr->signature, 'R', 'R') && rr_ptr.rr->len >= 5) rr_flag &= rr_ptr.rr->u.rr.flags.ENDIAN; - else if (rr_ptr.rr->signature == RRMAGIC('N', 'M')) + else if (CHECK2(&rr_ptr.rr->signature, 'N', 'M')) { name = (char *)rr_ptr.rr->u.nm.name; name_len = rr_ptr.rr->len - 5; rr_flag &= ~RR_FLAG_NM; } - else if (rr_ptr.rr->signature == RRMAGIC('P', 'X') + else if (CHECK2(&rr_ptr.rr->signature, 'P', 'X') && rr_ptr.rr->len >= 36) { file_type = ((rr_ptr.rr->u.px.mode.ENDIAN & POSIX_S_IFMT) @@ -212,7 +212,7 @@ ? ISO_DIRECTORY : ISO_OTHER)); rr_flag &= ~RR_FLAG_PX; } - else if (rr_ptr.rr->signature == RRMAGIC('C', 'E') + else if (CHECK2(&rr_ptr.rr->signature, 'C', 'E') && rr_ptr.rr->len >= 28) ce_ptr = rr_ptr.rr; if (!rr_flag) Modified: openbios-devel/fs/grubfs/iso9660.h =================================================================== --- openbios-devel/fs/grubfs/iso9660.h 2009-02-08 12:22:04 UTC (rev 449) +++ openbios-devel/fs/grubfs/iso9660.h 2009-02-08 15:45:15 UTC (rev 450) @@ -157,10 +157,9 @@ int i; } RR_ptr_t; -#define RRMAGIC(c1, c2) ((c1)|(c2) << 8) - -#define CHECK2(ptr, c1, c2) \ - (*(ptr) == (c1) && *(ptr + 1) == (c2)) +#define CHECK2(ptr, c1, c2) \ + (*(unsigned char *)(ptr) == (c1) && \ + *((unsigned char *)(ptr) + 1) == (c2)) #define CHECK4(ptr, c1, c2, c3, c4) \ (*(unsigned char *)(ptr) == (c1) && \ *((unsigned char *)(ptr) + 1) == (c2) && \

1 0

Re: [OpenBIOS] [Qemu-devel] [PATCH, RFC] Mac99 (CHRP?) support
by Aurelien Jarno 08 Feb '09

08 Feb '09

On Sat, Feb 07, 2009 at 11:05:52PM +0200, Blue Swirl wrote: > On 2/7/09, Blue Swirl <blauwirbel(a)gmail.com> wrote: > > On 2/7/09, Aurelien Jarno <aurelien(a)aurel32.net> wrote: > > > On Sat, Feb 07, 2009 at 01:38:58PM +0200, Blue Swirl wrote: > > > > Hi, > > > > > > Hi! > > > > > > > This set of patches adds basic support for Mac99 Qemu machine, > > > > > > > > > As you ask the question in the subject, this machine is a NewWorld > > > machine, and not a CHRP one. I think we don't really want to provide a > > > CHRP emulated machine, so the best is probably to rename ppc_chrp.c into > > > ppc_newworld.c. > > > > > > True. I think RS6000 series were closest to CHRP, not iMac. > > > > The rename does not affect OHW status, so it could be done immediately. > > > > > > > > provided by ppc_chrp.c. I've used the device tree of iMac DV ('99) as > > > > reference: > > > > http://penguinppc.org/historical/dev-trees-html/imac-dv-99.html > > > > > > > > The patches changes the machine to use OpenBIOS instead of OHW and > > > > otherwise breaks OHW assumptions. On OpenBIOS side there are still > > > > some missing bits. > > > > > > > > Comments welcome. > > > > > > > > > Great work. > > > > > > I gave a quick look at the patches, they looks fine. However I still > > > experience some problem with the PowerMac IDE emulation, especially with > > > recent kernels, so until it is fixed (Laurent is working on that) I > > > think we should keep the CMD646 as a default. > > > > > > OK¸ I'll change that part and send new patches. > > This new set of patches perform the rename (to be replaced with SVN > operation). CMD646 is used instead of pmac ide. > > Debian 4.0 R6 cd image boots, installer starts but keyboard does not > work (probably because OpenBIOS doesn't advertise OpenPic). That may be the problem. Alternatively, note that NewWorld machine are not suppose to support ADB bus, so maybe the kernel is disabling that part. We should switch the keyboard and the mouse to USB as on real machines. We already have the code on the QEMU side, so it should be easy. On the OpenBIOS side the code to support an USB keyboard is probably more complicated. > The 6th patch is not wanted, it just switches CMD646 back to pmac, but > it's there if someone wants to play. > > Should these be committed or do we want to wait for more OpenBIOS > updates? At least the OpenBIOS patch, patch #0 and patch #5 are > harmless. For QEMU, I think there is no problem with that. For OpenBIOS, I think as long as the patches don't break the OldWorld platform, they can be applied. -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien(a)aurel32.net http://www.aurel32.net

2 1

r449 - in openbios-devel: arch/ppc/qemu drivers
by svn＠openbios.org 08 Feb '09

08 Feb '09

Author: blueswirl Date: 2009-02-08 13:22:04 +0100 (Sun, 08 Feb 2009) New Revision: 449 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/ldscript openbios-devel/drivers/macio.c openbios-devel/drivers/macio.h openbios-devel/drivers/pci.c openbios-devel/drivers/pci_database.c openbios-devel/drivers/pci_database.h Log: Add basic Mac99 machine support Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-02-05 21:37:26 UTC (rev 448) +++ openbios-devel/arch/ppc/qemu/init.c 2009-02-08 12:22:04 UTC (rev 449) @@ -462,12 +462,12 @@ /* model */ - push_str("PowerMac1,1"); + push_str("PowerMac2,1"); fword("model"); /* compatible */ - push_str("PowerMac1,1"); + push_str("PowerMac2,1"); fword("encode-string"); push_str("MacRISC"); fword("encode-string"); Modified: openbios-devel/arch/ppc/qemu/ldscript =================================================================== --- openbios-devel/arch/ppc/qemu/ldscript 2009-02-05 21:37:26 UTC (rev 448) +++ openbios-devel/arch/ppc/qemu/ldscript 2009-02-08 12:22:04 UTC (rev 449) @@ -7,7 +7,7 @@ /* As NVRAM is at 0xfff04000, the .text needs to be after that */ -TEXT_ADDR = 0xfff06000; +TEXT_ADDR = 0xfff08000; /* Hard reset vector address */ Modified: openbios-devel/drivers/macio.c =================================================================== --- openbios-devel/drivers/macio.c 2009-02-05 21:37:26 UTC (rev 448) +++ openbios-devel/drivers/macio.c 2009-02-08 12:22:04 UTC (rev 449) @@ -19,15 +19,26 @@ #include "cuda.h" #include "escc.h" -#define IO_NVRAM_SIZE 0x00020000 -#define IO_NVRAM_OFFSET 0x00060000 +#define OW_IO_NVRAM_SIZE 0x00020000 +#define OW_IO_NVRAM_OFFSET 0x00060000 +#define OW_IO_NVRAM_SHIFT 4 +#define NW_IO_NVRAM_SIZE 0x00004000 +#define NW_IO_NVRAM_OFFSET 0xfff04000 +#define NW_IO_NVRAM_SHIFT 1 + +#define IO_OPENPIC_SIZE 0x00040000 +#define IO_OPENPIC_OFFSET 0x00040000 + static char *nvram; int arch_nvram_size( void ) { - return IO_NVRAM_SIZE>>4; + if (is_oldworld()) + return OW_IO_NVRAM_SIZE >> OW_IO_NVRAM_SHIFT; + else + return NW_IO_NVRAM_SIZE >> NW_IO_NVRAM_SHIFT; } void macio_nvram_init(const char *path, uint32_t addr) @@ -36,14 +47,28 @@ phandle_t dnode; int props[2]; char buf[64]; + unsigned long nvram_size, nvram_offset; - nvram = (char*)addr + IO_NVRAM_OFFSET; + if (is_oldworld()) { + nvram_offset = OW_IO_NVRAM_OFFSET; + nvram_size = OW_IO_NVRAM_SIZE; + } else { + nvram_offset = NW_IO_NVRAM_OFFSET; + nvram_size = NW_IO_NVRAM_SIZE; + push_str("/"); + fword("find-device"); + fword("new-device"); + push_str("nvram"); + fword("device-name"); + fword("finish-device"); + } + nvram = (char*)addr + nvram_offset; snprintf(buf, sizeof(buf), "%s/nvram", path); nvram_init(buf); dnode = find_dev(buf); set_int_property(dnode, "#bytes", arch_nvram_size() ); - props[0] = __cpu_to_be32(IO_NVRAM_OFFSET); - props[1] = __cpu_to_be32(IO_NVRAM_SIZE); + props[0] = __cpu_to_be32(nvram_offset); + props[1] = __cpu_to_be32(nvram_size); set_property(dnode, "reg", (char *)&props, sizeof(props)); set_property(dnode, "device_type", "nvram", 6); @@ -81,8 +106,15 @@ arch_nvram_put( char *buf ) { int i; + unsigned int it_shift; + + if (is_oldworld()) + it_shift = OW_IO_NVRAM_SHIFT; + else + it_shift = NW_IO_NVRAM_SHIFT; + for (i=0; i< arch_nvram_size() ; i++) - nvram[i<<4]=buf[i]; + nvram[i << it_shift] = buf[i]; #ifdef DUMP_NVRAM printk("new nvram:\n"); dump_nvram(); @@ -93,8 +125,15 @@ arch_nvram_get( char *buf ) { int i; + unsigned int it_shift; + + if (is_oldworld()) + it_shift = OW_IO_NVRAM_SHIFT; + else + it_shift = NW_IO_NVRAM_SHIFT; + for (i=0; i< arch_nvram_size(); i++) - buf[i]=nvram[i<<4]; + buf[i] = nvram[i << it_shift]; #ifdef DUMP_NVRAM printk("current nvram:\n"); @@ -102,8 +141,36 @@ #endif } +static void +openpic_init(const char *path, uint32_t addr) +{ + phandle_t dnode; + int props[2]; + char buf[128]; + + push_str(path); + fword("find-device"); + fword("new-device"); + push_str("interrupt-controller"); + fword("device-name"); + fword("finish-device"); + + snprintf(buf, sizeof(buf), "%s/interrupt-controller", path); + dnode = find_dev(buf); + set_property(dnode, "device_type", "open-pic", 9); + set_property(dnode, "compatible", "chrp,open-pic", 14); + set_property(dnode, "built-in", "", 0); + props[0] = __cpu_to_be32(IO_OPENPIC_OFFSET); + props[1] = __cpu_to_be32(IO_OPENPIC_SIZE); + set_property(dnode, "reg", (char *)&props, sizeof(props)); + set_int_property(dnode, "#interrupt-cells", 2); + set_int_property(dnode, "#address-cells", 0); + set_property(dnode, "interrupt-controller", "", 0); + set_int_property(dnode, "clock-frequency", 4166666); +} + void -ob_macio_init(const char *path, uint32_t addr) +ob_macio_heathrow_init(const char *path, uint32_t addr) { phandle_t aliases; @@ -115,3 +182,19 @@ escc_init(path, addr); macio_ide_init(path, addr, 1); } + +void +ob_macio_keylargo_init(const char *path, uint32_t addr) +{ + phandle_t aliases; + + aliases = find_dev("/aliases"); + set_property(aliases, "mac-io", path, strlen(path) + 1); + + cuda_init(path, addr); + /* The NewWorld NVRAM is not located in the MacIO device */ + macio_nvram_init("", 0); + escc_init(path, addr); + macio_ide_init(path, addr, 3); + openpic_init(path, addr); +} Modified: openbios-devel/drivers/macio.h =================================================================== --- openbios-devel/drivers/macio.h 2009-02-05 21:37:26 UTC (rev 448) +++ openbios-devel/drivers/macio.h 2009-02-08 12:22:04 UTC (rev 449) @@ -1,4 +1,5 @@ extern phandle_t pic_handle; -void ob_macio_init(const char *path, uint32_t addr); +void ob_macio_heathrow_init(const char *path, uint32_t addr); +void ob_macio_keylargo_init(const char *path, uint32_t addr); void macio_nvram_init(const char *path, uint32_t addr); Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-02-05 21:37:26 UTC (rev 448) +++ openbios-devel/drivers/pci.c 2009-02-08 12:22:04 UTC (rev 449) @@ -419,16 +419,26 @@ set_property(dev, "ranges", (char *)props, ncells * sizeof(cell)); } -int macio_config_cb (const pci_config_t *config) +int macio_heathrow_config_cb (const pci_config_t *config) { pci_set_ranges(config); #ifdef CONFIG_DRIVER_MACIO - ob_macio_init(config->path, config->assigned[0] & ~0x0000000F); + ob_macio_heathrow_init(config->path, config->assigned[0] & ~0x0000000F); #endif return 0; } +int macio_keylargo_config_cb (const pci_config_t *config) +{ + pci_set_ranges(config); + +#ifdef CONFIG_DRIVER_MACIO + ob_macio_keylargo_init(config->path, config->assigned[0] & ~0x0000000F); +#endif + return 0; +} + int vga_config_cb (const pci_config_t *config) { if (config->assigned[0] != 0x00000000) Modified: openbios-devel/drivers/pci_database.c =================================================================== --- openbios-devel/drivers/pci_database.c 2009-02-05 21:37:26 UTC (rev 448) +++ openbios-devel/drivers/pci_database.c 2009-02-08 12:22:04 UTC (rev 449) @@ -289,7 +289,7 @@ PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_PCI, NULL, "pci", "AAPL,UniNorth", "uni-north\0", 3, 2, 1, - NULL, NULL + host_config_cb, NULL, }, { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_I_PCI, NULL, @@ -1071,21 +1071,21 @@ PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_343S1201, "mac-io", "mac-io", "AAPL,343S1201", "heathrow\0", 1, 1, 1, - &macio_config_cb, NULL, + &macio_heathrow_config_cb, NULL, }, /* Paddington Mac I/O */ { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_343S1211, "mac-io", "mac-io", "AAPL,343S1211", "paddington\0heathrow\0", 1, 1, 1, - &macio_config_cb, NULL, + &macio_heathrow_config_cb, NULL, }, /* KeyLargo Mac I/O */ { PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_KEYL, "mac-io", "mac-io", "AAPL,Keylargo", "Keylargo\0", 1, 1, 2, - &macio_config_cb, NULL, + &macio_keylargo_config_cb, NULL, }, { 0xFFFF, 0xFFFF, Modified: openbios-devel/drivers/pci_database.h =================================================================== --- openbios-devel/drivers/pci_database.h 2009-02-05 21:37:26 UTC (rev 448) +++ openbios-devel/drivers/pci_database.h 2009-02-08 12:22:04 UTC (rev 449) @@ -27,7 +27,8 @@ extern int ide_config_cb2(const pci_config_t *config); extern int eth_config_cb(const pci_config_t *config); -extern int macio_config_cb(const pci_config_t *config); +extern int macio_heathrow_config_cb(const pci_config_t *config); +extern int macio_keylargo_config_cb(const pci_config_t *config); extern int vga_config_cb(const pci_config_t *config); extern int host_config_cb(const pci_config_t *config); extern int bridge_config_cb(const pci_config_t *config);

1 0

Fixing QUIK boot loader support
by lsorense＠csclub.uwaterloo.ca 08 Feb '09

08 Feb '09

After trying to fix a problem with the quik boot loader (as in you can't actually compile it with a current e2fslib without it breaking), I kept having odd problems. My tests were done using qemu (from git) and hence using openbios-ppc (which is way better than openhackware ever was). I managed to compile with an old library version just to verify that things still worked that way, and they did. Howver as soon as I changed anything about how QUIK structured its data, then it no longer booted. In fact it didn't even appear to try to start the boot loader. Seemed odd, and even though I don't considere myself that experienced at dealing with assembly, I was pretty sure what I was doing was right. But it never worked. So after about 3 days of trying different things and many many reboots of qemu, I finally thought I would look at what openbios uses to determine if the bootloader should be started. Much to my surprise I found a copy of a data structure from quik's source code plastered in openbios, and not only that openbios had various #define values copied from quik as well and was using those to determine where in the first stage boot loader to check for the string "QUIK" to decide if this was in fact the quik boot loader it had located. Gah! Well clearly as soon as I change quik, and move things around, this match no longer happens, and openbios ignores the perfectly valid bootable partition. Wouldn't it make a lot more sense to simply try booting any partition marked bootable? Isn't that what a real oldworld powermac would have done? So my first "quick fix" was to change the structure and constants to match my modified quik boot laoder, and hey what do you know, now it boots and it works with new e2fslib versions and it even supports using more than 11MB of ram for the kernel+initrd combination (I increased it to 64MB from 16MB mapped, except for the ppc 601 which is different and which I have no idea how to test). So a better fix would be to scan for the string QUIK anywhere in the 1KB first stage bootloader area, rather than looking at a specific location. The best fix would of course be to simply boot the partition if it is flagged as bootable and hence support any boot loader that could be there not just QUIK 2.x. Not sure if or how this might conflict with the yaboot support. Any suggistions and/or preferences for how this gets done? I will be fixing it one way or another because the current method simply doesn't work since the current version of quik no longer works if you recompile it on a modern powerpc linux system, and I have fixed that (I just have to figure out where the maintainer is to see how to go about doing a new release, assuming he still cares). -- Len Sorensen

1 0

Re: [OpenBIOS] [Qemu-devel] [PATCH, RFC] Mac99 (CHRP?) support
by Aurelien Jarno 07 Feb '09

07 Feb '09

On Sat, Feb 07, 2009 at 01:38:58PM +0200, Blue Swirl wrote: > Hi, Hi! > This set of patches adds basic support for Mac99 Qemu machine, As you ask the question in the subject, this machine is a NewWorld machine, and not a CHRP one. I think we don't really want to provide a CHRP emulated machine, so the best is probably to rename ppc_chrp.c into ppc_newworld.c. > provided by ppc_chrp.c. I've used the device tree of iMac DV ('99) as > reference: > http://penguinppc.org/historical/dev-trees-html/imac-dv-99.html > > The patches changes the machine to use OpenBIOS instead of OHW and > otherwise breaks OHW assumptions. On OpenBIOS side there are still > some missing bits. > > Comments welcome. Great work. I gave a quick look at the patches, they looks fine. However I still experience some problem with the PowerMac IDE emulation, especially with recent kernels, so until it is fixed (Laurent is working on that) I think we should keep the CMD646 as a default. -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien(a)aurel32.net http://www.aurel32.net

2 1

Re: [OpenBIOS] r448 - openbios-devel/modules
by hy 06 Feb '09

06 Feb '09

Dear laurent: Hi, my name is HY Chen, lived in Taiwan and my job is BIOS programmer. Nice to meet you. Regards, hy.hy.chen(a)msa.hinet.net ----- Original Message ----- From: <svn(a)openbios.org> To: <openbios(a)lists.openbios.org> Sent: Friday, February 06, 2009 5:37 AM Subject: [OpenBIOS] r448 - openbios-devel/modules > Author: laurent > Date: 2009-02-05 22:37:26 +0100 (Thu, 05 Feb 2009) > New Revision: 448 > > Modified: > openbios-devel/modules/disk-label.c > Log: > Set disk-label information when no partition map is used > > Modified: openbios-devel/modules/disk-label.c > =================================================================== > --- openbios-devel/modules/disk-label.c 2009-02-05 21:33:23 UTC (rev 447) > +++ openbios-devel/modules/disk-label.c 2009-02-05 21:37:26 UTC (rev 448) > @@ -52,6 +52,7 @@ > char block0[512]; > phandle_t ph; > int fd, success=0; > + xt_t xt; > > parstr = my_args_copy(); > /* printk("dlabel-open '%s'\n", parstr ); */ > @@ -81,11 +82,23 @@ > > /* try to see if there is a filesystem without partition */ > > - if (atol(parstr) == 0 || atol(parstr) == 1) { > + if (atol(parstr) == 1) { > PUSH_ih( my_self() ); > selfword("find-filesystem"); > ph = POP_ph(); > if( ph ) { > + di->offs_hi = 0; > + di->offs_lo = 0; > + di->size_hi = -1; > + di->size_lo = -1; > + di->part_ih = 0; > + di->type = -1; > + di->block_size = 512; > + xt = find_parent_method("block-size"); > + if (xt) { > + call_parent(xt); > + di->block_size = POP(); > + } > push_str( filename ); > PUSH_ph( ph ); > fword("interpose"); > @@ -104,7 +117,6 @@ > > /* open partition package */ > if( ph ) { > - xt_t xt; > if( !(di->part_ih=open_package(parstr, ph)) ) > goto out; > if( !(xt=find_ih_method("get-info", di->part_ih)) ) > > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you

1 0

r448 - openbios-devel/modules
by svn＠openbios.org 05 Feb '09

05 Feb '09

Author: laurent Date: 2009-02-05 22:37:26 +0100 (Thu, 05 Feb 2009) New Revision: 448 Modified: openbios-devel/modules/disk-label.c Log: Set disk-label information when no partition map is used Modified: openbios-devel/modules/disk-label.c =================================================================== --- openbios-devel/modules/disk-label.c 2009-02-05 21:33:23 UTC (rev 447) +++ openbios-devel/modules/disk-label.c 2009-02-05 21:37:26 UTC (rev 448) @@ -52,6 +52,7 @@ char block0[512]; phandle_t ph; int fd, success=0; + xt_t xt; parstr = my_args_copy(); /* printk("dlabel-open '%s'\n", parstr ); */ @@ -81,11 +82,23 @@ /* try to see if there is a filesystem without partition */ - if (atol(parstr) == 0 || atol(parstr) == 1) { + if (atol(parstr) == 1) { PUSH_ih( my_self() ); selfword("find-filesystem"); ph = POP_ph(); if( ph ) { + di->offs_hi = 0; + di->offs_lo = 0; + di->size_hi = -1; + di->size_lo = -1; + di->part_ih = 0; + di->type = -1; + di->block_size = 512; + xt = find_parent_method("block-size"); + if (xt) { + call_parent(xt); + di->block_size = POP(); + } push_str( filename ); PUSH_ph( ph ); fword("interpose"); @@ -104,7 +117,6 @@ /* open partition package */ if( ph ) { - xt_t xt; if( !(di->part_ih=open_package(parstr, ph)) ) goto out; if( !(xt=find_ih_method("get-info", di->part_ih)) )

1 0

r447 - openbios-devel/modules
by svn＠openbios.org 05 Feb '09

05 Feb '09

Author: laurent Date: 2009-02-05 22:33:23 +0100 (Thu, 05 Feb 2009) New Revision: 447 Modified: openbios-devel/modules/disk-label.c Log: disk-label: retrieve block-size on open Modified: openbios-devel/modules/disk-label.c =================================================================== --- openbios-devel/modules/disk-label.c 2009-02-05 21:21:59 UTC (rev 446) +++ openbios-devel/modules/disk-label.c 2009-02-05 21:33:23 UTC (rev 447) @@ -24,6 +24,7 @@ ucell offs_hi, offs_lo; ucell size_hi, size_lo; + int block_size; int type; /* partition type or -1 */ ihandle_t part_ih; @@ -114,6 +115,12 @@ di->offs_hi = POP(); di->offs_lo = POP(); di->type = POP(); + di->block_size = 512; + xt = find_ih_method("block-size", di->part_ih); + if (xt) { + call_package(xt, di->part_ih); + di->block_size = POP(); + } } /* probe for filesystem */ @@ -218,19 +225,7 @@ static void dlabel_block_size( dlabel_info_t *di ) { - xt_t xt; - - if( !di->part_ih ) - goto no_handler; - - xt = find_ih_method("block-size", di->part_ih); - if ( !xt ) - goto no_handler; - - call_package( xt , di->part_ih ); - return; -no_handler: - PUSH(512); + PUSH(di->block_size); } NODE_METHODS( dlabel ) = {

1 0

r446 - openbios-devel/fs/grubfs
by svn＠openbios.org 05 Feb '09

05 Feb '09

Author: laurent Date: 2009-02-05 22:21:59 +0100 (Thu, 05 Feb 2009) New Revision: 446 Modified: openbios-devel/fs/grubfs/grubfs_fs.c Log: Reset curfs to &dummy_fs on mount (fs_grubfs_open()) Modified: openbios-devel/fs/grubfs/grubfs_fs.c =================================================================== --- openbios-devel/fs/grubfs/grubfs_fs.c 2009-02-05 20:19:50 UTC (rev 445) +++ openbios-devel/fs/grubfs/grubfs_fs.c 2009-02-05 21:21:59 UTC (rev 446) @@ -246,6 +246,8 @@ grubfs_t *gfs; int i; + curfs=&dummy_fs; + curfs->dev_fd = fd; for (i = 0; i < sizeof(fsys_table)/sizeof(fsys_table[0]); i++) {

1 0

r445 - openbios-devel/modules
by svn＠openbios.org 05 Feb '09

05 Feb '09

Author: laurent Date: 2009-02-05 21:19:50 +0100 (Thu, 05 Feb 2009) New Revision: 445 Modified: openbios-devel/modules/mac-parts.c Log: set blocksize when partition number is 0 Modified: openbios-devel/modules/mac-parts.c =================================================================== --- openbios-devel/modules/mac-parts.c 2009-02-05 20:16:28 UTC (rev 444) +++ openbios-devel/modules/mac-parts.c 2009-02-05 20:19:50 UTC (rev 445) @@ -74,6 +74,7 @@ bs = 512; } if (parnum == 0) { + di->blocksize =(uint)bs; di->offs = (llong)0; di->size = (llong)dmap.sbBlkCount * bs; PUSH( -1 );

1 0

r444 - openbios-devel/fs
by svn＠openbios.org 05 Feb '09

05 Feb '09

Author: laurent Date: 2009-02-05 21:16:28 +0100 (Thu, 05 Feb 2009) New Revision: 444 Modified: openbios-devel/fs/ioglue.c Log: ioglue: cleanup traces Modified: openbios-devel/fs/ioglue.c =================================================================== --- openbios-devel/fs/ioglue.c 2009-02-05 00:16:54 UTC (rev 443) +++ openbios-devel/fs/ioglue.c 2009-02-05 20:16:28 UTC (rev 444) @@ -67,7 +67,7 @@ offs = -1; if( seek_io(fd, offs) ) { - printk("os_seek failure\n"); + /* printk("os_seek failure\n"); */ return (ulong)-1; }

1 0

r443 - openbios-devel/modules
by svn＠openbios.org 05 Feb '09

05 Feb '09

Author: laurent Date: 2009-02-05 01:16:54 +0100 (Thu, 05 Feb 2009) New Revision: 443 Modified: openbios-devel/modules/disk-label.c Log: Allows to use disk (like CD-ROM) without partition map but with filesystem on the full disk. We accept partition number 0 (which identifies the full disk) and partition number 1 (we can see the disk as only one partition). This is needed to boot openSUSE install CD which uses "&device;:1,\suseboot\yaboot.ibm" as its boot path. There is a Mac partition map on the CD, but partition 1 is the partition map itself, and thus is not usable by a filesystem. So we can guess, openFirmware must use ISO9660 instead of HFS and thus to not use the Mac partition map, but the whole CD for the partition #1. Disk openSUSE-ppc.iso: 135 MB, 135593984 bytes 4 heads, 32 sectors/track, 2069 cylinders Units = cylinders of 128 * 512 = 65536 bytes Device Boot Start End Blocks Id System openSUSE-ppc.iso1 1 1 48 Apple_partition_map openSUSE-ppc.iso2 1 2066 132160 Apple_HFS Modified: openbios-devel/modules/disk-label.c =================================================================== --- openbios-devel/modules/disk-label.c 2009-02-05 00:05:58 UTC (rev 442) +++ openbios-devel/modules/disk-label.c 2009-02-05 00:16:54 UTC (rev 443) @@ -78,6 +78,21 @@ } } + /* try to see if there is a filesystem without partition */ + + if (atol(parstr) == 0 || atol(parstr) == 1) { + PUSH_ih( my_self() ); + selfword("find-filesystem"); + ph = POP_ph(); + if( ph ) { + push_str( filename ); + PUSH_ph( ph ); + fword("interpose"); + success = 1; + goto out; + } + } + /* find partition handler */ seek_io( fd, 0 ); if( read_io(fd, block0, sizeof(block0)) != sizeof(block0) )

1 0

r442 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 05 Feb '09

05 Feb '09

Author: laurent Date: 2009-02-05 01:05:58 +0100 (Thu, 05 Feb 2009) New Revision: 442 Modified: openbios-devel/arch/ppc/qemu/main.c Log: Extract correctly "&device;" and "&partition;" from bootinfo.txt. To keep compatibility with yaboot (tested with debian install CD), put in bootpath a fully qualified path (<device>:<partition>,<filename>) Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2009-02-04 11:47:13 UTC (rev 441) +++ openbios-devel/arch/ppc/qemu/main.c 2009-02-05 00:05:58 UTC (rev 442) @@ -105,11 +105,70 @@ return lszz_offs; } +static char * +get_device( const char *path ) +{ + int i; + static char buf[1024]; + + for (i = 0; i < sizeof(buf) && path[i] && path[i] != ':'; i++) + buf[i] = path[i]; + buf[i] = 0; + + return buf; +} + +static int +get_partition( const char *path ) +{ + while ( *path && *path != ':' ) + path++; + + if (!*path) + return 0; + path++; + + if (!strchr(path, ',')) /* check if there is a ',' */ + return 0; + + return atol(path); +} + +static char * +get_filename( const char * path ) +{ + static char buf[1024]; + + while ( *path && *path != ':' ) + path++; + + if (!*path) + return NULL; + path++; + + while ( *path && isdigit(*path) ) + path++; + + if (*path == ',') + path++; + + strncpy(buf, path, sizeof(buf)); + buf[sizeof(buf) - 1] = 0; + + return buf; +} + static void encode_bootpath( const char *spec, const char *args ) { + char path[1024]; phandle_t chosen_ph = find_dev("/chosen"); - set_property( chosen_ph, "bootpath", spec, strlen(spec)+1 ); + + snprintf(path, sizeof(path), "%s:%d,%s", get_device(spec), + get_partition(spec), get_filename(spec)); + + ELF_DPRINTF("bootpath %s bootargs %s\n", path, args); + set_property( chosen_ph, "bootpath", path, strlen(spec)+1 ); set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); } @@ -154,11 +213,19 @@ static void try_bootinfo(const char *path) { - int fd; - char tagbuf[256], bootscript[256], c, *left, *right; - int len, tag, taglen, script, scriptlen; + int fd, len, tag, taglen, script, scriptlen, entity; + char tagbuf[256], bootscript[256], c; + char *device; + int partition; - snprintf(bootscript, sizeof(bootscript), "%s,ppc\\bootinfo.txt", path); + device = get_device(path); + partition = get_partition(path); + + /* read boot script */ + + snprintf(bootscript, sizeof(bootscript), "%s:%d,ppc\\bootinfo.txt", + device, partition); + ELF_DPRINTF("Trying %s\n", bootscript); if ((fd = open_io(bootscript)) == -1) { ELF_DPRINTF("Can't open %s\n", bootscript); @@ -173,11 +240,13 @@ taglen = 0; script = 0; scriptlen = 0; + entity = 0; do { len = read_io(fd, &c, 1); if (len < 0) goto badf; if (c == '<') { + script = 0; tag = 1; taglen = 0; } else if (c == '>') { @@ -191,6 +260,27 @@ } } else if (tag && taglen < sizeof(tagbuf)) { tagbuf[taglen++] = c; + } else if (script && c == '&') { + entity = 1; + taglen = 0; + } else if (entity && c ==';') { + entity = 0; + tagbuf[taglen] = '\0'; + if (strcasecmp(tagbuf, "device") == 0) { + strcpy(bootscript + scriptlen, device); + scriptlen += strlen(device); + } else if (strcasecmp(tagbuf, "partition") == 0) { + sprintf(bootscript + scriptlen, "%d", partition); + scriptlen = strlen(bootscript); + } else { /* unknown, keep it */ + bootscript[scriptlen] = '&'; + strcpy(bootscript + scriptlen + 1, tagbuf); + scriptlen += taglen + 1; + bootscript[scriptlen] = ';'; + scriptlen++; + } + } else if (entity && taglen < sizeof(tagbuf)) { + tagbuf[taglen++] = c; } else if (script && scriptlen < sizeof(bootscript)) { bootscript[scriptlen++] = c; } @@ -198,21 +288,6 @@ ELF_DPRINTF("got bootscript %s\n", bootscript); - // Replace &device;: with original path - push_str(bootscript); - PUSH('&'); - fword("left-split"); - fword("2swap"); - PUSH(':'); - fword("left-split"); - fword("2drop"); - right = pop_fstr_copy(); - left = pop_fstr_copy(); - while (right[0] != '\\' && right[0] != '\0') - right++; - snprintf(bootscript, sizeof(bootscript), "%s%s,%s", left, path, right); - ELF_DPRINTF("fixed bootscript %s\n", bootscript); - feval(bootscript); badf: close_io( fd );

1 0

Re: [OpenBIOS] [RFC PATCH] ppc correctly replace &device; and &partition;
by Laurent Vivier 04 Feb '09

04 Feb '09

> >Le 3 févr. 09 à 14:27, Stefan Assmann a écrit : > >> Subject: ppc correctly replace &device; and &partition; >> >> This patch correctly replaces the variables &device; and &partition; >> with firmware values thus allowing to boot from different partitions. >> >> Signed-off-by: Stefan Assmann <sassmann(a)suse.de> >> >> Index: arch/ppc/qemu/main.c >> =================================================================== >> --- arch/ppc/qemu/main.c (revision 439) >> +++ arch/ppc/qemu/main.c (working copy) >> @@ -154,9 +154,9 @@ >> static void >> try_bootinfo(const char *path) >> { >> - int fd; >> - char tagbuf[256], bootscript[256], c, *left, *right; >> - int len, tag, taglen, script, scriptlen; >> + int fd, len, tag, taglen, script, scriptlen; >> + char tagbuf[256], bootscript[256], c; >> + char *buf, *partition; >> >> snprintf(bootscript, sizeof(bootscript), "%s,ppc\\bootinfo.txt", >> path); >> ELF_DPRINTF("Trying %s\n", bootscript); >> @@ -195,22 +195,33 @@ >> bootscript[scriptlen++] = c; >> } >> } while (1); >> - >> ELF_DPRINTF("got bootscript %s\n", bootscript); >> >> - // Replace &device;: with original path >> - push_str(bootscript); >> - PUSH('&'); >> - fword("left-split"); >> - fword("2swap"); >> - PUSH(':'); >> - fword("left-split"); >> - fword("2drop"); >> - right = pop_fstr_copy(); >> - left = pop_fstr_copy(); >> - while (right[0] != '\\' && right[0] != '\0') >> - right++; >> - snprintf(bootscript, sizeof(bootscript), "%s%s,%s", left, path, >> right); >> + /* replace &device; and &partition; */ >> + if ( (buf = strstr(bootscript, (const char *) "&device;")) != >> NULL ) { >> + buf[0] = '\0'; >> + buf += strlen("&device;"); >> + snprintf(bootscript, sizeof(bootscript), "%s%s%s", >> bootscript, path, buf); > >what happens if strlen(path) > strlen("&device;") ? >moreover device is not path, but path is "device:partition" >> >> + } >> + if ( (partition = strchr(path, ':')) != NULL ) { >> + *partition = '\0'; >> + partition++; >> + if ( (buf = strstr(bootscript, (const char *) >> "&partition;")) != NULL ) { >> + *buf = '\0'; >> + buf += strlen("&partition;"); >> + snprintf(bootscript, sizeof(bootscript), "%s%s%s", >> bootscript, partition, buf); > >what happens if strlen(partition) > strlen("&partition;") ? > >> >> + } else { >> + /* FIXME: allow booting of SUSE media with following >> layout (fails without this workaround) >> + * Number Start End Size File system >> Name Flags >> + * 1 512B 1535B 1024B >> Apple , , , , , , , , , , , , type=Apple_partition_map >> + * 2 8192B 4126MB 4126MB >> SU1110.001 , , , , , , , , , , , , type=Apple_HFS >> + */ >> + if ( (buf = strstr(bootscript, (const char *) "1,\ >> \suseboot\\yaboot.ibm")) != NULL ) { > >what it is wrong here is we try to read a file from partition 1 which >is the partition map... >I guess we should write a "modules/iso9660-parts.c" to override this >(as macintosh CD are hybrid: ISO9660 and HFS). Something like that seems to work: Index: openbios-devel/modules/disk-label.c =================================================================== --- openbios-devel.orig/modules/disk-label.c 2009-02-04 12:51:53.000000000 +0100 +++ openbios-devel/modules/disk-label.c 2009-02-04 12:56:51.000000000 +0100 @@ -78,6 +78,19 @@ } } + /* try to see if there is a filesystem without partition */ + + PUSH_ih( my_self() ); + selfword("find-filesystem"); + ph = POP_ph(); + if( ph ) { + push_str( filename ); + PUSH_ph( ph ); + fword("interpose"); + success = 1; + goto out; + } + /* find partition handler */ seek_io( fd, 0 ); if( read_io(fd, block0, sizeof(block0)) != sizeof(block0) ) -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

2 2

[RFC PATCH] ppc correctly replace &device; and &partition; #2
by Stefan Assmann 04 Feb '09

04 Feb '09

Subject: ppc correctly replace &device; and &partition; This patch correctly replaces the variables &device; and &partition; with firmware values thus allowing to boot from different partitions. Signed-off-by: Stefan Assmann <sassmann(a)suse.de> Index: arch/ppc/qemu/main.c =================================================================== --- arch/ppc/qemu/main.c (revision 439) +++ arch/ppc/qemu/main.c (working copy) @@ -154,9 +154,9 @@ static void try_bootinfo(const char *path) { - int fd; - char tagbuf[256], bootscript[256], c, *left, *right; - int len, tag, taglen, script, scriptlen; + int fd, len, tag, taglen, script, scriptlen; + char tagbuf[256], bootscript[256], c; + char *buf, *partition; snprintf(bootscript, sizeof(bootscript), "%s,ppc\\bootinfo.txt", path); ELF_DPRINTF("Trying %s\n", bootscript); @@ -195,22 +195,23 @@ bootscript[scriptlen++] = c; } } while (1); - ELF_DPRINTF("got bootscript %s\n", bootscript); - // Replace &device;: with original path - push_str(bootscript); - PUSH('&'); - fword("left-split"); - fword("2swap"); - PUSH(':'); - fword("left-split"); - fword("2drop"); - right = pop_fstr_copy(); - left = pop_fstr_copy(); - while (right[0] != '\\' && right[0] != '\0') - right++; - snprintf(bootscript, sizeof(bootscript), "%s%s,%s", left, path, right); + /* replace &device; and &partition; */ + if ( (partition = strchr(path, ':')) != NULL ) { + *partition = '\0'; + partition++; + if ( (buf = strstr(bootscript, (const char *) "&device;")) != NULL ) { + *buf = '\0'; + buf += strlen("&device;"); + snprintf(bootscript, sizeof(bootscript), "%s%s%s", bootscript, path, buf); + } + if ( (buf = strstr(bootscript, (const char *) "&partition;")) != NULL ) { + *buf = '\0'; + buf += strlen("&partition;"); + snprintf(bootscript, sizeof(bootscript), "%s%s%s", bootscript, partition, buf); + } + } ELF_DPRINTF("fixed bootscript %s\n", bootscript); feval(bootscript); Stefan -- Stefan Assmann | SUSE LINUX Products GmbH Software Engineer | Maxfeldstr. 5, D-90409 Nuernberg Mail: sassmann(a)suse.de | GF: Markus Rex, HRB 16746 (AG Nuernberg)

1 0

r441 - openbios-devel/drivers
by svn＠openbios.org 04 Feb '09

04 Feb '09

Author: laurent Date: 2009-02-04 12:47:13 +0100 (Wed, 04 Feb 2009) New Revision: 441 Modified: openbios-devel/drivers/ide.c Log: ide.c: cleanup traces Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2009-02-03 20:33:37 UTC (rev 440) +++ openbios-devel/drivers/ide.c 2009-02-04 11:47:13 UTC (rev 441) @@ -24,6 +24,13 @@ #include "hdreg.h" #include "timer.h" +#ifdef CONFIG_DEBUG_IDE +#define IDE_DPRINTF(fmt, args...) \ +do { printk("IDE - %s: " fmt, __func__ , ##args); } while (0) +#else +#define IDE_DPRINTF(fmt, args...) do { } while (0) +#endif + /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_ide, INSTALL_OPEN, sizeof(struct ide_drive*) ); DECLARE_UNNAMED_NODE( ob_ide_ctrl, INSTALL_OPEN, sizeof(int)); @@ -154,7 +161,7 @@ struct ide_channel *chan = drive->channel; if (len & 1) { - printk("%d: command not word aligned\n", drive->nr); + IDE_DPRINTF("%d: command not word aligned\n", drive->nr); return; } @@ -168,7 +175,7 @@ struct ide_channel *chan = drive->channel; if (len & 1) { - printk("%d: command not word aligned\n", drive->nr); + IDE_DPRINTF("%d: command not word aligned\n", drive->nr); return; } @@ -195,14 +202,14 @@ if (!stat) stat = ob_ide_pio_readb(drive, IDEREG_STATUS); - printk("ob_ide_error drive<%d>: %s:\n", drive->nr, msg); - printk(" cmd=%x, stat=%x", chan->ata_cmd.command, stat); + IDE_DPRINTF("ob_ide_error drive<%d>: %s:\n", drive->nr, msg); + IDE_DPRINTF(" cmd=%x, stat=%x", chan->ata_cmd.command, stat); if ((stat & (BUSY_STAT | ERR_STAT)) == ERR_STAT) { err = ob_ide_pio_readb(drive, IDEREG_ERROR); - printk(", err=%x", err); + IDE_DPRINTF(", err=%x", err); } - printk("\n"); + IDE_DPRINTF("\n"); /* * see if sense is valid and dump that @@ -214,19 +221,21 @@ if (cmd->cdb[0] == ATAPI_REQ_SENSE) { old_cdb = cmd->old_cdb; - printk(" atapi opcode=%02x", old_cdb); + IDE_DPRINTF(" atapi opcode=%02x", old_cdb); } else { int i; - printk(" cdb: "); + IDE_DPRINTF(" cdb: "); for (i = 0; i < sizeof(cmd->cdb); i++) - printk("%02x ", cmd->cdb[i]); + IDE_DPRINTF("%02x ", cmd->cdb[i]); } if (cmd->sense_valid) - printk(", sense: %02x/%02x/%02x", cmd->sense.sense_key, cmd->sense.asc, cmd->sense.ascq); + IDE_DPRINTF(", sense: %02x/%02x/%02x", + cmd->sense.sense_key, cmd->sense.asc, + cmd->sense.ascq); else - printk(", no sense"); - printk("\n"); + IDE_DPRINTF(", no sense"); + IDE_DPRINTF("\n"); } } @@ -269,7 +278,7 @@ unsigned char control = IDEHEAD_DEV0; if (ob_ide_wait_stat(drive, 0, BUSY_STAT, NULL)) { - printk("select_drive: timed out\n"); + IDE_DPRINTF("select_drive: timed out\n"); return 1; } @@ -287,7 +296,7 @@ ob_ide_400ns_delay(drive); if (ob_ide_wait_stat(drive, 0, BUSY_STAT, NULL)) { - printk("select_drive: timed out\n"); + IDE_DPRINTF("select_drive: timed out\n"); return 1; } @@ -452,7 +461,7 @@ } while (bytes); if (bytes) - printk("bytes=%d, stat=%x\n", bytes, stat); + IDE_DPRINTF("bytes=%d, stat=%x\n", bytes, stat); return bytes ? 1 : 0; } @@ -472,7 +481,7 @@ return 1; if (cmd->buflen && cmd->data_direction == atapi_ddir_none) - printk("non-zero buflen but no data direction\n"); + IDE_DPRINTF("non-zero buflen but no data direction\n"); memset(acmd, 0, sizeof(*acmd)); acmd->lcyl = cmd->buflen & 0xff; @@ -504,7 +513,8 @@ * we are doing a sense, ERR_STAT == CHECK_CONDITION */ if (cmd->cdb[0] != ATAPI_REQ_SENSE) { - printk("odd, drive didn't want to transfer %x\n", stat); + IDE_DPRINTF("odd, drive didn't want to transfer %x\n", + stat); return 1; } } @@ -573,7 +583,7 @@ (void) ob_ide_wait_stat(drive, 0, BUSY_STAT, &stat); if (bytes) - printk("cdb failed, bytes=%d, stat=%x\n", bytes, stat); + IDE_DPRINTF("cdb failed, bytes=%d, stat=%x\n", bytes, stat); return (stat & ERR_STAT) || bytes; } @@ -664,9 +674,8 @@ struct atapi_command *cmd = &drive->channel->atapi_cmd; struct atapi_capacity cap; -#ifdef CONFIG_DEBUG_IDE - printk("ob_ide_atapi_drive_ready\n"); -#endif + IDE_DPRINTF("ob_ide_atapi_drive_ready\n"); + /* * Test Unit Ready is like a ping */ @@ -674,7 +683,7 @@ cmd->cdb[0] = ATAPI_TUR; if (ob_ide_atapi_packet(drive, cmd)) { - printk("%d: TUR failed\n", drive->nr); + IDE_DPRINTF("%d: TUR failed\n", drive->nr); return 1; } @@ -688,7 +697,7 @@ cmd->cdb[4] = 0x01; if (ob_ide_atapi_packet(drive, cmd)) { - printk("%d: START_STOP unit failed\n", drive->nr); + IDE_DPRINTF("%d: START_STOP unit failed\n", drive->nr); return 1; } @@ -867,10 +876,8 @@ if (block + sectors > drive->sectors) return 1; -#ifdef CONFIG_DEBUG_IDE - printk("ob_ide_read_sectors: block=%lu sectors=%u\n", - (unsigned long) block, sectors); -#endif + IDE_DPRINTF("ob_ide_read_sectors: block=%lu sectors=%u\n", + (unsigned long) block, sectors); if (drive->type == ide_type_ata) return ob_ide_read_ata(drive, block, buf, sectors); @@ -938,7 +945,8 @@ else if (drive->type == ide_type_atapi) cmd->command = WIN_IDENTIFY_PACKET; else { - printk("%s: called with bad device type %d\n", __FUNCTION__, drive->type); + IDE_DPRINTF("%s: called with bad device type %d\n", + __FUNCTION__, drive->type); return 1; } @@ -1167,10 +1175,9 @@ ob_ide_max_transfer(int *idx) { struct ide_drive *drive = *(struct ide_drive **)idx; -#ifdef CONFIG_DEBUG_IDE - printk("max_transfer %x\n", drive->max_sectors * drive->bs); -#endif + IDE_DPRINTF("max_transfer %x\n", drive->max_sectors * drive->bs); + PUSH(drive->max_sectors * drive->bs); } @@ -1182,10 +1189,8 @@ unsigned char *dest = (unsigned char *)POP(); struct ide_drive *drive = *(struct ide_drive **)idx; -#ifdef CONFIG_DEBUG_IDE - printk("ob_ide_read_blocks %lx block=%ld n=%ld\n", (unsigned long)dest, - (unsigned long)blk, (long)n); -#endif + IDE_DPRINTF("ob_ide_read_blocks %lx block=%ld n=%ld\n", + (unsigned long)dest, (unsigned long)blk, (long)n); while (n) { int len = n; @@ -1193,7 +1198,7 @@ len = drive->max_sectors; if (ob_ide_read_sectors(drive, blk, dest, len)) { - printk("ob_ide_read_blocks: error\n"); + IDE_DPRINTF("ob_ide_read_blocks: error\n"); RET(0); } @@ -1209,9 +1214,9 @@ ob_ide_block_size(int *idx) { struct ide_drive *drive = *(struct ide_drive **)idx; -#ifdef CONFIG_DEBUG_IDE - printk("ob_ide_block_size: block size %x\n", drive->bs); -#endif + + IDE_DPRINTF("ob_ide_block_size: block size %x\n", drive->bs); + PUSH(drive->bs); } @@ -1257,9 +1262,7 @@ drive = &chan->drives[unit]; *(struct ide_drive **)idx = drive; -#ifdef CONFIG_DEBUG_IDE - printk("opening channel %d unit %d\n", idx[1], idx[0]); -#endif + IDE_DPRINTF("opening channel %d unit %d\n", idx[1], idx[0]); dump_drive(drive); if (drive->type != ide_type_ata) @@ -1431,11 +1434,9 @@ props[4] = __cpu_to_be32(1); props[5] = __cpu_to_be32(2); set_property(dnode, "reg", (char *)&props, 6*sizeof(cell)); -#ifdef CONFIG_DEBUG_IDE - printk(DEV_NAME": [io ports 0x%x-0x%x,0x%x]\n", - current_channel, chan->io_regs[0], - chan->io_regs[0] + 7, chan->io_regs[8]); -#endif + IDE_DPRINTF(DEV_NAME": [io ports 0x%x-0x%x,0x%x]\n", + current_channel, chan->io_regs[0], + chan->io_regs[0] + 7, chan->io_regs[8]); for (j = 0; j < 2; j++) { struct ide_drive *drive = &chan->drives[j]; @@ -1444,10 +1445,8 @@ if (!drive->present) continue; -#ifdef CONFIG_DEBUG_IDE - printk(" drive%d [ATA%s ", j, - drive->type == ide_type_atapi ? "PI" : ""); -#endif + IDE_DPRINTF(" drive%d [ATA%s ", j, + drive->type == ide_type_atapi ? "PI" : ""); switch (drive->media) { case ide_media_floppy: media = "floppy"; @@ -1462,9 +1461,7 @@ media = "disk"; break; } -#ifdef CONFIG_DEBUG_IDE - printk("%s]: %s\n", media, drive->model); -#endif + IDE_DPRINTF("%s]: %s\n", media, drive->model); snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME "/%s", path, current_channel, media); @@ -1605,10 +1602,8 @@ props[0] = 0; OLDWORLD(set_property(dnode, "AAPL,bus-id", (char*)props, 1 * sizeof(cell))); -#ifdef CONFIG_DEBUG_IDE - printk(DEV_NAME": [io ports 0x%lx]\n", - current_channel, chan->mmio); -#endif + IDE_DPRINTF(DEV_NAME": [io ports 0x%lx]\n", + current_channel, chan->mmio); for (j = 0; j < 2; j++) { struct ide_drive *drive = &chan->drives[j]; @@ -1617,10 +1612,8 @@ if (!drive->present) continue; -#ifdef CONFIG_DEBUG_IDE - printk(" drive%d [ATA%s ", j, - drive->type == ide_type_atapi ? "PI" : ""); -#endif + IDE_DPRINTF(" drive%d [ATA%s ", j, + drive->type == ide_type_atapi ? "PI" : ""); switch (drive->media) { case ide_media_floppy: media = "floppy"; @@ -1635,9 +1628,7 @@ media = "disk"; break; } -#ifdef CONFIG_DEBUG_IDE - printk("%s]: %s\n", media, drive->model); -#endif + IDE_DPRINTF("%s]: %s\n", media, drive->model); snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME "/%s", path, current_channel, media);

1 0

[RFC PATCH] ppc correctly replace &device; and &partition;
by Stefan Assmann 04 Feb '09

04 Feb '09

Subject: ppc correctly replace &device; and &partition; This patch correctly replaces the variables &device; and &partition; with firmware values thus allowing to boot from different partitions. Signed-off-by: Stefan Assmann <sassmann(a)suse.de> Index: arch/ppc/qemu/main.c =================================================================== --- arch/ppc/qemu/main.c (revision 439) +++ arch/ppc/qemu/main.c (working copy) @@ -154,9 +154,9 @@ static void try_bootinfo(const char *path) { - int fd; - char tagbuf[256], bootscript[256], c, *left, *right; - int len, tag, taglen, script, scriptlen; + int fd, len, tag, taglen, script, scriptlen; + char tagbuf[256], bootscript[256], c; + char *buf, *partition; snprintf(bootscript, sizeof(bootscript), "%s,ppc\\bootinfo.txt", path); ELF_DPRINTF("Trying %s\n", bootscript); @@ -195,22 +195,33 @@ bootscript[scriptlen++] = c; } } while (1); - ELF_DPRINTF("got bootscript %s\n", bootscript); - // Replace &device;: with original path - push_str(bootscript); - PUSH('&'); - fword("left-split"); - fword("2swap"); - PUSH(':'); - fword("left-split"); - fword("2drop"); - right = pop_fstr_copy(); - left = pop_fstr_copy(); - while (right[0] != '\\' && right[0] != '\0') - right++; - snprintf(bootscript, sizeof(bootscript), "%s%s,%s", left, path, right); + /* replace &device; and &partition; */ + if ( (buf = strstr(bootscript, (const char *) "&device;")) != NULL ) { + buf[0] = '\0'; + buf += strlen("&device;"); + snprintf(bootscript, sizeof(bootscript), "%s%s%s", bootscript, path, buf); + } + if ( (partition = strchr(path, ':')) != NULL ) { + *partition = '\0'; + partition++; + if ( (buf = strstr(bootscript, (const char *) "&partition;")) != NULL ) { + *buf = '\0'; + buf += strlen("&partition;"); + snprintf(bootscript, sizeof(bootscript), "%s%s%s", bootscript, partition, buf); + } else { + /* FIXME: allow booting of SUSE media with following layout (fails without this workaround) + * Number Start End Size File system Name Flags + * 1 512B 1535B 1024B Apple , , , , , , , , , , , , type=Apple_partition_map + * 2 8192B 4126MB 4126MB SU1110.001 , , , , , , , , , , , , type=Apple_HFS + */ + if ( (buf = strstr(bootscript, (const char *) "1,\\suseboot\\yaboot.ibm")) != NULL ) { + *buf = *partition; + ELF_DPRINTF("SUSE bootscript hack %s\n", bootscript); + } + } + } ELF_DPRINTF("fixed bootscript %s\n", bootscript); feval(bootscript); Stefan -- Stefan Assmann | SUSE LINUX Products GmbH Software Engineer | Maxfeldstr. 5, D-90409 Nuernberg Mail: sassmann(a)suse.de | GF: Markus Rex, HRB 16746 (AG Nuernberg)

2 2

r440 - openbios-devel/modules
by svn＠openbios.org 03 Feb '09

03 Feb '09

Author: laurent Date: 2009-02-03 21:33:37 +0100 (Tue, 03 Feb 2009) New Revision: 440 Modified: openbios-devel/modules/mac-parts.c Log: mac-parts: block-size returns value found in partition map Modified: openbios-devel/modules/mac-parts.c =================================================================== --- openbios-devel/modules/mac-parts.c 2009-02-02 17:40:29 UTC (rev 439) +++ openbios-devel/modules/mac-parts.c 2009-02-03 20:33:37 UTC (rev 440) @@ -29,6 +29,7 @@ typedef struct { ullong offs; ullong size; + uint blocksize; } macparts_info_t; DECLARE_NODE( macparts, INSTALL_OPEN, sizeof(macparts_info_t), "+/packages/mac-parts" ); @@ -90,6 +91,7 @@ if( par.pmSig != 0x504d /* 'PM' */ || !par.pmPartBlkCnt ) RET(0); + di->blocksize =(uint)bs; di->offs = (llong)par.pmPyPartStart * bs; di->size = (llong)par.pmPartBlkCnt * bs; @@ -119,9 +121,10 @@ } static void -macparts_block_size( __attribute__((unused))macparts_info_t *di ) +macparts_block_size( macparts_info_t *di ) { - PUSH(512); + DPRINTF("macparts_block_size = %x\n", di->blocksize); + PUSH(di->blocksize); } static void

1 0

r439 - in openbios-devel: drivers include/openbios
by svn＠openbios.org 02 Feb '09

02 Feb '09

Author: blueswirl Date: 2009-02-02 18:40:29 +0100 (Mon, 02 Feb 2009) New Revision: 439 Modified: openbios-devel/drivers/pci.c openbios-devel/drivers/pci_database.c openbios-devel/include/openbios/pci.h Log: Add #defines for PCI classes and subclasses Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2009-02-02 17:06:37 UTC (rev 438) +++ openbios-devel/drivers/pci.c 2009-02-02 17:40:29 UTC (rev 439) @@ -734,7 +734,9 @@ ob_pci_configure(addr, &config, mem_base, io_base); ob_pci_add_properties(addr, pci_dev, &config); - if (ccode == 0x0600 || ccode == 0x0604) { + if (class == PCI_BASE_CLASS_BRIDGE && + (subclass == PCI_SUBCLASS_BRIDGE_HOST || + subclass == PCI_SUBCLASS_BRIDGE_PCI)) { /* host or bridge */ free(*path); *path = strdup(config.path); Modified: openbios-devel/drivers/pci_database.c =================================================================== --- openbios-devel/drivers/pci_database.c 2009-02-02 17:06:37 UTC (rev 438) +++ openbios-devel/drivers/pci_database.c 2009-02-02 17:40:29 UTC (rev 439) @@ -63,35 +63,43 @@ static const pci_subclass_t mass_subclass[] = { { - 0x00, "SCSI bus controller", NULL, NULL, NULL, + PCI_SUBCLASS_STORAGE_SCSI, "SCSI bus controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x01, "IDE controller", "ide", ide_devices, NULL, + PCI_SUBCLASS_STORAGE_IDE, "IDE controller", + "ide", ide_devices, NULL, NULL, NULL, }, { - 0x02, "Floppy disk controller", NULL, NULL, NULL, + PCI_SUBCLASS_STORAGE_FLOPPY, "Floppy disk controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x03, "IPI bus controller", NULL, NULL, NULL, + PCI_SUBCLASS_STORAGE_IPI, "IPI bus controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x04, "RAID controller", NULL, NULL, NULL, + PCI_SUBCLASS_STORAGE_RAID, "RAID controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x05, "ATA controller", "ata", NULL, NULL, + PCI_SUBCLASS_STORAGE_ATA, "ATA controller", + "ata", NULL, NULL, NULL, NULL, }, { - 0x80, "misc mass-storage controller", NULL, NULL, NULL, + PCI_SUBCLASS_STORAGE_OTHER, "misc mass-storage controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0xFF, NULL, NULL, NULL, NULL, + 0xFF, NULL, + NULL, NULL, NULL, NULL, NULL, }, }; @@ -113,39 +121,48 @@ static const pci_subclass_t net_subclass[] = { { - 0x00, "ethernet controller", NULL, eth_devices, NULL, + PCI_SUBCLASS_NETWORK_ETHERNET, "ethernet controller", + NULL, eth_devices, NULL, eth_config_cb, "ethernet", }, { - 0x01, "token ring controller", NULL, NULL, NULL, + PCI_SUBCLASS_NETWORK_TOKEN_RING, "token ring controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x02, "FDDI controller", NULL, NULL, NULL, + PCI_SUBCLASS_NETWORK_FDDI, "FDDI controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x03, "ATM controller", NULL, NULL, NULL, + PCI_SUBCLASS_NETWORK_ATM, "ATM controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x04, "ISDN controller", NULL, NULL, NULL, + PCI_SUBCLASS_NETWORK_ISDN, "ISDN controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x05, "WordFip controller", NULL, NULL, NULL, + PCI_SUBCLASS_NETWORK_WORDFIP, "WordFip controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x06, "PICMG 2.14 controller", NULL, NULL, NULL, + PCI_SUBCLASS_NETWORK_PICMG214, "PICMG 2.14 controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x80, "misc network controller", NULL, NULL, NULL, + PCI_SUBCLASS_NETWORK_OTHER, "misc network controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0xFF, NULL, NULL, NULL, NULL, + 0xFF, NULL, + NULL, NULL, NULL, NULL, NULL, }, }; @@ -188,61 +205,74 @@ static const pci_subclass_t displ_subclass[] = { { - 0x00, "display controller", NULL, NULL, vga_iface, + PCI_SUBCLASS_DISPLAY_VGA, "display controller", + NULL, NULL, vga_iface, NULL, NULL, }, { - 0x01, "XGA display controller", NULL, NULL, NULL, + PCI_SUBCLASS_DISPLAY_XGA, "XGA display controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x02, "3D display controller", NULL, NULL, NULL, + PCI_SUBCLASS_DISPLAY_3D, "3D display controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x80, "misc display controller", NULL, NULL, NULL, + PCI_SUBCLASS_DISPLAY_OTHER, "misc display controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0xFF, NULL, NULL, NULL, NULL, + 0xFF, NULL, + NULL, NULL, NULL, NULL, NULL, }, }; static const pci_subclass_t media_subclass[] = { { - 0x00, "video device", NULL, NULL, NULL, + PCI_SUBCLASS_MULTIMEDIA_VIDEO, "video device", + NULL, NULL, NULL, NULL, NULL, }, { - 0x01, "audio device", NULL, NULL, NULL, + PCI_SUBCLASS_MULTIMEDIA_AUDIO, "audio device", + NULL, NULL, NULL, NULL, NULL, }, { - 0x02, "computer telephony device", NULL, NULL, NULL, + PCI_SUBCLASS_MULTIMEDIA_PHONE, "computer telephony device", + NULL, NULL, NULL, NULL, NULL, }, { - 0x80, "misc multimedia device", NULL, NULL, NULL, + PCI_SUBCLASS_MULTIMEDIA_OTHER, "misc multimedia device", + NULL, NULL, NULL, NULL, NULL, }, { - 0xFF, NULL, NULL, NULL, NULL, + 0xFF, NULL, + NULL, NULL, NULL, NULL, NULL, }, }; static const pci_subclass_t mem_subclass[] = { { - 0x00, "RAM controller", NULL, NULL, NULL, + PCI_SUBCLASS_MEMORY_RAM, "RAM controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x01, "flash controller", NULL, NULL, NULL, + PCI_SUBCLASS_MEMORY_FLASH, "flash controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0xFF, NULL, NULL, NULL, NULL, + 0xFF, NULL, + NULL, NULL, NULL, NULL, NULL, }, }; @@ -331,55 +361,68 @@ static const pci_subclass_t bridg_subclass[] = { { - 0x00, "PCI host bridge", NULL, hbrg_devices, NULL, + PCI_SUBCLASS_BRIDGE_HOST, "PCI host bridge", + NULL, hbrg_devices, NULL, NULL, NULL, }, { - 0x01, "ISA bridge", NULL, NULL, NULL, + PCI_SUBCLASS_BRIDGE_ISA, "ISA bridge", + NULL, NULL, NULL, NULL, NULL, }, { - 0x02, "EISA bridge", NULL, NULL, NULL, + PCI_SUBCLASS_BRIDGE_EISA, "EISA bridge", + NULL, NULL, NULL, NULL, NULL, }, { - 0x03, "MCA bridge", NULL, NULL, NULL, + PCI_SUBCLASS_BRIDGE_MC, "MCA bridge", + NULL, NULL, NULL, NULL, NULL, }, { - 0x04, "PCI-to-PCI bridge", NULL, PCIbrg_devices, NULL, + PCI_SUBCLASS_BRIDGE_PCI, "PCI-to-PCI bridge", + NULL, PCIbrg_devices, NULL, NULL, NULL, }, { - 0x05, "PCMCIA bridge", NULL, NULL, NULL, + PCI_SUBCLASS_BRIDGE_PCMCIA, "PCMCIA bridge", + NULL, NULL, NULL, NULL, NULL, }, { - 0x06, "NUBUS bridge", NULL, NULL, NULL, + PCI_SUBCLASS_BRIDGE_NUBUS, "NUBUS bridge", + NULL, NULL, NULL, NULL, NULL, }, { - 0x07, "cardbus bridge", NULL, NULL, NULL, + PCI_SUBCLASS_BRIDGE_CARDBUS, "cardbus bridge", + NULL, NULL, NULL, NULL, NULL, }, { - 0x08, "raceway bridge", NULL, NULL, NULL, + PCI_SUBCLASS_BRIDGE_RACEWAY, "raceway bridge", + NULL, NULL, NULL, NULL, NULL, }, { - 0x09, "semi-transparent PCI-to-PCI bridge", NULL, NULL, NULL, + PCI_SUBCLASS_BRIDGE_PCI_SEMITP, "semi-transparent PCI-to-PCI bridge", + NULL, NULL, NULL, NULL, NULL, }, { - 0x0A, "infiniband-to-PCI bridge", NULL, NULL, NULL, + PCI_SUBCLASS_BRIDGE_IB_PCI, "infiniband-to-PCI bridge", + NULL, NULL, NULL, NULL, NULL, }, { - 0x80, "misc PCI bridge", NULL, miscbrg_devices, NULL, + PCI_SUBCLASS_BRIDGE_OTHER, "misc PCI bridge", + NULL, miscbrg_devices, NULL, NULL, NULL, }, { - 0xFF, NULL, NULL, NULL, NULL, + 0xFF, NULL, + NULL, NULL, NULL, NULL, NULL, }, }; @@ -475,35 +518,43 @@ static const pci_subclass_t comm_subclass[] = { { - 0x00, "serial controller", NULL, NULL, serial_iface, + PCI_SUBCLASS_COMMUNICATION_SERIAL, "serial controller", + NULL, NULL, serial_iface, NULL, NULL, }, { - 0x01, "parallel port", NULL, NULL, par_iface, + PCI_SUBCLASS_COMMUNICATION_PARALLEL, "parallel port", + NULL, NULL, par_iface, NULL, NULL, }, { - 0x02, "multiport serial controller", NULL, NULL, NULL, + PCI_SUBCLASS_COMMUNICATION_MULTISERIAL, "multiport serial controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x03, "modem", NULL, NULL, modem_iface, + PCI_SUBCLASS_COMMUNICATION_MODEM, "modem", + NULL, NULL, modem_iface, NULL, NULL, }, { - 0x04, "GPIB controller", NULL, NULL, NULL, + PCI_SUBCLASS_COMMUNICATION_GPIB, "GPIB controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x05, "smart card", NULL, NULL, NULL, + PCI_SUBCLASS_COMMUNICATION_SC, "smart card", + NULL, NULL, NULL, NULL, NULL, }, { - 0x80, "misc communication device", NULL, NULL, NULL, + PCI_SUBCLASS_COMMUNICATION_OTHER, "misc communication device", + NULL, NULL, NULL, NULL, NULL, }, { - 0xFF, NULL, NULL, NULL, NULL, + 0xFF, NULL, + NULL, NULL, NULL, NULL, NULL, }, }; @@ -613,112 +664,137 @@ static const pci_subclass_t sys_subclass[] = { { - 0x00, "PIC", NULL, NULL, pic_iface, + PCI_SUBCLASS_SYSTEM_PIC, "PIC", + NULL, NULL, pic_iface, NULL, NULL, }, { - 0x01, "DMA controller", NULL, NULL, dma_iface, + PCI_SUBCLASS_SYSTEM_DMA, "DMA controller", + NULL, NULL, dma_iface, NULL, NULL, }, { - 0x02, "system timer", NULL, NULL, tmr_iface, + PCI_SUBCLASS_SYSTEM_TIMER, "system timer", + NULL, NULL, tmr_iface, NULL, NULL, }, { - 0x03, "RTC controller", NULL, NULL, rtc_iface, + PCI_SUBCLASS_SYSTEM_RTC, "RTC controller", + NULL, NULL, rtc_iface, NULL, NULL, }, { - 0x04, "PCI hotplug controller", NULL, NULL, NULL, + PCI_SUBCLASS_SYSTEM_PCI_HOTPLUG, "PCI hotplug controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x80, "misc system peripheral", NULL, sys_devices, NULL, + PCI_SUBCLASS_SYSTEM_OTHER, "misc system peripheral", + NULL, sys_devices, NULL, NULL, NULL, }, { - 0xFF, NULL, NULL, NULL, NULL, + 0xFF, NULL, + NULL, NULL, NULL, NULL, NULL, }, }; static const pci_subclass_t inp_subclass[] = { { - 0x00, "keyboard controller", NULL, NULL, NULL, + PCI_SUBCLASS_INPUT_KEYBOARD, "keyboard controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x01, "digitizer", NULL, NULL, NULL, + PCI_SUBCLASS_INPUT_PEN, "digitizer", + NULL, NULL, NULL, NULL, NULL, }, { - 0x02, "mouse controller", NULL, NULL, NULL, + PCI_SUBCLASS_INPUT_MOUSE, "mouse controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x03, "scanner controller", NULL, NULL, NULL, + PCI_SUBCLASS_INPUT_SCANNER, "scanner controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x04, "gameport controller", NULL, NULL, NULL, + PCI_SUBCLASS_INPUT_GAMEPORT, "gameport controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x80, "misc input device", NULL, NULL, NULL, + PCI_SUBCLASS_INPUT_OTHER, "misc input device", + NULL, NULL, NULL, NULL, NULL, }, { - 0xFF, NULL, NULL, NULL, NULL, + 0xFF, NULL, + NULL, NULL, NULL, NULL, NULL, }, }; static const pci_subclass_t dock_subclass[] = { { - 0x00, "generic docking station", NULL, NULL, NULL, + PCI_SUBCLASS_DOCKING_GENERIC, "generic docking station", + NULL, NULL, NULL, NULL, NULL, }, { - 0x80, "misc docking station", NULL, NULL, NULL, + PCI_SUBCLASS_DOCKING_OTHER, "misc docking station", + NULL, NULL, NULL, NULL, NULL, }, { - 0xFF, NULL, NULL, NULL, NULL, + 0xFF, NULL, + NULL, NULL, NULL, NULL, NULL, }, }; static const pci_subclass_t cpu_subclass[] = { { - 0x00, "i386 processor", NULL, NULL, NULL, + PCI_SUBCLASS_PROCESSOR_386, "i386 processor", + NULL, NULL, NULL, NULL, NULL, }, { - 0x01, "i486 processor", NULL, NULL, NULL, + PCI_SUBCLASS_PROCESSOR_486, "i486 processor", + NULL, NULL, NULL, NULL, NULL, }, { - 0x02, "pentium processor", NULL, NULL, NULL, + PCI_SUBCLASS_PROCESSOR_PENTIUM, "pentium processor", + NULL, NULL, NULL, NULL, NULL, }, { - 0x10, "alpha processor", NULL, NULL, NULL, + PCI_SUBCLASS_PROCESSOR_ALPHA, "alpha processor", + NULL, NULL, NULL, NULL, NULL, }, { - 0x20, "PowerPC processor", NULL, NULL, NULL, + PCI_SUBCLASS_PROCESSOR_POWERPC, "PowerPC processor", + NULL, NULL, NULL, NULL, NULL, }, { - 0x30, "MIPS processor", NULL, NULL, NULL, + PCI_SUBCLASS_PROCESSOR_MIPS, "MIPS processor", + NULL, NULL, NULL, NULL, NULL, }, { - 0x40, "co-processor", NULL, NULL, NULL, + PCI_SUBCLASS_PROCESSOR_CO, "co-processor", + NULL, NULL, NULL, NULL, NULL, }, { - 0xFF, NULL, NULL, NULL, NULL, + 0xFF, NULL, + NULL, NULL, NULL, NULL, NULL, }, }; @@ -771,147 +847,181 @@ static const pci_subclass_t ser_subclass[] = { { - 0x00, "Firewire bus controller", "ieee1394", NULL, NULL, + PCI_SUBCLASS_SERIAL_FIREWIRE, "Firewire bus controller", + "ieee1394", NULL, NULL, NULL, NULL, }, { - 0x01, "ACCESS bus controller", NULL, NULL, NULL, + PCI_SUBCLASS_SERIAL_ACCESS, "ACCESS bus controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x02, "SSA controller", NULL, NULL, NULL, + PCI_SUBCLASS_SERIAL_SSA, "SSA controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x03, "USB controller", "usb", NULL, usb_iface, + PCI_SUBCLASS_SERIAL_USB, "USB controller", + "usb", NULL, usb_iface, NULL, NULL, }, { - 0x04, "fibre channel controller", NULL, NULL, NULL, + PCI_SUBCLASS_SERIAL_FIBER, "fibre channel controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x05, "SMBus controller", NULL, NULL, NULL, + PCI_SUBCLASS_SERIAL_SMBUS, "SMBus controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x06, "InfiniBand controller", NULL, NULL, NULL, + PCI_SUBCLASS_SERIAL_IB, "InfiniBand controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x07, "IPMI interface", NULL, NULL, ipmi_iface, + PCI_SUBCLASS_SERIAL_IPMI, "IPMI interface", + NULL, NULL, ipmi_iface, NULL, NULL, }, { - 0x08, "SERCOS controller", NULL, NULL, ipmi_iface, + PCI_SUBCLASS_SERIAL_SERCOS, "SERCOS controller", + NULL, NULL, ipmi_iface, NULL, NULL, }, { - 0x09, "CANbus controller", NULL, NULL, ipmi_iface, + PCI_SUBCLASS_SERIAL_CANBUS, "CANbus controller", + NULL, NULL, ipmi_iface, NULL, NULL, }, { - 0xFF, NULL, NULL, NULL, NULL, + 0xFF, NULL, + NULL, NULL, NULL, NULL, NULL, }, }; static const pci_subclass_t wrl_subclass[] = { { - 0x00, "IRDA controller", NULL, NULL, NULL, + PCI_SUBCLASS_WIRELESS_IRDA, "IRDA controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x01, "consumer IR controller", NULL, NULL, NULL, + PCI_SUBCLASS_WIRELESS_CIR, "consumer IR controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x10, "RF controller", NULL, NULL, NULL, + PCI_SUBCLASS_WIRELESS_RF_CONTROLLER, "RF controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x11, "bluetooth controller", NULL, NULL, NULL, + PCI_SUBCLASS_WIRELESS_BLUETOOTH, "bluetooth controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x12, "broadband controller", NULL, NULL, NULL, + PCI_SUBCLASS_WIRELESS_BROADBAND, "broadband controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x80, "misc wireless controller", NULL, NULL, NULL, + PCI_SUBCLASS_WIRELESS_OTHER, "misc wireless controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0xFF, NULL, NULL, NULL, NULL, + 0xFF, NULL, + NULL, NULL, NULL, NULL, NULL, }, }; static const pci_subclass_t sat_subclass[] = { { - 0x01, "satellite TV controller", NULL, NULL, NULL, + PCI_SUBCLASS_SATELLITE_TV, "satellite TV controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x02, "satellite audio controller", NULL, NULL, NULL, + PCI_SUBCLASS_SATELLITE_AUDIO, "satellite audio controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x03, "satellite voice controller", NULL, NULL, NULL, + PCI_SUBCLASS_SATELLITE_VOICE, "satellite voice controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x04, "satellite data controller", NULL, NULL, NULL, + PCI_SUBCLASS_SATELLITE_DATA, "satellite data controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0xFF, NULL, NULL, NULL, NULL, + 0xFF, NULL, + NULL, NULL, NULL, NULL, NULL, }, }; static const pci_subclass_t crypt_subclass[] = { { - 0x00, "cryptographic network controller", NULL, NULL, NULL, + PCI_SUBCLASS_CRYPT_NETWORK, "cryptographic network controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x10, "cryptographic entertainment controller", NULL, NULL, NULL, + PCI_SUBCLASS_CRYPT_ENTERTAINMENT, + "cryptographic entertainment controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0x80, "misc cryptographic controller", NULL, NULL, NULL, + PCI_SUBCLASS_CRYPT_OTHER, "misc cryptographic controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0xFF, NULL, NULL, NULL, NULL, + 0xFF, NULL, + NULL, NULL, NULL, NULL, NULL, }, }; static const pci_subclass_t spc_subclass[] = { { - 0x00, "DPIO module", NULL, NULL, NULL, + PCI_SUBCLASS_SP_DPIO, "DPIO module", + NULL, NULL, NULL, NULL, NULL, }, { - 0x01, "performances counters", NULL, NULL, NULL, + PCI_SUBCLASS_SP_PERF, "performances counters", + NULL, NULL, NULL, NULL, NULL, }, { - 0x10, "communication synchronisation", NULL, NULL, NULL, + PCI_SUBCLASS_SP_SYNCH, "communication synchronisation", + NULL, NULL, NULL, NULL, NULL, }, { - 0x20, "management card", NULL, NULL, NULL, + PCI_SUBCLASS_SP_MANAGEMENT, "management card", + NULL, NULL, NULL, NULL, NULL, }, { - 0x80, "misc signal processing controller", NULL, NULL, NULL, + PCI_SUBCLASS_SP_OTHER, "misc signal processing controller", + NULL, NULL, NULL, NULL, NULL, }, { - 0xFF, NULL, NULL, NULL, NULL, + 0xFF, NULL, + NULL, NULL, NULL, NULL, NULL, }, }; Modified: openbios-devel/include/openbios/pci.h =================================================================== --- openbios-devel/include/openbios/pci.h 2009-02-02 17:06:37 UTC (rev 438) +++ openbios-devel/include/openbios/pci.h 2009-02-02 17:40:29 UTC (rev 439) @@ -24,6 +24,138 @@ extern const pci_arch_t *arch; +/* Device classes and subclasses */ + +#define PCI_BASE_CLASS_STORAGE 0x01 +#define PCI_SUBCLASS_STORAGE_SCSI 0x00 +#define PCI_SUBCLASS_STORAGE_IDE 0x01 +#define PCI_SUBCLASS_STORAGE_FLOPPY 0x02 +#define PCI_SUBCLASS_STORAGE_IPI 0x03 +#define PCI_SUBCLASS_STORAGE_RAID 0x04 +#define PCI_SUBCLASS_STORAGE_ATA 0x05 +#define PCI_SUBCLASS_STORAGE_SAS 0x07 +#define PCI_SUBCLASS_STORAGE_OTHER 0x80 + +#define PCI_BASE_CLASS_NETWORK 0x02 +#define PCI_SUBCLASS_NETWORK_ETHERNET 0x00 +#define PCI_SUBCLASS_NETWORK_TOKEN_RING 0x01 +#define PCI_SUBCLASS_NETWORK_FDDI 0x02 +#define PCI_SUBCLASS_NETWORK_ATM 0x03 +#define PCI_SUBCLASS_NETWORK_ISDN 0x04 +#define PCI_SUBCLASS_NETWORK_WORDFIP 0x05 +#define PCI_SUBCLASS_NETWORK_PICMG214 0x06 +#define PCI_SUBCLASS_NETWORK_OTHER 0x80 + +#define PCI_BASE_CLASS_DISPLAY 0x03 +#define PCI_SUBCLASS_DISPLAY_VGA 0x00 +#define PCI_SUBCLASS_DISPLAY_XGA 0x01 +#define PCI_SUBCLASS_DISPLAY_3D 0x02 +#define PCI_SUBCLASS_DISPLAY_OTHER 0x80 + +#define PCI_BASE_CLASS_MULTIMEDIA 0x04 +#define PCI_SUBCLASS_MULTIMEDIA_VIDEO 0x00 +#define PCI_SUBCLASS_MULTIMEDIA_AUDIO 0x01 +#define PCI_SUBCLASS_MULTIMEDIA_PHONE 0x02 +#define PCI_SUBCLASS_MULTIMEDIA_OTHER 0x80 + +#define PCI_BASE_CLASS_MEMORY 0x05 +#define PCI_SUBCLASS_MEMORY_RAM 0x00 +#define PCI_SUBCLASS_MEMORY_FLASH 0x01 + +#define PCI_BASE_CLASS_BRIDGE 0x06 +#define PCI_SUBCLASS_BRIDGE_HOST 0x00 +#define PCI_SUBCLASS_BRIDGE_ISA 0x01 +#define PCI_SUBCLASS_BRIDGE_EISA 0x02 +#define PCI_SUBCLASS_BRIDGE_MC 0x03 +#define PCI_SUBCLASS_BRIDGE_PCI 0x04 +#define PCI_SUBCLASS_BRIDGE_PCMCIA 0x05 +#define PCI_SUBCLASS_BRIDGE_NUBUS 0x06 +#define PCI_SUBCLASS_BRIDGE_CARDBUS 0x07 +#define PCI_SUBCLASS_BRIDGE_RACEWAY 0x08 +#define PCI_SUBCLASS_BRIDGE_PCI_SEMITP 0x09 +#define PCI_SUBCLASS_BRIDGE_IB_PCI 0x0a +#define PCI_SUBCLASS_BRIDGE_OTHER 0x80 + +#define PCI_BASE_CLASS_COMMUNICATION 0x07 +#define PCI_SUBCLASS_COMMUNICATION_SERIAL 0x00 +#define PCI_SUBCLASS_COMMUNICATION_PARALLEL 0x01 +#define PCI_SUBCLASS_COMMUNICATION_MULTISERIAL 0x02 +#define PCI_SUBCLASS_COMMUNICATION_MODEM 0x03 +#define PCI_SUBCLASS_COMMUNICATION_GPIB 0x04 +#define PCI_SUBCLASS_COMMUNICATION_SC 0x05 +#define PCI_SUBCLASS_COMMUNICATION_OTHER 0x80 + +#define PCI_BASE_CLASS_SYSTEM 0x08 +#define PCI_SUBCLASS_SYSTEM_PIC 0x00 +#define PCI_SUBCLASS_SYSTEM_DMA 0x01 +#define PCI_SUBCLASS_SYSTEM_TIMER 0x02 +#define PCI_SUBCLASS_SYSTEM_RTC 0x03 +#define PCI_SUBCLASS_SYSTEM_PCI_HOTPLUG 0x04 +#define PCI_SUBCLASS_SYSTEM_OTHER 0x80 + +#define PCI_BASE_CLASS_INPUT 0x09 +#define PCI_SUBCLASS_INPUT_KEYBOARD 0x00 +#define PCI_SUBCLASS_INPUT_PEN 0x01 +#define PCI_SUBCLASS_INPUT_MOUSE 0x02 +#define PCI_SUBCLASS_INPUT_SCANNER 0x03 +#define PCI_SUBCLASS_INPUT_GAMEPORT 0x04 +#define PCI_SUBCLASS_INPUT_OTHER 0x80 + +#define PCI_BASE_CLASS_DOCKING 0x0a +#define PCI_SUBCLASS_DOCKING_GENERIC 0x00 +#define PCI_SUBCLASS_DOCKING_OTHER 0x80 + +#define PCI_BASE_CLASS_PROCESSOR 0x0b +#define PCI_SUBCLASS_PROCESSOR_386 0x00 +#define PCI_SUBCLASS_PROCESSOR_486 0x01 +#define PCI_SUBCLASS_PROCESSOR_PENTIUM 0x02 +#define PCI_SUBCLASS_PROCESSOR_ALPHA 0x10 +#define PCI_SUBCLASS_PROCESSOR_POWERPC 0x20 +#define PCI_SUBCLASS_PROCESSOR_MIPS 0x30 +#define PCI_SUBCLASS_PROCESSOR_CO 0x40 + +#define PCI_BASE_CLASS_SERIAL 0x0c +#define PCI_SUBCLASS_SERIAL_FIREWIRE 0x00 +#define PCI_SUBCLASS_SERIAL_ACCESS 0x01 +#define PCI_SUBCLASS_SERIAL_SSA 0x02 +#define PCI_SUBCLASS_SERIAL_USB 0x03 +#define PCI_SUBCLASS_SERIAL_FIBER 0x04 +#define PCI_SUBCLASS_SERIAL_SMBUS 0x05 +#define PCI_SUBCLASS_SERIAL_IB 0x06 +#define PCI_SUBCLASS_SERIAL_IPMI 0x07 +#define PCI_SUBCLASS_SERIAL_SERCOS 0x08 +#define PCI_SUBCLASS_SERIAL_CANBUS 0x09 + +#define PCI_BASE_CLASS_WIRELESS 0x0d +#define PCI_SUBCLASS_WIRELESS_IRDA 0x00 +#define PCI_SUBCLASS_WIRELESS_CIR 0x01 +#define PCI_SUBCLASS_WIRELESS_RF_CONTROLLER 0x10 +#define PCI_SUBCLASS_WIRELESS_BLUETOOTH 0x11 +#define PCI_SUBCLASS_WIRELESS_BROADBAND 0x12 +#define PCI_SUBCLASS_WIRELESS_OTHER 0x80 + +#define PCI_BASE_CLASS_SATELLITE 0x0f +#define PCI_SUBCLASS_SATELLITE_TV 0x00 +#define PCI_SUBCLASS_SATELLITE_AUDIO 0x01 +#define PCI_SUBCLASS_SATELLITE_VOICE 0x03 +#define PCI_SUBCLASS_SATELLITE_DATA 0x04 + +#define PCI_BASE_CLASS_CRYPT 0x10 +#define PCI_SUBCLASS_CRYPT_NETWORK 0x00 +#define PCI_SUBCLASS_CRYPT_ENTERTAINMENT 0x01 +#define PCI_SUBCLASS_CRYPT_OTHER 0x80 + +#define PCI_BASE_CLASS_SIGNAL_PROCESSING 0x11 +#define PCI_SUBCLASS_SP_DPIO 0x00 +#define PCI_SUBCLASS_SP_PERF 0x01 +#define PCI_SUBCLASS_SP_SYNCH 0x10 +#define PCI_SUBCLASS_SP_MANAGEMENT 0x20 +#define PCI_SUBCLASS_SP_OTHER 0x80 + +#define PCI_CLASS_OTHERS 0xff + +/* Vendors and devices. */ + #define PCI_VENDOR_ID_ATI 0x1002 #define PCI_DEVICE_ID_ATI_RAGE128_PF 0x5046

1 0

r438 - openbios-devel/arch/x86
by svn＠openbios.org 02 Feb '09

02 Feb '09

Author: blueswirl Date: 2009-02-02 18:06:37 +0100 (Mon, 02 Feb 2009) New Revision: 438 Modified: openbios-devel/arch/x86/openbios.c Log: Fix x86 PCI initialization Modified: openbios-devel/arch/x86/openbios.c =================================================================== --- openbios-devel/arch/x86/openbios.c 2009-02-01 11:25:16 UTC (rev 437) +++ openbios-devel/arch/x86/openbios.c 2009-02-02 17:06:37 UTC (rev 438) @@ -13,6 +13,7 @@ #include "openbios/kernel.h" #include "openbios/stack.h" #include "openbios/drivers.h" +#include "openbios/pci.h" #include "sys_info.h" #include "openbios.h" #include "relocate.h" @@ -21,6 +22,15 @@ static unsigned char intdict[256 * 1024]; +#ifdef CONFIG_DRIVER_PCI +static const pci_arch_t default_pci_host = { + .name = "Intel,i440FX", + .vendor_id = PCI_VENDOR_ID_INTEL, + .device_id = PCI_DEVICE_ID_INTEL_82441, + .io_base = 0x1000, +}; +#endif + static void init_memory(void) { /* push start and end of available memory to the stack @@ -41,6 +51,7 @@ modules_init(); #ifdef CONFIG_DRIVER_PCI + arch = &default_pci_host; ob_pci_init(); #endif #ifdef CONFIG_DRIVER_IDE

1 0

Re: [OpenBIOS] Fix boot-script parsing for openSUSE ppc media
by laurent＠vivier.eu 02 Feb '09

02 Feb '09

>> Fix boot-script parsing for openSUSE ppc media > >applied, thanks I've applied it, as it breaks nothing and allows to use Suse, but a better fix should be: - correctly parse the script to replace &device; by the boot device ("cd:", and not "cd:0", which is "&bootdevice;:&partition;") - correctly manage CD partition to be able to use ":1" instead of ":0" (in fact, for the moment, we use mac partition on CD and ":0" to use the entire disk). Regards, Laurent

3 2

r437 - in openbios-devel: arch/ppc/qemu arch/sparc64 drivers include/openbios
by svn＠openbios.org 01 Feb '09

01 Feb '09

Author: blueswirl Date: 2009-02-01 12:25:16 +0100 (Sun, 01 Feb 2009) New Revision: 437 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/sparc64/openbios.c openbios-devel/drivers/pci_database.c openbios-devel/include/openbios/pci.h Log: Add #defines for PCI vendor and device IDs for all devices, taken from Linux and pciids.sourceforge.net. Also fix a confusion between Sabre and Simba device IDs. Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-01-31 16:42:01 UTC (rev 436) +++ openbios-devel/arch/ppc/qemu/init.c 2009-02-01 11:25:16 UTC (rev 437) @@ -75,17 +75,23 @@ } static const pci_arch_t known_arch[] = { - [ARCH_PREP] = { "PREP", 0x1057, 0x4801, 0x80800000, 0x800c0000, + [ARCH_PREP] = { "PREP", PCI_VENDOR_ID_MOTOROLA, + PCI_DEVICE_ID_MOTOROLA_RAVEN, + 0x80800000, 0x800c0000, 0x80000000, 0x00100000, 0xf0000000, 0x10000000, 0x80000000, 0x00010000, 0x00000000, 0x00400000, { 9, 11, 9, 11 } }, - [ARCH_MAC99] = { "MAC99", 0x106b, 0x001F, 0xf2800000, 0xf2c00000, + [ARCH_MAC99] = { "MAC99", PCI_VENDOR_ID_APPLE, + PCI_DEVICE_ID_APPLE_UNI_N_PCI, + 0xf2800000, 0xf2c00000, 0xf2000000, 0x02000000, 0x80000000, 0x10000000, 0xf2000000, 0x00800000, 0x00000000, 0x01000000, { 8, 9, 10, 11 } }, - [ARCH_HEATHROW] = { "HEATHROW", 0x1057, 0x0002, 0xfec00000, 0xfee00000, + [ARCH_HEATHROW] = { "HEATHROW", PCI_VENDOR_ID_MOTOROLA, + PCI_DEVICE_ID_MOTOROLA_MPC106, + 0xfec00000, 0xfee00000, 0x80000000, 0x7f000000, 0x80000000, 0x01000000, 0xfe000000, 0x00800000, 0xfd000000, 0x01000000, { 21, 22, 23, 24 } Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2009-01-31 16:42:01 UTC (rev 436) +++ openbios-devel/arch/sparc64/openbios.c 2009-02-01 11:25:16 UTC (rev 437) @@ -61,8 +61,8 @@ { .pci = { .name = "SUNW,sabre", - .vendor_id = 0x108e, - .device_id = 0x5000, + .vendor_id = PCI_VENDOR_ID_SUN, + .device_id = PCI_DEVICE_ID_SUN_SABRE, .cfg_addr = APB_SPECIAL_BASE + 0x1000000ULL, .cfg_data = APB_MEM_BASE, .cfg_base = 0x80000000ULL, Modified: openbios-devel/drivers/pci_database.c =================================================================== --- openbios-devel/drivers/pci_database.c 2009-01-31 16:42:01 UTC (rev 436) +++ openbios-devel/drivers/pci_database.c 2009-02-01 11:25:16 UTC (rev 437) @@ -1,5 +1,6 @@ #include "openbios/config.h" #include "openbios/bindings.h" +#include "openbios/pci.h" #include "libc/vsprintf.h" #include "pci_database.h" @@ -46,7 +47,7 @@ static const pci_dev_t ide_devices[] = { { - 0x1095, 0x0646, /* CMD646 IDE controller */ + PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_CMD_646, /* CMD646 IDE controller */ "pci-ide", "pci-ata", NULL, "pci1095,646\0pci1095,646\0pciclass,01018f\0", 0, 0, 0, @@ -96,10 +97,11 @@ }; static const pci_dev_t eth_devices[] = { - { 0x10EC, 0x8029, - NULL, "NE2000", "NE2000 PCI", NULL, - 0, 0, 0, - NULL, "ethernet", + { + PCI_VENDOR_ID_REALTEK, PCI_DEVICE_ID_REALTEK_RTL8029, + NULL, "NE2000", "NE2000 PCI", NULL, + 0, 0, 0, + NULL, "ethernet", }, { 0xFFFF, 0xFFFF, @@ -150,13 +152,13 @@ static const pci_dev_t vga_devices[] = { { - 0x1002, 0x5046, + PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_RAGE128_PF, NULL, "ATY", "ATY Rage128", "VGA\0", 0, 0, 0, NULL, NULL, }, { - 0x1234, 0x1111, + PCI_VENDOR_ID_QEMU, PCI_DEVICE_ID_QEMU_VGA, NULL, "QEMU,VGA", "Qemu VGA", "VGA\0", 0, 0, 0, NULL, NULL, @@ -248,38 +250,38 @@ static const pci_dev_t hbrg_devices[] = { { - 0x106B, 0x0020, NULL, + PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_AGP, NULL, "pci", "AAPL,UniNorth", "uni-north\0", 3, 2, 1, NULL, NULL }, { - 0x106B, 0x001F, NULL, + PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_PCI, NULL, "pci", "AAPL,UniNorth", "uni-north\0", 3, 2, 1, NULL, NULL }, { - 0x106B, 0x001E, NULL, + PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_I_PCI, NULL, "pci", "AAPL,UniNorth", "uni-north\0", 3, 2, 1, NULL, NULL }, { - 0x1057, 0x0002, "pci", + PCI_VENDOR_ID_MOTOROLA, PCI_DEVICE_ID_MOTOROLA_MPC106, "pci", "pci", "MOT,MPC106", "grackle\0", 3, 2, 1, host_config_cb, NULL }, { - 0x1057, 0x4801, NULL, + PCI_VENDOR_ID_MOTOROLA, PCI_DEVICE_ID_MOTOROLA_RAVEN, NULL, "pci-bridge", "PREP Host PCI Bridge - Motorola Raven", NULL, 3, 2, 1, NULL, NULL, }, { - 0x108e, 0xa000, NULL, - "pci", "SUNW,simba", "pci108e,a000\0pciclass,0\0", + PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_SABRE, NULL, + "pci", "SUNW,sabre", "pci108e,a000\0pciclass,0\0", 3, 2, 1, host_config_cb, NULL, }, @@ -293,14 +295,14 @@ static const pci_dev_t PCIbrg_devices[] = { { - 0x1011, 0x0026, NULL, + PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21154, NULL, "pci-bridge", "DEV,21154", "DEV,21154\0pci-bridge\0", 3, 2, 1, bridge_config_cb, NULL, }, { - 0x108e, 0x5000, NULL, - "pci", "SUNW,sabre", "pci108e,5000\0pciclass,060400\0", + PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_SIMBA, NULL, + "pci", "SUNW,simba", "pci108e,5000\0pciclass,060400\0", 3, 2, 1, bridge_config_cb, NULL, }, @@ -314,7 +316,7 @@ static const pci_dev_t miscbrg_devices[] = { { - 0x108e, 0x1000, NULL, + PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, NULL, "ebus", "ebus", "pci108e,1000\0pciclass,068000\0", 3, 2, 1, ebus_config_cb, NULL, @@ -589,14 +591,14 @@ static const pci_dev_t sys_devices[] = { /* IBM MPIC controller */ { - 0x1014, 0x0002, + PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OPENPIC, "open-pic", "MPIC", NULL, "chrp,open-pic\0", 0, 0, 2, NULL, NULL, }, /* IBM MPIC2 controller */ { - 0x1014, 0xFFFF, + PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OPENPIC2, "open-pic", "MPIC2", NULL, "chrp,open-pic\0", 0, 0, 2, NULL, NULL, @@ -956,21 +958,21 @@ static const pci_dev_t misc_pci[] = { /* Heathrow Mac I/O */ { - 0x106B, 0x0010, + PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_343S1201, "mac-io", "mac-io", "AAPL,343S1201", "heathrow\0", 1, 1, 1, &macio_config_cb, NULL, }, /* Paddington Mac I/O */ { - 0x106B, 0x0017, + PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_343S1211, "mac-io", "mac-io", "AAPL,343S1211", "paddington\0heathrow\0", 1, 1, 1, &macio_config_cb, NULL, }, /* KeyLargo Mac I/O */ { - 0x106B, 0x0022, + PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_KEYL, "mac-io", "mac-io", "AAPL,Keylargo", "Keylargo\0", 1, 1, 2, &macio_config_cb, NULL, Modified: openbios-devel/include/openbios/pci.h =================================================================== --- openbios-devel/include/openbios/pci.h 2009-01-31 16:42:01 UTC (rev 436) +++ openbios-devel/include/openbios/pci.h 2009-02-01 11:25:16 UTC (rev 437) @@ -24,4 +24,44 @@ extern const pci_arch_t *arch; +#define PCI_VENDOR_ID_ATI 0x1002 +#define PCI_DEVICE_ID_ATI_RAGE128_PF 0x5046 + +#define PCI_VENDOR_ID_DEC 0x1011 +#define PCI_DEVICE_ID_DEC_21154 0x0026 + +#define PCI_VENDOR_ID_IBM 0x1014 +#define PCI_DEVICE_ID_IBM_OPENPIC 0x0002 +#define PCI_DEVICE_ID_IBM_OPENPIC2 0xffff + +#define PCI_VENDOR_ID_MOTOROLA 0x1057 +#define PCI_DEVICE_ID_MOTOROLA_MPC106 0x0002 +#define PCI_DEVICE_ID_MOTOROLA_RAVEN 0x4801 + +#define PCI_VENDOR_ID_APPLE 0x106b +#define PCI_DEVICE_ID_APPLE_343S1201 0x0010 +#define PCI_DEVICE_ID_APPLE_343S1211 0x0017 +#define PCI_DEVICE_ID_APPLE_UNI_N_I_PCI 0x001e +#define PCI_DEVICE_ID_APPLE_UNI_N_PCI 0x001f +#define PCI_DEVICE_ID_APPLE_UNI_N_AGP 0x0020 +#define PCI_DEVICE_ID_APPLE_UNI_N_KEYL 0x0022 + +#define PCI_VENDOR_ID_SUN 0x108e +#define PCI_DEVICE_ID_SUN_EBUS 0x1000 +#define PCI_DEVICE_ID_SUN_SIMBA 0x5000 +#define PCI_DEVICE_ID_SUN_PBM 0x8000 +#define PCI_DEVICE_ID_SUN_SABRE 0xa000 + +#define PCI_VENDOR_ID_CMD 0x1095 +#define PCI_DEVICE_ID_CMD_646 0x0646 + +#define PCI_VENDOR_ID_REALTEK 0x10ec +#define PCI_DEVICE_ID_REALTEK_RTL8029 0x8029 + +#define PCI_VENDOR_ID_QEMU 0x1234 +#define PCI_DEVICE_ID_QEMU_VGA 0x1111 + +#define PCI_VENDOR_ID_INTEL 0x8086 +#define PCI_DEVICE_ID_INTEL_82441 0x1237 + #endif /* _H_PCI */

1 0

r436 - openbios-devel/kernel
by svn＠openbios.org 31 Jan '09

31 Jan '09

Author: blueswirl Date: 2009-01-31 17:42:01 +0100 (Sat, 31 Jan 2009) New Revision: 436 Modified: openbios-devel/kernel/bootstrap.c openbios-devel/kernel/cross.h openbios-devel/kernel/dict.c openbios-devel/kernel/forth.c Log: Fix Sparc64 cross compilation in 32 bit environment, closes #17 Modified: openbios-devel/kernel/bootstrap.c =================================================================== --- openbios-devel/kernel/bootstrap.c 2009-01-31 13:33:07 UTC (rev 435) +++ openbios-devel/kernel/bootstrap.c 2009-01-31 16:42:01 UTC (rev 436) @@ -116,7 +116,7 @@ bit=i&~(-BITS); if(d1[i]==d2[i]) { - reloc_table[pos] &= target_ucell(~((ucell)1UL<<bit)); + reloc_table[pos] &= target_ucell(~((ucell)1ULL << bit)); // This check might bring false positives in data. //if(d1[i] >= pointer2cell(dict_one) && @@ -124,7 +124,7 @@ // printk("\nWARNING: inconsistent relocation (%x:%x)!\n", d1[i], d2[i]); } else { /* This is a pointer, it needs relocation, d2==dict */ - reloc_table[pos] |= target_ucell((ucell)1UL<<bit); + reloc_table[pos] |= target_ucell((ucell)1ULL << bit); d2[i] = target_ucell(target_ucell(d2[i]) - pointer2cell(d2)); } } @@ -175,8 +175,9 @@ .checksum = 0, .compression = 0, .relocation = -1, - .length = target_ulong(dicthead), - .last = target_ucell(((unsigned long)last-(unsigned long)dict)), + .length = target_ulong((uint32_t)dicthead), + .last = target_ucell((ucell)((unsigned long)last + - (unsigned long)dict)), .reserved[0] = 0, .reserved[1] = 0, .reserved[2] = 0, @@ -464,7 +465,7 @@ { FILE *f; char tib[160]; - long num; + cell num; char *test; const ucell SEMIS = (ucell)findword("(semis)"); @@ -627,11 +628,12 @@ u8 flags = read_byte((u8*)cell2pointer(res) - sizeof(cell) - 1); #ifdef CONFIG_DEBUG_INTERPRETER - printk("%s is 0x%p\n", tib, (ucell) res); + printk("%s is 0x%" FMT_CELL_x "\n", tib, (ucell) res); #endif if (!(*state) || (flags & 3)) { #ifdef CONFIG_DEBUG_INTERPRETER - printk("executing %s, %p (flags: %s %s)\n", + printk("executing %s, %" FMT_CELL_d + " (flags: %s %s)\n", tib, res, (flags & 1) ? "immediate" : "", (flags & 2) ? "compile-only" : ""); @@ -649,9 +651,9 @@ /* if not look if it's a number */ if (tib[0] == '-') - num = strtol(tib, &test, read_ucell(base)); + num = strtoll(tib, &test, read_ucell(base)); else - num = strtoul(tib, &test, read_ucell(base)); + num = strtoull(tib, &test, read_ucell(base)); if (*test != 0) { @@ -667,12 +669,12 @@ if (*state == 0) { #ifdef CONFIG_DEBUG_INTERPRETER - printk("pushed %x to stack\n\n", num); + printk("pushed %" FMT_CELL_x " to stack\n\n", num); #endif PUSH(num); } else { #ifdef CONFIG_DEBUG_INTERPRETER - printk("writing lit, %x to dict\n\n", num); + printk("writing lit, %" FMT_CELL_x " to dict\n\n", num); #endif writecell(LIT); /* lit */ writecell(num); Modified: openbios-devel/kernel/cross.h =================================================================== --- openbios-devel/kernel/cross.h 2009-01-31 13:33:07 UTC (rev 435) +++ openbios-devel/kernel/cross.h 2009-01-31 16:42:01 UTC (rev 436) @@ -46,16 +46,13 @@ #define target_ucell(value) ((ucell)target_long(value)) #define target_cell(value) ((cell)target_long(value)) #elif BITS==64 -#ifdef NATIVE_BITWIDTH_LARGER_THAN_HOST_BITWIDTH -#define target_ucell(value) ( ((ucell)target_long((value)&0xffffffff))<<32 ) -#define target_cell(value) ( ((cell)target_long((value)&0xffffffff))<<32 ) +#define target_ucell(value) \ + ((((ucell)target_long((value) & 0xffffffff)) << 32) | \ + ((ucell)target_long((value) >> 32))) +#define target_cell(value) \ + ((((cell)target_long((value) & 0xffffffff)) << 32) | \ + ((cell)target_long((value) >> 32))) #else -#define target_ucell(value) ( ((ucell)target_long((value)&0xffffffff))<<32 | \ - ((ucell)target_long((value)>>32)) ) -#define target_cell(value) ( ((cell)target_long((value)&0xffffffff))<<32 | \ - ((cell)target_long((value)>>32)) ) -#endif -#else #error "Endianness not supported. Please report." #endif Modified: openbios-devel/kernel/dict.c =================================================================== --- openbios-devel/kernel/dict.c 2009-01-31 13:33:07 UTC (rev 435) +++ openbios-devel/kernel/dict.c 2009-01-31 16:42:01 UTC (rev 436) @@ -167,7 +167,7 @@ l=(walk-(ucell *)dict); pos=l/BITS; bit=l&~(-BITS); - if (reloc_table[pos]&target_ucell(1UL<<bit)) { + if (reloc_table[pos] & target_ucell((ucell)1ULL << bit)) { // printk("%lx, pos %x, bit %d\n",*walk, pos, bit); write_ucell(walk, read_ucell(walk)+pointer2cell(dict)); } Modified: openbios-devel/kernel/forth.c =================================================================== --- openbios-devel/kernel/forth.c 2009-01-31 13:33:07 UTC (rev 435) +++ openbios-devel/kernel/forth.c 2009-01-31 16:42:01 UTC (rev 436) @@ -330,8 +330,18 @@ const ucell b = POP(); const ducell a = DPOP(); #ifdef NEED_FAKE_INT128_T - fprintf(stderr, "mudivmode called\n"); - exit(-1); + if (a.hi != 0) { + fprintf(stderr, "mudivmod called (0x%016llx %016llx / 0x%016llx)\n", + a.hi, a.lo, b); + exit(-1); + } else { + ducell c; + + PUSH(a.lo % b); + c.hi = 0; + c.lo = a.lo / b; + DPUSH(c); + } #else PUSH(a % b); DPUSH(a / b); @@ -480,8 +490,16 @@ const dcell d2 = DPOP(); const dcell d1 = DPOP(); #ifdef NEED_FAKE_INT128_T - fprintf(stderr, "dplus called\n"); - exit(-1); + ducell c; + + if (d1.hi != 0 || d2.hi != 0) { + fprintf(stderr, "dplus called (0x%016llx %016llx + 0x%016llx %016llx)\n", + d1.hi, d1.lo, d2.hi, d2.lo); + exit(-1); + } + c.hi = 0; + c.lo = d1.lo + d2.lo; + DPUSH(c); #else DPUSH(d1 + d2); #endif @@ -497,8 +515,16 @@ const dcell d2 = DPOP(); const dcell d1 = DPOP(); #ifdef NEED_FAKE_INT128_T - fprintf(stderr, "dminus called\n"); - exit(-1); + ducell c; + + if (d1.hi != 0 || d2.hi != 0) { + fprintf(stderr, "dminus called (0x%016llx %016llx + 0x%016llx %016llx)\n", + d1.hi, d1.lo, d2.hi, d2.lo); + exit(-1); + } + c.hi = 0; + c.lo = d1.lo - d2.lo; + DPUSH(c); #else DPUSH(d1 - d2); #endif @@ -514,8 +540,15 @@ const cell u2 = POP(); const cell u1 = POP(); #ifdef NEED_FAKE_INT128_T - fprintf(stderr, "mmult called\n"); - exit(-1); + ducell c; + + if (0) { // XXX How to detect overflow? + fprintf(stderr, "mmult called (%016llx * 0x%016llx)\n", u1, u2); + exit(-1); + } + c.hi = 0; + c.lo = u1 * u2; + DPUSH(c); #else DPUSH((dcell) u1 * u2); #endif @@ -531,8 +564,15 @@ const ucell u2 = POP(); const ucell u1 = POP(); #ifdef NEED_FAKE_INT128_T - fprintf(stderr, "ummult called\n"); - exit(-1); + ducell c; + + if (0) { // XXX How to detect overflow? + fprintf(stderr, "ummult called (%016llx * 0x%016llx)\n", u1, u2); + exit(-1); + } + c.hi = 0; + c.lo = u1 * u2; + DPUSH(c); #else DPUSH((ducell) u1 * u2); #endif

1 0

r435 - openbios-devel/kernel
by svn＠openbios.org 31 Jan '09

31 Jan '09

Author: blueswirl Date: 2009-01-31 14:33:07 +0100 (Sat, 31 Jan 2009) New Revision: 435 Modified: openbios-devel/kernel/bootstrap.c Log: Exit with nonzero status if there are errors Modified: openbios-devel/kernel/bootstrap.c =================================================================== --- openbios-devel/kernel/bootstrap.c 2009-01-31 13:31:29 UTC (rev 434) +++ openbios-devel/kernel/bootstrap.c 2009-01-31 13:33:07 UTC (rev 435) @@ -1108,5 +1108,9 @@ } free(ressources); - return 0; + + if (errors) + return 1; + else + return 0; }

1 0

r434 - openbios-devel/config/examples
by svn＠openbios.org 31 Jan '09

31 Jan '09

Author: blueswirl Date: 2009-01-31 14:31:29 +0100 (Sat, 31 Jan 2009) New Revision: 434 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 Log: Really allow overriding HOSTARCH Modified: openbios-devel/config/examples/amd64_rules.xml =================================================================== --- openbios-devel/config/examples/amd64_rules.xml 2009-01-31 09:07:29 UTC (rev 433) +++ openbios-devel/config/examples/amd64_rules.xml 2009-01-31 13:31:29 UTC (rev 434) @@ -10,7 +10,7 @@ ODIR := . SRCDIR := .. HOSTCC := gcc -HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations Modified: openbios-devel/config/examples/cross-ppc_rules.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_rules.xml 2009-01-31 09:07:29 UTC (rev 433) +++ openbios-devel/config/examples/cross-ppc_rules.xml 2009-01-31 13:31:29 UTC (rev 434) @@ -10,7 +10,7 @@ ODIR := . SRCDIR := .. HOSTCC := gcc -HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations Modified: openbios-devel/config/examples/cross-sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_rules.xml 2009-01-31 09:07:29 UTC (rev 433) +++ openbios-devel/config/examples/cross-sparc32_rules.xml 2009-01-31 13:31:29 UTC (rev 434) @@ -10,7 +10,7 @@ ODIR := . SRCDIR := .. HOSTCC := gcc -HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations Modified: openbios-devel/config/examples/cross-sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_rules.xml 2009-01-31 09:07:29 UTC (rev 433) +++ openbios-devel/config/examples/cross-sparc64_rules.xml 2009-01-31 13:31:29 UTC (rev 434) @@ -10,7 +10,7 @@ ODIR := . SRCDIR := .. HOSTCC := gcc -HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations Modified: openbios-devel/config/examples/cross-x86_rules.xml =================================================================== --- openbios-devel/config/examples/cross-x86_rules.xml 2009-01-31 09:07:29 UTC (rev 433) +++ openbios-devel/config/examples/cross-x86_rules.xml 2009-01-31 13:31:29 UTC (rev 434) @@ -10,7 +10,7 @@ ODIR := . SRCDIR := .. HOSTCC := gcc -HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations Modified: openbios-devel/config/examples/ppc_rules.xml =================================================================== --- openbios-devel/config/examples/ppc_rules.xml 2009-01-31 09:07:29 UTC (rev 433) +++ openbios-devel/config/examples/ppc_rules.xml 2009-01-31 13:31:29 UTC (rev 434) @@ -10,7 +10,7 @@ ODIR := . SRCDIR := .. HOSTCC := gcc -HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations Modified: openbios-devel/config/examples/sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/sparc32_rules.xml 2009-01-31 09:07:29 UTC (rev 433) +++ openbios-devel/config/examples/sparc32_rules.xml 2009-01-31 13:31:29 UTC (rev 434) @@ -10,7 +10,7 @@ ODIR := . SRCDIR := .. HOSTCC := gcc -HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations Modified: openbios-devel/config/examples/sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/sparc64_rules.xml 2009-01-31 09:07:29 UTC (rev 433) +++ openbios-devel/config/examples/sparc64_rules.xml 2009-01-31 13:31:29 UTC (rev 434) @@ -10,7 +10,7 @@ ODIR := . SRCDIR := .. HOSTCC := gcc -HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany Modified: openbios-devel/config/examples/x86_rules.xml =================================================================== --- openbios-devel/config/examples/x86_rules.xml 2009-01-31 09:07:29 UTC (rev 433) +++ openbios-devel/config/examples/x86_rules.xml 2009-01-31 13:31:29 UTC (rev 434) @@ -10,7 +10,7 @@ ODIR := . SRCDIR := .. HOSTCC := gcc -HOSTARCH=$(shell $(SRCDIR)/config/scripts/archname) +HOSTARCH?=$(shell $(SRCDIR)/config/scripts/archname) CROSSCFLAGS=$(shell $(SRCDIR)/config/scripts/crosscflags $(HOSTARCH) $(ARCH)) HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations

1 0

r433 - openbios-devel/config/scripts
by svn＠openbios.org 31 Jan '09

31 Jan '09

Author: blueswirl Date: 2009-01-31 10:07:29 +0100 (Sat, 31 Jan 2009) New Revision: 433 Modified: openbios-devel/config/scripts/switch-arch Log: Allow overriding HOSTARCH Modified: openbios-devel/config/scripts/switch-arch =================================================================== --- openbios-devel/config/scripts/switch-arch 2009-01-31 08:49:16 UTC (rev 432) +++ openbios-devel/config/scripts/switch-arch 2009-01-31 09:07:29 UTC (rev 433) @@ -15,7 +15,9 @@ chmod 755 config/scripts/archname chmod 755 config/scripts/reldir chmod 755 config/scripts/crosscflags -HOSTARCH=`config/scripts/archname` +if test "x$HOSTARCH" = "x"; then + HOSTARCH=`config/scripts/archname` +fi echo "Configuring OpenBIOS on $HOSTARCH for $*" for RULES_ARCH in $*; do

1 0

r432 - in openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 config/examples drivers include/openbios
by svn＠openbios.org 31 Jan '09

31 Jan '09

Author: blueswirl Date: 2009-01-31 09:49:16 +0100 (Sat, 31 Jan 2009) New Revision: 432 Added: openbios-devel/drivers/fw_cfg.c Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/sparc32/entry.S openbios-devel/arch/sparc64/entry.S openbios-devel/arch/sparc64/openbios.c openbios-devel/config/examples/cross-ppc_config.xml openbios-devel/config/examples/cross-sparc32_config.xml openbios-devel/config/examples/cross-sparc64_config.xml openbios-devel/config/examples/ppc_config.xml openbios-devel/config/examples/sparc32_config.xml openbios-devel/config/examples/sparc64_config.xml openbios-devel/drivers/build.xml openbios-devel/drivers/obio.c openbios-devel/include/openbios/fw_cfg.h Log: Refactor QEMU firmware confguration device handling (based on patch by Aurelien Jarno) Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-01-30 07:44:48 UTC (rev 431) +++ openbios-devel/arch/ppc/qemu/init.c 2009-01-31 08:49:16 UTC (rev 432) @@ -33,8 +33,6 @@ #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" -#define CFG_ADDR 0xf0000510 - #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" struct cpudef { @@ -95,39 +93,6 @@ }; uint32_t isa_io_base; -static volatile uint16_t *fw_cfg_cmd = (void *)CFG_ADDR; -static volatile uint8_t *fw_cfg_data = (void *)(CFG_ADDR + 2); - -static void -fw_cfg_read(uint16_t cmd, char *buf, unsigned int nbytes) -{ - unsigned int i; - - *fw_cfg_cmd = cmd; - for (i = 0; i < nbytes; i++) - buf[i] = *fw_cfg_data; -} - -static uint32_t -fw_cfg_read_i32(uint16_t cmd) -{ - char buf[sizeof(uint32_t)]; - - fw_cfg_read(cmd, buf, sizeof(uint32_t)); - - return __le32_to_cpu(*(uint32_t *)buf); -} - -static uint16_t -fw_cfg_read_i16(uint16_t cmd) -{ - char buf[sizeof(uint16_t)]; - - fw_cfg_read(cmd, buf, sizeof(uint16_t)); - - return __le16_to_cpu(*(uint16_t *)buf); -} - void entry( void ) { @@ -136,6 +101,8 @@ arch = &known_arch[ARCH_HEATHROW]; + fw_cfg_init(); + fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); buf[4] = '\0'; if (strncmp(buf, "QEMU", 4) == 0) { Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2009-01-30 07:44:48 UTC (rev 431) +++ openbios-devel/arch/sparc32/entry.S 2009-01-31 08:49:16 UTC (rev 432) @@ -11,6 +11,7 @@ #include "asm/asi.h" #include "asm/crs.h" #define NO_QEMU_PROTOS +#define NO_OPENBIOS_PROTOS #include "openbios/fw_cfg.h" #define CFG_ADDR 0x00000510 Modified: openbios-devel/arch/sparc64/entry.S =================================================================== --- openbios-devel/arch/sparc64/entry.S 2009-01-30 07:44:48 UTC (rev 431) +++ openbios-devel/arch/sparc64/entry.S 2009-01-31 08:49:16 UTC (rev 432) @@ -12,6 +12,7 @@ #include "pstate.h" #include "lsu.h" #define NO_QEMU_PROTOS +#define NO_OPENBIOS_PROTOS #include "openbios/fw_cfg.h" #define PROM_ADDR 0x1fff0000000 Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2009-01-30 07:44:48 UTC (rev 431) +++ openbios-devel/arch/sparc64/openbios.c 2009-01-31 08:49:16 UTC (rev 432) @@ -24,9 +24,6 @@ #include "openbios/fw_cfg.h" #include "video_subr.h" -#define BIOS_CFG_CMD 0x510 -#define BIOS_CFG_DATA 0x511 - #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" #define NVRAM_ADDR_LO 0x74 @@ -244,46 +241,6 @@ for (;;); } -static void -fw_cfg_read(uint16_t cmd, char *buf, unsigned int nbytes) -{ - unsigned int i; - - outw(cmd, BIOS_CFG_CMD); - for (i = 0; i < nbytes; i++) - buf[i] = inb(BIOS_CFG_DATA); -} - -static uint64_t -fw_cfg_read_i64(uint16_t cmd) -{ - char buf[sizeof(uint64_t)]; - - fw_cfg_read(cmd, buf, sizeof(uint64_t)); - - return __le64_to_cpu(*(uint64_t *)buf); -} - -static uint32_t -fw_cfg_read_i32(uint16_t cmd) -{ - char buf[sizeof(uint32_t)]; - - fw_cfg_read(cmd, buf, sizeof(uint32_t)); - - return __le32_to_cpu(*(uint32_t *)buf); -} - -static uint16_t -fw_cfg_read_i16(uint16_t cmd) -{ - char buf[sizeof(uint16_t)]; - - fw_cfg_read(cmd, buf, sizeof(uint16_t)); - - return __le16_to_cpu(*(uint16_t *)buf); -} - static uint8_t nvram_read_byte(uint16_t offset) { outb(offset & 0xff, NVRAM_ADDR_LO); @@ -330,6 +287,8 @@ nvram_read(0, (char *)&nv_info, sizeof(ohwcfg_v3_t)); + fw_cfg_init(); + fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); buf[4] = '\0'; Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2009-01-30 07:44:48 UTC (rev 431) +++ openbios-devel/config/examples/cross-ppc_config.xml 2009-01-31 08:49:16 UTC (rev 432) @@ -75,5 +75,6 @@ <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> <option name="CONFIG_DRIVER_MACIO" type="boolean" value="true"/> <option name="CONFIG_DRIVER_ESCC" type="boolean" value="true"/> - + <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> + <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0xf0000510"/> </config> Modified: openbios-devel/config/examples/cross-sparc32_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_config.xml 2009-01-30 07:44:48 UTC (rev 431) +++ openbios-devel/config/examples/cross-sparc32_config.xml 2009-01-31 08:49:16 UTC (rev 432) @@ -76,5 +76,6 @@ <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> <option name="CONFIG_DRIVER_ESCC" type="boolean" value="true"/> <option name="CONFIG_DRIVER_ESCC_SUN" type="boolean" value="true"/> - + <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> + <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0xd00000510ULL"/> </config> Modified: openbios-devel/config/examples/cross-sparc64_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_config.xml 2009-01-30 07:44:48 UTC (rev 431) +++ openbios-devel/config/examples/cross-sparc64_config.xml 2009-01-31 08:49:16 UTC (rev 432) @@ -77,5 +77,6 @@ <option name="CONFIG_DRIVER_EBUS" type="boolean" value="true"/> <option name="CONFIG_DRIVER_PC_KBD" type="boolean" value="true"/> <option name="CONFIG_DRIVER_PC_SERIAL" type="boolean" value="true"/> - + <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> + <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0x510"/> </config> Modified: openbios-devel/config/examples/ppc_config.xml =================================================================== --- openbios-devel/config/examples/ppc_config.xml 2009-01-30 07:44:48 UTC (rev 431) +++ openbios-devel/config/examples/ppc_config.xml 2009-01-31 08:49:16 UTC (rev 432) @@ -75,5 +75,6 @@ <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> <option name="CONFIG_DRIVER_MACIO" type="boolean" value="true"/> <option name="CONFIG_DRIVER_ESCC" type="boolean" value="true"/> - + <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> + <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0xf0000510"/> </config> Modified: openbios-devel/config/examples/sparc32_config.xml =================================================================== --- openbios-devel/config/examples/sparc32_config.xml 2009-01-30 07:44:48 UTC (rev 431) +++ openbios-devel/config/examples/sparc32_config.xml 2009-01-31 08:49:16 UTC (rev 432) @@ -76,5 +76,6 @@ <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> <option name="CONFIG_DRIVER_ESCC" type="boolean" value="true"/> <option name="CONFIG_DRIVER_ESCC_SUN" type="boolean" value="true"/> - + <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> + <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0xd00000510ULL"/> </config> Modified: openbios-devel/config/examples/sparc64_config.xml =================================================================== --- openbios-devel/config/examples/sparc64_config.xml 2009-01-30 07:44:48 UTC (rev 431) +++ openbios-devel/config/examples/sparc64_config.xml 2009-01-31 08:49:16 UTC (rev 432) @@ -77,5 +77,6 @@ <option name="CONFIG_DRIVER_EBUS" type="boolean" value="true"/> <option name="CONFIG_DRIVER_PC_KBD" type="boolean" value="true"/> <option name="CONFIG_DRIVER_PC_SERIAL" type="boolean" value="true"/> - + <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> + <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0x510"/> </config> Modified: openbios-devel/drivers/build.xml =================================================================== --- openbios-devel/drivers/build.xml 2009-01-30 07:44:48 UTC (rev 431) +++ openbios-devel/drivers/build.xml 2009-01-31 08:49:16 UTC (rev 432) @@ -22,6 +22,7 @@ <object source="pc_kbd.c" condition="DRIVER_PC_KBD"/> <object source="pc_serial.c" condition="DRIVER_PC_SERIAL"/> <object source="escc.c" condition="DRIVER_ESCC"/> + <object source="fw_cfg.c" condition="DRIVER_FW_CFG"/> </library> <dictionary name="openbios" target="forth"> Added: openbios-devel/drivers/fw_cfg.c =================================================================== --- openbios-devel/drivers/fw_cfg.c (rev 0) +++ openbios-devel/drivers/fw_cfg.c 2009-01-31 08:49:16 UTC (rev 432) @@ -0,0 +1,76 @@ +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "libc/byteorder.h" +#include "ofmem.h" +#define NO_QEMU_PROTOS +#include "openbios/fw_cfg.h" + +#if !defined(CONFIG_SPARC64) +static volatile uint16_t *fw_cfg_cmd; +static volatile uint8_t *fw_cfg_data; + +void +fw_cfg_read(uint16_t cmd, char *buf, unsigned int nbytes) +{ + unsigned int i; + + *fw_cfg_cmd = cmd; + for (i = 0; i < nbytes; i++) + buf[i] = *fw_cfg_data; +} +#else +// XXX depends on PCI bus location, should be removed +void +fw_cfg_read(uint16_t cmd, char *buf, unsigned int nbytes) +{ + unsigned int i; + + outw(cmd, CONFIG_FW_CFG_ADDR); + for (i = 0; i < nbytes; i++) + buf[i] = inb(CONFIG_FW_CFG_ADDR + 1); +} +#endif + +uint64_t +fw_cfg_read_i64(uint16_t cmd) +{ + char buf[sizeof(uint64_t)]; + + fw_cfg_read(cmd, buf, sizeof(uint64_t)); + + return __le64_to_cpu(*(uint64_t *)buf); +} + +uint32_t +fw_cfg_read_i32(uint16_t cmd) +{ + char buf[sizeof(uint32_t)]; + + fw_cfg_read(cmd, buf, sizeof(uint32_t)); + + return __le32_to_cpu(*(uint32_t *)buf); +} + +uint16_t +fw_cfg_read_i16(uint16_t cmd) +{ + char buf[sizeof(uint16_t)]; + + fw_cfg_read(cmd, buf, sizeof(uint16_t)); + + return __le16_to_cpu(*(uint16_t *)buf); +} + +void +fw_cfg_init(void) +{ +#if defined(CONFIG_SPARC32) + fw_cfg_cmd = (void *)map_io(CONFIG_FW_CFG_ADDR, 2); + fw_cfg_data = (uint8_t *)fw_cfg_cmd + 2; +#elif defined(CONFIG_SPARC64) + // Nothing for the port version +#elif defined(CONFIG_PPC) + fw_cfg_cmd = (void *)CONFIG_FW_CFG_ADDR; + fw_cfg_data = (void *)(CONFIG_FW_CFG_ADDR + 2); +#endif +} Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2009-01-30 07:44:48 UTC (rev 431) +++ openbios-devel/drivers/obio.c 2009-01-31 08:49:16 UTC (rev 432) @@ -646,39 +646,6 @@ for (;;); } -static volatile uint16_t *fw_cfg_cmd; -static volatile uint8_t *fw_cfg_data; - -static void -fw_cfg_read(uint16_t cmd, char *buf, unsigned int nbytes) -{ - unsigned int i; - - *fw_cfg_cmd = cmd; - for (i = 0; i < nbytes; i++) - buf[i] = *fw_cfg_data; -} - -static uint32_t -fw_cfg_read_i32(uint16_t cmd) -{ - char buf[sizeof(uint32_t)]; - - fw_cfg_read(cmd, buf, sizeof(uint32_t)); - - return __le32_to_cpu(*(uint32_t *)buf); -} - -static uint16_t -fw_cfg_read_i16(uint16_t cmd) -{ - char buf[sizeof(uint16_t)]; - - fw_cfg_read(cmd, buf, sizeof(uint16_t)); - - return __le16_to_cpu(*(uint16_t *)buf); -} - static uint8_t qemu_uuid[16]; static void @@ -710,8 +677,7 @@ fword("finish-device"); - fw_cfg_cmd = map_io(CFG_ADDR, CFG_SIZE); - fw_cfg_data = (uint8_t *)fw_cfg_cmd + 2; + fw_cfg_init(); fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); buf[4] = '\0'; Modified: openbios-devel/include/openbios/fw_cfg.h =================================================================== --- openbios-devel/include/openbios/fw_cfg.h 2009-01-30 07:44:48 UTC (rev 431) +++ openbios-devel/include/openbios/fw_cfg.h 2009-01-31 08:49:16 UTC (rev 432) @@ -30,4 +30,12 @@ #endif /* NO_QEMU_PROTOS */ +#ifndef NO_OPENBIOS_PROTOS +void fw_cfg_read(uint16_t cmd, char *buf, unsigned int nbytes); +uint64_t fw_cfg_read_i64(uint16_t cmd); +uint32_t fw_cfg_read_i32(uint16_t cmd); +uint16_t fw_cfg_read_i16(uint16_t cmd); +void fw_cfg_init(void); +#endif /* NO_OPENBIOS_PROTOS */ + #endif

1 0

r431 - in openbios-devel: drivers include/openbios
by svn＠openbios.org 30 Jan '09

30 Jan '09

Author: laurent Date: 2009-01-30 08:44:48 +0100 (Fri, 30 Jan 2009) New Revision: 431 Modified: openbios-devel/drivers/ide.c openbios-devel/drivers/macio.c openbios-devel/include/openbios/drivers.h Log: Add mac-io IDE driver Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2009-01-29 19:56:41 UTC (rev 430) +++ openbios-devel/drivers/ide.c 2009-01-30 07:44:48 UTC (rev 431) @@ -1294,30 +1294,14 @@ static void ob_ide_ctrl_initialize(int *idx) { - int len, props[6]; phandle_t ph=get_cur_dev(); - char *idename; - struct ide_channel *chan; /* set device type */ push_str(DEV_TYPE); fword("device-type"); - idename=get_property(ph, "name", &len); - chan = ide_seek_channel(idename); - - /* Create interrupt properties. */ - props[0]=14; props[1]=0; - set_property(ph, "interrupts", (char *)&props, 2*sizeof(int)); - set_int_property(ph, "#address-cells", 1); set_int_property(ph, "#size-cells", 0); - - props[0] = __cpu_to_be32(chan->io_regs[0]); - props[1] = __cpu_to_be32(1); props[2] = __cpu_to_be32(8); - props[3] = __cpu_to_be32(chan->io_regs[8]); - props[4] = __cpu_to_be32(1); props[5] = __cpu_to_be32(2); - set_property(ph, "reg", (char *)&props, 6*sizeof(int)); } static void @@ -1378,6 +1362,7 @@ struct ide_channel *chan; int io_ports[IDE_MAX_CHANNELS]; int ctl_ports[IDE_MAX_CHANNELS]; + cell props[6]; io_ports[0] = io_port0; ctl_ports[0] = ctl_port0 + 2; @@ -1433,6 +1418,19 @@ snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME, path, current_channel); REGISTER_NAMED_NODE(ob_ide_ctrl, nodebuff); + + dnode = find_dev(nodebuff); + + props[0]=14; props[1]=0; + set_property(dnode, "interrupts", + (char *)&props, 2*sizeof(cell)); + + props[0] = __cpu_to_be32(chan->io_regs[0]); + props[1] = __cpu_to_be32(1); props[2] = __cpu_to_be32(8); + props[3] = __cpu_to_be32(chan->io_regs[8]); + props[4] = __cpu_to_be32(1); props[5] = __cpu_to_be32(2); + set_property(dnode, "reg", (char *)&props, 6*sizeof(cell)); + #ifdef CONFIG_DEBUG_IDE printk(DEV_NAME": [io ports 0x%x-0x%x,0x%x]\n", current_channel, chan->io_regs[0], @@ -1486,3 +1484,177 @@ return 0; } + +#if defined(CONFIG_DRIVER_MACIO) +static unsigned char +macio_ide_inb(struct ide_channel *chan, unsigned int port) +{ + return in_8((unsigned char*)(chan->mmio + (port << 4))); +} + +static void +macio_ide_outb(struct ide_channel *chan, unsigned char data, unsigned int port) +{ + out_8((unsigned char*)(chan->mmio + (port << 4)), data); +} + +static void +macio_ide_insw(struct ide_channel *chan, + unsigned int port, unsigned char *addr, unsigned int count) +{ + _insw((uint16_t*)(chan->mmio + (port << 4)), addr, count); +} + +static void +macio_ide_outsw(struct ide_channel *chan, + unsigned int port, unsigned char *addr, unsigned int count) +{ + _outsw((uint16_t*)(chan->mmio + (port << 4)), addr, count); +} + +#define MACIO_IDE_OFFSET 0x00020000 +#define MACIO_IDE_SIZE 0x00001000 + +int macio_ide_init(const char *path, uint32_t addr, int nb_channels) +{ + int i, j; + char nodebuff[128]; + phandle_t dnode; + cell props[8]; + struct ide_channel *chan; + + for (i = 0; i < nb_channels; i++, current_channel++) { + + chan = malloc(sizeof(struct ide_channel)); + + snprintf(chan->name, sizeof(chan->name), + DEV_NAME, current_channel); + + chan->mmio = addr + MACIO_IDE_OFFSET + i * MACIO_IDE_SIZE; + + chan->obide_inb = macio_ide_inb; + chan->obide_insw = macio_ide_insw; + chan->obide_outb = macio_ide_outb; + chan->obide_outsw = macio_ide_outsw; + + chan->selected = -1; + + /* + * assume it's there, if not io port dead check will clear + */ + chan->present = 1; + + for (j = 0; j < 2; j++) { + chan->drives[j].present = 0; + chan->drives[j].unit = j; + chan->drives[j].channel = chan; + /* init with a decent value */ + chan->drives[j].bs = 512; + + chan->drives[j].nr = i * 2 + j; + } + + ob_ide_probe(chan); + + if (!chan->present) { + free(chan); + continue; + } + + ide_add_channel(chan); + + ob_ide_identify_drives(chan); + + snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME, path, + current_channel); + REGISTER_NAMED_NODE(ob_ide_ctrl, nodebuff); + + dnode = find_dev(nodebuff); + + set_property(dnode, "compatible", "heathrow-ata", 13); + + props[0] = 0x00000526; + props[1] = 0x00000085; + props[2] = 0x00000025; + props[3] = 0x00000025; + props[4] = 0x00000025; + props[5] = 0x00000000; + props[6] = 0x00000000; + props[7] = 0x00000000; + OLDWORLD(set_property(dnode, "AAPL,pio-timing", + (char *)&props, 8*sizeof(cell))); + + props[0] = 0x0000000d; + props[1] = 0x00000000; + set_property(dnode, "interrupts", + (char *)&props, 2*sizeof(cell)); + OLDWORLD(set_property(dnode, "AAPL,interrupts", + (char *)&props, 2*sizeof(cell))); + + props[0] = MACIO_IDE_OFFSET + i * MACIO_IDE_SIZE; + props[1] = MACIO_IDE_SIZE; + props[2] = 0x00008b00 + i * 0x0200; + props[3] = 0x0200; + set_property(dnode, "reg", (char *)&props, 4*sizeof(cell)); + + props[0] = addr + MACIO_IDE_OFFSET + i * MACIO_IDE_SIZE; + props[1] = addr + 0x00008b00 + i * 0x0200; + OLDWORLD(set_property(dnode, "AAPL,address", + (char *)&props, 2*sizeof(cell))); + + props[0] = 0; + OLDWORLD(set_property(dnode, "AAPL,bus-id", (char*)props, + 1 * sizeof(cell))); +#ifdef CONFIG_DEBUG_IDE + printk(DEV_NAME": [io ports 0x%lx]\n", + current_channel, chan->mmio); +#endif + + for (j = 0; j < 2; j++) { + struct ide_drive *drive = &chan->drives[j]; + const char *media = "UNKNOWN"; + + if (!drive->present) + continue; + +#ifdef CONFIG_DEBUG_IDE + printk(" drive%d [ATA%s ", j, + drive->type == ide_type_atapi ? "PI" : ""); +#endif + switch (drive->media) { + case ide_media_floppy: + media = "floppy"; + break; + case ide_media_cdrom: + media = "cdrom"; + break; + case ide_media_optical: + media = "mo"; + break; + case ide_media_disk: + media = "disk"; + break; + } +#ifdef CONFIG_DEBUG_IDE + printk("%s]: %s\n", media, drive->model); +#endif + snprintf(nodebuff, sizeof(nodebuff), + "%s/" DEV_NAME "/%s", path, current_channel, + media); + REGISTER_NAMED_NODE(ob_ide, nodebuff); + dnode = find_dev(nodebuff); + set_int_property(dnode, "reg", j); + + /* create aliases */ + + set_ide_alias(nodebuff); + if (drive->media == ide_media_cdrom) + set_cd_alias(nodebuff); + if (drive->media == ide_media_disk) + set_hd_alias(nodebuff); + } + } + + return 0; +} +#endif /* CONFIG_DRIVER_MACIO */ Modified: openbios-devel/drivers/macio.c =================================================================== --- openbios-devel/drivers/macio.c 2009-01-29 19:56:41 UTC (rev 430) +++ openbios-devel/drivers/macio.c 2009-01-30 07:44:48 UTC (rev 431) @@ -14,6 +14,7 @@ #include "libc/byteorder.h" #include "libc/vsprintf.h" +#include "openbios/drivers.h" #include "macio.h" #include "cuda.h" #include "escc.h" @@ -112,4 +113,5 @@ cuda_init(path, addr); macio_nvram_init(path, addr); escc_init(path, addr); + macio_ide_init(path, addr, 1); } Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2009-01-29 19:56:41 UTC (rev 430) +++ openbios-devel/include/openbios/drivers.h 2009-01-30 07:44:48 UTC (rev 431) @@ -47,6 +47,7 @@ /* drivers/ide.c */ int ob_ide_init(const char *path, uint32_t io_port0, uint32_t ctl_port0, uint32_t io_port1, uint32_t ctl_port1); +int macio_ide_init(const char *path, uint32_t addr, int nb_channels); #endif #ifdef CONFIG_DRIVER_ESP /* drivers/esp.c */

1 0

Re: [OpenBIOS] [coreboot] OpenBIOS SVN r416 breaks coreboot-v3
by Mark Cave-Ayland 29 Jan '09

29 Jan '09

Myles Watson wrote: > Yes. qemu 0.9.1 works with v2+OpenBIOS and v3+OpenBIOS, but the latest qemu > doesn't. The latest qemu works with v2 or v3 +OpenBIOS r186, so it looks > like an interaction between OpenBIOS and qemu. > > HTH, > Myles Okay, I think I found out what is happening. With coreboot-v3 and OpenBIOS SVN then the base address for I/O devices is set to 0x400 which causes subsequent hardware to be mapped higher. The backtrace on the hw_error() line shows this: Breakpoint 1, register_ioport_write (start=1296, length=1, size=1, func=0x42b105 <ne2000_asic_ioport_write>, opaque=0xc9abb8) at /home/build/src/qemu/trunk/vl.c:392 392 hw_error("register_ioport_write: invalid opaque: (start 0x%x, length 0x%x, address 0x%x)", start, length, i); (gdb) print/x start $1 = 0x510 (gdb) bt #0 register_ioport_write (start=1296, length=1, size=1, func=0x42b105 <ne2000_asic_ioport_write>, opaque=0xc9abb8) at /home/build/src/qemu/trunk/vl.c:392 #1 0x000000000042bc6b in ne2000_map (pci_dev=0xc9a990, region_num=0, addr=1280, size=256, type=1) at /home/build/src/qemu/trunk/hw/ne2000.c:771 #2 0x0000000000414548 in pci_update_mappings (d=0xc9a990) at /home/build/src/qemu/trunk/hw/pci.c:301 #3 0x0000000000414706 in pci_default_write_config (d=0xc9a990, address=16, val=1281, len=4) at /home/build/src/qemu/trunk/hw/pci.c:362 #4 0x00000000004148d7 in pci_data_write (opaque=0xc281c0, addr=2147489808, val=1281, len=4) at /home/build/src/qemu/trunk/hw/pci.c:467 #5 0x0000000000483e31 in pci_host_data_writel (opaque=0xc281a0, addr=3324, val=1281) at /home/build/src/qemu/trunk/hw/pci_host.h:74 #6 0x0000000000406818 in ioport_write (index=2, address=3324, data=1281) at /home/build/src/qemu/trunk/vl.c:298 #7 0x0000000000406c0d in cpu_outl (env=0xc10650, addr=3324, val=1281) at /home/build/src/qemu/trunk/vl.c:438 #8 0x00000000005248fe in helper_outl (port=3324, data=1281) at /home/build/src/qemu/trunk/target-i386/op_helper.c:582 #9 0x0000000040e5d11c in ?? () #10 0x00000000000000f4 in ?? () #11 0x0000000006e64a20 in ?? () #12 0x0000000006f687ab in ?? () #13 0x0000000040e5ce30 in ?? () #14 0x0000000040e603c8 in ?? () #15 0x0000000008000000 in ?? () #16 0x00007fff4ef701b0 in ?? () #17 0x00000000004fcd9c in tb_set_jmp_target (tb=0x406670, n=0, addr=2361183241434822607) at ../exec-all.h:240 #18 0x000000000040c64f in main_loop () at /home/build/src/qemu/trunk/vl.c:3737 #19 0x000000000040f772 in main (argc=6, argv=0x7fff4ef70bf8, envp=0x7fff4ef70c30) at /home/build/src/qemu/trunk/vl.c:5712 So in other words, with current OpenBIOS SVN the I/O space for the network card requires more than 0x110 bytes from 0x400 and hence when qemu tries to map I/O address 0x510 (which is already mapped to the BIOS I/O port), qemu reports the error and panics. My quick fix was to apply the following patch to openbios in order to raise the io_base further from 0x400 to 0x520 so that no devices appear below the BIOS_IO_PORT address of 0x510: --- drivers/pci.c (revision 428) +++ drivers/pci.c (working copy) @@ -762,7 +762,7 @@ mem_base = arch->mem_base; /* I/O ports under 0x400 are used by devices mapped at fixed location. */ - io_base = arch->io_base + 0x400; + io_base = arch->io_base + 0x520; path = strdup(""); for (bus = 0; bus<0x100; bus++) { ob_scan_pci_bus(bus, &mem_base, &io_base, &path); With this patch applied, I am pleased to report that qemu can successfully boot openbios once again. Can anyone with more knowledge comment on whether this is an adequate solution or not? ATB, Mark. -- Mark Cave-Ayland Sirius Corporation - The Open Source Experts http://www.siriusit.co.uk T: +44 870 608 0063

2 1

[PATCH] Fix fs->vol_name handling
by Stefan Assmann 29 Jan '09

29 Jan '09

Subject: Fix fs->vol_name handling This patch checks wether fs->vol_name exists and handles the case where it doesn't exist. That fixes the lockup that occurs when trying to run qemu-system-ppc -cdrom <iso> -boot d Signed-off-by: Stefan Assmann <sassmann(a)suse.de> Index: modules/filesystems.c =================================================================== --- modules/filesystems.c (revision 418) +++ modules/filesystems.c (working copy) @@ -145,8 +145,12 @@ if( !mi->volname ) mi->volname = malloc( VOLNAME_SIZE ); - - ret = mi->fs->vol_name( mi->fs, mi->volname, VOLNAME_SIZE ); + /* handle case where there is no vol_name function in fs */ + if( !mi->fs->vol_name ) { + mi->volname[0] = '\0'; + ret = mi->volname; + } else + ret = mi->fs->vol_name( mi->fs, mi->volname, VOLNAME_SIZE ); PUSH( (ucell)ret ); } Stefan -- Stefan Assmann | SUSE LINUX Products GmbH Software Engineer | Maxfeldstr. 5, D-90409 Nuernberg Mail: sassmann(a)suse.de | GF: Markus Rex, HRB 16746 (AG Nuernberg)

2 1

r430 - openbios-devel/modules
by svn＠openbios.org 29 Jan '09

29 Jan '09

Author: blueswirl Date: 2009-01-29 20:56:41 +0100 (Thu, 29 Jan 2009) New Revision: 430 Modified: openbios-devel/modules/filesystems.c Log: Fix fs->vol_name handling This patch checks wether fs->vol_name exists and handles the case where it doesn't exist. That fixes the lockup that occurs when trying to run qemu-system-ppc -cdrom <iso> -boot d Signed-off-by: Stefan Assmann <sassmann(a)suse.de> Modified: openbios-devel/modules/filesystems.c =================================================================== --- openbios-devel/modules/filesystems.c 2009-01-29 10:51:25 UTC (rev 429) +++ openbios-devel/modules/filesystems.c 2009-01-29 19:56:41 UTC (rev 430) @@ -145,8 +145,12 @@ if( !mi->volname ) mi->volname = malloc( VOLNAME_SIZE ); - - ret = mi->fs->vol_name( mi->fs, mi->volname, VOLNAME_SIZE ); + /* handle case where there is no vol_name function in fs */ + if( !mi->fs->vol_name ) { + mi->volname[0] = '\0'; + ret = mi->volname; + } else + ret = mi->fs->vol_name( mi->fs, mi->volname, VOLNAME_SIZE ); PUSH( (ucell)ret ); }

1 0

Re: [OpenBIOS] Fix boot-script parsing for openSUSE ppc media
by laurent＠vivier.eu 29 Jan '09

29 Jan '09

> Fix boot-script parsing for openSUSE ppc media applied, thanks Laurent

1 0

r429 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 29 Jan '09

29 Jan '09

Author: laurent Date: 2009-01-29 11:51:25 +0100 (Thu, 29 Jan 2009) New Revision: 429 Modified: openbios-devel/arch/ppc/qemu/main.c Log: Add an enhancement to deal with configurations in /ppc/bootinfo.txt like <boot-script>boot &device;:1,\suseboot\yaboot.ibm</boot-script>. This would evaluate to boot cd:0,1\suseboot\yaboot.ibm which results in a file not found error (seen on many openSUSE ppc media). With this patch the above will evaluate to boot cd:0,\suseboot\yaboot.ibm and yaboot will load. Signed-off-by: Stefan Assmann <sassmann(a)suse.de> Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2009-01-26 17:09:21 UTC (rev 428) +++ openbios-devel/arch/ppc/qemu/main.c 2009-01-29 10:51:25 UTC (rev 429) @@ -208,6 +208,8 @@ fword("2drop"); right = pop_fstr_copy(); left = pop_fstr_copy(); + while (right[0] != '\\' && right[0] != '\0') + right++; snprintf(bootscript, sizeof(bootscript), "%s%s,%s", left, path, right); ELF_DPRINTF("fixed bootscript %s\n", bootscript);

1 0

Fix boot-script parsing for openSUSE ppc media
by Stefan Assmann 29 Jan '09

29 Jan '09

Subject: Fix boot-script parsing for openSUSE ppc media Add an enhancement to deal with configurations in /ppc/bootinfo.txt like <boot-script>boot &device;:1,\suseboot\yaboot.ibm</boot-script>. This would evaluate to boot cd:0,1\suseboot\yaboot.ibm which results in a file not found error (seen on many openSUSE ppc media). With this patch the above will evaluate to boot cd:0,\suseboot\yaboot.ibm and yaboot will load. Signed-off-by: Stefan Assmann <sassmann(a)suse.de> Index: arch/ppc/qemu/main.c =================================================================== --- arch/ppc/qemu/main.c (revision 418) +++ arch/ppc/qemu/main.c (working copy) @@ -208,6 +208,8 @@ fword("2drop"); right = pop_fstr_copy(); left = pop_fstr_copy(); + while (right[0] != '\\' && right[0] != '\0') + right++; snprintf(bootscript, sizeof(bootscript), "%s%s,%s", left, path, right); ELF_DPRINTF("fixed bootscript %s\n", bootscript); Stefan -- Stefan Assmann | SUSE LINUX Products GmbH Software Engineer | Maxfeldstr. 5, D-90409 Nuernberg Mail: sassmann(a)suse.de | GF: Markus Rex, HRB 16746 (AG Nuernberg)

1 0

OpenBIOS SVN r416 breaks coreboot-v3
by Mark Cave-Ayland 28 Jan '09

28 Jan '09

Hi everyone, Whilst playing around with openbios to try and understand how it works on different platforms, I found that using coreboot-v3 with openbios SVN causes openbios to panic on boot under qemu SVN. The trace can be found here: http://pastebin.siriusit.co.uk/coreboot-v3-panic.txt With the help of some people on the coreboot mailing list, I've performed an SVN bisection and found that the panic starts appearing at r416 in openbios SVN for which the commit message can be found here: http://lists.openbios.org/pipermail/openbios/2009-January/003401.html However, I can't find any reference to the rationale behind the commit. Can anyone explain further explain whether is commit is correct or not? It would be really helpful if you could CC replies to the coreboot mailing list to help resolve this - the original thread can be found here: http://www.coreboot.org/pipermail/coreboot/2009-January/044462.html Many thanks, Mark. -- Mark Cave-Ayland Sirius Corporation - The Open Source Experts http://www.siriusit.co.uk T: +44 870 608 0063

3 3

[Fwd: Re: [coreboot] OpenBIOS SVN r416 breaks coreboot-v3]
by Mark Cave-Ayland 28 Jan '09

28 Jan '09

[ Forwarding onto the OpenBIOS list ] Just for those people who aren't on the coreboot mailing list - the thinking so far is that SVN trunk qemu has a part in this, as the resulting bios.bin works fine on 0.9.1. ATB, Mark. -- Mark Cave-Ayland Sirius Corporation - The Open Source Experts http://www.siriusit.co.uk T: +44 870 608 0063

1 0

Re: [OpenBIOS] [coreboot] OpenBIOS SVN r416 breaks coreboot-v3
by Mark Cave-Ayland 28 Jan '09

28 Jan '09

Myles Watson wrote: > That's actually what I would have expected. The IO address range is > only 16 bits from 0-64K. > > I guess we'll have to get more information from qemu so we know which > port address is being accessed when it dies. > > Myles Hi Myles, Here's my quick patch to qemu to dump out the address where the write is failing: Index: vl.c =================================================================== --- vl.c (revision 6426) +++ vl.c (working copy) @@ -389,7 +389,7 @@ for(i = start; i < start + length; i += size) { ioport_write_table[bsize][i] = func; if (ioport_opaque[i] != NULL && ioport_opaque[i] != opaque) - hw_error("register_ioport_write: invalid opaque"); + hw_error("register_ioport_write: invalid opaque: (start 0x%x, length 0x%x, address 0x%x)", start, length, i); ioport_opaque[i] = opaque; } return 0; And here is the result output: qemu: hardware error: register_ioport_write: invalid opaque: (start 0x510, length 0x1, address 0x510) HTH, Mark. -- Mark Cave-Ayland Sirius Corporation - The Open Source Experts http://www.siriusit.co.uk T: +44 870 608 0063

1 0

r428 - in openbios-devel: config/examples include/openbios
by svn＠openbios.org 26 Jan '09

26 Jan '09

Author: blueswirl Date: 2009-01-26 18:09:21 +0100 (Mon, 26 Jan 2009) New Revision: 428 Modified: openbios-devel/config/examples/sparc32_config.xml openbios-devel/include/openbios/drivers.h Log: Fix native Sparc32 compile Modified: openbios-devel/config/examples/sparc32_config.xml =================================================================== --- openbios-devel/config/examples/sparc32_config.xml 2009-01-25 20:37:01 UTC (rev 427) +++ openbios-devel/config/examples/sparc32_config.xml 2009-01-26 17:09:21 UTC (rev 428) @@ -75,5 +75,6 @@ <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> <option name="CONFIG_DRIVER_ESCC" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_ESCC_SUN" type="boolean" value="true"/> </config> Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2009-01-25 20:37:01 UTC (rev 427) +++ openbios-devel/include/openbios/drivers.h 2009-01-26 17:09:21 UTC (rev 428) @@ -16,6 +16,9 @@ #ifdef CONFIG_DRIVER_PCI /* drivers/pci.c */ int ob_pci_init(void); +#endif + +#if defined(CONFIG_DRIVER_PCI) || defined(CONFIG_DRIVER_ESCC) #ifdef CONFIG_PPC extern int is_apple(void); extern int is_oldworld(void);

1 0

Re: [OpenBIOS] [sparc64] Problematic pci at 0 and pci nodes in the device tree
by Mark Cave-Ayland 25 Jan '09

25 Jan '09

> Hi, > > I have the following problem with the OpenBIOS device tree (the > current Qemu version): > In the root directory, there are currently two pci nodes: > > ffd97778 pci at 0 > ffd98808 pci > > The "screen" alias is defined as: > /pci/pci/pci/QEMU,VGA > > When HelenOS attempts to lookup this path, it fails, because it > matches /pci instead of /pci at 0 and /pci does not have any children. > HelenOS is normally designed to cope with ambiguous node names, but in > this case the /pci node matches and sends it to the wrong direction. I > think the "screen" alias should be either defined using the > non-ambiguous pci at 0 path components or the /pci node should not > exist at all. > > Can you confirm this is a problem in the tree? Hi Jakub, I too am interested in getting Sparc64 working in Qemu in order to resurrect some old Solaris disk images I have here. Can you explain some more about the debugging methods you are using to analyse the forth dictionaries? At the moment I am struggling in that when running Qemu with "-vnc :1" on the command line, qemu-system-sparc64 simply hangs :( Many thanks, Mark. -- Mark Cave-Ayland Sirius Corporation - The Open Source Experts http://www.siriusit.co.uk T: +44 870 608 0063

3 8

r427 - openbios-devel/modules
by svn＠openbios.org 25 Jan '09

25 Jan '09

Author: blueswirl Date: 2009-01-25 21:37:01 +0100 (Sun, 25 Jan 2009) New Revision: 427 Modified: openbios-devel/modules/console_common.c Log: Fix console escape code problems with NetBSD 4.0 and Debian 3.1r1 Modified: openbios-devel/modules/console_common.c =================================================================== --- openbios-devel/modules/console_common.c 2009-01-25 12:20:12 UTC (rev 426) +++ openbios-devel/modules/console_common.c 2009-01-25 20:37:01 UTC (rev 427) @@ -21,6 +21,18 @@ #define NCOLS 80 #define NROWS 48 +// Warning: will hang on purpose when encountering unknown codes +//#define DEBUG_CONSOLE +#ifdef DEBUG_CONSOLE +#define DPRINTF(fmt, args...) \ + do { \ + printk(fmt , ##args); \ + for (;;); \ + } while (0) +#else +#define DPRINTF(fmt, args...) do {} while(0) +#endif + typedef enum { ESnormal, ESesc, ESsquare, ESgetpars, ESgotpars, ESfunckey, EShash, ESsetG0, ESsetG1, ESpercent, ESignore, ESnonstd, @@ -150,40 +162,86 @@ static void scroll1( void ) { - int x; + int x, y; - video_scroll( FONT_ADJ_HEIGHT ); + video_scroll(FONT_ADJ_HEIGHT); - for( x=0; x<cons.w; x++ ) - cons.buf[(cons.h-1)*cons.w + x] = 0; - draw_line(cons.h-1); + for (y = 1; y < cons.h - 1; y++) { + for (x = 0; x < cons.w; x++) + cons.buf[(y - 1) * cons.w + x] = cons.buf[y * cons.w + x]; + } + for (x = 0; x < cons.w; x++) + cons.buf[(cons.h - 1) * cons.w + x] = ' '; + draw_line(cons.h - 1); } +// Insert char +static void csi_at(unsigned int nr) +{ + unsigned int x; + + if (nr > cons.w - cons.x) + nr = cons.w - cons.x; + else if (!nr) + return; + + for (x = cons.x + nr; x < cons.w - 1; x++) + cons.buf[cons.y * cons.w + x - nr] = cons.buf[cons.y * cons.w + x]; + for (x = cons.x; x < cons.x + nr; x++) + cons.buf[cons.y * cons.w + x] = ' '; + draw_line(cons.y); +} + static void -do_con_trol(int ch) +do_con_trol(unsigned char ch) { unsigned int i, j; switch (ch) { + case 7: + // BEL + return; case 8: + // BS if (cons.x) cons.x--; return; - case 10 ... 12: + case 9: + // HT + cons.x = (cons.x + 8) & ~7; + return; + case 10: + // LF cons.x = 0; cons.y++; return; + case 12: + // FF + for (i = 0; i < cons.h; i++) { + for (j = 0; j < cons.w; j++) + cons.buf[i * cons.w + j] = ' '; + draw_line(i); + } + cons.x = cons.y = 0; + return; case 13: + // CR cons.x = 0; return; - case 24: - case 26: + case 25: + // EM + return; + case 24: // CAN + case 26: // SUB cons.vc_state = ESnormal; return; case 27: + // ESC cons.vc_state = ESesc; return; } + if (ch < 32) + DPRINTF("Unhandled control char %d\n", ch); switch (cons.vc_state) { case ESesc: @@ -196,7 +254,7 @@ scroll1(); return; default: - printk("Unhandled escape code '%c'\n", ch); + DPRINTF("Unhandled basic escape code '%c'\n", ch); return; } return; @@ -220,8 +278,37 @@ case ESgotpars: cons.vc_state = ESnormal; switch(ch) { + case 'A': + // Cursor up + if (cons.vc_par[0] == 0) + cons.vc_par[0] = 1; + if (cons.y - cons.vc_par[0] > 0) + cons.y -= cons.vc_par[0]; + return; + case 'B': + // Cursor down + if (cons.vc_par[0] == 0) + cons.vc_par[0] = 1; + if (cons.y + cons.vc_par[0] < cons.h - 1) + cons.y += cons.vc_par[0]; + return; + case 'C': + // Cursor right + if (cons.vc_par[0] == 0) + cons.vc_par[0] = 1; + if (cons.x + cons.vc_par[0] < cons.w - 1) + cons.x += cons.vc_par[0]; + return; + case 'D': + // Cursor left + if (cons.vc_par[0] == 0) + cons.vc_par[0] = 1; + if (cons.x - cons.vc_par[0] > 0) + cons.x -= cons.vc_par[0]; + return; case 'H': case 'f': + // Set cursor position if (cons.vc_par[0]) cons.vc_par[0]--; @@ -243,6 +330,8 @@ cons.buf[j * cons.w + i] = ' '; draw_line(j); } + } else { + DPRINTF("Unhandled CSI J code '%c'\n", cons.vc_par[0]); } return; case 'K': @@ -263,20 +352,26 @@ draw_line(cons.y); return; default: + DPRINTF("Unhandled CSI K code '%c'\n", cons.vc_par[0]); return; } return; case 'M': - scroll1(); + if (cons.vc_par[0] == 1) + scroll1(); + else + DPRINTF("Unhandled CSI M %d\n", cons.vc_par[0]); return; case 'm': + // Attributes are ignored return; case '@': + csi_at(cons.vc_par[0]); return; default: - printk("Unhandled escape code '%c', par[%d, %d, %d, %d, %d]\n", - ch, cons.vc_par[0], cons.vc_par[1], cons.vc_par[2], - cons.vc_par[3], cons.vc_par[4]); + DPRINTF("Unhandled escape code '%c', par[%d, %d, %d, %d, %d]\n", + ch, cons.vc_par[0], cons.vc_par[1], cons.vc_par[2], + cons.vc_par[3], cons.vc_par[4]); return; } return; @@ -290,7 +385,8 @@ int console_draw_str( const char *str ) { - int ch, y, x; + unsigned int y, x; + unsigned char ch; if( !cons.inited && console_init() ) return -1;

1 0