OpenBIOS November 2009

openbios@openbios.org

15 participants
81 discussions

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

10 Nov '09

Author: laurent Date: 2009-11-10 22:13:54 +0000 (Tue, 10 Nov 2009) New Revision: 607 Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Log: Add "64-bit" property for PowerPC 970fx. (allows Fedora bootloader to load the good kernel, 32-bit or 64-bit) Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c 2009-11-10 21:57:00 UTC (rev 606) +++ trunk/openbios-devel/arch/ppc/qemu/init.c 2009-11-10 22:13:54 UTC (rev 607) @@ -273,6 +273,12 @@ fword("encode-int"); push_str("reg"); fword("property"); + + PUSH(0); + PUSH(0); + fword("encode-bytes"); + push_str("64-bit"); + fword("property"); fword("finish-device");

1 0

r606 - trunk/openbios-devel/drivers
by svn＠openbios.org 10 Nov '09

10 Nov '09

Author: laurent Date: 2009-11-10 21:57:00 +0000 (Tue, 10 Nov 2009) New Revision: 606 Modified: trunk/openbios-devel/drivers/cuda.c Log: Define methods get-time and set-time of /pci/mac-io/via-cuda/rtc. We can now have date&time from our openbios command line interface... Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/drivers/cuda.c =================================================================== --- trunk/openbios-devel/drivers/cuda.c 2009-11-10 21:52:40 UTC (rev 605) +++ trunk/openbios-devel/drivers/cuda.c 2009-11-10 21:57:00 UTC (rev 606) @@ -58,7 +58,9 @@ #define CUDA_PACKET 1 /* CUDA commands (2nd byte) */ -#define CUDA_POWERDOWN 0xa +#define CUDA_GET_TIME 0x03 +#define CUDA_SET_TIME 0x09 +#define CUDA_POWERDOWN 0x0a #define CUDA_RESET_SYSTEM 0x11 static uint8_t cuda_readb (cuda_t *dev, int reg) @@ -233,8 +235,115 @@ RET(-1); } +/* + * get-time ( -- second minute hour day month year ) + * + */ + +static const int days_month[12] = + { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; +static const int days_month_leap[12] = + { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + +static inline int is_leap(int year) +{ + return ((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0); +} + +static void +rtc_get_time(int *idx) +{ + uint8_t cmdbuf[2], obuf[64]; + ucell second, minute, hour, day, month, year; + uint32_t now; + int current; + const int *days; + + cmdbuf[0] = CUDA_GET_TIME; + cuda_request(main_cuda, CUDA_PACKET, cmdbuf, sizeof(cmdbuf), obuf); + + /* seconds since 01/01/1904 */ + + now = (obuf[3] << 24) + (obuf[4] << 16) + (obuf[5] << 8) + obuf[6]; + + second = now % 60; + now /= 60; + + minute = now % 60; + now /= 60; + + hour = now % 24; + now /= 24; + + year = now * 100 / 36525; + now -= year * 36525 / 100; + year += 1904; + + days = is_leap(year) ? days_month_leap : days_month; + + current = 0; + month = 0; + while (month < 12) { + if (now <= current + days[month]) { + break; + } + current += days[month]; + month++; + } + month++; + + day = now - current; + + PUSH(second); + PUSH(minute); + PUSH(hour); + PUSH(day); + PUSH(month); + PUSH(year); +} + +/* + * set-time ( second minute hour day month year -- ) + * + */ + +static void +rtc_set_time(int *idx) +{ + uint8_t cmdbuf[5], obuf[3]; + ucell second, minute, hour, day, month, year; + const int *days; + uint32_t now; + unsigned int nb_days; + int i; + + year = POP(); + month = POP(); + day = POP(); + hour = POP(); + minute = POP(); + second = POP(); + + days = is_leap(year) ? days_month_leap : days_month; + nb_days = (year - 1904) * 36525 / 100 + day; + for (i = 0; i < month - 1; i++) + nb_days += days[i]; + + now = (((nb_days * 24) + hour) * 60 + minute) * 60 + second; + + cmdbuf[0] = CUDA_SET_TIME; + cmdbuf[1] = now >> 24; + cmdbuf[2] = now >> 16; + cmdbuf[3] = now >> 8; + cmdbuf[4] = now; + + cuda_request(main_cuda, CUDA_PACKET, cmdbuf, sizeof(cmdbuf), obuf); +} + NODE_METHODS(rtc) = { { "open", rtc_open }, + { "get-time", rtc_get_time }, + { "set-time", rtc_set_time }, }; static void

1 0

r605 - trunk/openbios-devel/drivers
by svn＠openbios.org 10 Nov '09

10 Nov '09

Author: laurent Date: 2009-11-10 21:52:40 +0000 (Tue, 10 Nov 2009) New Revision: 605 Modified: trunk/openbios-devel/drivers/cuda.c Log: Remove broken and useless cuda unit decode/encode methods. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/drivers/cuda.c =================================================================== --- trunk/openbios-devel/drivers/cuda.c 2009-11-10 21:50:36 UTC (rev 604) +++ trunk/openbios-devel/drivers/cuda.c 2009-11-10 21:52:40 UTC (rev 605) @@ -219,25 +219,10 @@ { } -static void -ob_cuda_decode_unit(void *private) -{ - PUSH(0); - fword("decode-unit-pci-bus"); -} - -static void -ob_cuda_encode_unit(void *private) -{ - fword("encode-unit-pci"); -} - NODE_METHODS(ob_cuda) = { { NULL, ob_cuda_initialize }, { "open", ob_cuda_open }, { "close", ob_cuda_close }, - { "decode-unit", ob_cuda_decode_unit }, - { "encode-unit", ob_cuda_encode_unit }, }; DECLARE_UNNAMED_NODE(rtc, INSTALL_OPEN, sizeof(int));

1 0

r604 - trunk/openbios-devel/drivers
by svn＠openbios.org 10 Nov '09

10 Nov '09

Author: laurent Date: 2009-11-10 21:50:36 +0000 (Tue, 10 Nov 2009) New Revision: 604 Modified: trunk/openbios-devel/drivers/macio.c Log: Define methods to decode/encode mac-io units. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/drivers/macio.c =================================================================== --- trunk/openbios-devel/drivers/macio.c 2009-11-10 21:39:42 UTC (rev 603) +++ trunk/openbios-devel/drivers/macio.c 2009-11-10 21:50:36 UTC (rev 604) @@ -170,11 +170,49 @@ set_int_property(dnode, "clock-frequency", 4166666); } +DECLARE_NODE(ob_macio, INSTALL_OPEN, sizeof(int), "Tmac-io"); + +/* ( str len -- addr ) */ + +static void +ob_macio_decode_unit(void *private) +{ + ucell addr; + + const char *arg = pop_fstr_copy(); + + addr = strtol(arg, NULL, 16); + + free((char*)arg); + + PUSH(addr); +} + +/* ( addr -- str len ) */ + +static void +ob_macio_encode_unit(void *private) +{ + char buf[8]; + + ucell addr = POP(); + + snprintf(buf, sizeof(buf), "%x", addr); + + push_str(buf); +} + +NODE_METHODS(ob_macio) = { + { "decode-unit", ob_macio_decode_unit }, + { "encode-unit", ob_macio_encode_unit }, +}; + void ob_macio_heathrow_init(const char *path, uint32_t addr) { phandle_t aliases; + REGISTER_NODE(ob_macio); aliases = find_dev("/aliases"); set_property(aliases, "mac-io", path, strlen(path) + 1);

1 0

r603 - in trunk/openbios-devel: drivers forth/util include/libc libc
by svn＠openbios.org 10 Nov '09

10 Nov '09

Author: laurent Date: 2009-11-10 21:39:42 +0000 (Tue, 10 Nov 2009) New Revision: 603 Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/forth/util/pci.fs trunk/openbios-devel/include/libc/string.h trunk/openbios-devel/libc/misc.c Log: Fully decode PCI unit name attribute. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/drivers/pci.c =================================================================== --- trunk/openbios-devel/drivers/pci.c 2009-11-10 21:34:21 UTC (rev 602) +++ trunk/openbios-devel/drivers/pci.c 2009-11-10 21:39:42 UTC (rev 603) @@ -91,8 +91,106 @@ static void ob_pci_decode_unit(int *idx) { - PUSH(0); - fword("decode-unit-pci-bus"); + ucell hi, mid, lo; + const char *arg = pop_fstr_copy(); + int dev, fn, reg, ss, n, p, t; + int bus = 0; /* no information */ + char *ptr; + + dev = 0; + fn = 0; + reg = 0; + ss = 0; + n = 0; + p = 0; + t = 0; + + ptr = (char*)arg; + if (*ptr == 'n') { + n = IS_NOT_RELOCATABLE; + ptr++; + } + if (*ptr == 'i') { + ss = IO_SPACE; + ptr++; + if (*ptr == 't') { + t = IS_ALIASED; + ptr++; + } + + /* DD,F,RR,NNNNNNNN */ + + dev = strtol(ptr, &ptr, 16); + ptr++; + fn = strtol(ptr, &ptr, 16); + ptr++; + reg = strtol(ptr, &ptr, 16); + ptr++; + lo = strtol(ptr, &ptr, 16); + mid = 0; + + } else if (*ptr == 'm') { + ss = MEMORY_SPACE_32; + ptr++; + if (*ptr == 't') { + t = IS_ALIASED; + ptr++; + } + if (*ptr == 'p') { + p = IS_PREFETCHABLE; + ptr++; + } + + /* DD,F,RR,NNNNNNNN */ + + dev = strtol(ptr, &ptr, 16); + ptr++; + fn = strtol(ptr, &ptr, 16); + ptr++; + reg = strtol(ptr, &ptr, 16); + ptr++; + lo = strtol(ptr, &ptr, 16); + mid = 0; + + } else if (*ptr == 'x') { + unsigned long long addr64; + ss = MEMORY_SPACE_64; + ptr++; + if (*ptr == 'p') { + p = IS_PREFETCHABLE; + ptr++; + } + + /* DD,F,RR,NNNNNNNNNNNNNNNN */ + + dev = strtol(ptr, &ptr, 16); + ptr++; + fn = strtol(ptr, &ptr, 16); + ptr++; + reg = strtol(ptr, &ptr, 16); + ptr++; + addr64 = strtoll(ptr, &ptr, 16); + lo = (ucell)addr64; + mid = addr64 >> 32; + + } else { + ss = CONFIGURATION_SPACE; + /* "DD" or "DD,FF" */ + dev = strtol(ptr, &ptr, 16); + if (*ptr == ',') { + ptr++; + fn = strtol(ptr, NULL, 16); + } + lo = 0; + mid = 0; + } + free((char*)arg); + + hi = n | p | t | (ss << 24) | (bus << 16) | (dev << 11) | (fn << 8) | reg; + + PUSH(lo); + PUSH(mid); + PUSH(hi); } /* ( phys.lo phy.mid phys.hi -- str len ) */ @@ -122,7 +220,7 @@ if (fn == 0) /* DD */ snprintf(buf, sizeof(buf), "%x", dev); else /* DD,F */ - snprintf(buf, sizeof(buf), "%x,%d", dev, fn); + snprintf(buf, sizeof(buf), "%x,%x", dev, fn); break; case IO_SPACE: Modified: trunk/openbios-devel/forth/util/pci.fs =================================================================== --- trunk/openbios-devel/forth/util/pci.fs 2009-11-10 21:34:21 UTC (rev 602) +++ trunk/openbios-devel/forth/util/pci.fs 2009-11-10 21:39:42 UTC (rev 603) @@ -90,17 +90,3 @@ \ : test-pci \ 0 2 0 dump-pci-device \ ; - -\ only forth - -: decode-unit-pci-bus ( str len bus -- phys.lo phys.mid phys.hi ) - -rot ascii , left-split - ( addr-R len-R addr-L len-L ) - parse-hex b << f800 and - -rot parse-hex 8 << 700 and - or - ( bus phys.hi ) - swap ff and 10 << or - 0 0 rot -; - Modified: trunk/openbios-devel/include/libc/string.h =================================================================== --- trunk/openbios-devel/include/libc/string.h 2009-11-10 21:34:21 UTC (rev 602) +++ trunk/openbios-devel/include/libc/string.h 2009-11-10 21:39:42 UTC (rev 603) @@ -23,7 +23,9 @@ #define atol(nptr) strtol(nptr, NULL, 10 ) extern long strtol( const char *nptr, char **endptr, int base ); +extern long long int strtoll( const char *nptr, char **endptr, int base ); + extern int strnicmp(const char *s1, const char *s2, size_t len); extern char *strcpy(char * dest,const char *src); extern char *strncpy(char * dest,const char *src,size_t count); Modified: trunk/openbios-devel/libc/misc.c =================================================================== --- trunk/openbios-devel/libc/misc.c 2009-11-10 21:34:21 UTC (rev 602) +++ trunk/openbios-devel/libc/misc.c 2009-11-10 21:39:42 UTC (rev 603) @@ -76,6 +76,41 @@ return sum * sign; } +long long int +strtoll( const char *nptr, char **endptr, int base ) +{ + long long int sum; + int n, sign=1; + while( isspace(*nptr) ) + nptr++; + + if( *nptr == '-' || *nptr == '+' ) + sign = (*nptr++ == '-') ? -1 : 1; + + if( base == 16 || base == 0) { + if( !base ) + base = (nptr[0] == '0')? 8 : 10; + if( nptr[0] == '0' && nptr[1] == 'x' ) { + nptr += 2; + base = 16; + } + } + for( sum=0 ;; nptr++ ) { + char ch = *nptr; + if( !isalnum(ch) ) + break; + n = isdigit(ch) ? ch - '0' : toupper(ch) - 'A' + 10; + if( n >= base || n < 0 ) + break; + sum *= base; + sum += n; + } + if( endptr ) + *endptr = (char*)nptr; + + return sum * sign; +} + // Propolice support long __guard[8] = { #ifdef CONFIG_BIG_ENDIAN

1 0

r602 - trunk/openbios-devel/forth/debugging
by svn＠openbios.org 10 Nov '09

10 Nov '09

Author: laurent Date: 2009-11-10 21:34:21 +0000 (Tue, 10 Nov 2009) New Revision: 602 Modified: trunk/openbios-devel/forth/debugging/client.fs Log: Correctly encode strings of bootpath and bootargs properties. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-11-09 19:39:26 UTC (rev 601) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-11-10 21:34:21 UTC (rev 602) @@ -282,11 +282,11 @@ ; : (encode-bootpath) ( "{params}<cr>" -- bootpath-str bootpath-len) - bl parse 2dup + bl parse 2dup encode-string " /chosen" (find-dev) if " bootpath" rot (property) then - linefeed parse + linefeed parse encode-string " /chosen" (find-dev) if " bootargs" rot (property) then

1 0

r601 - trunk/openbios-devel/drivers
by svn＠openbios.org 09 Nov '09

09 Nov '09

Author: laurent Date: 2009-11-09 19:39:26 +0000 (Mon, 09 Nov 2009) New Revision: 601 Modified: trunk/openbios-devel/drivers/cuda.c Log: Move "bind_func("poweroff", ppc32_poweroff)" from ob_cuda_initialize() to cuda_init() because it is a global word and if it is binded into the node initialization it breaks some other words ("decode-unit", "encode-unit"). Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/drivers/cuda.c =================================================================== --- trunk/openbios-devel/drivers/cuda.c 2009-11-08 23:43:19 UTC (rev 600) +++ trunk/openbios-devel/drivers/cuda.c 2009-11-09 19:39:26 UTC (rev 601) @@ -206,10 +206,6 @@ bind_func("ppc32-reset-all", ppc32_reset_all); push_str("' ppc32-reset-all to reset-all"); fword("eval"); - - PUSH(0); - fword("active-package!"); - bind_func("poweroff", ppc32_poweroff); } static void @@ -307,5 +303,8 @@ main_cuda = cuda; + device_end(); + bind_func("poweroff", ppc32_poweroff); + return cuda; }

1 0

PATCH: Implement Forth source debugger for OpenBIOS
by Mark Cave-Ayland 09 Nov '09

09 Nov '09

Hi all, Whilst spending some time working on debugging SPARC64 support with Qemu/OpenBIOS, it became readily apparent that progress was being hampered by the lack of debugging facilities in OpenBIOS (see http://lists.openbios.org/pipermail/openbios/2009-August/003949.html). Hence I've been working on adding a source debugger to OpenBIOS which should enable developers to step/trace through Forth words in order to locate bugs in the lower level Forth OpenBIOS code. The attached patch implements a Forth Source Debugger based upon the IEEE-1275 specification; it is not a comprehensive implementation but has already proved to be very useful in my tests here. A sample session using the debugger goes something like this: Welcome to OpenBIOS v1.0 built on Oct 31 2009 10:09 Type 'help' for detailed information [unix] Booting default not supported. 0 > : bar ." test " ; ok 0 > debug bar Stepper keys: <space>/<enter> Up Down Trace Rstack Forth ok 0 > bar : bar ( Empty ) 0xf7e11f0c: (") : (") ( Empty ) 0xf7dfd928: r> ( f7e11f0c ) 0xf7dfd92c: dup ( f7e11f0c f7e11f0c ) 0xf7dfd930: 2 ( f7e11f0c f7e11f0c 2 ) 0xf7dfd934: cells ( f7e11f0c f7e11f0c 8 ) 0xf7dfd938: + ( f7e11f0c f7e11f14 ) 0xf7dfd93c: over ( f7e11f0c f7e11f14 f7e11f0c ) 0xf7dfd940: cell+ ( f7e11f0c f7e11f14 f7e11f10 ) 0xf7dfd944: @ ( f7e11f0c f7e11f14 5 ) 0xf7dfd948: rot ( f7e11f14 5 f7e11f0c ) 0xf7dfd94c: over ( f7e11f14 5 f7e11f0c 5 ) 0xf7dfd950: + ( f7e11f14 5 f7e11f11 ) 0xf7dfd954: aligned ( f7e11f14 5 f7e11f14 ) 0xf7dfd958: cell+ ( f7e11f14 5 f7e11f18 ) 0xf7dfd95c: >r ( f7e11f14 5 ) 0xf7dfd960: (semis) [ Finished (") ] ( f7e11f14 5 ) 0xf7e11f1c: type test ( Empty ) 0xf7e11f20: (semis) [ Finished bar ] ok 0 > bar : bar ( Empty ) 0xf7e11f0c: (") : (") ( Empty ) 0xf7dfd928: r> [ Up to bar ] ( f7e11f14 5 ) 0xf7e11f1c: type test ( Empty ) 0xf7e11f20: (semis) [ Finished bar ] ok 0 > As eluded to in earlier posts to the list, my initial attempts at adding debug support were focused on storing additional information in the rstack. Unfortunately this created extra problems in debugging some of the more interesting Forth words, since they would manipulate the return stack and cause the debugger to get confused. My final implementation works in a much more simple way; when the debug word is invoked with the name of the word to debug, the start and end addresses of the word are added to a debug linked list. Then in the next() function, we iterate through the linked list to see if the current PC lies within one of the functions within. If this is the case, we enter the source debugger in step/trace mode as appropriate. Having given the patch a reasonably good test here, I'm quite pleased with the additional functionality it provides. The only minor downsides I can see are that the patch adds extra work in docol(), semis() and next() in order to update the debug linked list. I've tried to wrap most of the complexity in conditional while() statements so that it is only invoked while the debugger is active, and so should have a minimal impact on normal runtime performance (which seems to be the case here). Please test the patch and let me know if it requires extra work in order for it to be considered ready for committing to the OpenBIOS SVN repository. 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 Sirius Labs: http://www.siriusit.co.uk/labs

5 11

r600 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 09 Nov '09

09 Nov '09

Author: laurent Date: 2009-11-08 23:43:19 +0000 (Sun, 08 Nov 2009) New Revision: 600 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c Log: Correct typo Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-11-07 21:53:45 UTC (rev 599) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-11-08 23:43:19 UTC (rev 600) @@ -132,7 +132,7 @@ partition, directory, filename); ELF_DPRINTF("bootpath %s bootargs %s\n", path, args); - set_property( chosen_ph, "bootpath", path, strlen(spec)+1 ); + set_property( chosen_ph, "bootpath", path, strlen(path)+1 ); if (args) set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); }

1 0

r599 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 07 Nov '09

07 Nov '09

Author: laurent Date: 2009-11-07 21:53:45 +0000 (Sat, 07 Nov 2009) New Revision: 599 Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Log: ppc/qemu: correctly manage property "available" of package "/memory" Instead of hardcoding values during init, call ofmem_register() with "/memory" phandle. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c 2009-11-06 21:59:24 UTC (rev 598) +++ trunk/openbios-devel/arch/ppc/qemu/init.c 2009-11-07 21:53:45 UTC (rev 599) @@ -613,28 +613,12 @@ push_str("reg"); fword("property"); - /* available memory */ - - PUSH(0); - fword("encode-int"); - PUSH((unsigned long)get_ram_bottom()); - fword("encode-int"); - fword("encode+"); - PUSH((unsigned long)get_ram_top()); - fword("encode-int"); - fword("encode+"); - PUSH(ram_size); - fword("encode-int"); - fword("encode+"); - push_str("available"); - fword("property"); - cpu = id_cpu(); cpu->initfn(cpu); printk("CPU type %s\n", cpu->name); snprintf(buf, sizeof(buf), "/cpus/%s", cpu->name); - ofmem_register(0, find_dev(buf)); + ofmem_register(find_dev("/memory"), find_dev(buf)); node_methods_init(buf); #ifdef USE_RTAS

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →