openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r2200 - ofw/termemu
by repository service 18 May '11

18 May '11

Author: wmb Date: Wed May 18 03:48:02 2011 New Revision: 2200 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2200 Log: Added 565>rgb function. Modified: ofw/termemu/fb8.fth Modified: ofw/termemu/fb8.fth ============================================================================== --- ofw/termemu/fb8.fth Sat May 14 02:49:07 2011 (r2199) +++ ofw/termemu/fb8.fth Wed May 18 03:48:02 2011 (r2200) @@ -78,6 +78,11 @@ swap 2 rshift 5 lshift or swap 3 rshift d# 11 lshift or ; +: 565>rgb ( w -- r g b ) + dup d# 8 rshift 7 or + over 3 rshift h# fc and 3 or + rot 3 lshift h# f8 and 7 or +; create colors-8bpp 0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , a , b , c , d , e , f ,

1 0

[commit] r2199 - cpu/arm/marvell
by repository service 14 May '11

14 May '11

Author: wmb Date: Sat May 14 02:49:07 2011 New Revision: 2199 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2199 Log: OLPC XO-1.75 - Changed some values for the USB OTG PHY to match values I got from some source code drop. Modified: cpu/arm/marvell/utmiphy.fth Modified: cpu/arm/marvell/utmiphy.fth ============================================================================== --- cpu/arm/marvell/utmiphy.fth Fri May 13 00:09:17 2011 (r2198) +++ cpu/arm/marvell/utmiphy.fth Sat May 14 02:49:07 2011 (r2199) @@ -6,6 +6,7 @@ h# d420700c constant utmi-tx h# d4207010 constant utmi-rx h# d4207014 constant utmi-ivref +h# d4207018 constant utmi-t0 : regset ( mask adr -- ) tuck l@ or swap l! ; : regclr ( mask adr -- ) tuck l@ swap invert and swap l! ; @@ -16,14 +17,16 @@ loop ." PLL calibrate timeout" cr ; -h# 7e03.ffff value pll-clr \ PLLCALI12, PLLVDD18, PLLVDD12, KVCO, ICP, FBDIV, REFDIV, -h# 7e01.aeeb value pll-set \ 3 3 3 3 2 ee b +\ h# 7e03.ffff value pll-clr \ PLLCALI12, PLLVDD18, PLLVDD12, KVCO, ICP, FBDIV, REFDIV, +\ h# 7e01.aeeb value pll-set \ 3 3 3 3 2 ee b +h# 0003.ffff value pll-clr \ KVCO, ICP, FBDIV, REFDIV, +h# 7e01.9eeb value pll-set \ 3 3 3 3 1 ee b h# 00df.c000 value tx-clr \ TXVDD12, CK60_PHSEL, IMPCAL_VTH -h# 00c9.4000 value tx-set \ 3 4 5 +h# 00c8.0000 value tx-set \ 3 4 0 -h# 0001.80f0 value rx-clr \ REG_SQ_LENGTH, RX_SQ_THRESH -h# 0001.000a value rx-set \ 2 a +h# 0000.00f0 value rx-clr \ RX_SQ_THRESH +h# 0000.0070 value rx-set \ 7 : init-usb-phy ( -- ) [ifdef] notdef @@ -35,19 +38,27 @@ \ Turn on the USB PHY power h# 1010.0000 utmi-ctrl regset \ INPKT_DELAY_SOF, PU_REF h# 2 utmi-ctrl regset \ PLL_PWR_UP + d# 10 ms h# 1 utmi-ctrl regset \ PWR_UP + 1 ms + + \ Linux code does this, perhaps redundantly + h# 1000.0000 utmi-ctrl regset \ INPKT_DELAY_SOF, PU_REF + + h# 0000.8000 utmi-t0 regclr \ REG_FIFO_SQ_RST \ Configure the PLLs pll-clr utmi-pll regclr \ PLLCALI12, PLLVDD18, PLLVDD12, KVCO, ICP, FBDIV, REFDIV, - pll-set utmi-pll regset \ 3 3 3 3 2 ee b + pll-set utmi-pll regset \ 3 3 3 3 1 ee b + 1 ms tx-clr utmi-tx regclr \ TXVDD12, CK60_PHSEL, IMPCAL_VTH - tx-set utmi-tx regset \ 3 4 5 + tx-set utmi-tx regset \ 3 4 0 - rx-clr utmi-rx regclr \ REG_SQ_LENGTH, RX_SQ_THRESH - rx-set utmi-rx regset \ 2 a + rx-clr utmi-rx regclr \ RX_SQ_THRESH + rx-set utmi-rx regset \ 7 - d# 10000 wait-cal + d# 1000 wait-cal d# 200 us h# 0020.0000 utmi-pll regset \ VCOCAL_START

1 0

[commit] r2198 - cpu/x86/pc/olpc
by repository service 13 May '11

13 May '11

Author: wmb Date: Fri May 13 00:09:17 2011 New Revision: 2198 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2198 Log: OLPC RTC anti-rollback - working version. Modified: cpu/x86/pc/olpc/guardrtc.fth cpu/x86/pc/olpc/security.fth Modified: cpu/x86/pc/olpc/guardrtc.fth ============================================================================== --- cpu/x86/pc/olpc/guardrtc.fth Tue May 10 19:56:01 2011 (r2197) +++ cpu/x86/pc/olpc/guardrtc.fth Fri May 13 00:09:17 2011 (r2198) @@ -70,6 +70,7 @@ flash-open ( ) (put-mfg-data) ( ) flash-close ( ) + d# 1000 ms ( ) \ Give the EC time to restart ; : flash-write-some ( adr len offset -- ) flash-open ( adr len offset ) @@ -142,31 +143,41 @@ update-timestamp ( status ) ; -1 buffer: byte-buf -: encode-byte ( b -- ) byte-buf c! byte-buf 1 encode-bytes ; : +encode-bytes ( prop$ $ -- prop$' ) encode-bytes encode+ ; -: make-timestamp-property ( -- ) - rtc-timestamp 0= if exit then - " /chosen" find-package drop push-package ( ) - rtc-timestamp unix-seconds> ( s m h d m y ) - push-decimal ( s m h d m y ) - #timestamps (.) encode-bytes ( s m h d m y prop$ ) - " ," +encode-bytes rot (.4) +encode-bytes ( s m h d m prop$ ) - " -" +encode-bytes rot (.2) +encode-bytes ( s m h d prop$' ) - " -" +encode-bytes rot (.2) +encode-bytes ( s m h prop$' ) - " @" +encode-bytes rot (.2) +encode-bytes ( s m prop$' ) - " :" +encode-bytes rot (.2) +encode-bytes ( s prop$' ) - " :" +encode-bytes rot (.2) +encode-bytes ( prop$' ) - " "(00)" +encode-bytes ( prop$' ) - pop-base ( ) - - " rtc-timestamp" (property) ( ) - pop-package -; -: make-status-property ( value$ -- ) - " /chosen" find-package drop push-package ( value$ ) +string-array rtc-status-names + ," ok" + ," empty" + ," residue" + ," rollback" +end-string-array + +: make-rtc-properties ( status -- ) + " /chosen" find-package drop push-package ( status ) + + rtc-status-names count encode-string " rtc-status" (property) ( ) + + rtc-timestamp if + rtc-timestamp unix-seconds> ( s m h d m y ) + push-decimal ( s m h d m y ) + (.4) encode-bytes ( s m h d m prop$ ) + rot (.2) +encode-bytes ( s m h d prop$' ) + rot (.2) +encode-bytes ( s m h prop$' ) + " T" +encode-bytes ( s m h prop$' ) + rot (.2) +encode-bytes ( s m prop$' ) + rot (.2) +encode-bytes ( s prop$' ) + rot (.2) +encode-bytes ( prop$' ) + " Z"(00)" +encode-bytes ( prop$' ) + pop-base ( ) + + " rtc-timestamp" (property) ( ) + then + + push-decimal + #timestamps (.) encode-bytes " rtc-count" (property) ( ) + pop-base + pop-package ; @@ -178,24 +189,19 @@ then ( flag ) ; -: rtc-rollback? ( -- flag ) +: rtc-rollback? ( -- error? ) rtcar-enabled? 0= if exit then find-timestamp ( status ) ?update-timestamp ( status' ) - make-timestamp-property ( status ) - case - 0 of " ok" make-status-property false endof - 1 of " empty" make-status-property false endof - 2 of " residue" make-status-property true endof - 3 of " rollback" make-status-property true endof - ( default ) true swap - endcase + dup make-rtc-properties ( status ) + 2 >= ( error? ) ; -: parse-field ( val$ delimiter expected-length -- val$' field$ ) - >r left-parse-string ( val$' field$ ) - dup r> <> throw +: parse-field ( val$ length -- val$' field$ ) + 2dup < throw ( val$ length ) + >r over r@ ( val$ adr length r: length ) + 2swap r> /string 2swap ( val$' field$ ) ; \ Throws an error if either a number is unparsable or out of range : decode-number ( field$ min max -- n ) @@ -206,48 +212,47 @@ ; : decode-timestamp ( val$ -- s m h d m y ) - [char] - 4 parse-field d# 2000 d# 2099 decode-number >r ( val$' r: y ) - [char] - 2 parse-field 1 d# 12 decode-number >r ( val$' r: y m ) - [char] @ 2 parse-field 1 d# 31 decode-number >r ( val$' r: y m d ) - [char] : 2 parse-field 0 d# 23 decode-number >r ( val$' r: y m d h ) - [char] : 2 parse-field 0 d# 59 decode-number >r ( val$' r: y m d h m ) - dup 2 <> throw 0 d# 59 decode-number >r ( r: y m d h m s ) - r> r> r> r> r> r> ( s m h d m y ) -; -: fix-rtc-timestamps ( data$ -- ) \ "count old-ts new-ts" e.g. 2011-10-12,00:23:45 - bl left-parse-string ( rem$ count$ ) - - 0 h# 7fffffff ['] decode-number catch if ( rem$ x x x x ) - 4drop 2drop ." Bad count format" cr ( ) - exit ( -- ) - then ( rem$ count ) - -rot ( count rem$ ) - - find-timestamp ( count rem$ ) - - bl left-parse-string ( count rem$ old-timestamp$ ) - 2dup " no-timestamp" $= if ( count rem$ old-timestamp$ ) - 2drop ( count rem$ ) - rtc-timestamp if ( count rem$ ) - 3drop ( ) + 4 parse-field d# 2000 d# 2099 decode-number >r ( val$' r: y ) + 2 parse-field 1 d# 12 decode-number >r ( val$' r: y m ) + 2 parse-field 1 d# 31 decode-number >r ( val$' r: y m d ) + 1 parse-field drop c@ [char] T <> throw ( val$' r: y m d ) + 2 parse-field 0 d# 23 decode-number >r ( val$' r: y m d h ) + 2 parse-field 0 d# 59 decode-number >r ( val$' r: y m d h m ) + 2 parse-field 0 d# 59 decode-number >r ( val$' r: y m d h m s ) + 1 parse-field drop c@ [char] Z <> throw ( val$' r: y m d h m s ) + nip 0<> throw ( r: y m d h m s ) + r> r> r> r> r> r> ( s m h d m y ) +; +: fix-rtc-timestamps ( newrtc$ nonce$ -- currentrtc$ ) + find-timestamp drop ( newrtc$ nonce$ currentrtc$ ) + + 2dup " 00000000T000000Z" $= if ( newrtc$ nonce$ currentrtc$ ) + 2drop ( newrtc$ nonce$ ) + rtc-timestamp if ( newrtc$ nonce$ ) + 4drop ( ) ." Old timestamp mismatch" cr ( ) exit ( -- ) - then - else ( count rem$ old-timestamp$ ) - ['] decode-timestamp catch if ( count rem$ x x ) - 5drop ( ) + then ( newrtc$ nonce$ ) + else ( newrtc$ nonce$ currentrtc$ ) + ['] decode-timestamp catch if ( newrtc$ nonce$ x x ) + 2drop 4drop ( ) ." Bad timestamp format" cr ( ) exit ( -- ) - then ( count rem$ s m h d m y ) - then ( count rem$ s m h d m y ) + then ( newrtc$ nonce$ s m h d m y ) + >unix-seconds ( newrtc$ nonce$ timestamp ) + rtc-timestamp <> if ( newrtc$ nonce$ ) + 4drop ( ) + ." Old timestamp mismatch" cr ( ) + exit ( -- ) + then ( newrtc$ nonce$ ) + then ( newrtc$ nonce$ ) - >unix-seconds ( count rem$ old-timestamp ) - rtc-timestamp <> if ( count rem$ ) - 3drop ( ) - ." Old timestamp mismatch" cr ( ) + 0 h# 7fffffff ['] decode-number catch if ( newrtc$ x x x x ) + 4drop 2drop ." Bad count format" cr ( ) exit ( -- ) - then ( count rem$ ) - rot init-timestamp-area ( rem$ ) + then ( newrtc$ count ) + + init-timestamp-area ( newrtc$ ) ['] decode-timestamp catch if ( x x ) 2drop ." Bad timestamp format" cr ( ) Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Tue May 10 19:56:01 2011 (r2197) +++ cpu/x86/pc/olpc/security.fth Fri May 13 00:09:17 2011 (r2198) @@ -955,37 +955,102 @@ r> to debug-security? ; -: fix-rtc-history ( data$ -- ) \ SN UUID counter timestamp newtimestamp - \ Isolate data from first line + +0 [if] +\ SN : UUID : currrtc : nonce : newrtc +\ 0 11 12 48 49 65 66 76 77 (93) +d# 11 1+ d# 36 + 1+ d# 16 + 1+ d# 10 + 1+ d# 16 + +constant /rtc-signature +/rtc-signature buffer: rtc-signature-buf + +: check-rtc-signature ( sig$ currentrtc$ nonce$ newrtc$ -- good? ) + + rtc-signature-buf d# 77 + swap move ( sig$ currentrtc$ nonce$ ) + [char] : rtc-signature-buf d# 76 + c! ( sig$ currentrtc$ nonce$ ) + + rtc-signature-buf d# 66 + swap move ( sig$ currentrtc$ ) + [char] : rtc-signature-buf d# 65 + c! ( sig$ currentrtc$ ) + + rtc-signature-buf d# 49 + swap move ( sig$ ) + + \ Copy SN:UUID: from machine-id-buf to rtc-signature-buf + machine-id-buf d# 49 rtc-signature-buf move ( sig$ ) + + rtc-signature-buf /rtc-signature 2swap ( data$ sig$ ) + " sha256" signature-good? ( good? ) +; + newrtc$ rtc-signature-buf d# 77 + swap move ( ) + [char] : rtc-signature-buf d# 76 + c! ( ) + + nonce$ rtc-signature-buf d# 66 + swap move ( ) + [char] : rtc-signature-buf d# 65 + c! ( ) + + currentrtc$ rtc-signature-buf d# 49 + swap move ( ) + [char] : rtc-signature-buf d# 48 + c! ( ) + +[then] + +0 0 2value currentrtc$ +0 0 2value newrtc$ +0 0 2value nonce$ +0 0 2value rtcsig$ +: rtc-format-error ( -- done? ) + ." RTC Reset format error" ?lease-error-cr true +; +: check-rtc-key ( data$ -- done? ) \ rtc01: SN currentrtc nonce newrtc sig0N: ... + \ Isolate data from line newline left-parse-string 2nip ( rem$ ) + bl left-parse-string " rtc01:" $= 0= if ( rem$ ) + ." Unknown format" ?lease-error-cr ( rem$ ) + 2drop true exit ( -- true ) + then ( rem$ ) + bl left-parse-string ( rem$ serial$ ) my-sn$ $= 0= if ( rem$ ) - ." Wrong serial number" ?lease-error-cr ( rem$ ) - 2drop exit ( -- ) +\ ." Wrong serial number" ?lease-error-cr ( rem$ ) + 2drop false exit ( -- false ) then ( rem$ ) - \ Ignore UUID for now - bl left-parse-string ( rem$ uuid$ ) - 2drop ( rem$ ) - - fix-rtc-timestamps ( ) + bl left-parse-string to currentrtc$ ( rem$' ) + bl left-parse-string to nonce$ ( rem$' ) + bl left-parse-string to newrtc$ ( rem$' ) + to rtcsig$ ( ) + + currentrtc$ nip d# 16 <> if rtc-format-error exit then + nonce$ nip d# 10 <> if rtc-format-error exit then + newrtc$ nip d# 16 <> if rtc-format-error exit then + + newrtc$ nonce$ currentrtc$ machine-id-buf d# 48 " %s:%s:%s:%s" sprintf ( data$ ) + + rtcsig$ " sha256" signature-good? if ( ) + newrtc$ nonce$ currentrtc$ fix-rtc-timestamps ( ) + else + ." Bad signature " ?lease-error-cr ( ) + then ( ) + true ( done? ) ; : ?rtc-update ( -- ) rtcar-enabled? 0= if exit then show-dot null$ cn-buf place - " rtcreset" bundle-present? if + " rtcreset.sig" open-security? if exit then >r ( r: ih ) " RTCRESET found - " ?lease-debug + load-started leasekey$ to pubkey$ - img$ sig$ sha-valid? if - img$ fix-rtc-history - show-unlock - else - show-lock - then - then + begin + sec-line-buf /sec-line-max r@ read-line if ( actual -eof? ) + 2drop r> close-file drop exit + then ( actual -eof? ) + while ( actual ) + sec-line-buf swap check-rtc-key if ( ) + r> close-file drop exit ( -- ) + then ( ) + repeat ( actual ) + drop ( ) + " No matching records" ?lease-error-cr ( ) + r> close-file drop false ( false ) ; : load-from-device ( devname$ -- done? )

1 0

[commit] r2197 - in cpu/arm: mmp2 olpc/1.75
by repository service 10 May '11

10 May '11

Author: wmb Date: Tue May 10 19:56:01 2011 New Revision: 2197 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2197 Log: OLPC XO-1.75 - new improved clock speed setting tools. Added: cpu/arm/mmp2/clocks.fth Modified: cpu/arm/olpc/1.75/fw.bth Added: cpu/arm/mmp2/clocks.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/mmp2/clocks.fth Tue May 10 19:56:01 2011 (r2197) @@ -0,0 +1,35 @@ +purpose: Change the clock frequency + +: fccr@ ( -- n ) h# d405.0008 l@ ; +: fccr! ( n -- ) h# d405.0008 l! ; +: pj4-clksel ( n -- ) + d# 29 lshift ( field ) + fccr@ h# e000.0000 invert and or fccr! ( ) +; +: sp-clksel ( n -- ) + d# 26 lshift ( field ) + fccr@ h# 1c00.0000 invert and or fccr! ( ) +; +: pj4-cc! ( n -- ) h# d428.2804 l! ; + +: sp-cc! ( n -- ) h# d428.2800 l! ; +\ cfraaADXBpP +: sp-100mhz ( -- ) 0 sp-clksel o# 37077703303 sp-cc! ; \ A 100, D 400, XP 100, B 100, P 100 +: sp-200mhz ( -- ) 0 sp-clksel o# 37077301101 sp-cc! ; \ A 200, D 400, XP 200, B 200, P 200 +: sp-400mhz1 ( -- ) 0 sp-clksel o# 37077301100 sp-cc! ; \ A 200, D 400, XP 200, B 200, P 400 +: sp-400mhz2 ( -- ) 0 sp-clksel o# 37077300000 sp-cc! ; \ A 200, D 400, XP 400, B 400, P 400 +: sp-original 1 sp-clksel o# 37077301101 sp-cc! ; \ A 200, D 400, XP 400, B 400, P 400 + +\ cfr52ADXBCP +: pj4-100mhz ( -- ) 0 pj4-clksel o# 37042703303 pj4-cc! ; \ A 100, D 400, XP 100, B 100, P 100 +: pj4-200mhz ( -- ) 0 pj4-clksel o# 37042301101 pj4-cc! ; \ A 200, D 400, XP 200, B 200, P 200 +: pj4-400mhz ( -- ) 0 pj4-clksel o# 37042301100 pj4-cc! ; \ A 200, D 400, XP 200, B 200, P 400 +: pj4-800mhz ( -- ) 1 pj4-clksel o# 37042201100 pj4-cc! ; \ A 266, D 400, XP 400, B 400, P 800 + +0 [if] +\ PJ4 versions using voting cvr52ADXBCP +: pj4-100mhz ( -- ) 0 pj4-clksel o# 21742703303 pj4-cc! ; \ A 100, D 400, XP 100, B 100, P 100 +: pj4-200mhz ( -- ) 0 pj4-clksel o# 21742301101 pj4-cc! ; \ A 200, D 400, XP 200, B 200, P 200 +: pj4-400mhz ( -- ) 0 pj4-clksel o# 21742301100 pj4-cc! ; \ A 200, D 400, XP 200, B 200, P 400 +: pj4-800mhz ( -- ) 1 pj4-clksel o# 21742201100 pj4-cc! ; \ A 266, D 400, XP 400, B 400, P 800 +[then] Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue May 10 19:53:29 2011 (r2196) +++ cpu/arm/olpc/1.75/fw.bth Tue May 10 19:56:01 2011 (r2197) @@ -362,16 +362,7 @@ game-key-mask = if protect-fw try-fs-update then ; -\ fload ${BP}/cpu/arm/mmp2/clocks.fth - -\ 0 [if] -: 400mhz ( -- ) - h# d428.2804 l@ 7 invert and h# 7000.0000 or 1 or h# d428.2804 l! -; -: 800mhz ( -- ) - h# d428.2804 l@ 7 invert and h# 7000.0000 or h# d428.2804 l! -; -\ [then] +fload ${BP}/cpu/arm/mmp2/clocks.fth : startup ( -- ) standalone? 0= if exit then

1 0

[commit] r2196 - cpu/arm/mmp2 cpu/arm/olpc/1.75 cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev/olpc/kb3700 dev/olpc/spiflash
by repository service 10 May '11

10 May '11

Author: wmb Date: Tue May 10 19:53:29 2011 New Revision: 2196 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2196 Log: OLPC - RTC Anti-rollback security feature - initial checkin. Added: cpu/x86/pc/olpc/guardrtc.fth Modified: cpu/arm/mmp2/sspspi.fth cpu/arm/olpc/1.75/devices.fth cpu/arm/olpc/1.75/fw.bth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/security.fth cpu/x86/pc/olpc/setwp.fth cpu/x86/pc/olpc/via/fw.bth dev/olpc/kb3700/ecio.fth dev/olpc/spiflash/flashif.fth dev/olpc/spiflash/spiflash.fth Modified: cpu/arm/mmp2/sspspi.fth ============================================================================== --- cpu/arm/mmp2/sspspi.fth Tue May 10 01:27:14 2011 (r2195) +++ cpu/arm/mmp2/sspspi.fth Tue May 10 19:53:29 2011 (r2196) @@ -24,12 +24,105 @@ : ssp-spi-cs-on ( -- ) d# 46 gpio-clr ; : ssp-spi-cs-off ( -- ) d# 46 gpio-set ; +code ssp-spi-out-in ( bo -- bi ) + set r0,`ssp-base #` + begin + ldr r1,[r0,#8] + ands r1,r1,#4 + 0<> until + str tos,[r0,#0x10] + begin + ldr r1,[r0,#8] + ands r1,r1,#8 + 0<> until + ldr tos,[r0,#0x10] +c; +0 [if] : ssp-spi-out-in ( bo -- bi ) begin ssp-sssr l@ 4 and until \ Tx not full ssp-ssdr l! begin ssp-sssr l@ 8 and until \ Rx not empty ssp-ssdr l@ ; +[then] +code ssp-spi-in16 ( adr -- adr' ) + set r0,`ssp-base #` + set r2,#0xf04 + set r3,#0xf008 + mov r4,#0 + begin + ldr r1,[r0,#8] + and r1,r1,r2 + cmp r1,#4 + 0= until + str r4,[r0,#0x10] + str r4,[r0,#0x10] + str r4,[r0,#0x10] + str r4,[r0,#0x10] + str r4,[r0,#0x10] + str r4,[r0,#0x10] + str r4,[r0,#0x10] + str r4,[r0,#0x10] + str r4,[r0,#0x10] + str r4,[r0,#0x10] + str r4,[r0,#0x10] + str r4,[r0,#0x10] + str r4,[r0,#0x10] + str r4,[r0,#0x10] + str r4,[r0,#0x10] + str r4,[r0,#0x10] + begin + ldr r1,[r0,#8] + and r1,r1,r3 + cmp r1,r3 + 0= until + ldr r4,[r0,#0x10] + strb r4,[tos],#1 + ldr r4,[r0,#0x10] + strb r4,[tos],#1 + ldr r4,[r0,#0x10] + strb r4,[tos],#1 + ldr r4,[r0,#0x10] + strb r4,[tos],#1 + ldr r4,[r0,#0x10] + strb r4,[tos],#1 + ldr r4,[r0,#0x10] + strb r4,[tos],#1 + ldr r4,[r0,#0x10] + strb r4,[tos],#1 + ldr r4,[r0,#0x10] + strb r4,[tos],#1 + ldr r4,[r0,#0x10] + strb r4,[tos],#1 + ldr r4,[r0,#0x10] + strb r4,[tos],#1 + ldr r4,[r0,#0x10] + strb r4,[tos],#1 + ldr r4,[r0,#0x10] + strb r4,[tos],#1 + ldr r4,[r0,#0x10] + strb r4,[tos],#1 + ldr r4,[r0,#0x10] + strb r4,[tos],#1 + ldr r4,[r0,#0x10] + strb r4,[tos],#1 + ldr r4,[r0,#0x10] + strb r4,[tos],#1 +c; +: fast-spi-flash-read ( adr len offset -- ) + 3 spi-cmd spi-adr ( adr len ) + d# 16 /mod ( adr len%16 len/16 ) + swap >r ( adr len/16 r: len%16 ) + 0 ?do ( adr r: len%16 ) + ssp-spi-in16 ( adr' r: len%16 ) + loop ( adr' r: len%16 ) + r> 0 ?do ( adr ) + spi-in over c! ( adr ) + 1+ ( adr' ) + loop ( adr ) + drop ( ) + spi-cs-off ( ) +; : ssp-spi-out ( b -- ) ssp-spi-out-in drop ; : ssp-spi-in ( -- b ) 0 ssp-spi-out-in ; @@ -48,8 +141,10 @@ ['] ssp-spi-out to spi-out ['] ssp-spi-cs-on to spi-cs-on ['] ssp-spi-cs-off to spi-cs-off - ['] ssp-spi-reprogrammed to spi-reprogrammed - use-spi-flash-read + ['] noop to spi-reprogrammed + ['] noop to spi-reprogrammed-no-reboot +\ use-spi-flash-read + ['] fast-spi-flash-read to flash-read ; use-ssp-spi Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Tue May 10 01:27:14 2011 (r2195) +++ cpu/arm/olpc/1.75/devices.fth Tue May 10 19:53:29 2011 (r2196) @@ -103,7 +103,6 @@ fload ${BP}/dev/olpc/spiflash/spiflash.fth \ SPI FLASH programming : ignore-power-button ; \ XXX implement me -: ssp-spi-reprogrammed ; fload ${BP}/cpu/arm/mmp2/sspspi.fth \ Synchronous Serial Port SPI interface Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue May 10 01:27:14 2011 (r2195) +++ cpu/arm/olpc/1.75/fw.bth Tue May 10 19:53:29 2011 (r2196) @@ -229,6 +229,7 @@ ; code halt ( -- ) wfi c; fload ${BP}/cpu/x86/pc/olpc/sound.fth +fload ${BP}/cpu/x86/pc/olpc/guardrtc.fth fload ${BP}/cpu/x86/pc/olpc/security.fth : pre-setup-for-linux ( -- ) @@ -361,12 +362,16 @@ game-key-mask = if protect-fw try-fs-update then ; +\ fload ${BP}/cpu/arm/mmp2/clocks.fth + +\ 0 [if] : 400mhz ( -- ) h# d428.2804 l@ 7 invert and h# 7000.0000 or 1 or h# d428.2804 l! ; : 800mhz ( -- ) h# d428.2804 l@ 7 invert and h# 7000.0000 or h# d428.2804 l! ; +\ [then] : startup ( -- ) standalone? 0= if exit then Modified: cpu/x86/pc/olpc/fw.bth ============================================================================== --- cpu/x86/pc/olpc/fw.bth Tue May 10 01:27:14 2011 (r2195) +++ cpu/x86/pc/olpc/fw.bth Tue May 10 19:53:29 2011 (r2196) @@ -361,6 +361,7 @@ fload ${BP}/cpu/x86/pc/olpc/setwp.fth fload ${BP}/cpu/x86/pc/olpc/sound.fth +fload ${BP}/cpu/x86/pc/olpc/guardrtc.fth fload ${BP}/cpu/x86/pc/olpc/security.fth fload ${BP}/cpu/x86/pc/olpc/xpsecure.fth fload ${BP}/ofw/gui/ofpong.fth Added: cpu/x86/pc/olpc/guardrtc.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/olpc/guardrtc.fth Tue May 10 19:53:29 2011 (r2196) @@ -0,0 +1,282 @@ +\ See license at end of file +purpose: Real-Time Clock Anti-rollback for security + +\ The entry points are: +\ rtcar-enabled? ( -- flag ) +\ True if an "rt" tag is present in manufacturing data, thus enabling anti-rollback +\ rtc-rollback? ( -- flag ) +\ True if either a rollback attach is detected or the timestamp area is corrupt +\ fix-rtc-timestamps ( data$ -- ) \ "count old-timestamp new-timestamp" +\ Restores valid data in the timestamp area according to data$ + +\ Layout of timestamp area: +\ Bytes 0-3 - 4-byte rewrite count - little-endian +\ Bytes 4-8 - Timestamp 0 +\ Bytes 9-13 - Timestamp 1 +\ ... +\ Bytes 32759-32763 - Timestamp 6552 +\ Each timestamp is a 4-byte little-endian "unixtime" (seconds since +\ epoch), followed by a 1-byte xor checksum of the preceding 4 bytes ^ 0x55 + +5 constant /timestamp + +\ First 4 bytes are the write counter base value +/l constant timestamp-start +d# 32768 timestamp-start - /timestamp / constant #timestamps/rewrite +#timestamps/rewrite /timestamp * constant /timestamps + +0 value timestamp-offset +0 value rtc-timestamp +0 value new-timestamp +: +tsbuf ( offset -- adr ) mfg-data-buf + ; +: timestamp-adr ( -- adr ) timestamp-offset +tsbuf timestamp-start + ; +: compute-check-byte ( timestamp -- check ) + lbsplit xor xor xor h# 55 xor +; +: count-base@ ( -- n ) 0 +tsbuf le-l@ ; +: count-base! ( n -- ) 0 +tsbuf le-l! ; +: #timestamps ( timestamp-offset -- n ) + timestamp-offset /timestamp / ( #buffered-timestamps ) + count-base@ + ( n ) +; +: timestamp-bad? ( -- timestamp error? ) + timestamp-adr le-l@ ( timestamp ) + dup compute-check-byte ( timestamp computed-check ) + timestamp-adr la1+ c@ <> ( timestamp error ) +; +: set-timestamp-offset ( -- error? ) + 0 to timestamp-offset ( ) + 0 to rtc-timestamp + begin timestamp-offset /timestamps <> while ( ) + timestamp-adr le-l@ h# ffffffff = if ( ) + \ Verify that the rest of the area is all ff too + timestamp-adr /timestamps timestamp-offset - ( adr len ) + h# ff bskip 0<> ( error? ) + exit ( -- error? ) + then ( ) + timestamp-bad? if ( timestamp ) + drop ( ) + true exit \ Bad checksum ( -- error? ) + else ( timestamp ) + to rtc-timestamp ( ) + then ( ) + + timestamp-offset /timestamp + to timestamp-offset ( ) + repeat ( ) + false ( ) +; + +: commit-timestamp-area ( -- ) + flash-open ( ) + (put-mfg-data) ( ) + flash-close ( ) +; +: flash-write-some ( adr len offset -- ) + flash-open ( adr len offset ) + flash-write ( ) + flash-close ( ) +; +: init-timestamp-area ( base -- ) + count-base! ( ) + + timestamp-start +tsbuf /timestamps h# ff bskip if ( ) + \ There is junk in the timestamp area so we must erase and rewrite + timestamp-start +tsbuf /timestamps h# ff fill ( ) + commit-timestamp-area + else + \ The timestamp area is already erased, so we can write without erasing + mfg-data-buf /l mfg-data-offset flash-write-some + then + + 0 to timestamp-offset +; +: rewrite-timestamp-area ( -- ) + \ Fill the timestamp area with ff's + timestamp-start +tsbuf /timestamps /timestamp /string h# ff fill + + \ Update the rewrite count + count-base@ #timestamps/rewrite + count-base! + + \ Perform an erase and rewrite on the mfg data area + commit-timestamp-area +; +: update-timestamp ( -- ) + timestamp-offset /timestamps = if ( ) + rewrite-timestamp-area ( ) + 0 to timestamp-offset ( ) + then + + new-timestamp dup timestamp-adr le-l! ( unixtime ) + compute-check-byte timestamp-adr la1+ c! ( ) + timestamp-adr /timestamp timestamp-offset timestamp-start + mfg-data-offset + flash-write-some ( ) +; + +: find-timestamp ( -- status ) + get-mfg-data ( ) + + count-base@ h# ffffffff = if ( ) + 0 init-timestamp-area ( ) + then ( ) + + set-timestamp-offset if ( ) + \ There is bad data after the last timestamp, if any + 2 exit ( -- 1 ) + then ( ) + + timestamp-offset 0= if ( ) + \ There is no data in the timestamp area + 1 exit ( -- 2 ) + then ( ) + 0 ( -- 0 ) +; +: ?update-timestamp ( status -- status' ) + dup 1 > if exit then ( status ) + + time&date >unix-seconds to new-timestamp ( status ) + + new-timestamp rtc-timestamp <= if ( status ) + \ Time went backwards + drop 3 exit ( -- status' ) + then ( status ) + + update-timestamp ( status ) +; + +1 buffer: byte-buf +: encode-byte ( b -- ) byte-buf c! byte-buf 1 encode-bytes ; +: +encode-bytes ( prop$ $ -- prop$' ) encode-bytes encode+ ; + +: make-timestamp-property ( -- ) + rtc-timestamp 0= if exit then + " /chosen" find-package drop push-package ( ) + rtc-timestamp unix-seconds> ( s m h d m y ) + push-decimal ( s m h d m y ) + #timestamps (.) encode-bytes ( s m h d m y prop$ ) + " ," +encode-bytes rot (.4) +encode-bytes ( s m h d m prop$ ) + " -" +encode-bytes rot (.2) +encode-bytes ( s m h d prop$' ) + " -" +encode-bytes rot (.2) +encode-bytes ( s m h prop$' ) + " @" +encode-bytes rot (.2) +encode-bytes ( s m prop$' ) + " :" +encode-bytes rot (.2) +encode-bytes ( s prop$' ) + " :" +encode-bytes rot (.2) +encode-bytes ( prop$' ) + " "(00)" +encode-bytes ( prop$' ) + pop-base ( ) + + " rtc-timestamp" (property) ( ) + pop-package +; +: make-status-property ( value$ -- ) + " /chosen" find-package drop push-package ( value$ ) + encode-string " rtc-status" (property) ( ) + pop-package +; + +: rtcar-enabled? ( -- flag ) + " rt" find-tag if ( data$ ) + 2drop true ( flag ) + else ( ) + false ( flag ) + then ( flag ) +; + +: rtc-rollback? ( -- flag ) + rtcar-enabled? 0= if exit then + + find-timestamp ( status ) + ?update-timestamp ( status' ) + make-timestamp-property ( status ) + case + 0 of " ok" make-status-property false endof + 1 of " empty" make-status-property false endof + 2 of " residue" make-status-property true endof + 3 of " rollback" make-status-property true endof + ( default ) true swap + endcase +; + +: parse-field ( val$ delimiter expected-length -- val$' field$ ) + >r left-parse-string ( val$' field$ ) + dup r> <> throw +; +\ Throws an error if either a number is unparsable or out of range +: decode-number ( field$ min max -- n ) + 2>r ( field$ r: min max ) + push-decimal $number pop-base ( n error? r: min max ) + throw ( n r: min max ) + dup 2r> between 0= throw ( n ) +; + +: decode-timestamp ( val$ -- s m h d m y ) + [char] - 4 parse-field d# 2000 d# 2099 decode-number >r ( val$' r: y ) + [char] - 2 parse-field 1 d# 12 decode-number >r ( val$' r: y m ) + [char] @ 2 parse-field 1 d# 31 decode-number >r ( val$' r: y m d ) + [char] : 2 parse-field 0 d# 23 decode-number >r ( val$' r: y m d h ) + [char] : 2 parse-field 0 d# 59 decode-number >r ( val$' r: y m d h m ) + dup 2 <> throw 0 d# 59 decode-number >r ( r: y m d h m s ) + r> r> r> r> r> r> ( s m h d m y ) +; +: fix-rtc-timestamps ( data$ -- ) \ "count old-ts new-ts" e.g. 2011-10-12,00:23:45 + bl left-parse-string ( rem$ count$ ) + + 0 h# 7fffffff ['] decode-number catch if ( rem$ x x x x ) + 4drop 2drop ." Bad count format" cr ( ) + exit ( -- ) + then ( rem$ count ) + -rot ( count rem$ ) + + find-timestamp ( count rem$ ) + + bl left-parse-string ( count rem$ old-timestamp$ ) + 2dup " no-timestamp" $= if ( count rem$ old-timestamp$ ) + 2drop ( count rem$ ) + rtc-timestamp if ( count rem$ ) + 3drop ( ) + ." Old timestamp mismatch" cr ( ) + exit ( -- ) + then + else ( count rem$ old-timestamp$ ) + ['] decode-timestamp catch if ( count rem$ x x ) + 5drop ( ) + ." Bad timestamp format" cr ( ) + exit ( -- ) + then ( count rem$ s m h d m y ) + then ( count rem$ s m h d m y ) + + >unix-seconds ( count rem$ old-timestamp ) + rtc-timestamp <> if ( count rem$ ) + 3drop ( ) + ." Old timestamp mismatch" cr ( ) + exit ( -- ) + then ( count rem$ ) + rot init-timestamp-area ( rem$ ) + + ['] decode-timestamp catch if ( x x ) + 2drop ." Bad timestamp format" cr ( ) + exit ( -- ) + then ( s m h d m y ) + >unix-seconds to new-timestamp ( ) + update-timestamp ( ) +; + +\ 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 Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Tue May 10 01:27:14 2011 (r2195) +++ cpu/x86/pc/olpc/security.fth Tue May 10 19:53:29 2011 (r2196) @@ -728,7 +728,11 @@ " ak" find-tag if 2drop " run" else - lease-valid? if " run" else " act" then + rtc-rollback? if + " act" + else + lease-valid? if " run" else " act" then + then then cn-buf place ; @@ -951,6 +955,39 @@ r> to debug-security? ; +: fix-rtc-history ( data$ -- ) \ SN UUID counter timestamp newtimestamp + \ Isolate data from first line + newline left-parse-string 2nip ( rem$ ) + + bl left-parse-string ( rem$ serial$ ) + my-sn$ $= 0= if ( rem$ ) + ." Wrong serial number" ?lease-error-cr ( rem$ ) + 2drop exit ( -- ) + then ( rem$ ) + + \ Ignore UUID for now + bl left-parse-string ( rem$ uuid$ ) + 2drop ( rem$ ) + + fix-rtc-timestamps ( ) +; + +: ?rtc-update ( -- ) + rtcar-enabled? 0= if exit then + show-dot + null$ cn-buf place + " rtcreset" bundle-present? if + " RTCRESET found - " ?lease-debug + leasekey$ to pubkey$ + img$ sig$ sha-valid? if + img$ fix-rtc-history + show-unlock + else + show-lock + then + then +; + : load-from-device ( devname$ -- done? ) show-dot @@ -972,6 +1009,8 @@ then then + ?rtc-update + show-dot ?leased \ Sets cn-buf Modified: cpu/x86/pc/olpc/setwp.fth ============================================================================== --- cpu/x86/pc/olpc/setwp.fth Tue May 10 01:27:14 2011 (r2195) +++ cpu/x86/pc/olpc/setwp.fth Tue May 10 19:53:29 2011 (r2196) @@ -1,3 +1,6 @@ +\ See license at end of file +purpose: Changing manufacturing data - adding and deleting tags + \ Set the write protect tag. This is used to convert unlocked prototype \ machined to locked machines for testing the firmware security. This \ should not be necessary once mass production systems start coming from @@ -217,3 +220,27 @@ $add-tag ( data$ ) free-mem ; + +\ 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 Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Tue May 10 01:27:14 2011 (r2195) +++ cpu/x86/pc/olpc/via/fw.bth Tue May 10 19:53:29 2011 (r2196) @@ -406,6 +406,7 @@ fload ${BP}/cpu/x86/firfilter.fth fload ${BP}/cpu/x86/pc/olpc/sound.fth fload ${BP}/cpu/x86/pc/olpc/via/sound.fth +fload ${BP}/cpu/x86/pc/olpc/guardrtc.fth fload ${BP}/cpu/x86/pc/olpc/security.fth fload ${BP}/cpu/x86/pc/olpc/xpsecure.fth fload ${BP}/ofw/gui/ofpong.fth Modified: dev/olpc/kb3700/ecio.fth ============================================================================== --- dev/olpc/kb3700/ecio.fth Tue May 10 01:27:14 2011 (r2195) +++ dev/olpc/kb3700/ecio.fth Tue May 10 19:53:29 2011 (r2196) @@ -348,6 +348,10 @@ ." Restarting..." d# 2000 ms cr kbc-on begin again ; +: io-spi-reprogrammed-no-reboot ( -- ) + no-kbc-reboot + kbc-on +; : io-spi-start ( -- ) ['] io-spi@ to spi@ @@ -356,6 +360,7 @@ use-ec-spi \ spi-in, spi-cs-on, spi-cs-off via EC commands ['] io-spi-reprogrammed to spi-reprogrammed + ['] io-spi-reprogrammed-no-reboot to spi-reprogrammed-no-reboot use-mem-flash-read [ifdef] uncache-flash uncache-flash [then] Modified: dev/olpc/spiflash/flashif.fth ============================================================================== --- dev/olpc/spiflash/flashif.fth Tue May 10 01:27:14 2011 (r2195) +++ dev/olpc/spiflash/flashif.fth Tue May 10 19:53:29 2011 (r2196) @@ -2,6 +2,7 @@ purpose: Generic interface for FLASH programming operations defer flash-open ( -- ) +defer flash-close ( -- ) defer flash-write-enable ( -- ) defer flash-write-disable ( -- ) defer flash-write ( adr len offset -- ) Modified: dev/olpc/spiflash/spiflash.fth ============================================================================== --- dev/olpc/spiflash/spiflash.fth Tue May 10 01:27:14 2011 (r2195) +++ dev/olpc/spiflash/spiflash.fth Tue May 10 19:53:29 2011 (r2196) @@ -219,6 +219,8 @@ defer spi-reprogrammed ( -- ) \ What to do when done reprogramming ' noop to spi-reprogrammed +defer spi-reprogrammed-no-reboot ( -- ) \ What to do when done reprogramming +' noop to spi-reprogrammed-no-reboot defer write-spi-flash ( adr len offset -- ) @@ -312,6 +314,7 @@ \ Install the SPI FLASH versions as their implementations. : use-spi-flash ( -- ) ['] spi-flash-open to flash-open + ['] spi-reprogrammed-no-reboot to flash-close ['] spi-flash-write-enable to flash-write-enable ['] spi-reprogrammed to flash-write-disable ['] write-spi-flash to flash-write

1 0

[commit] r2195 - cpu/x86/pc/olpc/via
by repository service 10 May '11

10 May '11

Author: rsmith Date: Tue May 10 01:27:14 2011 New Revision: 2195 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2195 Log: OLPC XO-1.5: Ver: q3b03 Transition to new EC 2.2.x series code 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 Sat Apr 30 02:01:18 2011 (r2194) +++ cpu/x86/pc/olpc/via/ec-version.fth Tue May 10 01:27:14 2011 (r2195) @@ -1,5 +1,5 @@ \ The EC microcode -macro: EC_VERSION 2_1_0 +macro: EC_VERSION 2_2_1 \ 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 Sat Apr 30 02:01:18 2011 (r2194) +++ cpu/x86/pc/olpc/via/fw-version.fth Tue May 10 01:27:14 2011 (r2195) @@ -1,3 +1,3 @@ \ The overall firmware revision -macro: FW_MAJOR A -macro: FW_MINOR 65 +macro: FW_MAJOR B +macro: FW_MINOR 03

1 0

[commit] r2194 - cpu/x86/pc/olpc/via
by repository service 30 Apr '11

30 Apr '11

Author: quozl Date: Sat Apr 30 02:01:18 2011 New Revision: 2194 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2194 Log: Q3A65 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 Fri Apr 29 07:10:28 2011 (r2193) +++ cpu/x86/pc/olpc/via/fw-version.fth Sat Apr 30 02:01:18 2011 (r2194) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 64 +macro: FW_MINOR 65

1 0

[commit] r2193 - cpu/x86/pc/olpc/via
by repository service 29 Apr '11

29 Apr '11

Author: quozl Date: Fri Apr 29 07:10:28 2011 New Revision: 2193 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2193 Log: OLPC XO-1.5 - fs-update, remove erase support because it broke NANDblaster. The microSD card is used to hold the received .zd file, and erasing the card erases the file, causing fs-update to see a zero filled file beyond a certain point. This revision tested with sparse .zd files on NANDblaster and fs-update from USB. Modified: cpu/x86/pc/olpc/via/fsupdate.fth Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Wed Apr 27 09:14:27 2011 (r2192) +++ cpu/x86/pc/olpc/via/fsupdate.fth Fri Apr 29 07:10:28 2011 (r2193) @@ -66,24 +66,6 @@ vocabulary nand-commands also nand-commands definitions -\ some cards do not respond in a reasonable time, -\ some cards lock up and cause a command timeout in get-status, -\ so split the erase into many parts. -: erase-blocks - [char] ~ emit \ visual hint of erase delay - #image-eblocks /nand-block h# 200 */ ( #blocks ) - dup d# 16 / swap ( /part #blocks ) - 0 do ( /part ) - i over " erase-blocks" $call-nand - hdd-led-toggle \ visual hint of progress - dup +loop ( /part ) - drop - bs emit space bs emit hdd-led-off \ visual hint remove -; - -\ : erase-blocks -\ 0 #image-eblocks /nand-block h# 200 */ " erase-blocks" $call-nand ; - : zblocks: ( "eblock-size" "#eblocks" ... -- ) hdd-led-toggle ?compare-spec-line @@ -94,7 +76,6 @@ " size" $call-nand #image-eblocks /nand-block um* d< " Image size is larger than output device" ?nand-abort #image-eblocks show-init - erase-blocks get-inflater \ Separate the two buffers by enough space for both the compressed \ and uncompressed copies of the data. 4x is overkill, but there

1 0

[commit] r2192 - cpu/x86/pc/olpc/via dev/mmc/sdhci
by repository service 27 Apr '11

27 Apr '11

Author: quozl Date: Wed Apr 27 09:14:27 2011 New Revision: 2192 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2192 Log: OLPC XO-1.5 - fs-update, add support for sparse .zd files, undo -r2186 meaning of zblocks: parameter, split card erasure to avoid card lockup, and show progress during erasure. SDHCI - erase blocks, wait for card to leave programming state, and ignore spurious data timeout. Modified: cpu/x86/pc/olpc/via/fsupdate.fth dev/mmc/sdhci/sdhci.fth Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Mon Apr 18 12:11:06 2011 (r2191) +++ cpu/x86/pc/olpc/via/fsupdate.fth Wed Apr 27 09:14:27 2011 (r2192) @@ -8,14 +8,28 @@ push-hex $number pop-base " Bad number" ?nand-abort ; -0 value #eblocks-written +0 value min-eblock# +0 value max-eblock# + +: written ( eblock# -- ) + dup + max-eblock# max to max-eblock# ( eblock# ) + min-eblock# min to min-eblock# +; : ?all-written ( -- ) - #eblocks-written #image-eblocks <> if + max-eblock# 1+ #image-eblocks <> if cr red-letters - ." WARNING: The file specified " #image-eblocks .d - ." chunks but wrote only " #eblocks-written .d ." chunks" cr + ." WARNING: The file said highest block " #image-eblocks .d + ." but wrote only as high as block " max-eblock# .d cr + black-letters + then + min-eblock# 0 <> if + cr + red-letters + ." WARNING: The file did not write a zero block, " + ." but wrote only as low as block " min-eblock# .d cr black-letters then ; @@ -52,15 +66,35 @@ vocabulary nand-commands also nand-commands definitions +\ some cards do not respond in a reasonable time, +\ some cards lock up and cause a command timeout in get-status, +\ so split the erase into many parts. +: erase-blocks + [char] ~ emit \ visual hint of erase delay + #image-eblocks /nand-block h# 200 */ ( #blocks ) + dup d# 16 / swap ( /part #blocks ) + 0 do ( /part ) + i over " erase-blocks" $call-nand + hdd-led-toggle \ visual hint of progress + dup +loop ( /part ) + drop + bs emit space bs emit hdd-led-off \ visual hint remove +; + +\ : erase-blocks +\ 0 #image-eblocks /nand-block h# 200 */ " erase-blocks" $call-nand ; + : zblocks: ( "eblock-size" "#eblocks" ... -- ) hdd-led-toggle ?compare-spec-line get-hex# to /nand-block get-hex# to #image-eblocks + #image-eblocks to min-eblock# + 0 to max-eblock# " 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 /nand-block h# 200 */ " erase-blocks" $call-nand + erase-blocks get-inflater \ Separate the two buffers by enough space for both the compressed \ and uncompressed copies of the data. 4x is overkill, but there @@ -200,8 +234,8 @@ swap-buffers ( eblock# ) \ then + dup written ( eblock# ) show-written ( ) - #eblocks-written 1+ to #eblocks-written ( ) show-temperature hdd-led-toggle ; Modified: dev/mmc/sdhci/sdhci.fth ============================================================================== --- dev/mmc/sdhci/sdhci.fth Mon Apr 18 12:11:06 2011 (r2191) +++ dev/mmc/sdhci/sdhci.fth Wed Apr 27 09:14:27 2011 (r2192) @@ -284,7 +284,7 @@ then ( isr esr ) allow-timeout? if ( isr esr ) - dup 1 = if true to timeout? 2drop exit then + dup 1 = over h# 10 = or if true to timeout? 2drop exit then then ( isr esr ) ." SDHCI: Error: ISR = " swap u. @@ -489,16 +489,6 @@ 0 instance value writing? -: erase-blocks ( block# #blocks -- ) \ UNTESTED - intstat-on - dup 0= if 2drop exit then - 1- bounds ( last first ) - h# 201a 0 cmd ( last ) \ CMD32 - R1 - h# 211a 0 cmd ( ) \ CMD33 - R1 - 0 h# 261b 0 cmd \ CMD38 - R1b (wait for busy) - intstat-off -; - \ CMD40 is MMC \ See table 4-5 in sandisk spec @@ -1034,6 +1024,21 @@ : detach-sdio-card ( -- ) ; +: erase-blocks ( block# #blocks -- ) + intstat-on + dup 0= if 2drop exit then + 1- bounds ( last first ) + h# 201a 0 cmd ( last ) \ CMD32 - R1 + h# 211a 0 cmd ( ) \ CMD33 - R1 + 0 h# 261b 0 cmd \ CMD38 - R1b (wait for busy) + true to writing? ( ) + true to allow-timeout? + false to timeout? + wait-write-done drop + false to allow-timeout? + intstat-off +; + \ Asynchronous poll for completion : r/w-blocks-end? ( in? -- false | error? true ) drop

1 0

[commit] r2191 - cpu/x86/pc/olpc/via
by repository service 18 Apr '11

18 Apr '11

Author: quozl Date: Mon Apr 18 12:11:06 2011 New Revision: 2191 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2191 Log: OLPC - fs-update, -r2190, make radix explicit. Modified: cpu/x86/pc/olpc/via/fsupdate.fth Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Mon Apr 18 12:02:45 2011 (r2190) +++ cpu/x86/pc/olpc/via/fsupdate.fth Mon Apr 18 12:11:06 2011 (r2191) @@ -60,7 +60,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 /nand-block 200 */ " erase-blocks" $call-nand + 0 #image-eblocks /nand-block h# 200 */ " 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

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware