March 2010 - openfirmware - mail.coreboot.org

[commit] r1774 - cpu/x86/pc/olpc/via
by repository service March 18, 2010

March 18, 2010

Author: wmb Date: Thu Mar 18 19:21:33 2010 New Revision: 1774 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1774 Log: OLPC trac 10078 - second fs-update fails after mistyping file name on first try. Modified: cpu/x86/pc/olpc/via/fsupdate.fth Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Wed Mar 10 18:44:21 2010 (r1773) +++ cpu/x86/pc/olpc/via/fsupdate.fth Thu Mar 18 19:21:33 2010 (r1774) @@ -216,12 +216,12 @@ : fs-update ( "devspec" -- ) load-crypto abort" Can't load hash routines" - open-nand ( ) - false to secure-fsupdate? ( ) safe-parse-word r/o open-file ( fd ) abort" Can't open file" ( fd ) + open-nand ( ) + linefeed over force-line-delimiter ( fd ) t( ( fd )

1 0

[commit] r1773 - cpu/x86/pc/olpc
by repository service March 10, 2010

March 10, 2010

Author: wmb Date: Wed Mar 10 18:44:21 2010 New Revision: 1773 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1773 Log: Q3A35 rebuild - reverted non-yet-ready tweak to xpsecure.fth. Modified: cpu/x86/pc/olpc/xpsecure.fth Modified: cpu/x86/pc/olpc/xpsecure.fth ============================================================================== --- cpu/x86/pc/olpc/xpsecure.fth Wed Mar 10 18:37:16 2010 (r1772) +++ cpu/x86/pc/olpc/xpsecure.fth Wed Mar 10 18:44:21 2010 (r1773) @@ -21,7 +21,7 @@ ramdisk-base swap move ( ) \ Tell the BIOS INT 13 emulator code to use the ramdisk instead of the SD - ramdisk-ih to bios-disk-ih0 + ramdisk-ih to bios-disk-ih h# 80 to bios-boot-dev# ;

1 0

[commit] r1772 - cpu/x86/pc/olpc/via
by repository service March 10, 2010

March 10, 2010

Author: wmb Date: Wed Mar 10 18:37:16 2010 New Revision: 1772 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1772 Log: Q3A35 Modified: cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Wed Mar 10 18:35:32 2010 (r1771) +++ cpu/x86/pc/olpc/via/fw-version.fth Wed Mar 10 18:37:16 2010 (r1772) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 34 +macro: FW_MINOR 35

1 0

[commit] r1771 - dev
by repository service March 10, 2010

March 10, 2010

Author: wmb Date: Wed Mar 10 18:35:32 2010 New Revision: 1771 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1771 Log: Libertas WLAN driver improvements for adhoc multicasting. Modified: dev/libertas.fth Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Wed Mar 10 10:30:58 2010 (r1770) +++ dev/libertas.fth Wed Mar 10 18:35:32 2010 (r1771) @@ -16,8 +16,8 @@ \ Interface to /supplicant support package 0 value supplicant-ih : $call-supplicant ( ...$ -- ... ) supplicant-ih $call-method ; -: do-associate ( -- flag ) " do-associate" $call-supplicant ; -: process-eapol ( adr len -- ) " process-eapol" $call-supplicant ; +: supplicant-associate ( -- flag ) " do-associate" $call-supplicant ; +: supplicant-process-eapol ( adr len -- ) " process-eapol" $call-supplicant ; : .scan ( adr -- ) " .scan" $call-supplicant ; : .ssids ( adr -- ) " .ssids" $call-supplicant ; @@ -112,8 +112,10 @@ \ Data rates d# 14 constant #rates -create supported-rates 82 c, 84 c, 8b c, 96 c, 0c c, 12 c, 18 c, 24 c, - 30 c, 48 c, 60 c, 6c c, 00 c, 00 c, +\ create supported-rates 82 c, 84 c, 8b c, 96 c, 0c c, 12 c, 18 c, 24 c, +\ 30 c, 48 c, 60 c, 6c c, 00 c, 00 c, +create supported-rates 82 c, 84 c, 8b c, 96 c, 8c c, 92 c, 98 c, a4 c, + b0 c, c8 c, e0 c, ec c, 00 c, 00 c, #rates buffer: common-rates external @@ -308,7 +310,7 @@ then ; -: do-process-eapol ( adr len -- ) false to got-data? process-eapol ; +: do-process-eapol ( adr len -- ) false to got-data? supplicant-process-eapol ; \ ========================================================================= \ Generic commands & responses @@ -1104,7 +1106,8 @@ atim +xw \ ATIM window 4 +x \ Reserved bytes - cap +xw \ Capability info: ESS, short slot, WEP +\ cap +xw \ Capability info: ESS, short slot, WEP + 2 +xw \ Capability info: IBSS (WEP/WPA would add h# 10) \ XXX 14 bytes for 802.11g, 8 bytes for 802.11b common-rates #rates +x$ \ Common supported data rates @@ -1352,10 +1355,12 @@ headers : do-associate ( -- ok? ) - do-associate dup if + ['] 2drop to ?process-eapol \ Don't reenter the supplicant while associating + supplicant-associate dup if ds-disconnected reset-driver-state ds-associated set-driver-state then + ['] do-process-eapol to ?process-eapol ; : ?reassociate ( -- ) @@ -1640,11 +1645,7 @@ ds-disconnected reset-driver-state else link-up? 0= if - ['] 2drop to ?process-eapol do-associate 0= if free-buf false exit then - ds-disconnected reset-driver-state - ds-associated set-driver-state - ['] do-process-eapol to ?process-eapol then start-nic then

1 0

[commit] r1770 - cpu/x86/pc/olpc
by repository service March 10, 2010

March 10, 2010

Author: wmb Date: Wed Mar 10 10:30:58 2010 New Revision: 1770 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1770 Log: Added an additional BIOS disk device. Modified: cpu/x86/pc/olpc/xpsecure.fth Modified: cpu/x86/pc/olpc/xpsecure.fth ============================================================================== --- cpu/x86/pc/olpc/xpsecure.fth Wed Mar 10 10:30:01 2010 (r1769) +++ cpu/x86/pc/olpc/xpsecure.fth Wed Mar 10 10:30:58 2010 (r1770) @@ -21,7 +21,7 @@ ramdisk-base swap move ( ) \ Tell the BIOS INT 13 emulator code to use the ramdisk instead of the SD - ramdisk-ih to bios-disk-ih + ramdisk-ih to bios-disk-ih0 h# 80 to bios-boot-dev# ;

1 0

[commit] r1769 - cpu/x86/pc/olpc/via
by repository service March 10, 2010

March 10, 2010

Author: wmb Date: Wed Mar 10 10:30:01 2010 New Revision: 1769 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1769 Log: OLPC XO-1.5 - hopefully faster fs-update using erase-blocks and other asynchronous techniques. Modified: cpu/x86/pc/olpc/via/fsupdate.fth Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Wed Mar 10 10:29:14 2010 (r1768) +++ cpu/x86/pc/olpc/via/fsupdate.fth Wed Mar 10 10:30:01 2010 (r1769) @@ -71,6 +71,7 @@ " size" $call-nand #image-eblocks /nand-block um* d< " Image size is larger than output device" ?nand-abort #image-eblocks show-init + 0 #image-eblocks " erase-blocks" $call-nand get-inflater \ Separate the two buffers by enough space for both the compressed \ and uncompressed copies of the data. 4x is overkill, but there @@ -106,16 +107,30 @@ #image-eblocks show-writing ; +: eat-newline ( ih -- ) + fgetc newline <> ( error? ) + " Missing newline after zdata" ?nand-abort ( ) +; +: skip-zdata ( comprlen -- ) + ?compare-spec-line ( comprlen ) + + secure-fsupdate? if filefd else source-id then ( comprlen ih ) + + >r u>d r@ dftell ( d.comprlen d.pos r: ih ) + d+ r@ dfseek ( r: ih ) + + r> eat-newline +; + : get-zdata ( comprlen -- ) - ?compare-spec-line + ?compare-spec-line ( comprlen ) - secure-fsupdate? if filefd else source-id then ( ih ) + secure-fsupdate? if filefd else source-id then ( comprlen ih ) >r data-buffer /nand-block + over r@ fgets ( comprlen #read r: ih ) <> " Short read of zdata file" ?nand-abort ( r: ih ) - r> fgetc newline <> ( error? ) - " Missing newline after zdata" ?nand-abort ( ) + r> eat-newline \ The "2+" skips the Zlib header data-buffer /nand-block + 2+ data-buffer true (inflate) ( len ) @@ -169,22 +184,27 @@ " Malformed hash string" ?nand-abort ( eblock# hashname$ hash$ r: comprlen ) ?get-crc ( eblock# hashname$ hash$ r: comprlen ) - r> get-zdata ( eblock# hashname$ hash$ ) - ?check-crc ( eblock# hashname$ hash$ ) - check-hash? if ( eblock# hashname$ hash$ ) - check-hash ( eblock# ) - else ( eblock# hashname$ hash$ ) - 2drop 2drop ( eblock# ) - then + 2over " fa43239bcee7b97ca62f007cc68487560a39e19f74f3dde7486db3f98df8e471" $= if ( eblock# hashname$ hash$ r: comprlen) + r> skip-zdata ( eblock# hashname$ hash$ ) + 2drop 2drop ( eblock# ) + else ( eblock# hashname$ hash$ ) + r> get-zdata ( eblock# hashname$ hash$ ) + ?check-crc ( eblock# hashname$ hash$ ) + + check-hash? if ( eblock# hashname$ hash$ ) + check-hash ( eblock# ) + else ( eblock# hashname$ hash$ ) + 2drop 2drop ( eblock# ) + then ( eblock# ) - ( eblock# ) \ Asynchronous writes - data-buffer over nand-pages/block * nand-pages/block " write-blocks-start" $call-nand ( eblock# error? ) - " Write error" ?nand-abort ( eblock# ) + data-buffer over nand-pages/block * nand-pages/block " write-blocks-start" $call-nand ( eblock# error? ) + " Write error" ?nand-abort ( eblock# ) \ data-buffer over nand-pages/block * nand-pages/block " write-blocks" $call-nand ( eblock# #written ) \ nand-pages/block <> " Write error" ?nand-abort ( eblock# ) - swap-buffers ( eblock# ) + swap-buffers ( eblock# ) + then dup to last-eblock# ( eblock# ) show-written ( )

1 0

[commit] r1768 - cpu/x86/pc/olpc/via
by repository service March 10, 2010

March 10, 2010

Author: wmb Date: Wed Mar 10 10:29:14 2010 New Revision: 1768 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1768 Log: OLPC XO-1.5 - let the DMA area grow much larger, for NANDblaster. Modified: cpu/x86/pc/olpc/via/addrs.fth Modified: cpu/x86/pc/olpc/via/addrs.fth ============================================================================== --- cpu/x86/pc/olpc/via/addrs.fth Wed Mar 10 10:28:16 2010 (r1767) +++ cpu/x86/pc/olpc/via/addrs.fth Wed Mar 10 10:29:14 2010 (r1768) @@ -37,7 +37,8 @@ h# 18.0000 constant heap-size -h# 40.0000 constant /dma-extra \ In case the firmware region isn't enough +\ h# 40.0000 constant /dma-extra \ In case the firmware region isn't enough +h# 1000.0000 constant /dma-extra \ In case the firmware region isn't enough /fw-ram /dma-extra + constant dma-size \ We let the DMA area overlap the FW area \ fw-pa /dma-extra - constant dma-base 0 value dma-base \ Set in probemem.fth

1 0

[commit] r1767 - clients/lib
by repository service March 10, 2010

March 10, 2010

Author: wmb Date: Wed Mar 10 10:28:16 2010 New Revision: 1767 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1767 Log: Added some new string parsing routines to the client library. Modified: clients/lib/printf.c clients/lib/strings.c Modified: clients/lib/printf.c ============================================================================== --- clients/lib/printf.c Wed Mar 10 10:27:21 2010 (r1766) +++ clients/lib/printf.c Wed Mar 10 10:28:16 2010 (r1767) @@ -7,37 +7,65 @@ #include <stdarg.h> #include "stdio.h" -int -atoi(const char *s) +long +memtol(const char *s, int len, char **endptr, int base) { - int temp = 0, base = 10; + int temp = 0; + int minus = 0; + int digit; + const char *send = s+len; - if (*s == '0') { - ++s; - if (*s == 'x') { + if (s != send && *s == '+' || *s == '-') { + minus = *s == '-'; + s++; + } + if (base == 0) { + if (s!=send && *s == '0') { ++s; - base = 16; + if (s!=send && toupper(*s) == 'X') { + ++s; + base = 16; + } else { + base = 8; + } } else { - base = 8; + base = 10; + } + } else { + if (base == 16 && (send-s) > 1 && *s == '0' && toupper(s[1]) == 'X') { + s += 2; } } - while (*s) { - switch (*s) { - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - temp = (temp * base) + (*s++ - '0'); - break; - case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': - temp = (temp * base) + (*s++ - 'a' + 10); - break; - case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': - temp = (temp * base) + (*s++ - 'A' + 10); - break; - default: - return (temp); + while (s!=send) { + digit = toupper(*s) - '0'; + if (digit >= 0 && digit <= 9) { + temp = (temp * base) + digit; + s++; + } else { + digit = digit + '0' - 'A' + 10; + if (digit >= 10 && digit < base) { + temp = (temp * base) + digit; + s++; + } else { + break; + } } } - return (temp); + if (endptr) + *endptr = (char *)s; + return minus ? -temp : temp; +} + +long +strtol(const char *s, char **endptr, int base) +{ + return memtol(s, strlen(s), endptr, base); +} + +int +atoi(const char *s) +{ + return (int)strtol(s, NULL, 10); } STATIC int Modified: clients/lib/strings.c ============================================================================== --- clients/lib/strings.c Wed Mar 10 10:27:21 2010 (r1766) +++ clients/lib/strings.c Wed Mar 10 10:28:16 2010 (r1767) @@ -114,6 +114,23 @@ return(temp); } +void *memchr(const void *s, int c, int len) +{ + unsigned char *p = s; + while (len--) { + if (*p == (unsigned char)c) + return p; + p++; + } + return NULL; +} + +int toupper(int c) +{ + return (c >= 'a' && c <= 'z') ? (c - 'a' + 'A') : c; +} + + // LICENSE_BEGIN // Copyright (c) 2006 FirmWorks //

1 0

[commit] r1766 - dev
by repository service March 10, 2010

March 10, 2010

Author: wmb Date: Wed Mar 10 10:27:21 2010 New Revision: 1766 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1766 Log: Fast code implementations of interrupt controller handling words. Modified: dev/i8259.fth Modified: dev/i8259.fth ============================================================================== --- dev/i8259.fth Wed Mar 10 10:26:00 2010 (r1765) +++ dev/i8259.fth Wed Mar 10 10:27:21 2010 (r1766) @@ -72,17 +72,53 @@ h# b h# 20 ocw3@ dup 4 and if h# b h# a0 ocw3@ bwjoin then ; -: eoi ( -- ) - h# b h# 20 ocw3@ 4 and ( slave? ) - h# 20 h# 20 pc! ( slave? ) \ EOI to master - if h# 20 h# a0 pc! then ( ) \ EOI to slave -; - \ This is only needed when operating in rotating priority mode \ : iack# ( irq# -- ) \ dup 7 and h# 60 or swap 8 and if h# a0 else h# 20 then pc! \ ; +[ifdef] 386-assembler +code this-interrupt + ax ax xor + h# f # al mov + al h# 20 # out + h# 20 # in + h# 80 # al test 0= if + ax ax xor + ax push + next + then + h# 7 # al and + h# 2 # al cmp <> if \ Not cascaded + ax push + ax ax xor ax dec ax push + next + then + h# f # al mov + al h# a0 # out + h# a0 # in + h# 80 # al test 0= if + ax ax xor ax push + next + then + h# 7 # al and + h# 8 # al add + ax push + ax ax xor ax dec ax push +c; +code eoi + h# b # al mov + al h# 20 # out + h# 20 # in + h# 04 # al test \ Test slave bit + h# 20 # al mov + al h# 20 # out \ EOI to master + 0<> if + al h# a0 # out \ EOI to cascaded slave + then +c; +alias interrupt-done eoi +[else] : this-interrupt ( -- false | level true ) h# f h# 20 ocw3@ dup h# 80 and if ( low-code ) 7 and dup 2 = if ( low-level ) @@ -102,6 +138,12 @@ then ( false | level true ) ; : interrupt-done ( -- ) eoi ; +: eoi ( -- ) + h# b h# 20 ocw3@ 4 and ( slave? ) + h# 20 h# 20 pc! ( slave? ) \ EOI to master + if h# 20 h# a0 pc! then ( ) \ EOI to slave +; +[then] \ XXX we really should map the registers : open ( -- flag? ) true ;

1 0

[commit] r1765 - cpu/x86/pc/olpc/via
by repository service March 10, 2010

March 10, 2010

Author: wmb Date: Wed Mar 10 10:26:00 2010 New Revision: 1765 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1765 Log: OLPC XO-1.5 - Added disable-serial command. Modified: cpu/x86/pc/olpc/via/fw.bth Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Wed Mar 10 10:16:39 2010 (r1764) +++ cpu/x86/pc/olpc/via/fw.bth Wed Mar 10 10:26:00 2010 (r1765) @@ -743,9 +743,14 @@ : enable-serial ( -- ) serial-enabled? if exit then + h# 40 h# 8846 config-b! - " com1" open-dev add-input - " com1" open-dev add-output + " com1" open-dev dup to fallback-in-ih add-input + " com1" open-dev dup to fallback-out-ih add-output +; +: disable-serial + fallback-in-ih ?dup if remove-input then + fallback-out-ih ?dup if remove-output then ; tag-file @ fclose tag-file off

1 0