August 2011 - openfirmware - mail.coreboot.org

[commit] r2485 - cpu/arm/olpc/1.75
by repository service Aug. 28, 2011

Aug. 28, 2011

Author: wmb Date: Mon Aug 29 03:36:56 2011 New Revision: 2485 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2485 Log: OLPC XO-1.75 - initial revision of RM3150 touchscreen driver. Added: cpu/arm/olpc/1.75/rm3150-touchscreen.fth Added: cpu/arm/olpc/1.75/rm3150-touchscreen.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/olpc/1.75/rm3150-touchscreen.fth Mon Aug 29 03:36:56 2011 (r2485) @@ -0,0 +1,310 @@ +\ See license at end of file +purpose: Driver and diagnostic for Raydium RM-3150 Multitouch I2C Touchscreen + +0 0 " 4,60" " /twsi" begin-package +my-space encode-int my-address encode-int encode+ " reg" property +" touchscreen" name + +: ts-b! ( b reg# -- ) " smbus-b!" $call-parent ; +: ts-b@ ( reg# -- b ) " smbus-b@" $call-parent ; + +d# 896 constant touchscreen-max-x +d# 672 constant touchscreen-max-y + +: 4b>xy ( x.hi x.lo y.hi y.lo -- x y ) swap bwjoin >r swap bwjoin r> ; + +: touchscreen-present? ( -- flag ) + h# a ['] ts-b@ catch if ( x ) + drop false exit ( -- false ) + then ( max-x.hi ) + \ It would be nice to read all four bytes in one SMBUS transaction, + \ but that doesn't work for these register locations - the first + \ one reads correctly, and subsequent ones read as 0. You must + \ read them individually to get the right answer. + h# b ts-b@ h# c ts-b@ h# d ts-b@ ( max-x.hi max-x.lo max-y.hi max-y.lo ) + 4b>xy ( max-x max-y ) + touchscreen-max-y = ( max-y flag ) + swap touchscreen-max-x = and ( flag' ) +; + +: open ( -- okay? ) + my-unit " set-address" $call-parent + touchscreen-present? dup if ( okay? ) + 0 1 ts-b! ( okay? ) \ Set to polled mode + then ( okay? ) +; +: close ( -- ) + h# 82 1 ts-b! \ Restore default interrupt mode +; + +: pad-events ( -- n*[ x.hi x.lo y.hi y.lo z ] #contacts ) + d# 99 gpio-pin@ if false exit then + h# 10 ts-b@ h# 7f and >r ( r: #contacts ) + r@ if ( r: #contacts ) + h# 11 1 r@ 5 * " smbus-out-in" $call-parent ( n*[ x.hi x.lo y.hi y.lo z ] r: #contacts ) + then ( n*[ x.hi x.lo y.hi y.lo z ] r: #contacts ) + r> ( n*[ x.hi x.lo y.hi y.lo z ] #contacts ) +; + +h# f800 constant red +h# 07e0 constant green +h# 001f constant blue +h# ffe0 constant yellow +h# f81f constant magenta +h# 07ff constant cyan +h# ffff constant white +h# 0000 constant black + +variable pixcolor + +h# 4 value y-offset +0 value screen-w +0 value screen-h +0 value /line +2 value /pixel + + +variable ptr + +\ The following code receives and decodes touchpad packets + +: show-packets ( adr len -- ) + push-hex + bounds ?do + i 6 bounds ?do i c@ 3 u.r loop cr + 6 +loop + pop-base +; +: last-10 ( -- ) + ptr @ load-base - d# 60 > if + ptr @ d# 60 - d# 60 + else + load-base ptr @ over - + then + show-packets +; + +: scale-xy ( x y -- x' y' ) + swap screen-w touchscreen-max-x */ + swap screen-h touchscreen-max-y */ +; + +0 [if] +\ Try to receive a mouse report packet. If one arrives within +\ 20 milliseconds, return true and the decoded information. +\ Otherwise return false. +: pad? ( -- false | x y z down? contact# true ) + get-touch? if ( x dy buttons ) + 2>r >r scale-xy r> 2r> ( x' y' z down? contact# ) + true + else + false + then +; + +\ Display raw data from the device, stopping when a key is typed. +: show-pad ( -- ) + begin + pad? if . . . . . cr then + key? until +; +[then] + +: button ( color x -- ) + screen-h d# 50 - d# 200 d# 30 fill-rectangle-noff +; +d# 300 d# 300 2constant target-wh +: left-target ( -- x y w h ) 0 0 target-wh ; +: right-target ( -- x y w h ) screen-w screen-h target-wh xy- target-wh ; +false value left-hit? +false value right-hit? +: inside? ( mouse-x,y x y w h -- flag ) + >r >r ( mouse-x mouse-y x y r: h w ) + xy- ( dx dy ) + swap r> u< ( dy x-inside? ) + swap r> u< ( x-inside? y-inside? ) + and ( flag ) +; + +: draw-left-target ( -- ) green left-target fill-rectangle-noff ; +: draw-right-target ( -- ) red right-target fill-rectangle-noff ; + +: ?hit-target ( -- ) + pixcolor @ cyan = if \ touch1 ( x y ) + 2dup left-target inside? if ( x y ) + yellow left-target fill-rectangle-noff ( x y ) + true to left-hit? ( x y ) + exit + then ( x y ) + then ( x y ) + pixcolor @ yellow = if \ touch2 ( x y ) + 2dup right-target inside? if ( x y ) + yellow right-target fill-rectangle-noff ( x y ) + true to right-hit? ( x y ) + exit + then ( x y ) + then ( x y ) +; + +: track-init ( -- ) + " dimensions" $call-screen to screen-h to screen-w + screen-ih package( bytes/line )package to /line + load-base ptr ! +; + +: dot ( x y -- ) + swap screen-w 3 - min swap y-offset + screen-h 3 - min ( x' y' ) + pixcolor @ -rot 3 3 ( color x y w h ) + fill-rectangle-noff ( ) +; + +: background ( -- ) + black 0 0 screen-w screen-h fill-rectangle-noff + final-test? if + false to left-hit? + false to right-hit? + draw-left-target + draw-right-target + else + 0 d# 27 at-xy ." Touchscreen test. Type a key to exit" cr + then +; + +: *3/5 ( n -- n' ) 3 5 */ ; +: dimmer ( color -- color' ) + 565>rgb rot *3/5 rot *3/5 rot *3/5 rgb>565 +; + +: setcolor ( contact# -- ) + case + 0 of cyan endof + 1 of yellow endof + 2 of magenta endof + 3 of blue endof + 4 of red endof + 5 of green endof + 6 of cyan dimmer endof + 7 of yellow dimmer endof + 8 of magenta dimmer endof + 9 of blue dimmer endof + d# 10 of red dimmer endof + d# 11 of green dimmer endof + ( default ) white swap + endcase + + pixcolor ! +; +0 value pressure + +: track-n ( .. xhi xlo yhi ylo z #contacts -- ) + ?dup 0= if exit then ( .. xhi xlo yhi ylo z #contacts -- ) + 1- 0 swap do ( .. xhi xlo yhi ylo z ) + i setcolor ( .. xhi xlo yhi ylo z ) + to pressure ( .. xhi xlo yhi ylo ) + 4b>xy scale-xy ( .. x y ) + + final-test? if ( .. x y ) + ?hit-target ( .. x y ) + then ( .. x y ) + dot + -1 +loop +; + +: handle-key ( -- exit? ) + key upc case + [char] P of + cursor-on + cr last-10 + key drop + background + false + endof + + ( key ) true swap + endcase +; + +false value selftest-failed? \ Success/failure flag for final test mode +: exit-test? ( -- flag ) + final-test? if ( ) + \ If the targets have been hit, we exit with successa + left-hit? right-hit? and if ( ) + false to selftest-failed? ( ) + true ( flag ) + exit + then ( ) + + \ Otherwise we give the tester a chance to bail out by typing a key, + \ thus indicating failure + key? 0= if false exit then ( ) + key drop ( ) + true to selftest-failed? ( ) + true ( flag ) + exit + then ( ) + + \ If not final test mode, we only exit via a key - no targets + key? if handle-key else false then ( exit ? ) +; + +: discard-n ( .. #events -- ) 5 * 0 ?do drop loop ; + +: selftest ( -- error? ) + open 0= if + ." Touchscreen open failed" true exit + then + + \ Being able to open the touchpad is good enough in SMT mode + smt-test? if close false exit then + + final-test? 0= if + ." Touchscreen test will start in 4 seconds" cr + d# 4000 ms + then + + cursor-off track-init + + \ Consume already-queued keys to prevent premature exit + begin key? while key drop repeat + + \ Consume already-queued trackpad events to prevent premature exit + begin pad-events ?dup while discard-n repeat + + background + begin + ['] pad-events catch ?dup if .error close true exit then + track-n + exit-test? until + + close + cursor-on + page + final-test? if selftest-failed? else false then +; + + +end-package + +\ LICENSE_BEGIN +\ Copyright (c) 2011 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

[commit] r2484 - dev/olpc/touchpad
by repository service Aug. 28, 2011

Aug. 28, 2011

Author: wmb Date: Mon Aug 29 03:35:47 2011 New Revision: 2484 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2484 Log: OLPC XO-1 touchpad driver - made it use stream mode instead of remote mode, thus hopefully removing the last vestige of remote mode usage. Modified: dev/olpc/touchpad/touchpad.fth Modified: dev/olpc/touchpad/touchpad.fth ============================================================================== --- dev/olpc/touchpad/touchpad.fth Mon Aug 29 03:31:47 2011 (r2483) +++ dev/olpc/touchpad/touchpad.fth Mon Aug 29 03:35:47 2011 (r2484) @@ -292,20 +292,26 @@ : clipx ( delta -- x ) mouse-x @ + 0 max screen-w 1- min dup mouse-x ! ; : clipy ( delta -- y ) mouse-y @ + 0 max screen-h 1- min dup mouse-y ! ; +: rel>abs ( dy dy buttons -- x y buttons ) + >r ( dx dy ) + swap clipx swap negate clipy ( x y ) + r> ( buttons ) +; + \ Try to receive a GS-format packet. If one arrives within \ 20 milliseconds, return true and the decoded information. \ Otherwise return false. : pad? ( -- false | x y z tap? true ) mode @ 3 = if - poll-event if ( dx dy buttons ) - >r ( dx dy ) - swap clipx swap negate clipy 0 ( x y z ) - 0 r@ 1 and or ( x y z tap ) - r> 4 and 0<> 2 and or ( x y z tap' ) - 8 or ( x y z tap' ) - true - else - false + stream-poll? if ( dx dy buttons ) + rel>abs ( x y buttons ) + >r 0 ( x y z r: buttons ) + 0 r@ 1 and or ( x y z tap r: buttons ) + r> 4 and 0<> 2 and or ( x y z tap' ) + 8 or ( x y z tap' ) + true ( x y z tap true ) + else ( ) + false ( false ) then exit then

1 0

[commit] r2483 - cpu/arm
by repository service Aug. 28, 2011

Aug. 28, 2011

Author: wmb Date: Mon Aug 29 03:31:47 2011 New Revision: 2483 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2483 Log: ARM - Added assembler support for iwMMX instructions. The disassembler remains ignorant of those instructions. Modified: cpu/arm/assem.fth cpu/arm/code.fth cpu/arm/scc.fth Modified: cpu/arm/assem.fth ============================================================================== --- cpu/arm/assem.fth Mon Aug 29 03:30:53 2011 (r2482) +++ cpu/arm/assem.fth Mon Aug 29 03:31:47 2011 (r2483) @@ -49,7 +49,8 @@ : asm, ( n -- ) here /l asm-allot asm! ; previous definitions -: !op ( -- ) newword asm, ; +: )op ( -- ) newword asm, ; +: {} is newword ; 0 value op-end @@ -69,8 +70,8 @@ 0 value adr-delim -: xop ( change-bits -- ) newword xor is newword ; -: iop ( on-bits -- ) newword or is newword ; +: xop ( change-bits -- ) newword xor {} ; +: iop ( on-bits -- ) newword or {} ; : ad-error ( msg$ -- ) \ Types the message passed in, the contents of cbuf and the stack. @@ -105,7 +106,7 @@ : /rem ( n -- ) rem$ rot /string set-rem$ ; -: init-operands ( -- ) +: op( ( -- ) \ We can't do this because rem$ isn't set if we have an exact match \ rem-len abort" Invalid opcode" 0 0 set-rem$ @@ -157,6 +158,8 @@ next-cons constant adt-shift \ Shift op in Shifter Operands. next-cons constant adt-rrx next-cons constant adt-immed \ #immediate_value. +next-cons constant adt-wmmx \ wr0, wr1, ... +next-cons constant adt-wcx \ wc0, wC1, ... constant adt-last \ Last +1 of the address word types. : adt? ( n -- adt? ) adt-1st adt-last within ; @@ -284,6 +287,12 @@ : sreg: ( n "name" -- ) create , does> @ adt-sreg ; : sregs: ( 20x"name" -- ) 20 0 do i sreg: loop ; +\ Define the wireless MMX registers. +: wmmxreg: ( n "name" -- ) create , does> @ adt-wmmx ; +: wmmxregs: ( 10x"name" -- ) 10 0 do i wmmxreg: loop ; +: wcxreg: ( n "name" -- ) create , does> @ adt-wcx ; + + : range-error ( n msg$ -- ) type .d cr abort ; : expecting ( $ -- ) ." Expecting " ad-error ; @@ -520,24 +529,24 @@ 00ffffff land ; : amode-bbl ( b-adr -- ) - init-operands + op( [ifdef] testing get-whatever drop aoffset [else] get-immediate here [then] >br-offset iop - !op + )op ; -: amode-bx ( -- ) init-operands get-r00 !op ; +: amode-bx ( -- ) op( get-r00 )op ; : ?psr ( adt -- ) adt-xpsr <> " [cs]psr" ?expecting ; -: amode-mrs ( -- ) init-operands get-r12 get-whatever ?psr iop !op ; +: amode-mrs ( -- ) op( get-r12 get-whatever ?psr iop )op ; : amode-msr ( -- ) - init-operands + op( \ get xpsr and fields require-field $asm-execute ?psr iop ( ) @@ -554,14 +563,14 @@ \ Get the next field which we expect to be rx, or #num. require-field adr-delim case ( field$ delim ) ascii * of \ Take the address from the stack ( n adt-code field$ ) - 2drop do-#32 newword fff0ffff land 02080000 or is newword + 2drop do-#32 newword fff0ffff land 02080000 or {} endof ascii # of ( field$ ) \ Immediate address, the field should be empty and the real \ field is the next one. \ get an immediate field, the default is _f = 8, - newword fff0ffff land 02080000 or is newword + newword fff0ffff land 02080000 or {} endof 0 of \ This should be a register. ( field$ ) @@ -576,35 +585,35 @@ expecting-reg/immed endcase - !op + )op ; -: amode-vmrs ( -- ) init-operands get-r12 get-whatever ?psr iop !op ; -: amode-vmsr ( -- ) init-operands get-whatever ?psr iop get-r12 !op ; +: amode-vmrs ( -- ) op( get-r12 get-whatever ?psr iop )op ; +: amode-vmsr ( -- ) op( get-whatever ?psr iop get-r12 )op ; -: (amode-mul) ( -- ) init-operands get-r16 get-r00 get-r08 ; -: amode-mul ( -- ) (amode-mul) !op ; -: amode-mla ( -- ) (amode-mul) get-r12 !op ; -: amode-lmul ( -- ) init-operands get-r12 get-r16 get-r00 get-r08 !op ; -: amode-rrop2 ( -- ) init-operands get-r12 get-r16 get-opr2 !op ; -: amode-rnop2 ( -- ) init-operands get-r16 get-opr2 !op ; -: amode-rdop2 ( -- ) init-operands get-r12 get-opr2 !op ; -: amode-rev ( -- ) init-operands get-r12 get-r00 !op ; +: (amode-mul) ( -- ) op( get-r16 get-r00 get-r08 ; +: amode-mul ( -- ) (amode-mul) )op ; +: amode-mla ( -- ) (amode-mul) get-r12 )op ; +: amode-lmul ( -- ) op( get-r12 get-r16 get-r00 get-r08 )op ; +: amode-rrop2 ( -- ) op( get-r12 get-r16 get-opr2 )op ; +: amode-rnop2 ( -- ) op( get-r16 get-opr2 )op ; +: amode-rdop2 ( -- ) op( get-r12 get-opr2 )op ; +: amode-rev ( -- ) op( get-r12 get-r00 )op ; : set-imm16 ( n -- ) dup fff and 0 set-field d# 12 >> d# 16 set-field ; : amode-movw ( -- ) - init-operands get-r12 get-immediate ( imm ) + op( get-r12 get-immediate ( imm ) dup 0 10000 within 0= if " Immediate value won't fit in 16 bits" ad-error then - set-imm16 !op + set-imm16 )op ; : amode-lsm ( need-r16? -- ) - init-operands + op( if get-r16 ( ) adr-delim ascii ! = if ( ) @@ -640,11 +649,11 @@ \ We've finished the register list, is there a ^ hanging on the end? ascii ^ parse-1 if flip-b then - !op + )op ; : amode-vlsm ( need-r16? -- ) - init-operands + op( if get-r16 ( ) adr-delim ascii ! = if ( ) @@ -680,7 +689,7 @@ repeat ( first last ) \ Encode the resulting Vd, imm8 fields - 1+ over - 2* iop false set-vdfield !op + 1+ over - 2* iop false set-vdfield )op ; \ rd, [rn, <immed12>] {!} @@ -758,16 +767,16 @@ get-r12 ['] get-off12 get-ea ; -: amode-lst ( -- ) init-operands (amode-ls) !op ; +: amode-lst ( -- ) op( (amode-ls) )op ; : {!} ( -- ) ascii ! parse-1 if flip-w then ; -: amode-lsr ( -- ) init-operands (amode-ls) {!} !op ; +: amode-lsr ( -- ) op( (amode-ls) {!} )op ; : amode-pld ( -- ) \ Like amode-ls and friends except r16 vice r12. 0080.0000 iop - ['] get-off12 get-ea !op + ['] get-off12 get-ea )op ; : get-off8 ( -- ) @@ -794,6 +803,18 @@ p? if {!} then ; +: imm8-funny ( -- ) + \ Get the immediate value for wshufh + get-whatever case + adt-immed of + d# 8 ?#bits ( immed ) + dup f and 0 iop ( immed ) \ Low bits at field 0 + 4 rshift f and 14 iop ( ) \ High bits at field d# 20 + endof + + " immediate value" expecting + endcase +; : get-imm8 ( -- ) \ Get the offset for v[ldr|str] instructions get-whatever case @@ -821,46 +842,88 @@ \ rd, [rn], +-rm : amode-lssh ( -- ) - init-operands + op( \ Set the add offset and immediate value as defaults. 00c0.0000 iop get-r12 ['] get-off8 get-ea - !op + )op ; : amode-imed24 ( -- ) - init-operands get-immediate d# 24 ?#bits iop !op + op( get-immediate d# 24 ?#bits iop )op ; : get-off0 ( -- ) " Offset not allowed" ad-error ; : amode-swp ( -- ) - init-operands get-r12 get-r00 ['] get-off0 get-ea !op + op( get-r12 get-r00 ['] get-off0 get-ea )op ; : amode-ldrex ( -- ) - init-operands get-r12 ['] get-off0 get-ea !op + op( get-r12 ['] get-off0 get-ea )op ; : amode-copr ( -- ) \ Co-processors: mcr, mrc \ p, #, r, c, c, # - init-operands + op( adt-coproc 0f 08 get-this adt-immed 07 15 get-this adt-reg 0f 0c get-this adt-coreg 0f 10 get-this adt-coreg 0f 00 get-this adt-immed 07 05 get-this - !op + )op ; : amode-cdp ( -- ) \ Co-processors: cdp \ p, #, c, c, c, # - init-operands + op( adt-coproc 0f 08 get-this adt-immed 0f 14 get-this adt-coreg 0f 0c get-this adt-coreg 0f 10 get-this adt-coreg 0f 00 get-this adt-immed 07 05 get-this - !op + )op +; + +: wcx adt-wcx 0f 10 get-this ; +: wrd adt-wmmx 0f 0c get-this ; +: wrd5 adt-wmmx 0f 05 get-this ; +: wrn adt-wmmx 0f 10 get-this ; +: wrm adt-wmmx 0f 00 get-this ; +: amode-wmmx-cdp ( -- ) + \ wrd, wrn, wrm + op( + wrd + wrn + wrm + )op +; +: amode-wmmx-cdp2 ( -- ) + \ wrd, wrn + op( + wrd + wrn + )op +; +: imm3-0 + adt-immed 07 00 get-this +; +: amode-wmmx-cdp-imm ( -- ) + \ wrn, wrd, wrm + op( + wrn + wrd + wrm + adt-immed 07 14 get-this + )op +; + +: amode-wmmx-transfer ( -- ) + \ wrd, rn, wrm + op( + wrd + adt-reg 0f 0c get-this + wrm + )op ; \ Get the offset for ldc, stc instructions. @@ -874,19 +937,19 @@ ; : amode-lsc ( -- ) \ Co-processors: ldc, stc - init-operands + op( adt-coproc 0f 08 get-this adt-coreg 0f 0c get-this ['] get-off-c get-ea - !op + )op ; : amode-vldst ( -- ) \ vldr, vstr instructions - init-operands + op( \ Set the add offset and 64-bit width as defaults. 0080.0100 iop get-d12 ['] get-imm8 get-ea - !op + )op ; \ ---------------- @@ -924,6 +987,79 @@ then ; +: {hwd} ( opc -- ) + {} + ascii h parse-1 if 0040.0000 xop exit then + ascii w parse-1 if 0080.0000 xop exit then + ascii d parse-1 if 00c0.0000 xop exit then + " h w or d" expecting +; +: {bhw} ( -- ) + ascii b parse-1 if 0000.0000 xop exit then + ascii h parse-1 if 0040.0000 xop exit then + ascii w parse-1 if 0080.0000 xop exit then + " b h or w" expecting +; +: {bhw}2 ( -- ) + ascii b parse-1 if 0000.0000 xop exit then + ascii h parse-1 if 0000.0040 xop exit then + ascii w parse-1 if 0000.0080 xop exit then + " b h or w" expecting +; +: {bhwd} ( -- ) + {} + ascii b parse-1 if 0000.0000 iop exit then + ascii h parse-1 if 0040.0000 iop exit then + ascii w parse-1 if 0000.0100 iop exit then + ascii d parse-1 if 0040.0100 iop exit then + " b h w or d" expecting +; +: {us} ( opc -- ) + {} + ascii u parse-1 if 0000.0000 xop exit then + ascii s parse-1 if 0020.0000 xop exit then + " u or s" expecting +; +: {us} ( opc -- ) + {} + ascii u parse-1 if 0000.0000 xop exit then + ascii s parse-1 if 0020.0000 xop exit then + " u or s" expecting +; +: {tb}x ( -- ) + ascii b parse-1 if 0000.0000 xop exit then + ascii t parse-1 if 0002.0000 xop exit then + " t or b" expecting +; +: {tb}y ( -- ) + ascii b parse-1 if 0000.0000 xop exit then + ascii t parse-1 if 0001.0000 xop exit then + " t or b" expecting +; + +: {ml} ( -- ) + ascii l parse-1 if 0000.0000 xop exit then + ascii m parse-1 if 0010.0000 xop exit then + " m or l" expecting +; +: {z} ( -- ) ascii z parse-1 if 0010.0000 iop then ; +: {bh}2 ( -- ) + {} + ascii b parse-1 if 0000.0000 xop exit then + ascii h parse-1 if 0040.0000 xop exit then + " b or h" expecting +; + +: need-s ( -- ) ascii s parse-1 if " us or ss" expecting then ; +: {usss} ( -- ) + ascii u parse-1 if 0010.0000 xop need-s exit then + ascii s parse-1 if 0030.0000 xop need-s exit then + " us or ss" expecting +; +: {g} + ascii g parse-1 if 0000.0100 xop ( !! need to change mode of last operand from wrN to rN ) then +; + : parse-condition? ( -- cond true | false ) \ The next two characters of the input string will be checked for a \ valid condition code. If found, the appropriate code will be @@ -941,8 +1077,7 @@ then ; -: {cond} ( opcode -- ) - is newword +: +{cond} ( -- ) \ The next two characters of the input string will be checked for a \ valid condition code. If found, the appropriate code will be \ inserted in newword and the string pointer / length will be @@ -951,8 +1086,30 @@ parse-condition? 0= if h# e then d# 28 set-field \ put the condition code in. ; +: {cond} ( opcode -- ) + {} + +{cond} +; : {cond/s} ( opcode -- ) {cond} {s} ; -: {uncond} ( opcode -- ) is newword ; + +: amode-wldst ( -- ) + op( + get-whatever + case + adt-wcx of + 0c set-field + f000.0000 iop + newword 0040.0010 and 0000.0010 <> if + " Size must be W for WLDR or WSTR with wCX" ad-error + then + endof + adt-wmmx of 0c set-field endof + " wRn or wCn" expecting + endcase + ['] get-off-c get-ea + )op +; +: amode-tmia ( -- ) op( wrd5 get-r00 get-r12 )op ; : parse-inc ( default$ l-flag -- ) \ Parse the increment tag for ldm and stm. @@ -1051,9 +1208,14 @@ regs: r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14 r15 dregs: d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 d10 d11 d12 d13 d14 d15 d16 d17 d18 d19 d20 d21 d22 d23 d24 d25 d26 d27 d28 d29 d30 d31 sregs: s0 s1 s2 s3 s4 s5 s6 s7 s8 s9 s10 s11 s12 s13 s14 s15 s16 s17 s18 s19 s20 s21 s22 s23 s24 s25 s26 s27 s28 s29 s30 s31 - +wmmxregs: wr0 wr1 wr2 wr3 wr4 wr5 wr6 wr7 wr8 wr9 wr10 wr11 wr12 wr13 wr14 wr15 +0 wcxreg: wcid 1 wcxreg: wcon 2 wcxreg: wcssf 3 wcxreg: wcasf +8 wcxreg: wcgr0 9 wcxreg: wcgr1 a wcxreg: wcgr2 b wcxreg: wcgr3 + previous definitions + + also arm-assembler definitions : and 0000.0000 {cond/s} amode-rrop2 ; : eor 0020.0000 {cond/s} amode-rrop2 ; @@ -1099,6 +1261,72 @@ : mcr 0e00.0010 {cond} amode-copr ; : mrc 0e10.0010 {cond} amode-copr ; +: do-mmx ( opc -- ) 0e00.0000 or {cond} amode-wmmx-cdp ; +: wor 0000.0000 do-mmx ; +: wxor 0010.0000 do-mmx ; +: wand 0020.0000 do-mmx ; +: wandn 0030.0000 do-mmx ; +: wavg2b 0080.0000 do-mmx ; +: wavg2br 0090.0000 do-mmx ; +: wavg2h 00c0.0000 do-mmx ; +: wavg2hr 00d0.0000 do-mmx ; + +: waligni 0e00.0020 {cond} amode-wmmx-cdp-imm ; +: walignr0 0080.0020 do-mmx ; +: walignr1 0090.0020 do-mmx ; +: walignr2 00a0.0020 do-mmx ; +: walignr3 00b0.0020 do-mmx ; + +: do-mmx-shift ( opc -- ) 0e00.0000 or {hwd} {g} +{cond} amode-wmmx-cdp ; +: wsra 0000.0040 do-mmx-shift ; +: wsll 0010.0040 do-mmx-shift ; +: wsll 0020.0040 do-mmx-shift ; +: wror 0030.0040 do-mmx-shift ; + +: wmcmpeq 0e00.0060 {} {bhw} +{cond} amode-wmmx-cdp ; +: wmcmpgt 0e10.0060 {us} {bhw} +{cond} amode-wmmx-cdp ; + +: wpack 0e00.0080 {hwd} {usss} +{cond} amode-wmmx-cdp ; + +: wunpckeh 0e00.00c0 {us} {bhw} +{cond} amode-wmmx-cdp2 ; +: wunpckel 0e00.00e0 {us} {bhw} +{cond} amode-wmmx-cdp2 ; +: wunpckih 0e10.00c0 {} {bhw} +{cond} amode-wmmx-cdp ; +: wunpckih 0e10.00e0 {} {bhw} +{cond} amode-wmmx-cdp ; + +: wmul 0e00.0100 {us} {ml} +{cond} amode-wmmx-cdp ; +: wmac 0e40.0100 {us} {z} +{cond} amode-wmmx-cdp ; +: wmadd 0e80.0100 {us} +{cond} amode-wmmx-cdp ; + +: wsad 0e00.0120 {bh}2 {z} +{cond} amode-wmmx-cdp ; + +: wmax 0e00.0160 {us} {bhw} +{cond} amode-wmmx-cdp ; +: wmin 0e10.0160 {us} {bhw} +{cond} amode-wmmx-cdp ; + +: wadd 0e00.0180 {} {bhw} {usss} +{cond} amode-wmmx-cdp ; +: wadd 0e00.01a0 {} {bhw} {usss} +{cond} amode-wmmx-cdp ; +: wacc 0e00.01c0 {} {bhw} +{cond} amode-wmmx-cdp2 ; +: wshufh 0e00.01e0 {cond} op( wrd wrn imm8-funny )op ; +: tmcr 0e00.0110 {cond} op( wcx get-r12 )op ; +\ : tmia 0e2c.0010 {} {tb}x {tb}y +{cond} amode-tmia ; +: tmia 0e20.0010 {} +{cond} amode-tmia ; +: tmiaph 0e28.0010 {} +{cond} amode-tmia ; + +: tbcst 0e40.0010 {} {bhw}2 {cond} op( wrd get-r12 )op ; +: tinsr 0e60.0010 {} {bhw}2 {cond} op( wrd get-r12 imm3-0 )op ; + +: tmcrr 0c40.0000 {cond} op( wrm get-r12 get-r16 )op ; +: tmrrc 0c50.0000 {cond} op( get-r12 get-r16 wrm )op ; + +: tmrc 0e10.0110 {cond} op( get-r12 wcx )op ; +: tmovmsk 0e10.0030 {} {bhw} +{cond} op( get-r12 wrn )op ; +: tandc 0e13.f130 {} {bhw} +{cond} op( get-r12 )op ; \ rs must be R15 +: torc 0e13.f150 {} {bhw} +{cond} op( get-r12 )op ; \ rs must be R15 +: textrc 0e13.f170 {} {bhw} +{cond} op( get-r12 imm3-0 )op ; \ rs must be R15 +: textrm 0e10.0070 {us} {bhw} +{cond} op( get-r12 wrn imm3-0 )op ; + +: wldr 0c10.0000 {bhwd} +{cond} amode-wldst ; +: wstr 0c00.0000 {bhwd} +{cond} amode-wldst ; + : swi 0f00.0000 {cond} amode-imed24 ; : b 0a00.0000 {cond} amode-bbl ; @@ -1146,18 +1374,18 @@ newword -rot ( newword reg# imm ) lwsplit swap ( newword reg# imm.hi imm.lo ) set-imm16 0300.0000 iop ( newword reg# imm.hi ) - over rd-field !op \ movw rN,#<imm> + over rd-field )op \ movw rN,#<imm> ?dup if ( newword reg# imm.hi ) - rot is newword ( reg# imm.hi ) + rot {} ( reg# imm.hi ) set-imm16 0340.0000 iop ( reg# ) - rd-field !op \ movt rN,#<imm> + rd-field )op \ movt rN,#<imm> else 2drop then ; : (set) ( address? -- ) >r - 0000.0000 {cond} init-operands + 0000.0000 {cond} op( \ Put the register number on the return stack so it won't interfere \ with the stack items used by any "*" operands there may be. get-register >r ( r: adr? reg# ) @@ -1186,27 +1414,27 @@ then ( reg# op ) then ( reg# op ) then ( reg# op ) - iop rd-field !op + iop rd-field )op ; : adr ( -- ) true (set) ; : set ( -- ) false (set) ; \ Wrapper Call - FirmWorks pseudo-op for armsim wrapper calls -: wrc ( -- ) h# 03200010 {cond} init-operands get-r16 !op ; +: wrc ( -- ) 03200010 {cond} op( get-r16 )op ; -: nop32 ( -- ) h# 0320f000 {cond} !op ; -: yield ( -- ) h# 0320f001 {cond} !op ; -: wfe ( -- ) h# 0320f002 {cond} !op ; -: wfi ( -- ) h# 0320f003 {cond} !op ; -: sev ( -- ) h# 0320f004 {cond} !op ; - -: nop ( -- ) h# e1a00000 asm, ; \ mov r0,r0 -: dsb ( -- ) h# f57ff040 asm, ; -: dmb ( -- ) h# f57ff050 asm, ; -: isb ( -- ) h# f57ff060 asm, ; +: nop32 ( -- ) 0320f000 {cond} op( )op ; +: yield ( -- ) 0320f001 {cond} op( )op ; +: wfe ( -- ) 0320f002 {cond} op( )op ; +: wfi ( -- ) 0320f003 {cond} op( )op ; +: sev ( -- ) 0320f004 {cond} op( )op ; + +: nop ( -- ) e1a00000 {} op( )op ; \ mov r0,r0 +: dsb ( -- ) f57ff040 {} op( )op ; \ "dsb sy" is f57ff04f +: dmb ( -- ) f57ff050 {} op( )op ; +: isb ( -- ) f57ff060 {} op( )op ; -: pld ( -- ) h# f550.f000 {uncond} amode-pld ; -: pldw ( -- ) h# f510.f000 {uncond} amode-pld ; +: pld ( -- ) f550.f000 {} amode-pld ; +: pldw ( -- ) f510.f000 {} amode-pld ; : # ( -- adt-immed ) adt-immed ; : reg ( -- adt-reg ) adt-reg ; Modified: cpu/arm/code.fth ============================================================================== --- cpu/arm/code.fth Mon Aug 29 03:30:53 2011 (r2482) +++ cpu/arm/code.fth Mon Aug 29 03:31:47 2011 (r2483) @@ -80,15 +80,15 @@ : lnk ( -- ) \ [ also register-names ] lk [ previous ] drop ( reg# ) lk drop ( reg# ) - 01a0.0000 or {cond/s} init-operands get-r12 !op + 01a0.0000 or {cond/s} op( get-r12 )op ; : (incdec) ( op-template -- ) {cond/s} - init-operands + op( get-register dup rd-field rb-field get-opr2 - !op + )op ; \ inc{cond}{s} rN,<immed> @@ -101,7 +101,7 @@ \ sub{cond}{s} rN,rN,<immed> : dec ( -- ) 0040.0000 (incdec) ; -: (pshpop) ( op-template -- ) {cond} init-operands get-r12 get-r16 !op ; +: (pshpop) ( op-template -- ) {cond} op( get-r12 get-r16 )op ; \ psh{cond} rN,rM \ is equivalent to \ str{cond} rN,[rM,-1cell]! @@ -118,7 +118,7 @@ : nxt ( -- ) \ [ also register-names ] up [ previous ] drop ( reg# ) up drop - 01a0.f000 or {cond/s} init-operands !op + 01a0.f000 or {cond/s} op( )op ; also forth definitions Modified: cpu/arm/scc.fth ============================================================================== --- cpu/arm/scc.fth Mon Aug 29 03:30:53 2011 (r2482) +++ cpu/arm/scc.fth Mon Aug 29 03:31:47 2011 (r2483) @@ -7,6 +7,7 @@ code tlb-type@ ( -- n ) psh tos,sp mrc p15,0,tos,cr0,cr0,3 c; code control@ ( -- n ) psh tos,sp mrc p15,0,tos,cr1,cr0,0 c; code aux-control@ ( -- n ) psh tos,sp mrc p15,0,tos,cr1,cr0,1 c; +code coprocessor-access@ ( -- n ) psh tos,sp mrc p15,0,tos,cr1,cr0,2 c; code ttbase@ ( -- n ) psh tos,sp mrc p15,0,tos,cr2,cr0,0 c; code ttbase0@ ( -- n ) psh tos,sp mrc p15,0,tos,cr2,cr0,0 c; code ttbase1@ ( -- n ) psh tos,sp mrc p15,0,tos,cr2,cr1,0 c; @@ -20,6 +21,7 @@ code control! ( n -- ) mcr p15,0,tos,cr1,cr0,0 pop tos,sp c; code aux-control! ( n -- ) mcr p15,0,tos,cr1,cr0,1 pop tos,sp c; +code coprocessor-access! ( n -- ) mcr p15,0,tos,cr1,cr0,2 pop tos,sp c; code ttbase! ( n -- ) mcr p15,0,tos,cr2,cr0,0 pop tos,sp c; code ttbase0! ( n -- ) mcr p15,0,tos,cr2,cr0,0 pop tos,sp c; code ttbase1! ( n -- ) mcr p15,0,tos,cr2,cr1,0 pop tos,sp c;

1 0

[commit] r2482 - in cpu/arm: mmp2 olpc/1.75
by repository service Aug. 28, 2011

Aug. 28, 2011

Author: wmb Date: Mon Aug 29 03:30:53 2011 New Revision: 2482 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2482 Log: OLPC XO-1.75 - regularized the naming of some words in the TWSI driver. Modified: cpu/arm/mmp2/twsi.fth cpu/arm/olpc/1.75/sound.fth Modified: cpu/arm/mmp2/twsi.fth ============================================================================== --- cpu/arm/mmp2/twsi.fth Mon Aug 29 03:29:08 2011 (r2481) +++ cpu/arm/mmp2/twsi.fth Mon Aug 29 03:30:53 2011 (r2482) @@ -129,15 +129,22 @@ then ; -: twsi-write ( byte .. #bytes -- ) +: twsi-out ( byte .. #bytes -- ) slave-address twsi-start ( byte .. #bytes ) 1- 0 ?do 0 twsi-putbyte loop ( byte ) bbu_ICR_STOP twsi-putbyte ( ) ; +: twsi-write ( adr len -- ) + 0= if exit then ( adr len ) + slave-address twsi-start ( adr len ) + + 1- 0 ?do dup c@ 0 twsi-putbyte 1+ loop ( adr' ) + c@ bbu_ICR_STOP twsi-putbyte ( ) +; : twsi-b@ ( reg -- byte ) 1 1 twsi-get ; -: twsi-b! ( byte reg -- ) 2 twsi-write ; +: twsi-b! ( byte reg -- ) 2 twsi-out ; [ifdef] begin-package 0 0 " " " /" begin-package @@ -157,6 +164,18 @@ child-address set-twsi-target twsi-get ; +: smbus-b@ ( -- ) + child-address set-twsi-target + twsi-b@ +; +: smbus-b! ( -- ) + child-address set-twsi-target + twsi-b! +; +: smbus-out ( byte .. #bytes -- ) + child-address set-twsi-target + twsi-out +; d# 12,600,000 constant numerator : set-bus-speed ( hz -- ) \ Useful range is currently 25,000 .. 100,000 Modified: cpu/arm/olpc/1.75/sound.fth ============================================================================== --- cpu/arm/olpc/1.75/sound.fth Mon Aug 29 03:29:08 2011 (r2481) +++ cpu/arm/olpc/1.75/sound.fth Mon Aug 29 03:30:53 2011 (r2482) @@ -204,7 +204,7 @@ \ : audio-reset ( -- ) 8 gpio-clr ; \ : audio-unreset ( -- ) 8 gpio-set ; : codec@ ( reg# -- w ) choose-smbus 1 2 twsi-get swap bwjoin ; -: codec! ( w reg# -- ) choose-smbus >r wbsplit r> 3 twsi-write ; +: codec! ( w reg# -- ) choose-smbus >r wbsplit r> 3 twsi-out ; : codec-i@ ( index# -- w ) h# 6a codec! h# 6c codec@ ; : codec-i! ( w index# -- ) h# 6a codec! h# 6c codec! ;

1 0

[commit] r2481 - cpu/arm/mmp2
by repository service Aug. 28, 2011

Aug. 28, 2011

Author: wmb Date: Mon Aug 29 03:29:08 2011 New Revision: 2481 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2481 Log: OLPC XO-1.75 - Use virtual addressing for the interrupt controller device driver. Modified: cpu/arm/mmp2/irq.fth Modified: cpu/arm/mmp2/irq.fth ============================================================================== --- cpu/arm/mmp2/irq.fth Mon Aug 29 03:22:55 2011 (r2480) +++ cpu/arm/mmp2/irq.fth Mon Aug 29 03:29:08 2011 (r2481) @@ -32,7 +32,7 @@ ; : open ( -- flag ) - my-space to base-adr + my-unit h# 400 " map-in" $call-parent to base-adr \ Leave the IRQ table alone so as not to steal interrupts from the SP \ block-irqs \ d# 64 0 do i disable-irq loop

1 0

[commit] r2480 - cpu/arm/mmp2
by repository service Aug. 28, 2011

Aug. 28, 2011

Author: wmb Date: Mon Aug 29 03:22:55 2011 New Revision: 2480 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2480 Log: OLPC XO-1.75 - Added some support to the RTC driver for testing wakeup from suspend. Modified: cpu/arm/mmp2/rtc.fth Modified: cpu/arm/mmp2/rtc.fth ============================================================================== --- cpu/arm/mmp2/rtc.fth Mon Aug 29 03:21:48 2011 (r2479) +++ cpu/arm/mmp2/rtc.fth Mon Aug 29 03:22:55 2011 (r2480) @@ -9,6 +9,10 @@ : int5-mask@ ( -- value ) h# 28.216c io@ ; : int5-status@ ( -- value ) h# 28.2154 io@ ; : enable-rtc ( -- ) h# 81 h# 01.5000 io! ; +: enable-rtc-wakeup ( -- ) + h# 5.004c io@ h# 2.0010 or h# 5.004c io! + h# 5.104c io@ h# 2.0010 or h# 5.104c io! +; : soc-rtc@ ( offset -- value ) h# 01.0000 + io@ ; : soc-rtc! ( value offset -- value ) h# 01.0000 + io! ; : take-alarm ( -- ) @@ -16,10 +20,12 @@ 0 8 soc-rtc! int5-mask@ 1 or int5-mask! \ Mask alarm ; -: alarm-in-5 ( -- ) +: alarm-in-3 ( -- ) enable-rtc \ Turn on clocks + int5-mask@ 1 invert and int5-mask! \ Unmask alarm - 0 soc-rtc@ d# 5 + 4 soc-rtc! \ Set alarm for 5 seconds from now + enable-rtc-wakeup + 0 soc-rtc@ d# 3 + 4 soc-rtc! \ Set alarm for 3 seconds from now 7 8 soc-rtc! \ Ack old interrupts and enable new ones ['] take-alarm 5 interrupt-handler! 5 enable-interrupt

1 0

[commit] r2479 - in cpu/arm: mmp2 olpc olpc/1.75
by repository service Aug. 28, 2011

Aug. 28, 2011

Author: wmb Date: Mon Aug 29 03:21:48 2011 New Revision: 2479 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2479 Log: OLPC XO-1.75 - Big renaming of configuration constants associated with memory layout, accomplishing 3 things: a) To adapt to a different memory size, you now only have to change one parameter - /ram-total - instead of changing several. b) The early diagnostic frame buffer, used for numeric progress codes, is now stored in SRAM instead of DRAM, so its location does not change for different memory sizes. There is a corresponding change in CForth. c) The naming convention for memory resource addresses and sizes is now consistent - *-mem-pa for the address and /*-mem for the size - instead of the mixed bag that existed before. Modified: cpu/arm/mmp2/hwaddrs.fth cpu/arm/mmp2/mmuon.fth cpu/arm/mmp2/rootnode.fth cpu/arm/olpc/1.75/addrs.fth cpu/arm/olpc/1.75/config.fth cpu/arm/olpc/1.75/devices.fth cpu/arm/olpc/1.75/fw.bth cpu/arm/olpc/1.75/lcd.fth cpu/arm/olpc/1.75/probemem.fth cpu/arm/olpc/fbnums.fth cpu/arm/olpc/initmmu.fth cpu/arm/olpc/numdot.fth cpu/arm/olpc/resetvec.bth Modified: cpu/arm/mmp2/hwaddrs.fth ============================================================================== --- cpu/arm/mmp2/hwaddrs.fth Thu Aug 25 04:49:44 2011 (r2478) +++ cpu/arm/mmp2/hwaddrs.fth Mon Aug 29 03:21:48 2011 (r2479) @@ -1,11 +1,29 @@ \ Defined by MMP2 hardware -h# 01.9000 constant gpio-base -h# 05.1024 constant acgr-pa +h# d000.0000 constant memctrl-pa + +h# d100.0000 constant sram-pa \ Base of SRAM +h# 0030.0000 constant /sram \ Size of SRAM + +h# d400.0000 constant apb-pa \ Base of APB bus +h# d420.0000 constant axi-pa \ Base of AXI bus + +h# e000.0000 constant audio-sram-pa \ Base of Audio SRAM +h# 0010.0000 constant /audio-sram \ Size of Audio SRAM + +apb-pa constant io-pa \ We use this as the base for most IO accesses +h# 0040.0000 constant /io + +\ The following are offsets from io-pa +\ AXI devices +h# 01.4000 constant timer-pa h# 01.5000 constant clock-unit-pa +h# 01.9000 constant gpio-base h# 05.0000 constant main-pmu-pa -h# 28.2800 constant pmua-pa \ Application processor PMU register base +h# 05.1024 constant acgr-pa + +\ APB devices h# 20.b800 constant dsi1-pa \ 4-lane controller h# 20.ba00 constant dsi2-pa \ 3-lane controller h# 20.b000 constant lcd-pa -h# 01.4000 constant timer-pa +h# 28.2800 constant pmua-pa \ Application processor PMU register base Modified: cpu/arm/mmp2/mmuon.fth ============================================================================== --- cpu/arm/mmp2/mmuon.fth Thu Aug 25 04:49:44 2011 (r2478) +++ cpu/arm/mmp2/mmuon.fth Mon Aug 29 03:21:48 2011 (r2479) @@ -23,11 +23,11 @@ ; : ofw-sections ( -- ) - h# 0000.0000 h# c0e over dma-base map-sections \ Cache and write bufferable - dma-base h# c02 over dma-size map-sections \ Non-cacheable DMA space + h# 0000.0000 h# c0e over dma-mem-pa map-sections \ Cache and write bufferable + dma-mem-pa h# c02 over /dma-mem map-sections \ Non-cacheable DMA space extra-mem-pa h# c0e over /extra-mem map-sections \ Cache and write bufferable - fw-pa h# c0e over /fw-ram map-sections \ Cache and write bufferable - fb-pa h# c06 over fb-size map-sections \ Write bufferable + fw-mem-pa h# c0e over /fw-mem map-sections \ Cache and write bufferable + fb-mem-pa h# c06 over /fb-mem map-sections \ Write bufferable \ h# d100.0000 h# c0e over h# 0030.0000 map-sections \ Cache and write bufferable (SRAM) h# d100.0000 h# c02 over h# 0030.0000 map-sections \ I/O - no caching or buffering (SRAM) h# d400.0000 h# c02 over h# 0040.0000 map-sections \ I/O - no caching or buffering Modified: cpu/arm/mmp2/rootnode.fth ============================================================================== --- cpu/arm/mmp2/rootnode.fth Thu Aug 25 04:49:44 2011 (r2478) +++ cpu/arm/mmp2/rootnode.fth Mon Aug 29 03:21:48 2011 (r2479) @@ -25,15 +25,15 @@ : close ( -- ) ; : map-in ( phys size -- virt ) - drop ( phys ) - dup fb-pa = if drop fb-va exit then ( phys ) + drop ( phys ) + dup fb-mem-pa = if drop fb-mem-va exit then ( phys ) io-pa - io-va + ; : map-out ( virtual size -- ) 2drop ; -: dma-range ( -- start end ) dma-base dup dma-size + ; +: dma-range ( -- start end ) dma-mem-pa dup /dma-mem + ; h# 0 constant dma-map-mode \ XXX what should this be? Modified: cpu/arm/olpc/1.75/addrs.fth ============================================================================== --- cpu/arm/olpc/1.75/addrs.fth Thu Aug 25 04:49:44 2011 (r2478) +++ cpu/arm/olpc/1.75/addrs.fth Mon Aug 29 03:21:48 2011 (r2479) @@ -2,62 +2,49 @@ fload ${BP}/cpu/arm/mmuparams.fth -h# 2000.0000 constant total-ram-size +h# 2000.0000 constant /ram-total \ Total size of memory -h# 1fc0.0000 constant fb-pa -h# 40.0000 constant fb-size \ The screen use a little more than 3 MiB at 1200x900x24 +h# 0040.0000 constant /fb-mem \ The screen uses a little more than 3 MiB at 1200x900x24 +/ram-total /fb-mem - constant fb-mem-pa \ e.g. h# 1fc0.0000 -fb-pa constant available-ram-size +fb-mem-pa constant /available-mem - -h# 20000 constant dropin-offset \ Offset to dropin driver area in SPI FLASH -[ifdef] use-flash-nvram -h# d.0000 constant nvram-offset -[then] - -h# e.0000 constant mfg-data-offset \ Offset to manufacturing data area in SPI FLASH -h# f.0000 constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH -h# f.ffd8 constant crc-offset - -h# 10.0000 constant /rom \ Total size of SPI FLASH - -: (memory?) ( phys -- flag ) total-ram-size u< ; +: (memory?) ( phys -- flag ) /ram-total u< ; \ OFW implementation choices -h# d400.0000 constant io-pa -h# 1fa0.0000 constant fw-pa +h# 0020.0000 constant /fw-mem +fb-mem-pa /fw-mem - constant fw-mem-pa \ e.g. h# 1fa0.0000 -h# 1f00.0000 constant dma-base -h# 80.0000 constant dma-size +h# 0020.0000 constant /extra-mem +fw-mem-pa /extra-mem - constant extra-mem-pa \ e.g. h# 1f80.0000 -h# 1f80.0000 constant extra-mem-pa -h# 20.0000 constant /extra-mem +h# 0080.0000 constant /dma-mem +extra-mem-pa /dma-mem - constant dma-mem-pa \ e.g. h# 1f00.0000 -h# fd00.0000 constant dma-va +h# fd00.0000 constant dma-mem-va h# fd80.0000 constant extra-mem-va -h# fda0.0000 constant fw-va -h# fdc0.0000 constant fb-va -h# fe00.0000 constant io-va +h# fda0.0000 constant fw-mem-va +h# fdc0.0000 constant fb-mem-va + +h# fe00.0000 constant io-va \ We map IO (APB + AXI) space at this virtual address [ifdef] virtual-mode h# f700.0000 constant fw-virt-base h# 0100.0000 constant fw-virt-size \ 16 megs of mapping space [else] -\ fw-pa value fw-virt-base -fw-va value fw-virt-base -h# 20.0000 value fw-virt-size +fw-mem-va value fw-virt-base +/fw-mem value fw-virt-size [then] -h# 0020.0000 constant /fw-ram -/fw-ram /page-table - constant page-table-offset -page-table-offset constant stack-offset \ Stack is below this +/fw-mem /page-table - constant page-table-offset +page-table-offset constant stack-offset \ Stack is below this -fw-pa page-table-offset + constant page-table-pa +fw-mem-pa page-table-offset + constant page-table-pa \ h# 0110.0000 constant def-load-base h# 0800.0000 constant def-load-base -\ The heap starts at RAMtop, which on this system is "fw-pa /fw-ram +" +\ The heap starts at RAMtop, which on this system is "fw-mem-pa /fw-mem +" h# 10.0000 constant heap-size heap-size constant initial-heap-size @@ -65,3 +52,24 @@ \ RAM address where the Security Processor code places the subset of the dropin module \ image that it copies out of SPI FLASH. h# 900.0000 constant 'dropins \ Must agree with 'compressed in cforth/src/app/arm-xo-1.75/ + +h# 20000 constant dropin-offset \ Offset to dropin driver area in SPI FLASH + +[ifdef] use-flash-nvram +h# d.0000 constant nvram-offset +[then] + +h# e.0000 constant mfg-data-offset \ Offset to manufacturing data area in SPI FLASH +h# f.0000 constant mfg-data-end-offset \ Offset to end of manufacturing data area in SPI FLASH +h# f.ffd8 constant crc-offset + +h# 10.0000 constant /rom \ Total size of SPI FLASH + +\ SRAM usage + +sram-pa constant sram-va + +sram-va h# 2.0000 + constant 'ddr-recal +sram-va h# 2.0100 + constant 'ddr-self-refresh + +sram-pa h# 2.4000 + constant diagfb-pa \ Low-resolution frame buffer for startup numbers Modified: cpu/arm/olpc/1.75/config.fth ============================================================================== --- cpu/arm/olpc/1.75/config.fth Thu Aug 25 04:49:44 2011 (r2478) +++ cpu/arm/olpc/1.75/config.fth Mon Aug 29 03:21:48 2011 (r2479) @@ -5,7 +5,7 @@ create use-null-nvram create use-elf -fload ${BP}/cpu/arm/olpc/1.75/addrs.fth fload ${BP}/cpu/arm/mmp2/hwaddrs.fth +fload ${BP}/cpu/arm/olpc/1.75/addrs.fth create machine-signature ," CL2" Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Thu Aug 25 04:49:44 2011 (r2478) +++ cpu/arm/olpc/1.75/devices.fth Mon Aug 29 03:21:48 2011 (r2479) @@ -234,23 +234,23 @@ : display-on \ init-xo-display \ Turns on DCON smb-init - fb-pa hdisp vdisp * >bytes h# ffffffff lfill + frame-buffer-adr hdisp vdisp * >bytes h# ffffffff lfill init-lcd ; : map-frame-buffer ( -- ) - fb-pa fb-size " map-in" $call-parent to frame-buffer-adr + fb-mem-pa /fb-mem " map-in" $call-parent to frame-buffer-adr ; " display" device-type " ISO8859-1" encode-string " character-set" property 0 0 encode-bytes " iso6429-1983-colors" property \ Used as temporary storage for images by $get-image - : graphmem ( -- adr ) dimensions * pixel* fb-pa + ; + : graphmem ( -- adr ) dimensions * pixel* fb-mem-pa + ; : display-install ( -- ) + map-frame-buffer display-on default-font set-font - map-frame-buffer width height ( width height ) over char-width / over char-height / ( width height rows cols ) /scanline depth fb-install ( ) @@ -392,6 +392,7 @@ fload ${BP}/cpu/arm/mmp2/thermal.fth fload ${BP}/cpu/arm/mmp2/dramrecal.fth +fload ${BP}/cpu/arm/mmp2/rtc.fth \ Internal RTC, used for wakeups \ LICENSE_BEGIN \ Copyright (c) 2010 FirmWorks Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Thu Aug 25 04:49:44 2011 (r2478) +++ cpu/arm/olpc/1.75/fw.bth Mon Aug 29 03:21:48 2011 (r2479) @@ -11,7 +11,6 @@ \ ' $report-name is include-hook \ ' noop is include-hook -fb-pa constant display-pa fload ${BP}/cpu/arm/olpc/fbnums.fth fload ${BP}/cpu/arm/olpc/fbmsg.fth @@ -46,7 +45,7 @@ d# 900 tag-w, \ Height d# 24 tag-w, \ Depth d# 1200 3 * tag-w, \ Pitch - fb-va tag-l, \ Base address + fb-mem-va tag-l, \ Base address d# 1200 3 * d# 900 * tag-l, \ Total size - perhaps could be larger 5 tag-b, \ Red size d# 11 tag-b, \ Red position @@ -70,12 +69,12 @@ \ Each of these groups is a struct map_desc as defined in arch/arm/include/asm/mach/ extra-mem-va tag-l, \ VA of OFW memory extra-mem-pa pageshift rshift tag-l, \ Page frame number of OFW memory - fw-virt-base /fw-ram + extra-mem-va - tag-l, \ Size of OFW memory + fw-mem-va /fw-mem + extra-mem-va - tag-l, \ Size of OFW memory MT_MEMORY tag-l, \ Mapping type of OFW memory - fb-va tag-l, \ VA of OFW Frame Buffer - fb-pa pageshift rshift tag-l, \ PA of OFW Frame Buffer - fb-size tag-l, \ Size of OFW memory + fb-mem-va tag-l, \ VA of OFW Frame Buffer + fb-mem-pa pageshift rshift tag-l, \ PA of OFW Frame Buffer + /fb-mem tag-l, \ Size of OFW memory MT_DEVICE_WC tag-l, \ Mapping type of OFW frame buffer ; ' (ofw-tag,) to ofw-tag, @@ -267,11 +266,12 @@ device-end fload ${BP}/cpu/x86/pc/olpc/gridmap.fth \ Gridded display tools fload ${BP}/cpu/x86/pc/olpc/via/copynand.fth -fload ${BP}/cpu/arm/olpc/1.75/exc7200-touchscreen.fth \ Touchscreen driver and diagnostic +\ fload ${BP}/cpu/arm/olpc/1.75/exc7200-touchscreen.fth \ Touchscreen driver and diagnostic +fload ${BP}/cpu/arm/olpc/1.75/rm3150-touchscreen.fth \ Touchscreen driver and diagnostic fload ${BP}/cpu/arm/olpc/1.75/roller.fth \ Accelerometer test -fload ${BP}/cpu/arm/olpc/1.75/pinch.fth \ Touchscreen gestures -: pinch " pinch" screen-ih $call-method ; +\ fload ${BP}/cpu/arm/olpc/1.75/pinch.fth \ Touchscreen gestures +\ : pinch " pinch" screen-ih $call-method ; : emacs ( -- ) false to already-go? @@ -342,7 +342,7 @@ fload ${BP}/cpu/x86/pc/olpc/via/fsverify.fth devalias fsdisk int:0 -create pong-use-touchscreen +\ create pong-use-touchscreen fload ${BP}/ofw/gui/ofpong.fth fload ${BP}/cpu/x86/pc/olpc/life.fth Modified: cpu/arm/olpc/1.75/lcd.fth ============================================================================== --- cpu/arm/olpc/1.75/lcd.fth Thu Aug 25 04:49:44 2011 (r2478) +++ cpu/arm/olpc/1.75/lcd.fth Mon Aug 29 03:21:48 2011 (r2479) @@ -10,7 +10,7 @@ h# 1b pmua-disp-clk-sel + h# 28284c io! 0 h# 190 lcd! \ Disable LCD DMA controller - fb-pa h# f4 lcd! \ Frame buffer area 0 + fb-mem-pa h# f4 lcd! \ Frame buffer area 0 0 h# f8 lcd! \ Frame buffer area 1 hdisp bytes/pixel * h# fc lcd! \ Pitch in bytes Modified: cpu/arm/olpc/1.75/probemem.fth ============================================================================== --- cpu/arm/olpc/1.75/probemem.fth Thu Aug 25 04:49:44 2011 (r2478) +++ cpu/arm/olpc/1.75/probemem.fth Mon Aug 29 03:21:48 2011 (r2479) @@ -16,14 +16,14 @@ headers : probe ( -- ) - 0 available-ram-size log&release + 0 /available-mem log&release 0 0 encode-bytes ( adr 0 ) physavail ['] make-phys-memlist find-node ( adr len prev 0 ) 2drop " reg" property \ Claim the memory used by OFW - fw-pa /fw-ram 0 claim drop + fw-mem-pa /fw-mem 0 claim drop extra-mem-pa /extra-mem 0 claim drop 0 pagesize 0 claim drop \ Vector table @@ -55,9 +55,12 @@ : show-line ( adr len -- ) (cr type 3 spaces kill-line ; ' show-line to show-status -: test-mem ( adr len -- ) \ Test a chunk 'o memory - ." Testing address 0x" over .x ." length 0x" dup .x cr +[ifndef] 8u.h +: 8u.h ( n -- ) push-hex (.8) type pop-base ; +[then] +: .chunk ( adr len -- ) ." Testing address 0x" swap 8u.h ." length 0x" 8u.h cr ; +: test-mem ( adr len -- ) \ Test a chunk 'o memory 2>r 2r@ 0 mem-claim to p-adr ( ) ( r: adr len ) [ifdef] virtual-mode @@ -95,6 +98,7 @@ begin dup while ( adr len ) 2 decode-ints swap ( adr len this-len r: this-padr ) + 2dup .chunk ( adr len this-len r: this-padr ) test-mem ( adr len ) mem-fail? if ( adr len ) 2drop true exit ( -- error ) Modified: cpu/arm/olpc/fbnums.fth ============================================================================== --- cpu/arm/olpc/fbnums.fth Thu Aug 25 04:49:44 2011 (r2478) +++ cpu/arm/olpc/fbnums.fth Mon Aug 29 03:21:48 2011 (r2479) @@ -51,7 +51,7 @@ : putdig ( n pos -- ) numerals rot wa+ w@ ( pos glyph ) \ Vertical offset by 2 lines (fb-pitch 2*), horizontal by pos character cells - display-pa fb-pitch 2* + rot wa+ ( glyph fb-adr ) + diagfb-pa fb-pitch 2* + rot wa+ ( glyph fb-adr ) 5 0 do ( glyph fb-adr ) over 3 and ( glyph fb-adr pattern# ) patterns swap wa+ w@ ( glyph fb-adr pattern ) Modified: cpu/arm/olpc/initmmu.fth ============================================================================== --- cpu/arm/olpc/initmmu.fth Thu Aug 25 04:49:44 2011 (r2478) +++ cpu/arm/olpc/initmmu.fth Mon Aug 29 03:21:48 2011 (r2479) @@ -221,12 +221,12 @@ 0= until mov r1,0 \ Address of low memory - set r2,`dma-base #` \ Size of low memory - up to dma-base + set r2,`dma-mem-pa #` \ Size of low memory - up to dma-base set r3,#0xc0e \ Cache and write bufferable bl `map-sections-v=p` - set r1,`dma-base #` \ Address of DMA area - set r2,`dma-size #` \ Size of DMA area + set r1,`dma-mem-pa #` \ Address of DMA area + set r2,`/dma-mem #` \ Size of DMA area set r3,#0xc02 \ No caching or write buffering bl `map-sections-v=p` @@ -235,41 +235,41 @@ set r3,#0xc0e \ Write bufferable bl `map-sections-v=p` - set r1,`fw-pa #` \ Address of Firmware region - set r2,`/fw-ram #` \ Size of firmware region + set r1,`fw-mem-pa #` \ Address of Firmware region + set r2,`/fw-mem #` \ Size of firmware region set r3,#0xc0e \ Write bufferable bl `map-sections-v=p` - set r1,`fb-pa #` \ Address - Frame buffer - set r2,`fb-size #` \ Size of frame buffer + set r1,`fb-mem-pa #` \ Address - Frame buffer + set r2,`/fb-mem #` \ Size of frame buffer set r3,#0xc06 \ Write bufferable bl `map-sections-v=p` - set r1,#0xd1000000 \ Address of SRAM - set r2,#0x00300000 \ Size of SRAM + set r1,`sram-pa #` \ Address of SRAM + set r2,`/sram #` \ Size of SRAM set r3,#0xc02 \ No caching or write buffering bl `map-sections-v=p` - set r1,#0xd4000000 \ Address of I/O - set r2,#0x00400000 \ Size of I/O region + set r1,`io-pa #` \ Address of I/O + set r2,`/io #` \ Size of I/O region set r3,#0xc02 \ No caching or write buffering bl `map-sections-v=p` - set r1,#0xe0000000 \ Address of Audio SRAM - set r2,#0x00100000 \ Size of audio SRAM + set r1,`audio-sram-pa #` \ Address of Audio SRAM + set r2,`/audio-sram #` \ Size of audio SRAM set r3,#0xc02 \ No caching or write buffering bl `map-sections-v=p` - set r1,`dma-base #` \ Address of DMA area - set r2,`dma-size #` \ Size of DMA area + set r1,`dma-mem-pa #` \ Address of DMA area + set r2,`/dma-mem #` \ Size of DMA area set r3,#0xc02 \ No caching or write buffering - set r4,`dma-va #` \ Virtual address + set r4,`dma-mem-va #` \ Virtual address bl `map-sections` - set r1,`fb-pa #` \ Address - Frame buffer - set r2,`fb-size #` \ Size of frame buffer + set r1,`fb-mem-pa #` \ Address - Frame buffer + set r2,`/fb-mem #` \ Size of frame buffer set r3,#0xc06 \ Write bufferable - set r4,`fb-va #` \ Virtual address + set r4,`fb-mem-va #` \ Virtual address bl `map-sections set r1,`extra-mem-pa #` \ Address of additional allocatable memory @@ -278,14 +278,14 @@ set r4,`extra-mem-va #' \ Virtual address bl `map-sections` - set r1,`fw-pa #` \ Address of Firmware region - set r2,`/fw-ram #` \ Size of firmware region + set r1,`fw-mem-pa #` \ Address of Firmware region + set r2,`/fw-mem #` \ Size of firmware region set r3,#0xc0e \ Write bufferable - set r4,`fw-va #` \ Virtual address + set r4,`fw-mem-va #` \ Virtual address bl `map-sections` - set r1,#0xd4000000 \ Address of I/O - set r2,#0x00400000 \ Size of I/O region + set r1,`io-pa #` \ Address of I/O + set r2,`/io #` \ Size of I/O region set r3,#0xc02 \ No caching or write buffering set r4,`io-va #` \ Virtual address bl `map-sections` Modified: cpu/arm/olpc/numdot.fth ============================================================================== --- cpu/arm/olpc/numdot.fth Thu Aug 25 04:49:44 2011 (r2478) +++ cpu/arm/olpc/numdot.fth Mon Aug 29 03:21:48 2011 (r2479) @@ -13,7 +13,7 @@ \ work in any case. label fb-adr-loc \ Frame buffer address -fb-pa , +diagfb-pa , end-code label numerals Modified: cpu/arm/olpc/resetvec.bth ============================================================================== --- cpu/arm/olpc/resetvec.bth Thu Aug 25 04:49:44 2011 (r2478) +++ cpu/arm/olpc/resetvec.bth Mon Aug 29 03:21:48 2011 (r2479) @@ -30,7 +30,7 @@ ; previous definitions -\ /fw-ram constant stack-offset \ Offset of top of inflater stack within destination RAM +\ /fw-mem constant stack-offset \ Offset of top of inflater stack within destination RAM stack-offset h# 2.0000 - constant workspace-offset \ Offset of inflater workspace within destination RAM start-assembling @@ -152,7 +152,7 @@ \ Setup the page (section) table and turn on the MMU and caches \ set r0,`page-table-pa #` - set r0,`fw-pa page-table-offset + #` + set r0,`fw-mem-pa page-table-offset + #` bl `init-map` \ Setup the initial virtual address map bl `enable-mmu` \ Turn on the MMU bl `caches-on` \ Turn on the caches

1 0

[commit] r2478 - cpu/x86/pc/olpc/via
by repository service Aug. 24, 2011

Aug. 24, 2011

Author: quozl Date: Thu Aug 25 04:49:44 2011 New Revision: 2478 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2478 Log: Q3B19 Modified: cpu/x86/pc/olpc/via/ec-version.fth cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/ec-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/ec-version.fth Wed Aug 24 08:20:04 2011 (r2477) +++ cpu/x86/pc/olpc/via/ec-version.fth Thu Aug 25 04:49:44 2011 (r2478) @@ -1,5 +1,5 @@ \ The EC microcode -macro: EC_VERSION 2_2_7 +macro: EC_VERSION 2_2_8 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Wed Aug 24 08:20:04 2011 (r2477) +++ cpu/x86/pc/olpc/via/fw-version.fth Thu Aug 25 04:49:44 2011 (r2478) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 18 +macro: FW_MINOR 19

1 0

[commit] r2477 - cpu/arm/olpc/1.75
by repository service Aug. 23, 2011

Aug. 23, 2011

Author: quozl Date: Wed Aug 24 08:20:04 2011 New Revision: 2477 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2477 Log: Q4B08 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Mon Aug 22 12:21:06 2011 (r2476) +++ cpu/arm/olpc/1.75/fw-version.fth Wed Aug 24 08:20:04 2011 (r2477) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 07 +macro: FW_MINOR 08

1 0

[commit] r2476 - cpu/x86/pc/olpc/via
by repository service Aug. 22, 2011

Aug. 22, 2011

Author: quozl Date: Mon Aug 22 12:21:06 2011 New Revision: 2476 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2476 Log: Q3B18 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 Mon Aug 22 12:20:17 2011 (r2475) +++ cpu/x86/pc/olpc/via/fw-version.fth Mon Aug 22 12:21:06 2011 (r2476) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 17 +macro: FW_MINOR 18

1 0