April 2012 - openfirmware - mail.coreboot.org

[commit] r2948 - cpu/x86/pc/olpc
by repository service April 22, 2012

April 22, 2012

Author: quozl Date: Mon Apr 23 03:46:26 2012 New Revision: 2948 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2948 Log: OLPC XO-1 - change help to track 12.1.0 decision against ubifs. Modified: cpu/x86/pc/olpc/help.fth Modified: cpu/x86/pc/olpc/help.fth ============================================================================== --- cpu/x86/pc/olpc/help.fth Fri Apr 20 09:07:04 2012 (r2947) +++ cpu/x86/pc/olpc/help.fth Mon Apr 23 03:46:26 2012 (r2948) @@ -4,7 +4,8 @@ : help ( -- ) blue-letters ." INSTALLATION:" cancel mcr \ ================================================================================ - ." update-nand u:\os.img Install OS from USB drive to internal storage" mcr + ." copy-nand u:\os.img Install OS from USB drive to internal storage" mcr + ." update-nand u:\os.img Install a partitioned OS to internal storage" mcr ." flash u:\q2f08.rom Install firmware from USB drive" mcr blue-letters ." DIRECTORY LISTING:" cancel mcr ." dir u:\ List USB drive root directory" mcr

1 0

[commit] r2947 - ofw/fs/ext2fs
by repository service April 20, 2012

April 20, 2012

Author: quozl Date: Fri Apr 20 09:07:04 2012 New Revision: 2947 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2947 Log: ext2fs - fix inode reference count for directories on filesystems without DIR_NLINK, and maintain directory count in group descriptor, #11787 Modified: ofw/fs/ext2fs/bitmap.fth ofw/fs/ext2fs/dir.fth ofw/fs/ext2fs/sb.fth Modified: ofw/fs/ext2fs/bitmap.fth ============================================================================== --- ofw/fs/ext2fs/bitmap.fth Thu Apr 19 21:05:54 2012 (r2946) +++ ofw/fs/ext2fs/bitmap.fth Fri Apr 20 09:07:04 2012 (r2947) @@ -75,11 +75,32 @@ then ( n r: adr ) r> h# 0e + le-w! ( ) ; -: free-inodes+! ( n inode# -- ) +: free-inodes+! ( n group# -- ) tuck free-inodes@ + ( group# n' ) over free-inodes! ( group# ) gd-update ( ) ; +: used-dirs@ ( group# -- n ) + group-desc dup h# 10 + le-w@ ( adr lo ) + desc64? if ( adr lo ) + swap h# 30 + le-w@ wljoin ( n ) + else ( adr lo ) + nip ( n ) + then ( n ) +; +: used-dirs! ( n group# -- ) + group-desc >r ( n r: adr ) + desc64? if ( n r: adr ) + lwsplit ( lo hi r: adr ) + r@ h# 30 + le-w! ( lo r: adr ) + then ( n r: adr ) + r> h# 10 + le-w! ( ) +; +: used-dirs+! ( n group# -- ) + tuck used-dirs@ + ( group# n' ) + over used-dirs! ( group# ) + gd-update ( ) +; [ifdef] 386-assembler code find-low-zero ( n -- bit# ) Modified: ofw/fs/ext2fs/dir.fth ============================================================================== --- ofw/fs/ext2fs/dir.fth Thu Apr 19 21:05:54 2012 (r2946) +++ ofw/fs/ext2fs/dir.fth Fri Apr 20 09:07:04 2012 (r2947) @@ -78,7 +78,7 @@ : +link-count ( increment -- ) \ link-count = 1 means that the directory has more links than can \ be represented in a 16-bit number; don't increment in that case. - dir? if ( increment ) + dir? sb-nlink? and if ( increment ) link-count 1 = if ( increment ) drop exit ( -- ) then ( increment ) @@ -89,7 +89,7 @@ \ If the incremented value exceeds the limit, store 1 \ We should also set the RO_COMPAT_DIR_NLINK bit in the superblock, \ but we assume that OFW won't be used to create enormous directories - dir? if ( link-count ) + dir? sb-nlink? and if ( link-count ) dup d# 65000 >= if ( link-count ) drop 1 ( link-count' ) then ( link-count' ) @@ -106,6 +106,9 @@ dup ctime! ( time ) \ set creation time mtime! ( ) \ set modification time 0 link-count! ( ) \ link count will be incremented by new-dirent + dir? if + 1 inode# 1- ipg / used-dirs+! + then inode# ( inode# ) ; @@ -214,6 +217,10 @@ \ Delete the currently selected inode. Does not affect the directory entry, if any. : idelete ( -- ) + dir? if + -1 inode# 1- ipg / used-dirs+! + then + \ Short symlinks hold no blocks, but have a string in the direct block list, \ so we must not interpret that string as a block list. d.#blks-held d0<> if @@ -276,7 +283,7 @@ new-inode ( name$ inode# ) \ new-inode changed the value of inode#; we must restore it so - \ new-dirent can find info about the containing diretory + \ new-dirent can find info about the containing directory wd-inum set-inode ( name$ inode# ) new-dirent ( error? ) Modified: ofw/fs/ext2fs/sb.fth ============================================================================== --- ofw/fs/ext2fs/sb.fth Thu Apr 19 21:05:54 2012 (r2946) +++ ofw/fs/ext2fs/sb.fth Fri Apr 20 09:07:04 2012 (r2947) @@ -57,6 +57,7 @@ : sb-64bit? ( -- flag ) incompat-flags h# 80 and 0<> ; : sb-extents? ( -- flag ) incompat-flags h# 40 and 0<> ; : sb-gd-csum? ( -- flag ) ro-flags h# 10 and 0<> ; +: sb-nlink? ( -- flag ) ro-flags h# 20 and 0<> ; \ Don't write to a disk that uses extensions we don't understand : unknown-extensions? ( -- unsafe? )

1 0

[commit] r2946 - ofw/fs/ext2fs
by repository service April 19, 2012

April 19, 2012

Author: wmb Date: Thu Apr 19 21:05:54 2012 New Revision: 2946 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2946 Log: OLPC trac 11786 - fixed bug with file deletion introduced by svn 2817. Modified: ofw/fs/ext2fs/dir.fth Modified: ofw/fs/ext2fs/dir.fth ============================================================================== --- ofw/fs/ext2fs/dir.fth Thu Apr 19 03:43:07 2012 (r2945) +++ ofw/fs/ext2fs/dir.fth Thu Apr 19 21:05:54 2012 (r2946) @@ -77,15 +77,25 @@ : +link-count ( increment -- ) \ link-count = 1 means that the directory has more links than can - \ be represented in a 16-bit number - link-count 1 = if drop exit then \ Don't increment if already 1 + \ be represented in a 16-bit number; don't increment in that case. + dir? if ( increment ) + link-count 1 = if ( increment ) + drop exit ( -- ) + then ( increment ) + then ( increment ) + + link-count + ( link-count' ) \ If the incremented value exceeds the limit, store 1 \ We should also set the RO_COMPAT_DIR_NLINK bit in the superblock, - \ but we assume that OFW won't really be used to create enormous directories - link-count + dup d# 65000 >= if drop 1 then ( link-count ) + \ but we assume that OFW won't be used to create enormous directories + dir? if ( link-count ) + dup d# 65000 >= if ( link-count ) + drop 1 ( link-count' ) + then ( link-count' ) + then ( link-count ) - link-count! + link-count! ( ) ; : new-inode ( mode -- inode# )

1 0

[commit] r2945 - cpu/arm/olpc/1.75
by repository service April 18, 2012

April 18, 2012

Author: quozl Date: Thu Apr 19 03:43:07 2012 New Revision: 2945 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2945 Log: Q4D10 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Tue Apr 17 03:04:04 2012 (r2944) +++ cpu/arm/olpc/1.75/fw-version.fth Thu Apr 19 03:43:07 2012 (r2945) @@ -1,4 +1,4 @@ \ The overall firmware revision macro: FW_PREFIX Q4 macro: FW_MAJOR D -macro: FW_MINOR 09 +macro: FW_MINOR 10

1 0

[commit] r2944 - cpu/arm/mmp2
by repository service April 16, 2012

April 16, 2012

Author: quozl Date: Tue Apr 17 03:04:04 2012 New Revision: 2944 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2944 Log: OLPC XO-1.75 - restore thermal protection after suspend, #11779 Modified: cpu/arm/mmp2/dramrecal.fth cpu/arm/mmp2/thermal.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Fri Apr 13 07:01:36 2012 (r2943) +++ cpu/arm/mmp2/dramrecal.fth Tue Apr 17 03:04:04 2012 (r2944) @@ -869,6 +869,7 @@ timers-wake resume-usb enable-interrupts + init-thermal-sensor ; : strp ( -- ) ec-rst-pwr str ec-max-pwr .d ." mW " soc .% space ; Modified: cpu/arm/mmp2/thermal.fth ============================================================================== --- cpu/arm/mmp2/thermal.fth Fri Apr 13 07:01:36 2012 (r2943) +++ cpu/arm/mmp2/thermal.fth Tue Apr 17 03:04:04 2012 (r2944) @@ -1,11 +1,25 @@ \ See license at end of file purpose: Driver for the MMP2 thermal sensor +\ See also cforth:src/app/arm-xo-1.75/thermal.fth h# 013200 value thermal-base +: room-temp@ ( -- n ) thermal-base io@ ; +: room-temp! ( n -- ) thermal-base io! ; +thermal-base h# 4 + value wd-thresh +: wd-thresh@ ( -- n ) wd-thresh io@ ; +: wd-thresh! ( n -- ) wd-thresh io! ; +\ thermal-base h# 8 + value lo-thresh +\ thermal-base h# c + value hi-thresh +thermal-base h# 10 + value ts-ctrl +: ts-ctrl! ( n -- ) ts-ctrl io! ; + : init-thermal-sensor ( -- ) thermal-base io@ h# 400 and if exit then 7 h# 90 apbc! 3 h# 90 apbc! \ Enable clocks to thermal sensor - h# 10000 thermal-base io! \ Enable sensing + h# 10000 room-temp! \ Enable sensing + d# 696 wd-thresh! \ Set thermal watchdog threshold to 85C + h# 88 ts-ctrl! \ Clear thermal watchdog reset status + \ Set thermal watchdog reset enable ; \ thermal watchdog is enabled by CForth @@ -46,10 +60,6 @@ wdtpcr io! ; -thermal-base h# 4 + value wd-thresh -: wd-thresh@ ( -- n ) wd-thresh io@ ; -: wd-thresh! ( n -- ) wd-thresh io! ; - : .c ( n -- ) (.) type ." C " ; : .thermal

1 0

[commit] r2943 - ofw/disklabel
by repository service April 12, 2012

April 12, 2012

Author: quozl Date: Fri Apr 13 07:01:36 2012 New Revision: 2943 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2943 Log: disklabel - file spec parsing, avoid treating a-h as partition letter if UFS partition support is disabled. Modified: ofw/disklabel/methods.fth Modified: ofw/disklabel/methods.fth ============================================================================== --- ofw/disklabel/methods.fth Fri Apr 13 01:28:34 2012 (r2942) +++ ofw/disklabel/methods.fth Fri Apr 13 07:01:36 2012 (r2943) @@ -200,12 +200,14 @@ dup 0= if exit then ( adr len ) then +[ifdef] ufs-support \ If the first character is "a".."h", it's a UFS partition letter over c@ lcc ascii a ascii h between if ( adr len ) over c@ to ufs-partition ( adr len ) 1 /string ( adr' len' ) dup 0= if exit then ( adr len ) then ( adr len ) +[then] ; : parse-partition ( -- ) null$ to filename null$ to partition-name$ -1 to #part 0 to ufs-partition

1 0

[commit] r2942 - cpu/arm/olpc
by repository service April 12, 2012

April 12, 2012

Author: wmb Date: Fri Apr 13 01:28:34 2012 New Revision: 2942 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2942 Log: OLPC XO-1.75 and XO-3 - changed EDI (SPI interface to EC) timing to account for rise time issue on MISO. Modified: cpu/arm/olpc/bbedi.fth Modified: cpu/arm/olpc/bbedi.fth ============================================================================== --- cpu/arm/olpc/bbedi.fth Mon Apr 9 05:10:42 2012 (r2941) +++ cpu/arm/olpc/bbedi.fth Fri Apr 13 01:28:34 2012 (r2942) @@ -103,7 +103,7 @@ loop ( b ) ; [else] -code edi-out0 ( byte -- ) +code edi-out ( byte -- ) mov r2,#8 mov r0,#0x200 \ MOSI mask set r1,`h# 19100 +io #` \ GPIO register address @@ -112,7 +112,9 @@ ands r3,tos,#0x80 \ Test bit strne r0,[r1,#0x18] \ Set MOSI if bit is non0 + strne r0,[r1,#0x18] \ Set MOSI if bit is non0 \ Twice for delay - setup time to CLK streq r0,[r1,#0x24] \ Clr MOSI if bit is 0 + streq r0,[r1,#0x24] \ Clr MOSI if bit is 0 \ Twice for delay - setup time to CLK str r4,[r1,#0x18] \ Set CLK str r4,[r1,#0x24] \ Clr CLK @@ -123,7 +125,7 @@ pop tos,sp c; -code edi-out ( byte -- ) +code edi-out1 ( byte -- ) mov r2,#8 mov r0,#0x200 \ MOSI mask set r1,`h# 19100 +io #` \ GPIO register address @@ -158,7 +160,7 @@ \ This delay is necessary to let the MMP2 GPIO pin clock in the \ data value. Without the delay, bit values get lost. - mov r7,#0x160 \ Delay spins + mov r7,#0x400 \ Delay spins begin decs r7,#1 0= until @@ -166,6 +168,11 @@ ldr r0,[r1] \ Read pin register str r0,[r3],#4 str r4,[r1,#0x24] \ Clr CLK + mov r7,#0x400 \ Delay spins + begin + decs r7,#1 + 0= until + ands r0,r0,#0x80 \ Test MISO bit incne tos,1 \ Set bit in byte

1 0

[commit] r2941 - cpu/x86/pc/olpc/via
by repository service April 8, 2012

April 8, 2012

Author: quozl Date: Mon Apr 9 05:10:42 2012 New Revision: 2941 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2941 Log: Q3C05 Modified: cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Mon Apr 9 02:47:49 2012 (r2940) +++ cpu/x86/pc/olpc/via/fw-version.fth Mon Apr 9 05:10:42 2012 (r2941) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 04 +macro: FW_MINOR 05

1 0

[commit] r2940 - cpu/arm/olpc/1.75
by repository service April 8, 2012

April 8, 2012

Author: quozl Date: Mon Apr 9 02:47:49 2012 New Revision: 2940 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2940 Log: Q4D09 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Sat Apr 7 01:05:35 2012 (r2939) +++ cpu/arm/olpc/1.75/fw-version.fth Mon Apr 9 02:47:49 2012 (r2940) @@ -1,4 +1,4 @@ \ The overall firmware revision macro: FW_PREFIX Q4 macro: FW_MAJOR D -macro: FW_MINOR 08 +macro: FW_MINOR 09

1 0

[commit] r2939 - forth/lib ofw/fs/ext2fs
by repository service April 6, 2012

April 6, 2012

Author: wmb Date: Sat Apr 7 01:05:35 2012 New Revision: 2939 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2939 Log: Ext2/3/4 file system journal recovery - OLPC trac 11762 - Fixed list management problem that could result in missing list nodes in the journal overlay and revocation lists. Modified: forth/lib/linklist.fth ofw/fs/ext2fs/recovery.fth Modified: forth/lib/linklist.fth ============================================================================== --- forth/lib/linklist.fth Fri Apr 6 11:32:55 2012 (r2938) +++ forth/lib/linklist.fth Sat Apr 7 01:05:35 2012 (r2939) @@ -45,6 +45,11 @@ \ for each node in the list. Returns the node for which "acf" \ returned "true", and also the preceding node. See the comments \ in the code for more information. +\ +\ find-node? ( ??? list acf -- ??? false | ??? node true ) +\ Searches the linked list "list", executing the procedure "acf" +\ for each node in the list. Returns the node and true if found, +\ or false if not found. alias list: variable @@ -58,6 +63,8 @@ alias >next-node @ ( node-adr -- next-node-adr ) +: list-end? ( node-adr -- flag ) >next-node @ 0= ; + \ Inserts "new-node" into a linked list after "prev-node" (and before \ the node which was the successor of "prev-node"). @@ -112,6 +119,14 @@ r> r> r> drop ( ??? prev-node this-node ) ; +: find-node? ( ??? list acf -- ??? false | ??? node true ) + find-node ?dup if ( ??? prev-node this-node ) + nip true ( ??? node true ) + else ( ??? prev-node ) + drop false ( ??? false ) + then ( ??? false | ??? node true ) +; + \ Here's how "find-node" could be used to locate the insertion point \ for a list sorted in ascending order of the second field. Modified: ofw/fs/ext2fs/recovery.fth ============================================================================== --- ofw/fs/ext2fs/recovery.fth Fri Apr 6 11:32:55 2012 (r2938) +++ ofw/fs/ext2fs/recovery.fth Sat Apr 7 01:05:35 2012 (r2939) @@ -160,7 +160,8 @@ /n field >r_sequence nodetype: revoke-node -list: revoke-list +instance variable revoke-list +revoke-list off : free-revoke-list ( -- ) begin revoke-list >next-node while ( ) @@ -169,44 +170,40 @@ repeat ( ) ; -: block#> ( d.block# 'node -- d.block# flag ) - >r_block# 2@ 2over d< +\ Worker function for find-node? +: block#= ( d.block# 'node -- d.block# flag ) + >r_block# 2@ 2over d= ; \ node is either the found one or the insertion point -: find-revoked ( d.block# -- d.block# node found? ) - revoke-list ['] block#> find-node if ( d.block# node ) - 3dup >r_block# 2@ d= ( d.block# node found? ) - else ( d.block# node ) - false ( d.block# node found? ) - then ( d.block# node found? ) +: find-revoked? ( d.block# -- d.block# false | d.block# node found? ) + revoke-list ['] block#= find-node? ; 0 value next-commit-id : revoked? ( d.block# -- revoked? ) - find-revoked if ( d.block# node ) - nip nip ( node ) - >r_sequence @ ( sequence# ) - next-commit-id = ( revoked? ) - else ( d.block# node ) - 3drop false ( revoked? ) - then ( revoked? ) + find-revoked? if ( d.block# node ) + nip nip ( node ) + >r_sequence @ ( sequence# ) + next-commit-id = ( revoked? ) + else ( d.block# ) + 2drop false ( revoked? ) + then ( revoked? ) ; : set-revoke ( d.block# -- ) - find-revoked if ( d.block# node ) + find-revoked? if ( d.block# node ) nip nip ( node ) next-commit-id over >r_sequence @ - 0>= if ( node ) next-commit-id over >r_sequence ! ( node ) then ( node ) drop ( ) - else ( d.block# node ) - -rot ( node d.block# ) - revoke-node allocate-node >r ( node d.block# r: newnode ) - r@ >r_block# 2! ( node r: newnode ) - next-commit-id r@ >r_sequence ! ( node r: newnode ) - r> swap insert-after ( ) + else ( d.block# ) + revoke-node allocate-node >r ( d.block# r: newnode ) + r@ >r_block# 2! ( r: newnode ) + next-commit-id r@ >r_sequence ! ( r: newnode ) + r> revoke-list insert-after ( ) then ( ) ; @@ -216,7 +213,8 @@ /n field >o_escaped? nodetype: overlay-node -list: overlay-list +instance variable overlay-list +overlay-list off : free-overlay-list ( -- ) begin overlay-list >next-node while ( ) @@ -225,13 +223,8 @@ repeat ( ) ; -\ node is either the found one or the insertion point -: find-overlay? ( d.block# -- d.block# node found? ) - overlay-list ['] block#> find-node if ( d.block# node ) - 3dup >r_block# 2@ d= ( d.block# node found? ) - else ( d.block# node ) - false ( d.block# node found? ) - then ( d.block# node found? ) +: find-overlay? ( d.block# -- d.block# false | d.block# node true ) + overlay-list ['] block#= find-node? ; : j-read-file-block ( adr lblk# -- ) @@ -245,8 +238,7 @@ else ( adr ) drop ( ) then ( ) - else ( adr d.pblk# node ) - drop ( adr d.pblk# ) + else ( adr d.pblk# ) d.block swap bsize move ( ) then ( ) else ( adr ) @@ -266,11 +258,10 @@ : note-jblock ( d.block# escaped? log-blk# -- ) 2swap find-overlay? if ( escaped? log-blk# d.block# node ) set-overlay-node ( ) - else ( escaped? log-blk# d.block# node ) - >r ( escaped? log-blk# d.block# r: prev-node ) - >r overlay-node allocate-node ( d.block# escaped? log-blk# newnode r: prevnode ) - dup >r set-overlay-node ( r: prevnode newnode ) - r> r> insert-after ( ) + else ( escaped? log-blk# d.block# ) + overlay-node allocate-node >r ( d.block# escaped? log-blk# r: newnode ) + r@ set-overlay-node ( r: newnode ) + r> overlay-list insert-after ( ) then ; @@ -408,6 +399,7 @@ then ; : commit-journal ( -- ) + j-read-only? if exit then jsb >s_sequence dup be-l@ 1+ swap be-l! 0 jsb >s_start be-l! jsb 0 write-file-block @@ -416,7 +408,10 @@ : process-journal ( -- ) read-journal if exit then -." Recovering from journal ... " + ." Recovering from journal " + j-read-only? if ." (read-only)" then + ." ... " + 0 to end-transaction 0 ['] one-pass catch ?dup if @@ -443,4 +438,3 @@ free-journal cr ; -\ XXX need to do free-overlay-list in close

1 0