January 2010 - openfirmware - mail.coreboot.org

[commit] r1727 - cpu/x86/pc/olpc/via
by repository service Jan. 30, 2010

Jan. 30, 2010

Author: wmb Date: Sat Jan 30 04:36:13 2010 New Revision: 1727 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1727 Log: Q3A33 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 Sat Jan 30 04:34:21 2010 (r1726) +++ cpu/x86/pc/olpc/via/fw-version.fth Sat Jan 30 04:36:13 2010 (r1727) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 32 +macro: FW_MINOR 33

1 0

[commit] r1726 - dev/hdaudio
by repository service Jan. 30, 2010

Jan. 30, 2010

Author: wmb Date: Sat Jan 30 04:34:21 2010 New Revision: 1726 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1726 Log: HDAudio driver - added timeouts to all wait loops in case the hardware is unresponsive. Modified: dev/hdaudio/core.fth Modified: dev/hdaudio/core.fth ============================================================================== --- dev/hdaudio/core.fth Sat Jan 30 04:32:39 2010 (r1725) +++ dev/hdaudio/core.fth Sat Jan 30 04:34:21 2010 (r1726) @@ -72,9 +72,24 @@ : dplbase h# 70 au + ; : dpubase h# 74 au + ; +0 value time-limit +: set-time-limit ( ms -- ) get-msecs + to time-limit ; +: 1sec-time-limit ( -- ) d# 1000 set-time-limit ; +: ?timeout ( -- ) + get-msecs time-limit - 0> if + ." Audio device timeout!" cr + abort + then +; : running? ( -- ? ) gctl rl@ 1 and 0<> ; -: reset ( -- ) 0 gctl rl! begin running? 0= until ; -: start ( -- ) 1 gctl rl! begin running? until ; +: reset ( -- ) + 0 gctl rl! + 1sec-time-limit begin ?timeout running? 0= until +; +: start ( -- ) + 1 gctl rl! + 1sec-time-limit begin ?timeout running? until +; \ \\ Stream Descriptors \ Default: 48kHz 16bit stereo @@ -151,7 +166,10 @@ 0 value corb-pos : corb-dma-on ( -- ) 2 corbctl rb! ; -: corb-dma-off ( -- ) 0 corbctl rb! begin corbctl rb@ 2 and 0= until ; +: corb-dma-off ( -- ) + 0 corbctl rb! + 1sec-time-limit begin ?timeout corbctl rb@ 2 and 0= until +; : init-corb ( -- ) /corb dma-alloc to corb @@ -165,7 +183,10 @@ corb-dma-on ; -: wait-for-corb-sync ( -- ) begin corbrp rw@ corb-pos = until ; +: wait-for-corb-sync ( -- ) + 1sec-time-limit + begin ?timeout corbrp rw@ corb-pos = until +; : corb-tx ( u -- ) corb-pos 1+ d# 256 mod to corb-pos @@ -199,7 +220,7 @@ : rirb-data? ( -- ) rirb-pos rirbwp rw@ <> ; : rirb-read ( -- resp solicited? ) - begin rirb-data? until + 1sec-time-limit begin ?timeout rirb-data? until rirb-pos 1+ d# 256 mod to rirb-pos rirb-pos 2 * cells rirb + ( adr ) dup @ ( adr resp ) @@ -228,13 +249,23 @@ \ \ Streams \ \\ Starting and stopping channels -: assert-stream-reset ( -- ) 1 sdctl rb! begin sdctl rb@ 1 and 1 = until ; -: deassert-stream-reset ( -- ) 0 sdctl rb! begin sdctl rb@ 1 and 0 = until ; +: assert-stream-reset ( -- ) + 1 sdctl rb! + 1sec-time-limit begin ?timeout sdctl rb@ 1 and 1 = until +; +: deassert-stream-reset ( -- ) + 0 sdctl rb! + 1sec-time-limit begin ?timeout sdctl rb@ 1 and 0 = until +; : reset-stream ( -- ) assert-stream-reset deassert-stream-reset ; -: start-stream ( -- ) 2 sdctl rb! begin sdctl rb@ 2 and 0<> until ; +: start-stream ( -- ) + 2 sdctl rb! + 1sec-time-limit begin ?timeout sdctl rb@ 2 and 0<> until +; : stop-stream ( -- ) - 0 sdctl rb! begin sdctl rb@ 2 and 0= until + 0 sdctl rb! + 1sec-time-limit begin ?timeout sdctl rb@ 2 and 0= until 4 sdsts rb! \ clear completion flag ; @@ -434,7 +465,9 @@ ; : stream-done? ( -- ) sdsts c@ 4 and 0<> ; -: wait-stream-done ( -- ) begin stream-done? until ; +: wait-stream-done ( -- ) + d# 20,000 set-time-limit begin ?timeout stream-done? until +; \ \\ Upsampling

1 0

[commit] r1725 - cpu/x86/pc/olpc/via
by repository service Jan. 30, 2010

Jan. 30, 2010

Author: wmb Date: Sat Jan 30 04:32:39 2010 New Revision: 1725 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1725 Log: OLPC XO-1.5 - 1) Turn off pretty boot if the boot sequence falls through to network booting. 2) Extra delay before probe-usb in factory mode, possibly helpful for detecting ethernet devices. 3) Catch the startup sound in case the driver aborts. Modified: cpu/x86/pc/olpc/via/fw.bth Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Sat Jan 30 04:29:00 2010 (r1724) +++ cpu/x86/pc/olpc/via/fw.bth Sat Jan 30 04:32:39 2010 (r1725) @@ -356,6 +356,16 @@ fload ${BP}/cpu/x86/pc/olpc/via/leds.fth \ LEDs fload ${BP}/cpu/x86/pc/olpc/via/factory.fth \ Manufacturing tools +\ Pseudo device that appears in the boot order before net booting +0 0 " " " /" begin-package + " prober" device-name + : open + visible + false + ; + : close ; +end-package + fload ${BP}/dev/logdev.fth fload ${BP}/cpu/x86/pc/olpc/disptest.fth @@ -589,7 +599,7 @@ ; : factory-test? ( -- flag ) - \ TS is the "test station" tag. Its value is set to "DL" at the + \ TS is the "test station" tag, whose value is set to "SHIP" at the \ end of manufacturing test. " TS" find-tag if ( adr len ) ?-null " SHIP" $= 0= ( in-factory? ) @@ -673,10 +683,11 @@ show-child install-alarm - sound + ['] sound catch drop ?games ['] false to interrupt-auto-boot? + factory-test? if d# 1000 ms then \ Extra USB probe delay in the factory probe-usb " probe+" do-drop-in

1 0

[commit] r1724 - dev/hdaudio
by repository service Jan. 30, 2010

Jan. 30, 2010

Author: wmb Date: Sat Jan 30 04:29:00 2010 New Revision: 1724 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1724 Log: OLPC XO-1.5 factory support - lengthened audio test in case mode for better noise immunity in final test, and shortened the initial preparation pass so the total test time doesn't get too long. Modified: dev/hdaudio/noiseburst.fth dev/hdaudio/test.fth Modified: dev/hdaudio/noiseburst.fth ============================================================================== --- dev/hdaudio/noiseburst.fth Sat Jan 30 04:23:25 2010 (r1723) +++ dev/hdaudio/noiseburst.fth Sat Jan 30 04:29:00 2010 (r1724) @@ -359,13 +359,13 @@ left-range d# 200 d# 140 sm-covar-abs-sum nip ( sum1.high ) left-range d# 540 d# 400 sm-covar-abs-sum nip ( sum1.high sum2.high ) >ratio - d# 30 < + d# 25 < ; : case-ratio-right ( -- error? ) right-range d# 330 d# 140 sm-covar-abs-sum nip ( sum1.high ) right-range d# 590 d# 400 sm-covar-abs-sum nip ( sum1.high sum2.high ) >ratio - d# 15 < + d# 14 < ; \ This compares the total energy within the impulse response band to the @@ -439,8 +439,7 @@ ['] -mono-wmean to fix-dc ; : setup-case ( -- ) -\ xxx - this needs to use the internal speakers and mic even though the loopback cable is attached - h# 40000 to /pb \ Long burst for better S/N on far away speaker + h# 80000 to /pb \ Long burst for better S/N on far away speaker /pb 2/ h# 1000 + to /rb \ Mono reception (internal mic) ['] case-ratio-left to analyze-left ['] case-ratio-right to analyze-right Modified: dev/hdaudio/test.fth ============================================================================== --- dev/hdaudio/test.fth Sat Jan 30 04:23:25 2010 (r1723) +++ dev/hdaudio/test.fth Sat Jan 30 04:29:00 2010 (r1724) @@ -90,8 +90,8 @@ : test-common ( setup$ -- error? ) $call-analyzer ( ) " prepare-signal" $call-analyzer ( pb /pb rb /rb ) - \ First time lets the input channel settle - 2over 2over out-in ( pb /pb rb /rb ) + \ First shorter run lets the input channel settle + 2over 4 / 2over 4 / out-in ( pb /pb rb /rb ) out-in ( ) " analyze-signal" $call-analyzer ( okay? ) ; @@ -116,7 +116,6 @@ output-common-settings d# -23 set-volume \ -23 prevents obvious visible clipping " setup-fixture" test-common false to force-speakers? false to force-internal-mic? - ; : test-with-loopback ( -- error? ) input-common-settings stereo

1 0

[commit] r1723 - cpu/x86/pc/olpc/via
by repository service Jan. 30, 2010

Jan. 30, 2010

Author: wmb Date: Sat Jan 30 04:23:25 2010 New Revision: 1723 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1723 Log: OLPC XO-1.5 factory support - fixed stack depth problem in scanner?, which caused crashes when waiting for the scanner to be connected. Modified: cpu/x86/pc/olpc/via/factory.fth Modified: cpu/x86/pc/olpc/via/factory.fth ============================================================================== --- cpu/x86/pc/olpc/via/factory.fth Sat Jan 30 00:03:10 2010 (r1722) +++ cpu/x86/pc/olpc/via/factory.fth Sat Jan 30 04:23:25 2010 (r1723) @@ -101,7 +101,7 @@ ; : scanner? ( -- flag ) - " usb-keyboard" expand-alias if 2drop true else false then + " usb-keyboard" expand-alias nip nip ; : wait-scanner ( -- ) scanner? 0= if

1 0

[commit] r1722 - ofw/fs/ext2fs
by repository service Jan. 29, 2010

Jan. 29, 2010

Author: wmb Date: Sat Jan 30 00:03:10 2010 New Revision: 1722 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1722 Log: Fixed silly error in previous commit to ext2/methods.fth Modified: ofw/fs/ext2fs/methods.fth Modified: ofw/fs/ext2fs/methods.fth ============================================================================== --- ofw/fs/ext2fs/methods.fth Fri Jan 29 10:03:08 2010 (r1721) +++ ofw/fs/ext2fs/methods.fth Sat Jan 30 00:03:10 2010 (r1722) @@ -167,7 +167,7 @@ : ext2fsnowrite ( addr count 'fh -- #written ) ." Not writing to the ext2 filesystem because of unsupported extensions" cr - 2drop 0 + 3drop 0 ; : ext2fsfwrite ( addr count 'fh -- #written ) drop

1 0

r1721 - ofw/core
by svn＠openfirmware.info Jan. 29, 2010

Jan. 29, 2010

Author: wmb Date: 2010-01-29 10:03:08 +0100 (Fri, 29 Jan 2010) New Revision: 1721 Modified: ofw/core/filecmds.fth Log: OLPC trac 10004 - Correctly report disk-free > 2 GiB. Modified: ofw/core/filecmds.fth =================================================================== --- ofw/core/filecmds.fth 2010-01-29 07:03:08 UTC (rev 1720) +++ ofw/core/filecmds.fth 2010-01-29 09:03:08 UTC (rev 1721) @@ -657,8 +657,19 @@ public : disk-free ( "name" -- ) - parse-word $disk-free drop - push-decimal d# 1024 / (.) type ." K" cr pop-base + parse-word $disk-free ( d.size ) + dup if \ Larger than 4G, so display size in GB + d# 1,000,000,000 um/mod nip ( gbytes ) + .d ." GB" cr ( ) + exit + then ( d.size ) + 2dup h# 40.0000. d< if ( d.size ) + d# 1024 um/mod nip ( kbytes ) + .d ." KB" cr ( ) + exit + then ( d.size ) + d# 1,000,000 um/mod nip ( mbytes ) + .d ." MB" cr ( ) ; : more ( "devspec" -- )

1 0

r1720 - ofw/fs/ext2fs
by svn＠openfirmware.info Jan. 29, 2010

Jan. 29, 2010

Author: wmb Date: 2010-01-29 08:03:08 +0100 (Fri, 29 Jan 2010) New Revision: 1720 Modified: ofw/fs/ext2fs/dir.fth ofw/fs/ext2fs/inode.fth ofw/fs/ext2fs/layout.fth ofw/fs/ext2fs/methods.fth ofw/fs/ext2fs/sb.fth Log: OLPC trac 9972 - support the ext2 LARGE_FILE extension and improve the error reporting in the presence of unsupported extensions. Modified: ofw/fs/ext2fs/dir.fth =================================================================== --- ofw/fs/ext2fs/dir.fth 2010-01-29 05:13:22 UTC (rev 1719) +++ ofw/fs/ext2fs/dir.fth 2010-01-29 07:03:08 UTC (rev 1720) @@ -18,7 +18,7 @@ 0 instance value wf-type \ Type - 4 for directory, d# 10 for symlink, etc : get-dirblk ( -- end? ) - lblk# bsize * file-size >= if true exit then + lblk# bsize um* dfile-size d< 0= if true exit then lblk# >pblk# to dir-block# false ; @@ -58,7 +58,7 @@ \ **** Select the next directory entry : next-dirent ( -- end? ) dirent-len@ dup diroff +! totoff +! - totoff @ file-size >= if true exit then + totoff @ u>d dfile-size d< 0= if true exit then diroff @ bsize = if lblk#++ get-dirblk if true exit then diroff off @@ -130,7 +130,7 @@ drop ( last ) ; : last-dirent ( -- free-bytes ) - file-size bsize /mod swap 0= if 1- then to lblk# ( ) + dfile-size bsize um/mod nip swap 0= if 1- then to lblk# ( ) lblk# >pblk# to dir-block# (last-dirent) drop dirent-len@ dirent-reclen - @@ -413,7 +413,7 @@ : file-info ( id -- false | id' s m h d m y len attributes name$ true ) inode# >r dirent-inode@ set-inode ( id ) - 1+ mtime unix-seconds> file-size file-attr file-name true + 1+ mtime unix-seconds> dfile-size drop file-attr file-name true r> set-inode ; Modified: ofw/fs/ext2fs/inode.fth =================================================================== --- ofw/fs/ext2fs/inode.fth 2010-01-29 05:13:22 UTC (rev 1719) +++ ofw/fs/ext2fs/inode.fth 2010-01-29 07:03:08 UTC (rev 1720) @@ -23,8 +23,8 @@ : uid ( -- uid ) 2 +i short@ ; : uid! ( uid -- ) 2 +i short! update ; : filetype ( -- type ) file-attr h# f000 and ; -: file-size ( -- n ) 4 +i int@ ; -: file-size! ( n -- ) 4 +i int! update ; +: dfile-size ( -- d ) 4 +i int@ 108 +i int@ ; +: dfile-size! ( d -- ) 108 +i int! 4 +i int! update ; : atime ( -- seconds ) 8 +i int@ ; : atime! ( seconds -- ) 8 +i int! update ; : ctime ( -- seconds ) 12 +i int@ ; @@ -40,6 +40,7 @@ : #blks-held ( -- n ) 28 +i int@ ; : #blks-held! ( n -- ) 28 +i int! update ; : file-acl ( -- n ) 104 +i int@ ; +: dir-acl ( -- n ) 108 +i int@ ; d# 12 constant #direct-blocks : direct0 ( -- adr ) 40 +i ; Modified: ofw/fs/ext2fs/layout.fth =================================================================== --- ofw/fs/ext2fs/layout.fth 2010-01-29 05:13:22 UTC (rev 1719) +++ ofw/fs/ext2fs/layout.fth 2010-01-29 07:03:08 UTC (rev 1720) @@ -189,8 +189,8 @@ ; : append-block ( -- ) - add-block ( block ) - file-size bsize / dup bsize * file-size! ( block #blocks ) + add-block ( block ) + dfile-size bsize um/mod nip dup bsize um* dfile-size! ( block #blocks ) 1+ >pblk int! update ; Modified: ofw/fs/ext2fs/methods.fth =================================================================== --- ofw/fs/ext2fs/methods.fth 2010-01-29 05:13:22 UTC (rev 1719) +++ ofw/fs/ext2fs/methods.fth 2010-01-29 07:03:08 UTC (rev 1720) @@ -19,7 +19,7 @@ dirent-inode@ set-inode add-block ( block# ) - file-size h# 400 + file-size! + dfile-size h# 400. d+ dfile-size! ( block# ) dup direct0 int! update ( block# ) block bsize erase update \ flush ( ) inode# first-dirent if true exit then ( ) @@ -136,7 +136,7 @@ \ EXT2FS file interface -: ext2fsdflen ( 'fhandle -- d.size ) drop file-size 0 ; +: ext2fsdflen ( 'fhandle -- d.size ) drop dfile-size ; : ext2fsdfalign ( d.byte# 'fh -- d.aligned ) drop swap bsize 1- invert and swap @@ -159,19 +159,24 @@ : ext2fsfread ( addr count 'fh -- #read ) drop dup bsize > abort" Bad size for ext2fsfread" - file-size lblk# bsize * - ( addr count rem ) + dfile-size lblk# bsize um* d- drop ( addr count rem ) umin swap ( actual addr ) lblk# read-file-block ( actual ) dup 0> if lblk#++ then ( actual ) ; +: ext2fsnowrite ( addr count 'fh -- #written ) + ." Not writing to the ext2 filesystem because of unsupported extensions" cr + 2drop 0 +; : ext2fsfwrite ( addr count 'fh -- #written ) drop dup bsize > abort" Bad size for ext2fsfwrite" ( addr count ) - tuck lblk# bsize * + dup file-size u> if ( actual addr new ) - file-size! \ changing byte count, NOT #blks - else - drop + tuck 0 lblk# bsize um* d+ ( addr count d.new-size ) + dfile-size 2over d< if ( actual addr d.new ) + dfile-size! \ extending file ( actual addr ) + else ( actual addr d.new ) + 2drop \ not extending file ( actual addr ) then ( actual addr ) lblk# write-file-block ( actual ) @@ -191,7 +196,11 @@ >r bsize alloc-mem bsize initbuf dirent-inode@ r@ ['] ext2fsdflen ['] ext2fsdfalign ['] ext2fsfclose ['] ext2fsdfseek - r@ read = unknown-extensions? or if ['] nullwrite else ['] ext2fsfwrite then + r@ read = unknown-extensions? or if + ['] ext2fsnowrite + else + ['] ext2fsfwrite + then r> write = if ['] nullread else ['] ext2fsfread then true ; @@ -249,8 +258,8 @@ : seek ( offset.low offset.high -- error? ) ext2fs-fd ['] dfseek catch if 2drop true else false then ; -: size ( -- d ) file-size 0 ; -: load ( adr -- size ) file-size read ; +: size ( -- d ) dfile-size ; +: load ( adr -- size ) dfile-size drop read ; \ : files ( -- ) begin file-name type cr next-dirent until ; \ LICENSE_BEGIN Modified: ofw/fs/ext2fs/sb.fth =================================================================== --- ofw/fs/ext2fs/sb.fth 2010-01-29 05:13:22 UTC (rev 1719) +++ ofw/fs/ext2fs/sb.fth 2010-01-29 07:03:08 UTC (rev 1720) @@ -54,7 +54,7 @@ 23 +sbl h# ffffffff invert and \ Accept all compat extensions 24 +sbl h# 00000002 invert and or \ Incompatible - accept FILETYPE - 25 +sbl h# 00000001 invert and or \ RO - accept SPARSE_SUPER + 25 +sbl h# 00000003 invert and or \ RO - accept SPARSE_SUPER and LARGE_FILE ; : do-alloc ( adr len -- ) " dma-alloc" $call-parent ;

1 0

r1719 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Jan. 29, 2010

Jan. 29, 2010

Author: wmb Date: 2010-01-29 06:13:22 +0100 (Fri, 29 Jan 2010) New Revision: 1719 Modified: cpu/x86/pc/olpc/via/fw-version.fth Log: Q3A32 Modified: cpu/x86/pc/olpc/via/fw-version.fth =================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth 2010-01-29 04:55:52 UTC (rev 1718) +++ cpu/x86/pc/olpc/via/fw-version.fth 2010-01-29 05:13:22 UTC (rev 1719) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 31 +macro: FW_MINOR 32

1 0

r1718 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Jan. 29, 2010

Jan. 29, 2010

Author: wmb Date: 2010-01-29 05:55:52 +0100 (Fri, 29 Jan 2010) New Revision: 1718 Modified: cpu/x86/pc/olpc/via/rtcwake.fth Log: XO-1.5 selftest - do only one suspend/resume pass. Modified: cpu/x86/pc/olpc/via/rtcwake.fth =================================================================== --- cpu/x86/pc/olpc/via/rtcwake.fth 2010-01-28 23:38:48 UTC (rev 1717) +++ cpu/x86/pc/olpc/via/rtcwake.fth 2010-01-29 04:55:52 UTC (rev 1718) @@ -69,9 +69,7 @@ \ on the operator. ." Testing S3 suspend/resume" cr rtc-alarm-delay >r - ." Sleeping for 1 second .. " 1 to rtc-alarm-delay pm-sleep-rtc cr - ." Sleeping for 4 seconds .. " 4 to rtc-alarm-delay pm-sleep-rtc cr - ." Sleeping for 8 seconds .. " 8 to rtc-alarm-delay pm-sleep-rtc cr + ." Sleeping for 4 seconds .. " 4 to rtc-alarm-delay pm-sleep-rtc cr r> to rtc-alarm-delay false ;

1 0