r1267 - dev/hdaudio
by svn＠openfirmware.info
Author: wmb
Date: 2009-08-01 01:16:23 +0200 (Sat, 01 Aug 2009)
New Revision: 1267
Modified:
dev/hdaudio/core.fth
Log:
OLPC trac 9431 - fixed volume-setting for HDAudio driver, thanks to Luke.
Modified: dev/hdaudio/core.fth
===================================================================
--- dev/hdaudio/core.fth 2009-07-31 22:52:11 UTC (rev 1266)
+++ dev/hdaudio/core.fth 2009-07-31 23:16:23 UTC (rev 1267)
@@ -419,7 +419,7 @@
: steps/dB ( -- #steps ) step-size 4 * ;
: dB>steps ( dB -- #steps ) -4 * step-size / ;
-: dB>step# ( dB -- step ) dB>steps 0dB-step + ;
+: dB>step# ( dB -- step ) dB>steps 0dB-step swap - ;
\ \\ Playback
9 years, 7 months
r1266 - dev/ide
by svn＠openfirmware.info
Author: wmb
Date: 2009-08-01 00:52:11 +0200 (Sat, 01 Aug 2009)
New Revision: 1266
Modified:
dev/ide/dmaide.fth
dev/ide/generic.fth
Log:
IDE driver - added DMA write support.
Modified: dev/ide/dmaide.fth
===================================================================
--- dev/ide/dmaide.fth 2009-07-31 20:05:33 UTC (rev 1265)
+++ dev/ide/dmaide.fth 2009-07-31 22:52:11 UTC (rev 1266)
@@ -38,7 +38,7 @@
;
: dma-wait ( -- )
- begin dma-stat@ dup 1 and 0= swap 2 and or until
+ begin 1 ms dma-stat@ dup 1 and 0= swap 2 and or until
;
\ Sense and clear errors. The bit masked by 04 is read-clear and means
@@ -49,30 +49,36 @@
: dma-interrupt? ( -- flag ) dma-stat@ 4 and ;
-: dma-rblock ( dma-adr #blks -- error? )
- /block@ *
- set-dma ( )
- dma-cmd@ 1 or dma-cmd! dma-wait dma-cmd@ 1 invert and dma-cmd!
- dma-interrupt? if
+: dma-begin ( dma-adr #blks direction -- dma-adr phys #blks )
+ dma-cmd! ( dma-adr #blks )
+ 2dup /block@ * true " dma-map-in" $call-parent swap ( adr phys #blks )
+ 2dup /block@ * set-dma ( adr phys #blks )
+ dma-cmd@ 1 or dma-cmd! ( adr phys #blks )
+;
+: dma-end ( adr phys #blks -- actual# )
+ dma-wait 0 dma-cmd! ( adr phys #blks )
+ dma-interrupt? if ( adr phys #blks )
r-csr@ drop \ Clear interrupt in drive
- dma-stat@ h# f0 and 4 or dma-stat!
- then
- dma-error?
-;
+ dma-stat@ h# f0 and 4 or dma-stat! ( adr phys #blks )
+ then ( adr phys #blks )
-: (drblocks) ( adr #blks -- actual# )
- tuck dma-rblock if drop 0 then
+ dma-error? if 0 else dup then >r ( adr phys #blks r: actual )
+
+ /block@ * " dma-map-out" $call-parent ( r: actual )
+
+ r> ( actual# )
;
: dma-rblocks ( adr #blks -- actual#blks )
- 2dup /block@ * true " dma-map-in" $call-parent swap ( adr phys #blks )
+ 8 dma-begin ( adr phys #blks )
+ dma-read-cmd r-csr! ( adr phys #blks )
+ dma-end ( actual#blks )
+;
- dma-read-cmd r-csr!
- 8 dma-cmd! \ DMA direction for disk read (0 is write)
- ['] rblock behavior >r ['] dma-rblock to rblock
- 2dup (drblocks) ( adr phys #blks actual#blks )
- r> to rblock
- >r /block@ * " dma-map-out" $call-parent r> ( actual#blks )
+: dma-wblocks ( adr #blks -- actual#blks )
+ 0 dma-begin ( adr phys #blks )
+ dma-write-cmd r-csr! ( adr phys #blks )
+ dma-end ( actual#blks )
;
: vendor-id ( -- w ) my-space " config-w@" $call-parent ;
@@ -172,11 +178,13 @@
4 my-w@ 4 or 4 my-w!
['] dma-rblocks to rblocks
+ ['] dma-wblocks to wblocks
;
' (open-dma) to open-dma
: (close-dma) ( -- )
['] pio-rblocks to rblocks
+ ['] pio-wblocks to wblocks
\ Disable bus mastering
4 my-w@ 4 invert and 4 my-w!
Modified: dev/ide/generic.fth
===================================================================
--- dev/ide/generic.fth 2009-07-31 20:05:33 UTC (rev 1265)
+++ dev/ide/generic.fth 2009-07-31 22:52:11 UTC (rev 1266)
@@ -177,7 +177,8 @@
chip-base io-blk-w! false
pio-end-hack
;
-: wblocks ( addr #blks -- actual# | error )
+
+: pio-wblocks ( addr #blks -- actual# | error )
over >r ( addr #blks ) ( R: addr )
h# 30 r-csr!
@@ -194,6 +195,8 @@
until
r> - /block@ /
;
+defer wblocks
+' pio-wblocks to wblocks
\ Read or write "#blks" blocks starting at "block#" into memory at "addr"
\ Input? is true for reading or false for writing.
9 years, 7 months
r1265 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info
Author: wmb
Date: 2009-07-31 22:05:33 +0200 (Fri, 31 Jul 2009)
New Revision: 1265
Added:
cpu/x86/pc/olpc/via/fsupdate.fth
Log:
Via - added "fs-update" command for OS installation.
Added: cpu/x86/pc/olpc/via/fsupdate.fth
===================================================================
--- cpu/x86/pc/olpc/via/fsupdate.fth (rev 0)
+++ cpu/x86/pc/olpc/via/fsupdate.fth 2009-07-31 20:05:33 UTC (rev 1265)
@@ -0,0 +1,290 @@
+purpose: Secure NAND updater
+\ See license at end of file
+
+\ Depends on words from security.fth and copynand.fth
+
+: get-hex# ( -- n )
+ safe-parse-word
+ push-hex $number pop-base " Bad number" ?nand-abort
+;
+
+0 [if]
+0 value partition-map-offset
+0 value next-partition-start
+
+0 value partition#
+d# 256 constant /partition-entry
+: partition-adr ( -- adr ) partition# /partition-entry * load-base + ;
+: max-nand-offset ( -- n ) " usable-page-limit" $call-nand /nand-page * ;
+
+: add-partition ( name$ #eblocks -- )
+ partition# " max#partitions" $call-nand >= abort" Partition map overflow"
+
+ -rot ( #eblocks name$ )
+ partition-adr /partition-entry erase ( #eblocks name$ )
+ d# 15 min partition-adr swap move ( #eblocks )
+ next-partition-start partition-adr d# 16 + l! ( #eblocks )
+
+ dup -1 = if ( #eblocks )
+ drop max-nand-offset ( last-offset )
+ next-partition-start - ( #bytes )
+ else
+ /nand-block * ( #bytes )
+ then ( #bytes )
+
+ dup partition-adr d# 24 + l! \ size ( #bytes )
+
+ next-partition-start + to next-partition-start ( )
+ next-partition-start max-nand-offset > abort" NAND size overflow"
+
+ partition# 1+ to partition#
+;
+: start-partition-map ( -- )
+ load-base /nand-block h# ff fill
+ 0 to partition#
+\ 0 to next-partition-start
+ " partition-map-page#" $call-nand /nand-page * to partition-map-offset
+
+ partition-map-offset to next-partition-start
+ " FIS directory" 1 add-partition
+;
+: write-partition-map ( -- )
+ partition-map-offset /nand-page / dup " erase-block" $call-nand
+ load-base swap nand-pages/block " write-pages" $call-nand
+ nand-pages/block <> abort" Can't write partition map"
+ " read-partmap" $call-nand
+;
+
+0 value partition-page-offset
+: map-eblock# ( block# -- block#' ) partition-page-offset + ;
+
+\ XXX need to check for overwriting existing partition map
+[then]
+
+0 value last-eblock#
+: erase-eblock ( eblock# -- )
+ drop \ XXX
+;
+
+0 value secure-fsupdate?
+d# 128 constant /spec-maxline
+
+: erase-gap ( end-block -- )
+ dup last-eblock# > if
+ last-eblock# 1+ ?do i erase-eblock loop
+ else
+ drop
+ then
+;
+
+vocabulary nand-commands
+also nand-commands definitions
+
+0 [if]
+: set-partition: ( "partitionid" -- ) \ partitionid is number or name
+ safe-parse-word " $set-partition" $call-nand abort" Nonexistent partition#"
+;
+
+: partitions: ( "name" "#eblocks" ... -- )
+ start-partition-map
+ begin parse-word dup while ( name$ )
+ get-hex# add-partition ( )
+ repeat ( null$ )
+ 2drop
+ write-partition-map
+;
+[then]
+
+: zblocks: ( "eblock-size" "#eblocks" ... -- )
+ get-hex# to /nand-block
+ get-hex# to #image-eblocks
+ open-nand
+ #image-eblocks show-init
+ get-inflater
+;
+
+: zblocks-end: ( -- ) #image-eblocks erase-gap ;
+
+: data: ( "filename" -- )
+ safe-parse-word fn-buf place
+ " ${DN}${PN}\${CN}${FN}" expand$ image-name-buf place
+ open-img
+ true to secure-fsupdate?
+;
+
+: erase-all ( -- )
+ #image-eblocks 0 ?do i erase-eblock loop
+ #image-eblocks show-writing
+;
+
+: get-zdata ( comprlen -- )
+ secure-fsupdate? if
+ load-base /spec-maxline fileih read-line ( len end? error? )
+ " Spec line read error" ?nand-abort ( len end? )
+ 0= " Spec line too long" ?nand-abort ( len )
+ load-base swap ( adr len )
+ source $= 0= " Spec line mismatch" ?nand-abort ( )
+
+ fileih ( ih )
+ else ( )
+ source-id ( ih )
+ then ( ih )
+
+ >r load-base /nand-block + over r@ fgets ( comprlen #read r: ih )
+ <> " Short read of zdata file" ?nand-abort ( r: ih )
+
+ r> fgetc newline <> ( error? )
+ " Missing newline after zdata" ?nand-abort ( )
+
+ \ The "2+" skips the Zlib header
+ load-base /nand-block + 2+ load-base true (inflate) ( len )
+ /nand-block <> " Wrong expanded data length" ?nand-abort ( )
+;
+
+: zblock: ( "eblock#" "comprlen" "hashname" "hash-of-128KiB" -- )
+ get-hex# ( eblock# )
+ get-hex# >r ( eblock# r: comprlen )
+ safe-parse-word ( eblock# hashname$ r: comprlen )
+ safe-parse-word hex-decode ( eblock# hashname$ [ hash$ ] err? r: comprlen )
+ " Malformed hash string" ?nand-abort ( eblock# hashname$ hash$ r: comprlen )
+
+ r> get-zdata ( eblock# hashname$ hash$ )
+
+ 2>r ( eblock# hashname$ r: hash$ )
+ load-base /nand-block 2swap ( eblock# data$ hashname$ r: hash$ )
+ hash ( eblock# calc-hash$ r: hash$ )
+
+ 2r> $= 0= if ( eblock# )
+ ." Bad hash for eblock# " .x cr cr
+ ." Your USB key may be bad. Please try a different one." cr
+ ." See http://wiki.laptop.org/go/Bad_hash" cr cr
+ abort
+ then ( eblock# )
+
+ dup erase-gap ( eblock# )
+
+ dup /nand-block um* " seek" $call-nand ( eblock# error )
+ " Bad seek" ?nand-abort ( eblock# )
+
+ load-base /nand-block " write" $call-nand ( eblock# #written )
+ /nand-block <> ( eblock# error? )
+ " Error writing to NAND FLASH" ?nand-abort ( eblock# )
+
+ dup to last-eblock# ( eblock# )
+ show-written ( )
+;
+
+previous definitions
+
+: fs-update ( "devspec" -- )
+ load-crypto abort" Can't load hash routines"
+
+ false to secure-fsupdate?
+ safe-parse-word r/o open-file ( fd )
+ abort" Can't open file" ( fd )
+
+ file @ ( fd fd' )
+ over file ! linefeed line-delimiter c! ( fd fd' )
+ file ! ( fd )
+
+
+ also nand-commands
+ ['] include-file catch dup if
+ nip .error
+ then
+ previous
+ show-done
+ close-nand-ihs
+;
+
+: do-fs-update ( img$ -- )
+ tuck load-base h# c00000 + swap move ( len )
+ load-base h# c00000 + swap ( adr len )
+
+ ['] noop to show-progress
+
+\ clear-context nand-commands
+ also nand-commands
+
+ true to secure-fsupdate?
+ ['] include-buffer catch ?dup if nip nip .error security-failure then
+
+ previous
+\ only forth also definitions
+
+ show-done
+ close-nand-ihs
+;
+
+: fs-update-from-list ( devlist$ -- )
+ load-crypto if visible ." Crytpo load failed" cr show-sad security-failure then
+
+ visible ( devlist$ )
+ begin dup while ( rem$ )
+ bl left-parse-string ( rem$ dev$ )
+ dn-buf place ( rem$ )
+
+ null$ pn-buf place ( rem$ )
+ null$ cn-buf place ( rem$ )
+ " fs" bundle-present? if ( rem$ )
+ " Filesystem image found - " ?lease-debug
+ fskey$ to pubkey$ ( rem$ )
+ img$ sig$ sha-valid? if ( rem$ )
+ 2drop ( )
+ show-unlock ( )
+ img$ do-fs-update ( )
+ ." Rebooting in 10 seconds ..." cr
+ d# 10,000 ms bye
+ exit
+ then ( rem$ )
+ show-lock ( rem$ )
+ then ( rem$ )
+ repeat ( rem$ )
+ 2drop
+;
+: update-devices " disk: sd: http:\\172.18.0.1" ;
+: try-fs-update ( -- )
+ ." Searching for a NAND file system update image." cr
+ " disk: sd:" fs-update-from-list
+[ifdef] Later
+ ." Trying NANDblaster" cr
+ ['] nandblaster catch 0= if exit then
+ " http:\\172.18.0.1" fs-update-from-list
+[then]
+;
+
+: $update-nand ( devspec$ -- )
+ load-crypto abort" Can't load the crypto functions"
+ null$ cn-buf place ( devspec$ )
+ 2dup ( devspec$ devspec$ )
+ [char] : right-split-string dn-buf place ( devspec$ path+file$ )
+ [char] \ right-split-string ( devspec$ file$ path$ )
+ dup if 1- then pn-buf place ( devspec$ file$ )
+ 2drop ( devspec$ )
+ boot-read loaded do-fs-update ( )
+;
+: update-nand ( "devspec" -- ) safe-parse-word $update-nand ;
+
+\ 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
9 years, 7 months
r1264 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info
Author: wmb
Date: 2009-07-31 20:46:49 +0200 (Fri, 31 Jul 2009)
New Revision: 1264
Added:
cpu/x86/pc/olpc/via/copynand.fth
Modified:
cpu/x86/pc/olpc/via/devices.fth
cpu/x86/pc/olpc/via/fw.bth
cpu/x86/pc/olpc/via/olpc.bth
Log:
Via - added "fs-update" command for OS installation.
Added: cpu/x86/pc/olpc/via/copynand.fth
===================================================================
--- cpu/x86/pc/olpc/via/copynand.fth (rev 0)
+++ cpu/x86/pc/olpc/via/copynand.fth 2009-07-31 18:46:49 UTC (rev 1264)
@@ -0,0 +1,567 @@
+\ See license at end of file
+purpose: Copy a file onto the NAND FLASH
+
+0 value fileih
+0 value nandih
+
+h# 20000 value /nand-block
+h# 200 value /nand-page
+/nand-block /nand-page / value nand-pages/block
+0 value #nand-pages
+
+0 value #image-eblocks
+
+: $call-nand ( ?? method$ -- ?? ) nandih $call-method ;
+
+: close-image-file ( -- )
+ fileih ?dup if 0 to fileih close-dev then
+;
+: close-nand ( -- )
+ nandih ?dup if 0 to nandih close-dev then
+;
+: close-nand-ihs ( -- )
+ close-image-file
+ close-nand
+;
+
+: ?nand-abort ( flag msg$ -- )
+ rot if
+ close-nand-ihs $abort
+ else
+ 2drop
+ then
+;
+
+: ?key-stop ( -- )
+ key? dup if key drop then ( stop? )
+ " Stopped by keystroke" ?nand-abort
+;
+
+: set-nand-vars ( -- )
+ " size" $call-nand /nand-page um/mod nip to #nand-pages
+;
+: open-nand ( -- )
+ " fsdisk" open-dev to nandih
+ nandih 0= " Can't open disk device" ?nand-abort
+ set-nand-vars
+;
+
+h# 100 buffer: image-name-buf
+: image-name$ ( -- adr len ) image-name-buf count ;
+
+: get-img-filename ( -- ) safe-parse-word image-name-buf place ;
+
+: open-img ( "devspec" -- )
+ image-name$ open-dev to fileih
+ fileih 0= " Can't open NAND image file" ?nand-abort
+ " size" fileih $call-method ( d.size )
+
+ 2dup h# 20000 um/mod swap if 1+ then ( d.size #eblocks )
+ nip nip ( #eblocks )
+
+ to #image-eblocks
+
+ #image-eblocks 0= " Image file is empty" ?nand-abort
+;
+
+: read-image-block ( -- )
+ load-base /nand-block " read" fileih $call-method ( len )
+ dup /nand-block <> if ( len )
+ load-base over + /nand-page rot - h# ff fill
+ else
+ drop
+ then
+;
+
+: check-mem-hash ( record# -- )
+ drop \ XXX
+;
+
+
+defer show-init ( #eblocks -- )
+' drop to show-init
+
+defer show-erasing ( #blocks -- )
+: (show-erasing) ( #blocks -- ) ." Erasing " . ." blocks" cr ;
+' (show-erasing) to show-erasing
+
+defer show-erased ( block# -- )
+: (show-erased) ( block# -- ) (cr . ;
+' (show-erased) to show-erased
+
+defer show-bad ( block# -- )
+' drop to show-bad
+
+defer show-bbt-block ( block# -- )
+' drop to show-bbt-block
+
+defer show-clean ( block# -- )
+' drop to show-clean
+
+defer show-cleaning ( -- )
+: (show-cleaning) ( -- ) cr ." Cleanmarkers" ;
+' (show-cleaning) to show-cleaning
+
+defer show-writing ( #blocks -- )
+: (show-writing) ." Writing " . ." blocks" cr ;
+' (show-writing) to show-writing
+
+defer show-pending ( block# -- )
+' drop to show-pending
+
+defer show-written
+: (show-written) ( block# -- ) (cr . ;
+' (show-written) to show-written
+
+defer show-strange
+' drop to show-strange
+
+defer show-done
+' cr to show-done
+
+: written? ( adr len -- flag ) h# ffffffff lskip 0<> ;
+
+h# 80 h# 80 h# 80 rgb>565 constant bbt-color \ gray
+ 0 0 0 rgb>565 constant erased-color \ black
+h# ff 0 0 rgb>565 constant bad-color \ red
+ 0 0 h# ff rgb>565 constant clean-color \ blue
+h# ff 0 h# ff rgb>565 constant partial-color \ magenta
+h# ff h# ff 0 rgb>565 constant pending-color \ yellow
+ 0 h# ff 0 rgb>565 constant written-color \ green
+ 0 h# ff h# ff rgb>565 constant strange-color \ cyan
+h# ff h# ff h# ff rgb>565 constant starting-color \ white
+
+d# 22 constant status-line
+
+: gshow-init ( #eblocks -- )
+ cursor-off " erase-screen" $call-screen
+
+ starting-color ( #eblocks color )
+ swap 0 ?do i over show-state loop
+ drop
+ 0 status-line at-xy
+;
+
+: gshow-erasing ( #eblocks -- ) drop ." Erasing " ;
+
+: gshow-erased ( eblock# -- ) erased-color show-state ;
+: gshow-bad ( eblock# -- ) bad-color show-state ;
+: gshow-bbt-block ( eblock# -- ) bbt-color show-state ;
+: gshow-clean ( eblock# -- ) clean-color show-state ;
+: gshow-strange ( eblock# -- ) strange-color show-state ;
+
+: gshow-cleaning ( -- ) d# 26 status-line at-xy ." Cleanmarkers" cr ;
+: gshow-done ( -- ) cursor-on ;
+
+: gshow-pending ( eblock# -- ) pending-color show-state ;
+
+: gshow-writing ( #eblocks -- )
+ ." Writing "
+ 0 swap 0 ?do ( eblock# )
+ dup show-pending ( eblock# )
+ 1 ( eblock# increment )
+ swap 1+ swap ( eblock#' increment )
+ +loop ( eblock#' )
+ drop
+;
+
+: show-eblock# ( eblock# -- ) d# 20 status-line at-xy .x ;
+: gshow-written ( eblock# -- )
+ dup written-color show-state
+ show-eblock#
+;
+
+: gshow
+ ['] gshow-init to show-init
+ ['] gshow-erasing to show-erasing
+ ['] gshow-erased to show-erased
+ ['] gshow-bad to show-bad
+ ['] gshow-bbt-block to show-bbt-block
+ ['] gshow-clean to show-clean
+ ['] gshow-cleaning to show-cleaning
+ ['] gshow-pending to show-pending
+ ['] gshow-writing to show-writing
+ ['] gshow-written to show-written
+ ['] gshow-strange to show-strange
+ ['] gshow-done to show-done
+;
+
+gshow
+
+\ 0 - marked bad block : show-bad
+\ 1 - unreadable block : show-bad
+\ 2 - jffs2 w/ summary: show-written
+\ 3 - jffs2 w/o summary: show-pending
+\ 4 - clean : show-clean
+\ 5 - non-jffs2 data : show-strange
+\ 6 - erased : show-erased
+\ 7 - primary bad-block-table : show-bbt-block
+\ 8 - secondary bad-block-table : show-bbt-block
+: show-status ( status eblock# -- )
+ swap case
+ 0 of show-bad endof
+ 1 of show-bad endof
+ 2 of show-written endof
+ 3 of show-pending endof
+ 4 of show-clean endof
+ 5 of show-strange endof
+ 6 of show-erased endof
+ 7 of show-bbt-block endof
+ 8 of show-bbt-block endof
+ endcase
+;
+
+0 value nand-map
+0 value working-page
+: classify-block ( page# -- status )
+ to working-page
+
+ working-page /nand-page um* " seek" $call-nand drop
+
+ \ Try to read the first few bytes
+ load-base /l " read" $call-nand
+
+ \ Check for non-erased, non-JFFS2 data
+ load-base l@ h# ffff.ffff <> if 5 exit then
+
+ \ See if the whole thing is really completely erased
+ load-base /l + /nand-block /l - " read" $call-nand /nand-block /l - <> if 1 exit then
+
+ \ Not completely erased
+ load-base /nand-block written? if 5 exit then
+
+ \ Erased
+ 6
+;
+
+0 value current-block
+0 value examine-done?
+
+string-array status-descriptions
+ ," Marked bad in Bad Block Table" \ 0
+ ," Read error" \ 1
+ ," JFFS2 data with summary" \ 2
+ ," JFFS2 data, no summary" \ 3
+ ," Clean (erased with JFFS2 cleanmarker)" \ 4
+ ," Dirty, with non-JFFS2 data" \ 5
+ ," Erased, no cleanmarker" \ 6
+ ," Primary Bad Block Table" \ 7
+ ," Secondary Bad Block Table" \ 8
+end-string-array
+
+: show-block-status ( block# -- )
+ dup show-eblock#
+ nand-map + c@ status-descriptions count type kill-line
+;
+
+: cell-border ( block# color -- )
+ swap >loc ( color x y )
+ -1 -1 xy+
+ 3dup grid-w 1 do-fill ( color x y )
+ 3dup grid-w 0 xy+ 1 grid-h do-fill ( color x y )
+ 3dup 0 1 xy+ 1 grid-h do-fill ( color x y )
+ 1 grid-h xy+ grid-w 1 do-fill
+;
+: lowlight ( block# -- ) background-rgb rgb>565 cell-border ;
+: highlight ( block# -- ) 0 cell-border ;
+: point-block ( block# -- )
+ current-block lowlight
+ to current-block
+ current-block highlight
+;
+
+0 value nand-block-limit
+: +block ( offset -- )
+ current-block + nand-block-limit mod ( new-block )
+ point-block
+ current-block show-block-status
+;
+
+: process-key ( char -- )
+ case
+ h# 9b of endof
+ [char] A of #cols negate +block endof \ up
+ [char] B of #cols +block endof \ down
+ [char] C of 1 +block endof \ right
+ [char] D of -1 +block endof \ left
+ [char] ? of #cols 8 * negate +block endof \ page up
+ [char] / of #cols 8 * +block endof \ page down
+ [char] K of 8 +block endof \ page right
+ [char] H of -8 +block endof \ page left
+ h# 1b of d# 20 ms key? 0= if true to examine-done? then endof
+ endcase
+;
+
+: examine-nand ( -- )
+ 0 status-line 1- at-xy red-letters ." Arrows, fn Arrows to move, Esc to exit" black-letters cr
+ #nand-pages nand-pages/block / to nand-block-limit
+ 0 to current-block
+ current-block highlight
+ false to examine-done?
+ begin key process-key examine-done? until
+ current-block lowlight
+;
+
+: (scan-nand) ( -- )
+ nand-map 0= if
+ #nand-pages nand-pages/block / alloc-mem to nand-map
+ then
+
+ " usable-page-limit" $call-nand
+ dup nand-pages/block / show-init ( page-limit )
+
+ 0 ?do
+ i classify-block ( status )
+ i nand-pages/block / ( status eblock# )
+ 2dup nand-map + c! ( status eblock# )
+ show-status
+ nand-pages/block +loop ( )
+
+ show-done
+;
+
+: scan-nand ( -- )
+ open-nand (scan-nand) close-nand-ihs
+ examine-nand
+;
+
+
+: >eblock# ( page# -- eblock# ) nand-pages/block / ;
+
+: copy-nand ( "devspec" -- )
+ open-nand
+ get-img-filename
+ open-img
+
+ ['] noop to show-progress
+
+ #nand-pages >eblock# dup show-init ( #eblocks )
+
+ show-erasing ( )
+
+ #image-eblocks show-writing
+
+ #image-eblocks 0 ?do
+ read-image-block
+ i check-mem-hash
+ load-base " copy-block" $call-nand ( page# error? )
+ " Error writing to NAND FLASH" ?nand-abort ( page# )
+ >eblock# show-written ( )
+ loop
+
+ show-done
+
+ close-nand-ihs
+;
+
+: verify-nand ( "devspec" -- )
+ open-nand
+ get-img-filename
+ open-img
+ ['] noop to show-progress
+
+ ." Verifing " #image-eblocks . ." blocks" cr
+
+ #image-eblocks 0 ?do
+ (cr i .
+ read-image-block
+
+ i /nand-block um* " seek" $call-nand drop
+ load-base /nand-block " read" $call-nand ( len )
+ /nand-block <> " Disk read error" ?nand-abort ( )
+
+ load-base load-base /nand-block + /nand-block comp if ( )
+ cr ." Miscompare in block starting at page# " ( )
+ ?key-stop
+ then ( )
+ loop ( )
+ close-nand-ihs
+;
+
+: verify-img ( "img-devspec" -- )
+ hex
+ open-nand close-nand-ihs \ To set sizes
+ get-img-filename
+ open-img
+
+ ['] noop to show-progress
+
+ ." Verifying " #image-eblocks . ." blocks" cr
+
+ #image-eblocks 0 ?do
+ (cr i .
+ read-image-block
+ i check-mem-hash
+ loop
+ close-nand-ihs
+;
+
+: check-hash ( adr len -- )
+ 2drop \ XXX
+;
+
+: verify-nand ( "crc-devspec" -- )
+ hex
+ open-nand
+ safe-parse-word open-img
+ ['] noop to show-progress
+
+ ." Verifying " #image-eblocks . ." blocks" cr
+
+ #image-eblocks 0 ?do
+ (cr i .
+
+ i /nand-block um* " seek" $call-nand drop
+ load-base /nand-block " read" $call-nand ( len )
+ /nand-block <> " Disk read failure" ?nand-abort ( )
+
+ load-base /nand-block check-hash if ( )
+ cr ." Hash mismatch at eblock " i . cr ( )
+ ?key-stop
+ else ( actual-crc expected-crc )
+ 2drop ( )
+ then ( )
+ loop ( )
+ close-nand-ihs
+;
+
+: make-new-file ( devspec$ -- fileih )
+ 2dup ['] $delete catch if 2drop then ( name$ )
+ 2dup ['] $create-file catch if ( name$ x x )
+ 2drop ( name$ )
+ " Can't open a file. Try using the raw disk?" confirm if ( name$ )
+ open-dev ( ih )
+ else ( name$ )
+ 2drop 0 ( ih=0 )
+ then ( ih )
+ else ( name$ ih )
+ nip nip ( ih )
+ then ( ih )
+;
+
+: open-dump-file ( devspec$ -- )
+ cr ." Dumping to " 2dup type cr
+
+ make-new-file to fileih
+
+ fileih 0= " Can't open output" ?nand-abort
+;
+
+: dump-eblock? ( block# -- flag )
+ \ Dump JFFS2 w/summary (2), JFFS2 w/o summary (3), non JFFS2 data (5)
+ nand-map + c@ dup 2 = over 3 = or swap 5 = or
+;
+
+0 [if]
+: eblock>file ( -- )
+ load-base /nand-block " write" fileih $call-method
+ /nand-block <> " Write to dump file failed" ?nand-abort
+ load-base /nand-block $crc #image-eblocks >crc l!
+ #image-eblocks 1+ to #image-eblocks
+;
+
+: fastdump-nand ( -- )
+ \ The stack is empty at the end of each line unless otherwise noted
+ (scan-nand)
+
+ cursor-off
+ d# 20 status-line at-xy ." "
+
+ " usable-page-limit" $call-nand >eblock# 0 do
+ i dump-eblock? if
+ i point-block
+ i show-eblock#
+ load-base i nand-pages/block * nand-pages/block " read-pages" $call-nand ( #read )
+ nand-pages/block <> " Read failed" ?nand-abort
+ eblock>file
+ then
+ loop
+ show-done
+;
+
+: slowdump-nand ( -- )
+ \ The stack is empty at the end of each line unless otherwise noted
+ #nand-pages 0 ?do
+ (cr i >eblock# .
+ load-base i nand-pages/block " read-pages" $call-nand ( #read )
+ nand-pages/block = if
+ load-base /nand-block written? if
+ ." w"
+ eblock>file
+ i nand-pages/block bounds ?do
+ i pad ! pad 4 " write" fileih $call-method
+ 4 <> " Write of eblock number failed" ?nand-abort
+ loop
+ else
+ ." s"
+ then
+ then
+ nand-pages/block +loop
+;
+
+: (dump-nand) ( "devspec" -- )
+ open-nand
+ get-img-filename
+
+ alloc-crc-buf
+ image-name$ open-dump-file
+
+ 0 to #image-eblocks
+
+ fastdump-nand
+ cr ." Done" cr
+
+ close-image-file
+
+ close-nand-ihs
+;
+: save-nand ( "devspec" -- ) (dump-nand) ;
+
+: fastcopy-nand ( "devspec" -- )
+ open-nand
+
+ safe-parse-word open-dev to fileih
+ fileih 0= " Can't open NAND fastboot image file" ?nand-abort
+
+ " size" fileih $call-method drop ( len )
+ " start-fastcopy" $call-nand ( error? )
+ " Not enough spare NAND space for fast copy" ?nand-abort
+
+ begin ( )
+ load-base /nand-block " read" fileih $call-method ( len )
+ dup 0> while ( len )
+ \ If the read didn't fill a complete block, zero the rest
+ load-base /nand-block rot /string erase
+
+ load-base " next-fastcopy" $call-nand ( )
+ repeat ( len )
+ drop ( )
+ " end-fastcopy" $call-nand ( )
+
+ close-nand-ihs
+;
+[then]
+
+\ LICENSE_BEGIN
+\ Copyright (c) 2006 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/devices.fth
===================================================================
--- cpu/x86/pc/olpc/via/devices.fth 2009-07-31 18:45:34 UTC (rev 1263)
+++ cpu/x86/pc/olpc/via/devices.fth 2009-07-31 18:46:49 UTC (rev 1264)
@@ -164,9 +164,6 @@
.( XXX Not clearing CMOS) cr
patch noop init-bios-cmos stand-init
-devalias nand /nandflash
-devalias mtd /nandflash
-
[ifdef] use-null-nvram
\ For not storing configuration variable changes across reboots ...
\ This is useful for "turnkey" systems where configurability would
Modified: cpu/x86/pc/olpc/via/fw.bth
===================================================================
--- cpu/x86/pc/olpc/via/fw.bth 2009-07-31 18:45:34 UTC (rev 1263)
+++ cpu/x86/pc/olpc/via/fw.bth 2009-07-31 18:46:49 UTC (rev 1264)
@@ -319,9 +319,8 @@
fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic
fload ${BP}/dev/olpc/touchpad/touchpad.fth \ Touchpad diagnostic
fload ${BP}/cpu/x86/pc/olpc/gridmap.fth \ Gridded display tools
-[ifdef] Later
-fload ${BP}/cpu/x86/pc/olpc/copynand.fth
-[then]
+fload ${BP}/cpu/x86/pc/olpc/via/copynand.fth
+
\ fload ${BP}/cpu/x86/pc/olpc/carousel.fth \ Carouseled NAND writing
fload ${BP}/cpu/x86/pc/olpc/crypto.fth \ Cryptographic image validation
fload ${BP}/cpu/x86/pc/olpc/lzip.fth \ Access zip images from memory
@@ -480,8 +479,9 @@
[ifdef] Later
fload ${BP}/cpu/x86/pc/olpc/nandcastui.fth
fload ${BP}/cpu/x86/pc/olpc/wifichannel.fth
-fload ${BP}/cpu/x86/pc/olpc/fsupdate.fth
[then]
+fload ${BP}/cpu/x86/pc/olpc/via/fsupdate.fth
+devalias fsdisk /ide@0/disk:0
fload ${BP}/ofw/inet/sntp.fth
: olpc-ntp-servers ( -- )
Modified: cpu/x86/pc/olpc/via/olpc.bth
===================================================================
--- cpu/x86/pc/olpc/via/olpc.bth 2009-07-31 18:45:34 UTC (rev 1263)
+++ cpu/x86/pc/olpc/via/olpc.bth 2009-07-31 18:46:49 UTC (rev 1264)
@@ -145,8 +145,8 @@
" memtest" " memtest" $add-deflated-dropin
+ " verify.img" " verify" $add-deflated-dropin
[ifdef] Later
- " verify.img" " verify" $add-deflated-dropin
" os.public" " ospubkey" $add-dropin \ Incompressible
" fw.public" " fwpubkey" $add-dropin \ Incompressible
" fs.public" " fspubkey" $add-dropin \ Incompressible
9 years, 7 months
r1263 - dev/mmc/sdhci
by svn＠openfirmware.info
Author: wmb
Date: 2009-07-31 20:45:34 +0200 (Fri, 31 Jul 2009)
New Revision: 1263
Modified:
dev/mmc/sdhci/sdhci.fth
dev/mmc/sdhci/sdmmc.fth
Log:
SDHCI/SDMMC driver - reordered closing sequence so deferred writes
get flushed before turning things off, thus avoiding command timeouts
on close.
Modified: dev/mmc/sdhci/sdhci.fth
===================================================================
--- dev/mmc/sdhci/sdhci.fth 2009-07-31 18:44:18 UTC (rev 1262)
+++ dev/mmc/sdhci/sdhci.fth 2009-07-31 18:45:34 UTC (rev 1263)
@@ -756,8 +756,12 @@
;
: detach-card ( -- )
+ intstat-on
+ wait-write-done
+ intstat-off
card-clock-off
card-power-off
+ unmap-regs
;
: attach-sdio-card ( -- okay? )
@@ -841,11 +845,8 @@
: close ( -- )
open-count 1 = if
- intstat-on
- wait-write-done
scratch-buf d# 64 " dma-free" $call-parent
then
- unmap-regs
open-count 1- 0 max to open-count
;
Modified: dev/mmc/sdhci/sdmmc.fth
===================================================================
--- dev/mmc/sdhci/sdmmc.fth 2009-07-31 18:44:18 UTC (rev 1262)
+++ dev/mmc/sdhci/sdmmc.fth 2009-07-31 18:45:34 UTC (rev 1263)
@@ -57,9 +57,10 @@
;
: close ( -- )
- " detach-card" $call-parent
label-package close-package
deblocker close-package
+ \ Close packages first in case of delayed write flush
+ " detach-card" $call-parent
;
: block-size ( -- n ) h# 200 ;
9 years, 7 months
r1262 - forth/kernel
by svn＠openfirmware.info
Author: wmb
Date: 2009-07-31 20:44:18 +0200 (Fri, 31 Jul 2009)
New Revision: 1262
Modified:
forth/kernel/kernel.fth
Log:
Kernel - fixed problem in file buffering that caused failures
with "fputs" when the size of the input array was larger than
the distance from the file buffer to the end of address space.
Modified: forth/kernel/kernel.fth
===================================================================
--- forth/kernel/kernel.fth 2009-07-31 09:27:04 UTC (rev 1261)
+++ forth/kernel/kernel.fth 2009-07-31 18:44:18 UTC (rev 1262)
@@ -2120,7 +2120,7 @@
\ Advance the file pointer to the new buffer starting position
bufaddr> fstart 2! ( end curr aln-len )
- bfbase @ + bflimit @ umin bfend ! ( end curr ) \ Room for new bytes
+ bfbase @ + bflimit @ min bfend ! ( end curr ) \ Room for new bytes
bfbase @ dup bftop ! bfcurrent ! ( end curr ) \ No valid bytes yet
false
;
9 years, 7 months
r1261 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info
Author: wmb
Date: 2009-07-31 11:27:04 +0200 (Fri, 31 Jul 2009)
New Revision: 1261
Added:
cpu/x86/pc/olpc/via/cmos.fth
Modified:
cpu/x86/pc/olpc/via/devices.fth
Log:
Via - fixed CMOS RAM high ban access (see trac 9431).
Added: cpu/x86/pc/olpc/via/cmos.fth
===================================================================
--- cpu/x86/pc/olpc/via/cmos.fth (rev 0)
+++ cpu/x86/pc/olpc/via/cmos.fth 2009-07-31 09:27:04 UTC (rev 1261)
@@ -0,0 +1,50 @@
+\ See license at end of file
+purpose: Access to CMOS RAM on Via VX855
+
+: cmos-setup ( index -- data-reg )
+ dup h# 80 and if
+ h# 74 pc! h# 75
+ else
+ h# 70 pc! h# 71
+ then
+;
+
+: cmos@ ( index -- b ) lock[ cmos-setup pc@ ]unlock ;
+
+: cmos! ( b index -- ) lock[ cmos-setup pc! ]unlock ;
+
+: bios-checksum-bad? ( -- flag )
+ 0 h# 2d h# 10 do i cmos@ + loop ( sum )
+ h# 2f cmos@ h# 2e cmos@ bwjoin <>
+;
+
+\ Zero is the right checksum for zero data
+: init-bios-cmos ( -- ) h# 30 h# 10 do 0 i cmos! loop ;
+
+stand-init: CMOS
+ bios-checksum-bad? if init-bios-cmos then
+;
+
+\ LICENSE_BEGIN
+\ Copyright (c) 2006 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/devices.fth
===================================================================
--- cpu/x86/pc/olpc/via/devices.fth 2009-07-29 21:45:59 UTC (rev 1260)
+++ cpu/x86/pc/olpc/via/devices.fth 2009-07-31 09:27:04 UTC (rev 1261)
@@ -160,7 +160,7 @@
\ XXX remove the OS file commands from tools.dic
fload ${BP}/ofw/core/filecmds.fth \ File commands: dir, del, ren, etc.
-fload ${BP}/cpu/x86/pc/olpc/cmos.fth \ CMOS RAM indices are 1f..ff , above RTC
+fload ${BP}/cpu/x86/pc/olpc/via/cmos.fth \ CMOS RAM indices are 1f..ff , above RTC
.( XXX Not clearing CMOS) cr
patch noop init-bios-cmos stand-init
9 years, 7 months
r1260 - cpu/x86/pc/olpc
by svn＠openfirmware.info
Author: wmb
Date: 2009-07-29 23:45:59 +0200 (Wed, 29 Jul 2009)
New Revision: 1260
Modified:
cpu/x86/pc/olpc/fw.bth
Log:
OLPC trac 9362 - setup-smbios for Linux boots for XO-1.
Modified: cpu/x86/pc/olpc/fw.bth
===================================================================
--- cpu/x86/pc/olpc/fw.bth 2009-07-29 01:11:44 UTC (rev 1259)
+++ cpu/x86/pc/olpc/fw.bth 2009-07-29 21:45:59 UTC (rev 1260)
@@ -631,6 +631,8 @@
probe-usb
" probe+" do-drop-in
+ setup-smbios \ Must be done after build-date is defined via do-drop-in
+
interpreter-init
?scan-nand
?diags
9 years, 7 months
r1259 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info
Author: wmb
Date: 2009-07-29 03:11:44 +0200 (Wed, 29 Jul 2009)
New Revision: 1259
Modified:
cpu/x86/pc/olpc/via/smbios.fth
Log:
Via - The SMBIOS system-info table said OLPC 1 instead of OLPC 1.5 .
Modified: cpu/x86/pc/olpc/via/smbios.fth
===================================================================
--- cpu/x86/pc/olpc/via/smbios.fth 2009-07-29 01:10:30 UTC (rev 1258)
+++ cpu/x86/pc/olpc/via/smbios.fth 2009-07-29 01:11:44 UTC (rev 1259)
@@ -415,7 +415,7 @@
get-uuid r> 8 + swap move ( adr )
+OLPC
" XO" +smbios$
- " 1" +smbios$ \ Version
+ " 1.5" +smbios$ \ Version
" SN" get-tag$ +smbios$
end-smbios-table
9 years, 7 months
r1258 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info
Author: wmb
Date: 2009-07-29 03:10:30 +0200 (Wed, 29 Jul 2009)
New Revision: 1258
Modified:
cpu/x86/pc/olpc/via/probemem.fth
Log:
OLPC trac #9401 - Via - Fixed test-all crash by removing redundant
mmu-map from memory node selftest method in probemem.fth
Modified: cpu/x86/pc/olpc/via/probemem.fth
===================================================================
--- cpu/x86/pc/olpc/via/probemem.fth 2009-07-29 01:08:57 UTC (rev 1257)
+++ cpu/x86/pc/olpc/via/probemem.fth 2009-07-29 01:10:30 UTC (rev 1258)
@@ -93,9 +93,7 @@
begin ?dup while
2 decode-ints swap ( rem$ chunk$ )
2dup .chunk ( rem$ chunk$ )
-[ifdef] virtual-mode
- 2dup over swap 3 mmu-map ( rem$ chunk$ )
-[then]
+ \ We maintain a 1-1 convenience mapping so explicit mapping is unnecessary
memory-test-suite if 2drop true exit then ( rem$ )
repeat drop
false
9 years, 7 months