OpenBIOS July 2007

openbios@openbios.org

3 participants
65 discussions

r487 - dev/geode/ac97
by svn＠openbios.org 23 Jul '07

23 Jul '07

Author: wmb Date: 2007-07-23 21:34:43 +0200 (Mon, 23 Jul 2007) New Revision: 487 Modified: dev/geode/ac97/ac97.fth Log: AC97 audio driver - added a 30 ms delay after turning on the amplifier, thus ensuring that the amp is actually on before starting send it audio. Modified: dev/geode/ac97/ac97.fth =================================================================== --- dev/geode/ac97/ac97.fth 2007-07-23 19:32:55 UTC (rev 486) +++ dev/geode/ac97/ac97.fth 2007-07-23 19:34:43 UTC (rev 487) @@ -215,7 +215,7 @@ : codec-set ( bitmask reg# -- ) dup >r codec@ or r> codec! ; : codec-clr ( bitmask reg# -- ) dup >r codec@ swap invert and r> codec! ; : amplifier-on ( -- ) - h# 8000 h# 26 amp-default-on? if codec-clr else codec-set then + h# 8000 h# 26 amp-default-on? if codec-clr else codec-set then d# 30 ms ; : amplifier-off ( -- ) h# 8000 h# 26 amp-default-on? if codec-set else codec-clr then

1 0

r486 - cpu/x86
by svn＠openbios.org 23 Jul '07

23 Jul '07

Author: wmb Date: 2007-07-23 21:32:55 +0200 (Mon, 23 Jul 2007) New Revision: 486 Modified: cpu/x86/tsc.fth Log: x86 timing-measurement: Made t( and )t store the starting timestamp in a variable instead of on the stack, so you can now measure code sequences that change the stack depth. Modified: cpu/x86/tsc.fth =================================================================== --- cpu/x86/tsc.fth 2007-07-23 19:30:35 UTC (rev 485) +++ cpu/x86/tsc.fth 2007-07-23 19:32:55 UTC (rev 486) @@ -39,11 +39,12 @@ ' (ms) to ms \ Timing tools -: t( ( -- d.timestamp ) tsc@ ; -: )t ( d.timestamp -- ) - tsc@ 2swap d- d# 367 um/mod nip ( microseconds ) +2variable timestamp +: t( ( -- ) tsc@ timestamp 2! ; +: )t ( -- ) + tsc@ timestamp 2@ d- d# 367 um/mod nip ( microseconds ) push-decimal - <# u# u# u# [char] , hold u# u#s u#> type ." usec" + <# u# u# u# [char] , hold u# u#s u#> type ." uS " pop-base ;

1 0

r485 - cpu/x86/pc
by svn＠openbios.org 23 Jul '07

23 Jul '07

Author: wmb Date: 2007-07-23 21:30:35 +0200 (Mon, 23 Jul 2007) New Revision: 485 Modified: cpu/x86/pc/paging.bth Log: x86 - Fixed crash that occurs after a long sequence of memory mapping operations, caused by an error in the early init code. One of the pages that is used by the memory management code was on the free list. Modified: cpu/x86/pc/paging.bth =================================================================== --- cpu/x86/pc/paging.bth 2007-07-23 06:51:54 UTC (rev 484) +++ cpu/x86/pc/paging.bth 2007-07-23 19:30:35 UTC (rev 485) @@ -147,11 +147,6 @@ loopa then -[ifdef] mem-info-pa - si mem-info-pa 1 la+ #) mov \ Report top of page table area -\ di mem-info-pa 2 la+ #) mov \ Report top of page table area -[then] - [ifdef] rom-pa \ Page Directory Entry /ptab # si sub @@ -175,6 +170,10 @@ loopa [then] +[ifdef] mem-info-pa + si mem-info-pa 1 la+ #) mov \ Report top of page table area +[then] + ascii P report \ enable paging bx cr3 mov \ Set Page Directory Base Register

1 0

r484 - dev/mmc/sdhci
by svn＠openbios.org 23 Jul '07

23 Jul '07

Author: wmb Date: 2007-07-23 08:51:54 +0200 (Mon, 23 Jul 2007) New Revision: 484 Modified: dev/mmc/sdhci/sdhci.fth Log: SDHCI: OLPC trac 1377 - added MMC support and prefixed error message with "SDHCI:" Modified: dev/mmc/sdhci/sdhci.fth =================================================================== --- dev/mmc/sdhci/sdhci.fth 2007-07-22 08:49:28 UTC (rev 483) +++ dev/mmc/sdhci/sdhci.fth 2007-07-23 06:51:54 UTC (rev 484) @@ -89,6 +89,7 @@ ; 0 instance value sd-clk +0 instance value mmc? \ 1 is reset_all, 2 is reset CMD line, 4 is reset DAT line : sw-reset ( mask -- ) @@ -138,6 +139,12 @@ : card-clock-on ( -- ) h# 2c cw@ 4 or h# 2c cw! ; : card-clock-off ( -- ) h# 2c cw@ 4 invert and h# 2c cw! ; +: card-clock-slow ( -- ) \ Less than 400 kHz, for init + card-clock-off + h# 8003 h# 2c cw! \ Set divisor to 2^128, leaving internal clock on + card-clock-on +; + : card-clock-25 ( -- ) card-clock-off h# 103 h# 2c cw! \ Set divisor to 2^1, leaving internal clock on @@ -219,7 +226,7 @@ dup 1 = if true to timeout? 2drop exit then then ( isr esr ) - ." Error: ISR = " swap u. + ." SDHCI: Error: ISR = " swap u. ." ESR = " dup u. decode-esr ." Stopping" cr abort \ debug-me @@ -242,7 +249,7 @@ get-msecs d# 1000 + ( limit ) begin present-state@ 1 and while ( limit ) dup get-msecs - 0< if - ." SDHCI command ready timeout" cr + ." SDHCI: command ready timeout" cr abort then repeat ( limit ) @@ -283,7 +290,12 @@ \ Store in the buffer in little-endian form : get-response136 ( buf -- ) \ 128 bits (16 bytes) of data. - h# 20 h# 10 do i cl@ buf+! 4 +loop drop +\ h# 20 h# 10 do i cl@ buf+! 4 +loop drop + >r + h# 1c cl@ 8 lshift h# 1b cb@ or r@ 0 la+ l! + h# 18 cl@ 8 lshift h# 17 cb@ or r@ 1 la+ l! + h# 14 cl@ 8 lshift h# 13 cb@ or r@ 2 la+ l! + h# 10 cl@ 8 lshift r> 3 la+ l! ; d# 64 instance buffer: scratch-buf @@ -297,11 +309,14 @@ : reset-card ( -- ) 0 0 0 cmd 0 to rca ; \ 0 - +: send-op-cond ( voltage-range -- ocr ) h# 0102 0 cmd response ; \ R3 + \ Get card ID; Result is in cid buffer : get-all-cids ( -- ) 0 h# 0209 0 cmd cid get-response136 ; \ 2 R2 \ Get relative card address -: get-rca ( -- ) 0 h# 031a 0 cmd response h# ffff0000 and to rca ; \ 3 R6 +: get-rca ( -- ) 0 h# 031a 0 cmd response h# ffff0000 and to rca ; \ 3 R6 - SD +: set-rca ( rca -- ) to rca rca h# 031a 0 cmd ; \ 3 R1 - MMC : set-dsr ( -- ) 0 h# 0400 0 cmd ; \ 4 - UNTESTED @@ -317,8 +332,10 @@ : deselect-card ( -- ) 0 h# 0700 0 cmd ; \ 7 - with null RCA : select-card ( -- ) rca h# 071b 0 cmd ; \ 7 R1b -: send-if-cond ( -- ) h# 1aa h# 081a 0 cmd ( response h# 1aa <> if ." Error" then ) ; \ 8 R7 +: send-if-cond ( -- ) h# 1aa h# 081a 0 cmd ( response h# 1aa <> if ." Error" then ) ; \ 8 R7 (SD) +\ : send-ext-csd ( adr -- ) 0 h# 0812 0 cmd ; \ 8 R1 (MMC) Untested - requires data transfer + \ Get Card-specific data : get-csd ( -- ) rca h# 0909 0 cmd csd get-response136 ; \ 9 R2 : get-cid ( -- ) rca h# 0a09 0 cmd cid get-response136 ; \ 10 R2 UNTESTED @@ -385,67 +402,114 @@ scratch-buf ; -\ Version 2 of the spec add CMD8. Pre-v2 cards will time out on CMD8. -: sd2? ( -- flag ) - true to allow-timeout? false to timeout? - send-if-cond - false to allow-timeout? +9 instance value address-shift +h# 8010.0000 value oc-mode \ Voltage settings, etc. - timeout? 0= -; +: wait-powered ( -- error? ) + false to mmc? -0 instance value address-shift -h# 8010.0000 value oc-mode \ Voltage settings, etc. + 9 to address-shift -: wait-powered ( -- ocr ) d# 100 0 do - oc-mode set-oc ( ocr ) \ acmd41 - dup h# 8000.0000 and ( card-powered-on? ) - if unloop exit then + + false to timeout? + mmc? if + oc-mode send-op-cond \ cmd2 ( ocr ) + timeout? if drop true unloop exit then ( ocr ) + else + oc-mode set-oc \ acmd41 ( ocr ) + timeout? if drop true to mmc? 0 then ( ocr ) + then ( ocr ) + + dup h# 8000.0000 and if ( card-powered-on? ) + + \ Card Capacity Status bit - High Capacity cards are addressed + \ in blocks, so the block number does not have to be shifted. + \ Standard capacity cards are addressed in bytes, so the block + \ number must be left-shift by 9 (multiplied by 512). + h# 4000.0000 and if 0 to address-shift then + + unloop false exit + then drop d# 10 ms loop ( ) - ." Card didn't power up after 1 second" cr + + ." SDHCI: Card didn't power up after 1 second" cr abort ; -: set-operating-conditions ( -- ) - sd2? if h# 4030.0000 else h# 0030.0000 then to oc-mode +: set-operating-conditions ( -- error? ) + false to mmc? + true to allow-timeout? - wait-powered + \ SD version 2 adds CMD3. Pre-v2 cards will time out. + false to timeout? send-if-cond ( ) + timeout? if h# 0030.0000 else h# 4030.0000 then to oc-mode - \ Card Capacity Status bit - High Capacity cards are addressed - \ in blocks, so the block number does not have to be shifted. - \ Standard capacity cards are addressed in bytes, so the block - \ number must be left-shift by 9 (multiplied by 512). + wait-powered if true exit then - h# 4000.0000 and if 0 else 9 then to address-shift + false to allow-timeout? + false ; -: configure-transfer ( -- ) - 2 set-bus-width \ acmd6 - bus width 4 - 4-bit +: set-timeout ( -- ) \ The h# c below is supposed to be h# b, but there is a CaFe bug \ in which the timeout code is off by one, which makes the timeout \ be half the requested length. h# c data-timeout! \ 2^24 / 48 MHz = 0.35 sec - /block set-blocklen \ Cmd 16 ; -: ?high-speed ( -- ) - \ High speed didn't exist until SD spec version 1.10 - \ The low nibble of the first byte of SCR data is 0 for v1.0 and v1.01, - \ 1 for v1.10, and 2 for v2. - get-scr c@ h# f and 0= if exit then +: configure-transfer ( -- ) + mmc? if + 1-bit + \ We don't support 4-bit mode for MMC yet - \ Ask if high-speed is supported - h# 00ff.fff1 switch-function d# 13 + c@ 2 and if - h# 80ff.fff1 switch-function drop \ Perform the switch - \ Bump the host controller clock - host-high-speed \ Changes the clock edge - card-clock-50 + \ We don't support switching to high speed on MMC yet. + \ Doing so requires reading the EXT_CSD block + else + 2 set-bus-width \ acmd6 - bus width 4 + 4-bit + /block set-blocklen \ Cmd 16 + + \ High speed didn't exist until SD spec version 1.10 + \ The low nibble of the first byte of SCR data is 0 for v1.0 and v1.01, + \ 1 for v1.10, and 2 for v2. + get-scr c@ h# f and 0= if exit then + + \ Ask if high-speed is supported + h# 00ff.fff1 switch-function d# 13 + c@ 2 and if + h# 80ff.fff1 switch-function drop \ Perform the switch + \ Bump the host controller clock + host-high-speed \ Changes the clock edge + card-clock-50 + else + card-clock-25 + then then ; +\ Extract bit fields from CSD or CID (adr is either csd or cid) +: @bits ( bit# #bits adr -- bits ) + rot 8 - ( #bits adr bit# ) \ -8 accounts for elided CRC + d# 32 /mod ( #bits adr off long# ) + /l* rot + >r ( #bits off r: ladr ) + 2dup + d# 32 > if ( #bits off r: ladr ) + \ Get two longs and splice + r@ l@ over rshift ( #bits off l.low r: ladr ) + r> la1+ l@ ( #bits off l.low l.high ) + rot d# 32 swap - ( #bits l.low l.high #shift ) + lshift or ( #bits l ) + else ( #bits off r: ladr ) + \ The field is contained in one longword + r> l@ swap rshift ( #bits l ) + then ( #bits l ) + swap dup d# 32 = if ( l #bits ) + drop ( bits ) + else ( l #bits ) + 1 swap lshift 1- and ( bits ) + then ( bits ) +; + 0 instance value writing? \ This is the correct way to wait for programming complete. @@ -455,7 +519,7 @@ get-msecs d# 1000 + ( limit ) begin get-status 9 rshift h# f and 7 = while ( limit ) dup get-msecs - 0< if - ." SDHCI wait-write-done timeout" cr + ." SDHCI: wait-write-done timeout" cr abort then repeat ( limit ) @@ -473,20 +537,29 @@ card-inserted? 0= if card-power-off false exit then - card-clock-25 d# 10 ms \ This delay is just a guess + card-clock-slow d# 10 ms \ This delay is just a guess reset-card \ Cmd 0 - ['] set-operating-conditions catch if false exit then + set-operating-conditions if false exit then get-all-cids \ Cmd 2 - get-rca \ Cmd 3 - Get relative card address - get-csd \ Cmd 9 - Get card-specific data - select-card \ Cmd 7 - Select + mmc? if + h# 10000 set-rca \ Cmd 3 (MMC) - Get relative card address + else + get-rca \ Cmd 3 (SD) - Get relative card address + then + card-clock-25 + + get-csd \ Cmd 9 - Get card-specific data + + select-card \ Cmd 7 - Select + configure-transfer - ?high-speed + set-timeout + true ;

1 0

Re: [OpenBIOS] [Qemu-devel] Re: What is the current support state for Sparc emulation
by Blue Swirl 22 Jul '07

22 Jul '07

On 7/19/07, spectral(a)op.pl <spectral(a)op.pl> wrote: > Unhandled Exception 0x00000007 > PC = 0xffd0a55c NPC = 0xffd09374 > Stopping execution > > So this is my report, I hope it can be of some use. I'll try to boot sparc version of OpenSolaris soon and I'l let you know how it went. Thanks for the report. Exception 7 is unaligned access, support for detection of unaligned accesses in QEMU was improved recently. The exception happens inside OpenBIOS: 0xffd0a55c is in lstore (kernel/forth.c:649). 644 645 static void lstore(void) 646 { 647 const u32 *aaddr = (u32 *)cell2pointer(POP()); 648 const u32 longval = POP(); 649 write_long(aaddr, longval); 650 } Maybe write_long should handle unaligned addresses?

2 3

r483 - dev/16550pkg
by svn＠openbios.org 22 Jul '07

22 Jul '07

Author: wmb Date: 2007-07-22 10:49:28 +0200 (Sun, 22 Jul 2007) New Revision: 483 Modified: dev/16550pkg/16550.fth Log: serial driver - Fixed a bug caused by a name conflict between x86 "msr@" and PowerPC "msr@", which are not compatible. The net result was that the OFW "com1" driver did not work at all on x86. Modified: dev/16550pkg/16550.fth =================================================================== --- dev/16550pkg/16550.fth 2007-07-22 01:17:56 UTC (rev 482) +++ dev/16550pkg/16550.fth 2007-07-22 08:49:28 UTC (rev 483) @@ -12,12 +12,14 @@ 0 instance value uart-base \ Virtual address of UART; set later : uart-base-adr ( -- adr ) - [ifdef] msr@ uart-base - msr@ h# 30 and 0= if h# fff and io-base + then - [else] - uart-base - [then] +\ The following code is a PowerPC-specific hack that +\ handles the case where memory mapping is turned off +\ (in which case the 0x30 bit in MSR is 0). Note that +\ the PowerPC msr@ is not compatible with the x86 msr@. +\ [ifdef] msr@ +\ msr@ h# 30 and 0= if h# fff and io-base + then +\ [then] ; : uart@ ( reg# -- byte ) uart-base-adr + rb@ ; \ Read from a UART register : uart! ( byte reg# -- ) uart-base-adr + rb! ; \ Write to a UART register

1 0

r482 - forth/lib
by svn＠openbios.org 22 Jul '07

22 Jul '07

Author: wmb Date: 2007-07-22 03:17:56 +0200 (Sun, 22 Jul 2007) New Revision: 482 Added: forth/lib/base64decode.fth forth/lib/base64encode.fth Log: Added base64 encoding and decoding functions. Added: forth/lib/base64decode.fth =================================================================== --- forth/lib/base64decode.fth (rev 0) +++ forth/lib/base64decode.fth 2007-07-22 01:17:56 UTC (rev 482) @@ -0,0 +1,127 @@ +purpose: Decode base64 (RFC 1341) +\ See license at end of file + +0 [if] +\ Constructing the map on the fly takes almost as much space as including +\ it verbatim. The verbatim copy is probably smaller when compressed. + +h# 100 buffer: base64-map + +: ?make-map ( -- ) + base64-map c@ h# ff <> if + base64-map h# 100 h# ff fill + " ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" + bounds ?do i base64-map i c@ + c! loop + h# fe base64-map [char] = + c! + then +; + +[else] + +base @ hex +create base64-map +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, 3e c, ff c, ff c, ff c, 3f c, \ + / +34 c, 35 c, 36 c, 37 c, 38 c, 39 c, 3a c, 3b c, \ 0-7 +3c c, 3d c, ff c, ff c, ff c, fe c, ff c, ff c, \ 89= +ff c, 0 c, 1 c, 2 c, 3 c, 4 c, 5 c, 6 c, \ A-G + 7 c, 8 c, 9 c, a c, b c, c c, d c, e c, \ H-O + f c, 10 c, 11 c, 12 c, 13 c, 14 c, 15 c, 16 c, \ P-W +17 c, 18 c, 19 c, ff c, ff c, ff c, ff c, ff c, \ X-Z +ff c, 1a c, 1b c, 1c c, 1d c, 1e c, 1f c, 20 c, \ a-g +21 c, 22 c, 23 c, 24 c, 25 c, 26 c, 27 c, 28 c, \ h-o +29 c, 2a c, 2b c, 2c c, 2d c, 2e c, 2f c, 30 c, \ p-w +31 c, 32 c, 33 c, ff c, ff c, ff c, ff c, ff c, \ x-z +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +ff c, ff c, ff c, ff c, ff c, ff c, ff c, ff c, +base ! +[then] + +variable base64-buf \ Bit buffer, collects 6-bit groups into 3 bytes +variable base64-nbits \ Number of bits currently in bit buffer +variable base64-trim \ Number of bytes to trim at the end +\needs base64-outp variable base64-outp \ Output buffer pointer + +: base64-bits ( 6bits -- ) + base64-buf @ 6 lshift or base64-buf ! + 6 base64-nbits +! + base64-nbits @ d# 24 = if + base64-buf @ lbsplit drop ( b2 b1 b0 ) + base64-outp @ tuck c! 1+ tuck c! 1+ tuck c! 1+ ( adr' ) + base64-outp ! + base64-nbits off + then +; + +\ where must be large enough to hold the result including up to 2 padding bytes +\ Trivially, ( inlen ) 3 + 4 / 3 * ( outlen ) +\ but that ignores the fact that, in practice, the line length is limited to +\ to 76 characters, so some embedded newlines are skipped. That makes the +\ actual output length smaller than the calculation above, so the above is safe. +\ In-place decoding is possible, since the output pointer can never catch up +\ to the input pointer. + +: decode-base64 ( adr len where -- len' ) +[ifdef] ?make-map ?make-map [then] + base64-nbits off 0 base64-trim ! ( adr len where ) + dup base64-outp ! -rot ( where adr len ) + + bounds ?do ( where ) + i c@ base64-map + c@ ( where sym ) + dup h# ff = if ( where sym ) + drop ( where ) + else ( where sym ) + dup h# fe = if ( where sym ) + 1 base64-trim +! ( where sym ) + base64-trim @ 2 > abort" Bad base64 input" + drop 0 base64-bits ( where ) + else ( where sym ) + base64-trim @ 0<> abort" Bad base64 input" + base64-bits ( where ) + then ( where ) + then ( where ) + loop ( where ) + base64-outp @ swap - base64-trim @ - ( len ) +; + +\ LICENSE_BEGIN +\ Copyright (c) 2007 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Added: forth/lib/base64encode.fth =================================================================== --- forth/lib/base64encode.fth (rev 0) +++ forth/lib/base64encode.fth 2007-07-22 01:17:56 UTC (rev 482) @@ -0,0 +1,118 @@ +purpose: Encode in base64 (RFC 1341) +\ See license at end of file + +variable base64-linelen + +defer base64-emit + +: base64-putcr ( -- ) + carret base64-emit linefeed base64-emit + base64-linelen off +; + +: base64-putb ( char -- ) + base64-emit 1 base64-linelen +! + base64-linelen @ d# 72 = if base64-putcr then +; + +: base64-out ( 6bits -- ) + h# 3f and ( bits ) + " ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" ( bits adr len ) + drop + c@ ( char ) + base64-putb ( ) +; + +: base64-put= ( -- ) [char] = base64-putb debug-me ; + +: base64-encbyte ( adr bits #rshift -- adr' bits' ) + >r ( adr bits' r: #rshift ) + 8 lshift over c@ or ( adr bits' r: #rshift ) \ Get 8 new bits + swap 1+ swap ( adr bits' r: #rshift ) \ Increment address + dup r> rshift base64-out ( adr bits' ) \ Output 6 high bits +; + +: encode-base64 ( adr len -- ) + base64-linelen off ( adr len ) + bounds ( endadr adr ) + begin 2dup 3 + >= while ( endadr adr ) + 0 ( endadr adr 0bits ) + 2 base64-encbyte ( endadr adr' 2bits ) + 4 base64-encbyte ( endadr adr' 4bits ) + 6 base64-encbyte ( endadr adr' 6bits ) + base64-out ( endadr adr ) + repeat ( endadr adr ) + + tuck - case ( adr ) + 1 of ( adr ) + 0 ( adr 0bits ) + 2 base64-encbyte ( adr' 2bits ) + 4 lshift base64-out ( adr ) + base64-put= base64-put= ( adr ) + endof + + 2 of ( adr ) + 0 ( adr 0bits ) + 2 base64-encbyte ( adr' 2bits ) + 4 base64-encbyte ( adr' 4bits ) + 2 lshift base64-out ( adr ) + base64-put= ( adr ) + endof + endcase ( adr ) + + drop ( ) + + base64-linelen @ if base64-putcr then ( ) +; + +: stream-encode-base64 ( adr len -- ) + ['] emit to base64-emit + encode-base64 +; + +\ "where" must have enough space to hold the result +\ +\ : outlen ( inlen -- outlen ) +\ \ Account for symbol expansion +\ 2 + 3 / 4 * ( #6bit-symbols ) +\ \ Account for CR-LFs +\ d# 72 /mod d# 74 * ( lastline-symbols fullline-bytes ) +\ \ CR-LF on possible short last line +\ swap ?dup if + 2+ then +\ ; + +\needs base64-outp variable base64-outp \ Output buffer pointer +variable base64-outbase +: base64-memout ( char -- ) base64-outp @ c! 1 base64-outp +! ; + +: mem-encode-base64 ( adr len where -- outlen ) + dup base64-outp ! base64-outbase ! + ['] base64-memout to base64-emit + + encode-base64 + + base64-outp @ base64-outbase @ - +; + +\ LICENSE_BEGIN +\ Copyright (c) 2007 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0

r481 - cpu/x86/pc/olpc
by svn＠openbios.org 20 Jul '07

20 Jul '07

Author: wmb Date: 2007-07-20 23:16:58 +0200 (Fri, 20 Jul 2007) New Revision: 481 Modified: cpu/x86/pc/olpc/copynand.fth Log: OLPC trac 1115 - copy-nand improvements: a) Checked for a number of error cases - empty .img file, .img file not a multiple of the NAND erase block size, .crc file length not a multiple of the CRC record length, .crc file length wrong for the .img file. b) Read the CRC file into a buffer at the beginning, so copy-nand works over HTTP. Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2007-07-20 02:51:52 UTC (rev 480) +++ cpu/x86/pc/olpc/copynand.fth 2007-07-20 21:16:58 UTC (rev 481) @@ -10,10 +10,22 @@ 0 value nand-pages/block 0 value #nand-pages +0 value #image-eblocks +0 value #crc-records + +0 value crc-buf + +: >crc ( index -- crc ) crc-buf swap la+ l@ ; + : close-nand-ihs ( -- ) - fileih ?dup if 0 to fileih close-dev then - nandih ?dup if 0 to nandih close-dev then + fileih ?dup if 0 to fileih close-dev 0 to #image-eblocks then + nandih ?dup if 0 to nandih close-dev 0 to #nand-pages then crc-ih ?dup if 0 to crc-ih close-dev then + #crc-records if + crc-buf #crc-records /l* free-mem + 0 to crc-buf + 0 to #crc-records + then ; : ?nand-abort ( flag msg$ -- ) @@ -48,37 +60,63 @@ true ; - +\ Open the CRC file and parse all the CRC values into an integer array : open-crcs ( name$ -- ) open-dev to crc-ih crc-ih 0= " Can't open CRC file" ?nand-abort + + " size" crc-ih $call-method 9 um/mod ( residue #lines ) + swap 0<> " CRC file length is not a multiple of the CRC record length" ?nand-abort + + to #crc-records ( ) + #crc-records /l* alloc-mem to crc-buf + + #crc-records 0 ?do + next-crc 0= " CRC record read failure" ?nand-abort ( crc ) + crc-buf i la+ l! + loop + + crc-ih close-dev 0 to crc-ih ; h# 100 buffer: image-name-buf : image-name$ ( -- adr len ) image-name-buf count ; +h# 100 buffer: crc-name-buf +: crc-name$ ( -- adr len ) crc-name-buf count ; - : ?open-crcs ( -- ) image-name$ + 4 - " .img" caps-comp 0= if - " crc" image-name$ + 3 - swap move - image-name$ open-crcs - else - 0 to crc-ih + image-name$ crc-name-buf place + " crc" crc-name$ + 3 - swap move + crc-name$ open-crcs then - crc-ih if ." Check file is " image-name$ type cr then + #crc-records if + ." Check file is " crc-name$ type cr + then ; +: get-img-filename ( -- ) safe-parse-word image-name-buf place ; + : open-img ( "devspec" -- ) - safe-parse-word 2dup image-name-buf place ( devspec$ ) - open-dev to fileih + image-name$ open-dev to fileih fileih 0= " Can't open NAND image file" ?nand-abort + " size" fileih $call-method /nand-block um/mod ( residue #eblocks ) + to #image-eblocks ( residue ) + 0<> " Image file size is not a multiple of the NAND erase block size" ?nand-abort + #image-eblocks 0= " Image file is empty" ?nand-abort + + #crc-records if + #image-eblocks #crc-records <> " CRC file length is wrong" ?nand-abort + then ; -: #records ( ih /record -- n ) - swap " size" rot $call-method rot um/mod nip +: read-image-block ( -- ) + load-base /nand-block " read" fileih $call-method ( len ) + /nand-block <> " Bad read of .img file" ?nand-abort ( ) ; -: check-mem-crc ( crc -- ) +: check-mem-crc ( record# -- ) + >crc ( crc ) load-base /nand-block $crc ( crc actual-crc ) 2dup <> if cr ." CRC miscompare - expected " swap . ." got " . cr @@ -89,79 +127,70 @@ then ( ) ; -: ?check-crc ( -- ) - crc-ih if - next-crc 0= " Premature end of .crc file" ?nand-abort - check-mem-crc - then +: ?check-crc ( record# -- ) + #crc-records if check-mem-crc else drop then ; + : copy-nand ( "devspec" -- ) open-nand + get-img-filename + ?open-crcs open-img - ?open-crcs ['] noop to show-progress ." Erasing..." cr " wipe" nandih $call-method - cr ." Writing " fileih /nand-block #records . ." blocks" cr - 0 - begin - load-base /nand-block " read" fileih $call-method - 0> while - (cr dup . 1+ - ?check-crc + cr ." Writing " #image-eblocks . ." blocks" cr + + #image-eblocks 0 ?do + (cr i . + read-image-block + i ?check-crc load-base " copy-block" nandih $call-method - repeat - drop + loop close-nand-ihs ; : verify-nand ( "devspec" -- ) open-nand + get-img-filename open-img ['] noop to show-progress - ." Verifing " fileih /nand-block #records . ." blocks" cr + ." Verifing " #image-eblocks . ." blocks" cr - 0 - begin ( block# ) - load-base /nand-block " read" fileih $call-method ( block# #read ) - 0> while ( block# ) - (cr dup . 1+ ( block#' ) - load-base /nand-block + " read-next-block" nandih $call-method ( block# ) - load-base load-base /nand-block + /nand-block comp if ( block# ) - cr ." Miscompare in block starting at page# " ( block# ) - " scan-page#" nandih $call-method .x cr ( block# ) + #image-eblocks 0 ?do + (cr i . + read-image-block + load-base /nand-block + " read-next-block" nandih $call-method ( ) + load-base load-base /nand-block + /nand-block comp if ( ) + cr ." Miscompare in block starting at page# " ( ) + " scan-page#" nandih $call-method .x cr ( ) ?key-stop - then ( block# ) - repeat ( block# ) - drop ( ) + then ( ) + repeat ( ) close-nand-ihs ; : crc-img ( "img-devspec" -- ) hex open-nand close-nand-ihs \ To set sizes + get-img-filename + ?open-crcs open-img - ?open-crcs - crc-ih 0= " No CRC file" ?nand-abort + #crc-records 0= " No CRC file" ?nand-abort ['] noop to show-progress - ." Verifying " crc-ih 9 #records . ." blocks" cr + ." Verifying " #crc-records . ." blocks" cr - 0 - begin next-crc while ( block# crc ) - swap (cr dup . 1+ swap ( block#' crc ) - - load-base /nand-block " read" fileih $call-method ( block# crc len ) - /nand-block <> " Short img file" ?nand-abort ( block# crc ) - - check-mem-crc ( block# ) - repeat ( block# ) - drop ( ) + #crc-records 0 ?do + (cr i . + read-image-block + i check-mem-crc + loop close-nand-ihs ; @@ -171,25 +200,23 @@ safe-parse-word open-crcs ['] noop to show-progress - ." Verifying " crc-ih 9 #records . ." blocks" cr + ." Verifying " #crc-records . ." blocks" cr - 0 - begin next-crc while ( block# crc ) - swap (cr dup . 1+ swap ( block#' crc ) + #crc-records 0 ?do + (cr i . - load-base " read-next-block" nandih $call-method ( block# crc ) + load-base " read-next-block" nandih $call-method ( ) - load-base /nand-block $crc ( block# crc actual-crc ) - 2dup <> if - cr ." CRC miscompare - expected " swap . ." got " . + load-base /nand-block $crc i >crc ( actual-crc expected-crc ) + 2dup <> if ( actual-crc expected-crc ) + cr ." CRC miscompare - expected " . ." got " . ( ) ." in NAND block starting at page " " scan-page#" nandih $call-method . cr ?key-stop - else - 2drop - then ( block# ) - repeat ( block# ) - drop ( ) + else ( actual-crc expected-crc ) + 2drop ( ) + then ( ) + repeat ( ) close-nand-ihs ;

1 0

r166 - in openbios-devel: arch/sparc32 drivers
by svn＠openbios.org 20 Jul '07

20 Jul '07

Author: blueswirl Date: 2007-07-20 13:23:30 +0200 (Fri, 20 Jul 2007) New Revision: 166 Modified: openbios-devel/arch/sparc32/init.fs openbios-devel/arch/sparc32/romvec.c openbios-devel/drivers/iommu.c openbios-devel/drivers/obio.c Log: Fix mapping of a single byte area, fix reset and poweroff Modified: openbios-devel/arch/sparc32/init.fs =================================================================== --- openbios-devel/arch/sparc32/init.fs 2007-07-11 19:48:31 UTC (rev 165) +++ openbios-devel/arch/sparc32/init.fs 2007-07-20 11:23:30 UTC (rev 166) @@ -52,12 +52,6 @@ device-end -: sparc32-reset-all - h# 71f00000 1 iow! - ; - -' sparc32-reset-all to reset-all - : rmap@ ( virt -- rmentry ) drop 0 ; Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2007-07-11 19:48:31 UTC (rev 165) +++ openbios-devel/arch/sparc32/romvec.c 2007-07-20 11:23:30 UTC (rev 166) @@ -244,7 +244,7 @@ static void obp_reboot(char *str) { - extern volatile int *reset_reg; + extern volatile unsigned char *reset_reg; printk("rebooting (%s)\n", str); *reset_reg = 1; @@ -254,7 +254,7 @@ static void obp_abort(void) { - extern volatile int *power_reg; + extern volatile unsigned char *power_reg; printk("abort, power off\n"); *power_reg = 1; @@ -264,7 +264,7 @@ static void obp_halt(void) { - extern volatile int *power_reg; + extern volatile unsigned char *power_reg; printk("halt, power off\n"); *power_reg = 1; Modified: openbios-devel/drivers/iommu.c =================================================================== --- openbios-devel/drivers/iommu.c 2007-07-11 19:48:31 UTC (rev 165) +++ openbios-devel/drivers/iommu.c 2007-07-20 11:23:30 UTC (rev 166) @@ -195,7 +195,7 @@ unsigned int mva; off = pa & (PAGE_SIZE - 1); - npages = (off + (size - 1) + (PAGE_SIZE - 1)) / PAGE_SIZE; + npages = (off + size - 1) / PAGE_SIZE + 1; pa &= ~(PAGE_SIZE - 1); va = mem_alloc(&cio, npages * PAGE_SIZE, PAGE_SIZE); Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-07-11 19:48:31 UTC (rev 165) +++ openbios-devel/drivers/obio.c 2007-07-20 11:23:30 UTC (rev 166) @@ -812,9 +812,15 @@ fword("finish-device"); } -volatile int *power_reg, *reset_reg; +volatile unsigned char *power_reg, *reset_reg; static void +sparc32_reset_all(void) +{ + *reset_reg = 1; +} + +static void ob_power_init(uint64_t base, uint64_t offset, int intr) { ob_new_obio_device("power", NULL); @@ -824,6 +830,10 @@ // Not in device tree reset_reg = map_io(base + (uint64_t)SLAVIO_RESET, RESET_REGS); + bind_func("sparc32-reset-all", sparc32_reset_all); + push_str("' sparc32-reset-all to reset-all"); + fword("eval"); + ob_intr(intr); fword("finish-device");

1 0

r480 - cpu/i8051
by svn＠openbios.org 20 Jul '07

20 Jul '07

Author: wmb Date: 2007-07-20 04:51:52 +0200 (Fri, 20 Jul 2007) New Revision: 480 Modified: cpu/i8051/kernel.bth Log: 8051 - enabled headerless Modified: cpu/i8051/kernel.bth =================================================================== --- cpu/i8051/kernel.bth 2007-07-20 02:13:21 UTC (rev 479) +++ cpu/i8051/kernel.bth 2007-07-20 02:51:52 UTC (rev 480) @@ -35,7 +35,8 @@ fload ${BP}/cpu/i8051/metainit.fth \ Turn on the metacompiler -always-headers \ Don't omit any headers +\ always-headers \ Don't omit any headers +sometimes-headers \ Omit headers according to headers/headerless \ Comment out the following lines when debugging -1 threshold ! \ Turn OFF ALL debugging messages

1 0