November 2011 - openfirmware - mail.coreboot.org

[commit] r2677 - cpu/arm/olpc/1.75
by repository service Nov. 8, 2011

Nov. 8, 2011

Author: wmb Date: Tue Nov 8 20:20:58 2011 New Revision: 2677 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2677 Log: Q4C04 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 Nov 8 20:19:14 2011 (r2676) +++ cpu/arm/olpc/1.75/fw-version.fth Tue Nov 8 20:20:58 2011 (r2677) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 03 +macro: FW_MINOR 04

1 0

[commit] r2676 - cpu/arm/olpc/1.75
by repository service Nov. 8, 2011

Nov. 8, 2011

Author: wmb Date: Tue Nov 8 20:19:14 2011 New Revision: 2676 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2676 Log: OLPC XO-1.75 - disable muxed I/O when starting Linux, paving the way for OFW interaction when Linux is running. Modified: cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Nov 8 20:19:10 2011 (r2675) +++ cpu/arm/olpc/1.75/fw.bth Tue Nov 8 20:19:14 2011 (r2676) @@ -37,15 +37,6 @@ unload-crypto " /usb" " reset-usb" execute-device-method drop ; -: quiesce ( -- ) - timers-off - usb-quiet - close-ec - \ Change the sleep state of EC_SPI_ACK from 1 (OFW value) to 0 (Linux value) - d# 125 af@ h# 100 invert and d# 125 af! -; - -' quiesce to linux-hook d# 9999 to arm-linux-machine-type \ Marvell Jasper @@ -416,6 +407,31 @@ 0 to keyboard-ih then ; + +: teardown-mux-io ( -- ) + install-uart-io + text-off + keyboard-off + fallback-out-ih remove-output + fallback-in-ih remove-input + stdin off + stdout off + in-mux-ih close-dev + out-mux-ih close-dev +; +: quiesce ( -- ) + teardown-mux-io + timers-off + usb-quiet + close-ec + \ Change the sleep state of EC_SPI_ACK from 1 (OFW value) to 0 (Linux value) + d# 125 af@ h# 100 invert and d# 125 af! +; + +' quiesce to linux-hook +\ Because visible doesn't work sometimes when calling back from Linux +dev /client-services patch noop visible enter dend + : interpreter-init ( -- ) hex warning on

1 0

[commit] r2675 - ofw/fs/ext2fs
by repository service Nov. 8, 2011

Nov. 8, 2011

Author: wmb Date: Tue Nov 8 20:19:10 2011 New Revision: 2675 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2675 Log: EXT2FS - added an option for "local replay" of a dirty ext3 journal, without writing to the disk. Modified: ofw/fs/ext2fs/methods.fth ofw/fs/ext2fs/recovery.fth Modified: ofw/fs/ext2fs/methods.fth ============================================================================== --- ofw/fs/ext2fs/methods.fth Tue Nov 8 20:19:06 2011 (r2674) +++ ofw/fs/ext2fs/methods.fth Tue Nov 8 20:19:10 2011 (r2675) @@ -161,7 +161,7 @@ dup bsize > abort" Bad size for ext2fsfread" dfile-size lblk# bsize um* d- drop ( addr count rem ) umin swap ( actual addr ) - lblk# read-file-block ( actual ) + lblk# j-read-file-block ( actual ) dup 0> if lblk#++ then ( actual ) ; @@ -250,6 +250,7 @@ update-gds flush release-buffers + free-overlay-list ; : read ( adr len -- actual ) ext2fs-fd ['] fgets catch if 3drop 0 then Modified: ofw/fs/ext2fs/recovery.fth ============================================================================== --- ofw/fs/ext2fs/recovery.fth Tue Nov 8 20:19:06 2011 (r2674) +++ ofw/fs/ext2fs/recovery.fth Tue Nov 8 20:19:10 2011 (r2675) @@ -133,16 +133,15 @@ : write-jblock ( d.block# adr -- ) -rot drop write-fs-block ( error? ) -\ j-blocksize 2swap ( adr len d.block# ) -\ j-blocksize du* ( adr len d.byte# ) -\ write-bytes if ." Journal recovery write error" cr abort then ; 0 value next-log-block +: log-block++ ( -- block# ) + next-log-block dup 1 +wrap to next-log-block ( block# ) +; : next-jblock ( buf -- ) - next-log-block read-file-block ( ) - next-log-block 1 +wrap to next-log-block ( ) + log-block++ read-file-block ( ) ; 0 value crc32-sum @@ -208,9 +207,66 @@ then ( ) ; -: replay-tag ( -- ) - obh next-jblock ( ) +listnode + /n 2* field >o_block# + /n field >o_pblock# + /n field >o_escaped? +nodetype: overlay-node + +list: overlay-list + +: free-overlay-list ( -- ) + begin overlay-list >next-node while ( ) + overlay-list delete-after ( node ) + overlay-node free-node ( ) + repeat ( ) +; + +\ node is either the found one or the insertion point +: find-overlay? ( d.block# -- d.block# node found? ) + revoke-list ['] block#> find-node drop ( d.block# node ) + 3dup >r_block# 2@ d= ( d.block# node ) +; +: j-read-file-block ( adr lblk# -- ) + >pblk# ?dup if ( adr pblk# ) + u>d find-overlay? if ( adr d.pblk# node ) + nip nip ( adr node ) + tuck >o_pblock# l@ ( node adr pblk# ) + block over bsize move ( node adr ) + swap >o_escaped? l@ if ( adr ) + jbd_magic swap be-l! ( ) + else ( adr ) + drop ( ) + then ( ) + else ( adr d.pblk# node ) + 2drop ( adr pblk# ) + block swap bsize move ( ) + then ( ) + else ( adr ) + bsize erase ( ) + then ( ) +; + +0 value j-read-only? +: set-overlay-node ( escaped? log-blk# d.block# node -- ) + >r ( escaped? log-blk# d.block# r: node ) + r@ >o_block# 2! ( escaped? log-blk# r: node ) + >pblk# r@ >o_pblock# l! ( escaped? r: node ) + r> >o_escaped? l! ( ) +; +: 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 ( ) + then +; + +: replay-tag ( -- ) tagp >t_blocknr be-l@ ( block# ) j-incompat 2 and if ( block# ) \ 2:FEATURE_INCOMPAT_64BIT tagp >t_blocknr_high be-l@ ( d.block# ) @@ -220,10 +276,16 @@ 2dup revoked? if ( d.block# ) 2drop ( ) else ( d.block# ) - tagp >t_flags be-l@ 1 and if ( d.block# ) \ 1:FLAG_ESCAPE - jbd_magic obh >data be-l! ( d.block# ) - then ( d.block# ) - obh write-jblock ( ) + tagp >t_flags be-l@ 1 and ( d.block# escaped? ) + j-read-only? if ( d.block# escaped? ) + log-block++ note-jblock ( ) + else ( d.block# escaped? ) + obh next-jblock ( d.block# escaped? ) + if ( d.block# ) \ 1:FLAG_ESCAPE + jbd_magic obh >data be-l! ( d.block# ) + then ( d.block# ) + obh write-jblock ( ) + then ( ) then ( ) ; @@ -360,7 +422,7 @@ 2 ['] one-pass catch if ." Journal replay failed" cr - free-revoke-list free-journal exit + free-overlay-list free-revoke-list free-journal exit then free-revoke-list @@ -369,3 +431,4 @@ free-journal cr ; +\ XXX need to do free-overlay-list in close

1 0

[commit] r2674 - cpu/arm/mmp2
by repository service Nov. 8, 2011

Nov. 8, 2011

Author: wmb Date: Tue Nov 8 20:19:06 2011 New Revision: 2674 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2674 Log: OLPC XO-1.75 - moved the DRAM resume delay after the self-refresh exit command, thus giving both DLLs time to recalibrate. Modified: cpu/arm/mmp2/dramrecal.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Tue Nov 8 20:17:14 2011 (r2673) +++ cpu/arm/mmp2/dramrecal.fth Tue Nov 8 20:19:06 2011 (r2674) @@ -86,8 +86,6 @@ mov r1, #0x40000000 \ DLL_UPDATE_EN str r1, [r0, #0x240] \ PHY_CTRL14 - mov r1, #0x0300 begin decs r1,1 0= until \ Delay, needed for some DRAMs - mov r1, #0x80 \ Exit Self Refresh value str r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 @@ -108,6 +106,10 @@ decs r1, #1 0= until [then] + + \ Delay to let the memory controller and DRAM DLLs settle + mov r1, #0x0300 begin decs r1,1 0= until + mov r1, #0x0 \ Unblock data requests str r1, [r0, #0x7e0] \ SDRAM_CTRL14

1 0

[commit] r2673 - cpu/arm/olpc/1.75
by repository service Nov. 8, 2011

Nov. 8, 2011

Author: rsmith Date: Tue Nov 8 20:17:14 2011 New Revision: 2673 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2673 Log: OLPC: XO 1.75: EC code 0.3.04 Modified: cpu/arm/olpc/1.75/ec-version.fth Modified: cpu/arm/olpc/1.75/ec-version.fth ============================================================================== --- cpu/arm/olpc/1.75/ec-version.fth Tue Nov 8 13:05:09 2011 (r2672) +++ cpu/arm/olpc/1.75/ec-version.fth Tue Nov 8 20:17:14 2011 (r2673) @@ -1,5 +1,5 @@ \ The EC microcode -macro: EC_VERSION 4_0_3_03 +macro: EC_VERSION 4_0_3_04 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

[commit] r2672 - cpu/arm/olpc/1.75
by repository service Nov. 8, 2011

Nov. 8, 2011

Author: pgf Date: Tue Nov 8 13:05:09 2011 New Revision: 2672 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2672 Log: reimplement game-key@ using gpio-pin@ rather than keypad-bit we no longer use the keypad controller Modified: cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Tue Nov 8 00:19:39 2011 (r2671) +++ cpu/arm/olpc/1.75/fw.bth Tue Nov 8 13:05:09 2011 (r2672) @@ -231,8 +231,10 @@ : close ; end-package +\ it seems to be difficult to get SoC wakeups from the keypad controller, +\ so we set them up as gpio, instead. +[ifdef] use_mmp2_keypad_control fload ${BP}/cpu/arm/mmp2/keypad.fth -[ifndef] cl2-a1 [ifdef] notdef \ CForth turns on the keypad; resetting it makes it not work stand-init: keypad keypad-on @@ -259,6 +261,7 @@ d# 19 gpio-pin@ 0= if h# 01 or then \ Square d# 20 gpio-pin@ 0= if h# 40 or then \ Rotate [else] +[ifdef] use_mmp2_keypad_control d# 15 gpio-pin@ 0= if button-rotate or then ( n ) scan-keypad ( n keypad ) button-o h# 01 keypad-bit ( n' keypad ) @@ -270,6 +273,17 @@ rocker-down h# 40 keypad-bit ( n' keypad ) rocker-left h# 80 keypad-bit ( n' keypad ) drop ( n ) +[else] + d# 15 gpio-pin@ 0= if button-rotate or then + d# 16 gpio-pin@ 0= if button-o or then + d# 17 gpio-pin@ 0= if button-check or then + d# 18 gpio-pin@ 0= if button-x or then + d# 19 gpio-pin@ 0= if button-square or then + d# 20 gpio-pin@ 0= if rocker-up or then + d# 21 gpio-pin@ 0= if rocker-right or then + d# 22 gpio-pin@ 0= if rocker-down or then + d# 23 gpio-pin@ 0= if rocker-left or then +[then] [then] ;

1 0

[commit] r2671 - cpu/x86/pc/olpc
by repository service Nov. 7, 2011

Nov. 7, 2011

Author: quozl Date: Tue Nov 8 00:19:39 2011 New Revision: 2671 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2671 Log: Q2F05 Modified: cpu/x86/pc/olpc/versions.fth Modified: cpu/x86/pc/olpc/versions.fth ============================================================================== --- cpu/x86/pc/olpc/versions.fth Mon Nov 7 23:17:33 2011 (r2670) +++ cpu/x86/pc/olpc/versions.fth Tue Nov 8 00:19:39 2011 (r2671) @@ -1,8 +1,8 @@ \ Version numbers of items included in the OLPC firmware image \ The overall firmware revision -macro: FW_MAJOR E -macro: FW_MINOR 49 +macro: FW_MAJOR F +macro: FW_MINOR 05 \ The EC microcode macro: EC_VERSION 1_2_1

1 0

[commit] r2670 - cpu/x86/pc/olpc
by repository service Nov. 7, 2011

Nov. 7, 2011

Author: rsmith Date: Mon Nov 7 23:17:33 2011 New Revision: 2670 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2670 Log: OLPC: XO-1: Switch XO-1 EC firmware to Ver: 1.2.1 Modified: cpu/x86/pc/olpc/versions.fth Modified: cpu/x86/pc/olpc/versions.fth ============================================================================== --- cpu/x86/pc/olpc/versions.fth Thu Nov 3 03:12:26 2011 (r2669) +++ cpu/x86/pc/olpc/versions.fth Mon Nov 7 23:17:33 2011 (r2670) @@ -5,7 +5,7 @@ macro: FW_MINOR 49 \ The EC microcode -macro: EC_VERSION e35 +macro: EC_VERSION 1_2_1 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

[commit] r2669 - cpu/x86/pc/olpc
by repository service Nov. 2, 2011

Nov. 2, 2011

Author: quozl Date: Thu Nov 3 03:12:26 2011 New Revision: 2669 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2669 Log: OLPC XO-1.75 - reverse instruction to return sumcell value, fixes #11376 Modified: cpu/x86/pc/olpc/life.fth Modified: cpu/x86/pc/olpc/life.fth ============================================================================== --- cpu/x86/pc/olpc/life.fth Thu Nov 3 01:52:11 2011 (r2668) +++ cpu/x86/pc/olpc/life.fth Thu Nov 3 03:12:26 2011 (r2669) @@ -70,7 +70,7 @@ add r0,r0,r1 ldrb r1,[tos, `lf_width 1+`] add r0,r0,r1 - mov r0,tos + mov tos,r0 c; [then]

1 0

[commit] r2668 - cpu/x86/pc/olpc/via
by repository service Nov. 2, 2011

Nov. 2, 2011

Author: quozl Date: Thu Nov 3 01:52:11 2011 New Revision: 2668 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2668 Log: q3b23 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 Thu Nov 3 00:34:07 2011 (r2667) +++ cpu/x86/pc/olpc/via/fw-version.fth Thu Nov 3 01:52:11 2011 (r2668) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 22 +macro: FW_MINOR 23

1 0