openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r2683 - cpu/arm/olpc/1.75 cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev/olpc/keyboard
by repository service 14 Nov '11

14 Nov '11

Author: quozl Date: Mon Nov 14 04:24:06 2011 New Revision: 2683 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2683 Log: OLPC - enable the keyboard interrupt on mechanical keyboards, using the del key, see #10318. Modified: cpu/arm/olpc/1.75/fw.bth cpu/x86/pc/olpc/sound.fth cpu/x86/pc/olpc/via/fw.bth dev/olpc/keyboard/selftest.fth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Mon Nov 14 01:58:24 2011 (r2682) +++ cpu/arm/olpc/1.75/fw.bth Mon Nov 14 04:24:06 2011 (r2683) @@ -285,6 +285,9 @@ dev /ap-sp/keyboard fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic device-end +stand-init: Keyboard + " /ap-sp/keyboard" " set-keyboard-type" execute-device-method drop +; dev /ap-sp/mouse fload ${BP}/dev/olpc/touchpad/syntpad.fth \ Touchpad diagnostic device-end Modified: cpu/x86/pc/olpc/sound.fth ============================================================================== --- cpu/x86/pc/olpc/sound.fth Mon Nov 14 01:58:24 2011 (r2682) +++ cpu/x86/pc/olpc/sound.fth Mon Nov 14 04:24:06 2011 (r2683) @@ -56,13 +56,13 @@ dev /keyboard 0 value waiting-up? -: olpc-check-abort ( scan-code -- abort? ) \ Square pressed? +: olpc-check-abort ( scan-code -- abort? ) \ an abort key pressed? last-scan over to last-scan ( scan-code old-scan-code ) h# e0 <> if drop false exit then ( scan-code ) check-abort? 0= if drop false exit then ( scan-code ) - dup h# 7f and h# 5d <> if drop false exit then ( scan-code ) + dup h# 7f and abort-key <> if drop false exit then ( scan-code ) h# 80 and if \ Up false to waiting-up? Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Mon Nov 14 01:58:24 2011 (r2682) +++ cpu/x86/pc/olpc/via/fw.bth Mon Nov 14 04:24:06 2011 (r2683) @@ -386,6 +386,9 @@ dev /keyboard fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic device-end +stand-init: Keyboard + " /keyboard" " set-keyboard-type" execute-device-method drop +; fload ${BP}/dev/olpc/touchpad/touchpad.fth \ Touchpad diagnostic fload ${BP}/cpu/x86/pc/olpc/gridmap.fth \ Gridded display tools fload ${BP}/cpu/x86/pc/olpc/via/copynand.fth Modified: dev/olpc/keyboard/selftest.fth ============================================================================== --- dev/olpc/keyboard/selftest.fth Mon Nov 14 01:58:24 2011 (r2682) +++ dev/olpc/keyboard/selftest.fth Mon Nov 14 04:24:06 2011 (r2683) @@ -10,6 +10,9 @@ \ This is 1 for the original rubber keyboard and 2 for the mechanical keyboard 1 value keyboard-type +\ Scan code of abort key +h# 5d value abort-key + \ There are two scancode tables: \ 1. simple scancode (down values); up value is f0 + scancode \ 2. e0 + scancode (down values); up value is e0 + f0 + scancode @@ -712,12 +715,20 @@ else " KM" find-tag if ( adr len ) -null ( adr' len' ) - " olpcm" $= if 2 else 1 then ( type ) + " olpcm" $= if + h# 53 to abort-key \ del + 2 + else + 1 + then ( type ) else ( ) 1 ( type ) then ( type ) then to keyboard-type +; + +: use-keyboard-type ( -- ) keyboard-type case 0 of ['] make-buttons ['] ibm#s0 ['] /ibm#s0 ['] all-tested?0 endof @@ -733,6 +744,7 @@ open 0= if true exit then set-keyboard-type + use-keyboard-type make-keys

1 0

[commit] r2682 - cpu/arm/olpc/1.75 cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev/olpc/kb3700
by repository service 14 Nov '11

14 Nov '11

Author: quozl Date: Mon Nov 14 01:58:24 2011 New Revision: 2682 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2682 Log: OLPC - keep storage LED lit during fs-update and flash, by turning off light sensor Modified: cpu/arm/olpc/1.75/devices.fth cpu/arm/olpc/1.75/leds.fth cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/via/devices.fth cpu/x86/pc/olpc/via/fsupdate.fth dev/olpc/kb3700/eccmds.fth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Fri Nov 11 09:45:01 2011 (r2681) +++ cpu/arm/olpc/1.75/devices.fth Mon Nov 14 01:58:24 2011 (r2682) @@ -182,12 +182,21 @@ ['] ec-spi-reprogrammed to spi-reprogrammed ; : flash-vulnerable( ( -- ) + ols-off ignore-power-button hdd-led-on ; : )flash-vulnerable ( -- ) hdd-led-off ; +: fs-vulnerable( ( -- ) + ols-off + hdd-led-on +; +: )fs-vulnerable ( -- ) + hdd-led-off + ols-on +; fload ${BP}/dev/olpc/spiflash/spiui.fth \ User interface for SPI FLASH programming \ fload ${BP}/dev/olpc/spiflash/recover.fth \ XO-to-XO SPI FLASH recovery Modified: cpu/arm/olpc/1.75/leds.fth ============================================================================== --- cpu/arm/olpc/1.75/leds.fth Fri Nov 11 09:45:01 2011 (r2681) +++ cpu/arm/olpc/1.75/leds.fth Mon Nov 14 01:58:24 2011 (r2682) @@ -6,11 +6,6 @@ " leds" device-name : open ( -- okay? ) true ; : close ( -- ) ; -: ols-led-on ( -- ) h# 57 ec-cmd ; -: ols-led-off ( -- ) h# 58 ec-cmd ; -: ols-assy-mode-on ( -- ) h# 59 ec-cmd ; -: ols-assy-mode-off ( -- ) h# 5a ec-cmd ; -: ols-led-ec-control ( -- ) h# 5b ec-cmd ; : selftest ( -- ) ." Flashing LEDs" cr Modified: cpu/x86/pc/olpc/devices.fth ============================================================================== --- cpu/x86/pc/olpc/devices.fth Fri Nov 11 09:45:01 2011 (r2681) +++ cpu/x86/pc/olpc/devices.fth Mon Nov 14 01:58:24 2011 (r2682) @@ -320,6 +320,8 @@ load-base constant flash-buf : flash-vulnerable( ( -- ) ignore-power-button ; : )flash-vulnerable ( -- ) ; +: fs-vulnerable( ( -- ) ; +: )fs-vulnerable ( -- ) ; fload ${BP}/dev/olpc/spiflash/spiui.fth \ User interface for SPI FLASH programming fload ${BP}/dev/olpc/spiflash/recover.fth \ XO-to-XO SPI FLASH recovery Modified: cpu/x86/pc/olpc/via/devices.fth ============================================================================== --- cpu/x86/pc/olpc/via/devices.fth Fri Nov 11 09:45:01 2011 (r2681) +++ cpu/x86/pc/olpc/via/devices.fth Mon Nov 14 01:58:24 2011 (r2682) @@ -296,6 +296,12 @@ : )flash-vulnerable ( -- ) hdd-led-off ; +: fs-vulnerable( ( -- ) + hdd-led-on +; +: )fs-vulnerable ( -- ) + hdd-led-off +; fload ${BP}/dev/olpc/spiflash/spiui.fth \ User interface for SPI FLASH programming fload ${BP}/cpu/x86/pc/olpc/via/recover.fth \ XO-to-XO SPI FLASH recovery Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Fri Nov 11 09:45:01 2011 (r2681) +++ cpu/x86/pc/olpc/via/fsupdate.fth Mon Nov 14 01:58:24 2011 (r2682) @@ -67,7 +67,7 @@ also nand-commands definitions : zblocks: ( "eblock-size" "#eblocks" ... -- ) - hdd-led-toggle + fs-vulnerable( ?compare-spec-line get-hex# to /nand-block get-hex# to #image-eblocks @@ -90,7 +90,7 @@ \ Asynchronous writes " write-blocks-end" $call-nand ( error? ) " Write error" ?nand-abort - hdd-led-off + )fs-vulnerable release-inflater fexit ; Modified: dev/olpc/kb3700/eccmds.fth ============================================================================== --- dev/olpc/kb3700/eccmds.fth Fri Nov 11 09:45:01 2011 (r2681) +++ dev/olpc/kb3700/eccmds.fth Mon Nov 14 01:58:24 2011 (r2682) @@ -82,7 +82,21 @@ d# 16 cscount-max ; -: als@ ( -- w ) h# 56 ec-cmd-w@ ; +: als@ ( -- w ) h# 56 ec-cmd-w@ ; +: ols-led-on ( -- ) h# 57 ec-cmd ; +: ols-led-off ( -- ) h# 58 ec-cmd ; +: ols-assy-mode-on ( -- ) h# 59 ec-cmd ; +: ols-assy-mode-off ( -- ) h# 5a ec-cmd ; +: ols-led-ec-control ( -- ) h# 5b ec-cmd ; +: ols-off + ols-led-on + ols-led-ec-control + ols-assy-mode-on +; +: ols-on + ols-led-ec-control + ols-assy-mode-off +; : ec-min-pwr ( -- ) h# 5d ec-cmd-w@ w->n ; : ec-max-pwr ( -- ) h# 5e ec-cmd-w@ w->n ;

1 0

[commit] r2681 - cpu/x86/pc/olpc
by repository service 11 Nov '11

11 Nov '11

Author: quozl Date: Fri Nov 11 09:45:01 2011 New Revision: 2681 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2681 Log: OLPC - fix link Modified: cpu/x86/pc/olpc/keymap.fth Modified: cpu/x86/pc/olpc/keymap.fth ============================================================================== --- cpu/x86/pc/olpc/keymap.fth Thu Nov 10 07:18:02 2011 (r2680) +++ cpu/x86/pc/olpc/keymap.fth Fri Nov 11 09:45:01 2011 (r2681) @@ -1,7 +1,7 @@ purpose: Populate keymaps from the KA manufacturing data tag \ See license at end of file -\ Per http://wiki.laptop.org/Manufacturing_Data#Keyboard_ASCII_Map +\ Per http://wiki.laptop.org/go/Manufacturing_Data#Keyboard_ASCII_Map h# 60 constant /submap

1 0

[commit] r2680 - cpu/arm/olpc/1.75
by repository service 10 Nov '11

10 Nov '11

Author: quozl Date: Thu Nov 10 07:18:02 2011 New Revision: 2680 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2680 Log: OLPC XO-1.75 - refix #11215, regression introduced in -r2561 Modified: cpu/arm/olpc/1.75/devices.fth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Thu Nov 10 05:32:25 2011 (r2679) +++ cpu/arm/olpc/1.75/devices.fth Thu Nov 10 07:18:02 2011 (r2680) @@ -182,6 +182,7 @@ ['] ec-spi-reprogrammed to spi-reprogrammed ; : flash-vulnerable( ( -- ) + ignore-power-button hdd-led-on ; : )flash-vulnerable ( -- )

1 0

[commit] r2679 - cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev
by repository service 10 Nov '11

10 Nov '11

Author: quozl Date: Thu Nov 10 05:32:25 2011 New Revision: 2679 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2679 Log: OLPC - show RTC in banner, cache banner internal storage result, show value of RTC in test. #11424 Modified: cpu/x86/pc/olpc/banner.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/via/banner.fth cpu/x86/pc/olpc/via/fw.bth dev/ds1385r.fth Modified: cpu/x86/pc/olpc/banner.fth ============================================================================== --- cpu/x86/pc/olpc/banner.fth Wed Nov 9 06:00:22 2011 (r2678) +++ cpu/x86/pc/olpc/banner.fth Thu Nov 10 05:32:25 2011 (r2679) @@ -27,7 +27,7 @@ : (xbanner-basics) ( -- ) ?spaces cpu-model type ." , " .memory ." , S/N " " SN" find-tag if type else ." Unknown" then cr - ?spaces .rom ." " .ec cr + ?spaces .rom ." " .ec ." " .clock ; ' (xbanner-basics) to banner-basics Modified: cpu/x86/pc/olpc/fw.bth ============================================================================== --- cpu/x86/pc/olpc/fw.bth Wed Nov 9 06:00:22 2011 (r2678) +++ cpu/x86/pc/olpc/fw.bth Thu Nov 10 05:32:25 2011 (r2679) @@ -300,6 +300,9 @@ : user-ok "ok" ; \ This is supposed to check for authorization true value user-mode? +: .clock ( -- ) + time&date .date space .time ." UTC" cr +; fload ${BP}/cpu/x86/pc/olpc/banner.fth fload ${BP}/ofw/gui/loadmenu.fth @@ -453,9 +456,6 @@ ntp-timestamp abort" Can't contact NTP server" ntp>time&date ; -: .clock ( -- ) - time&date .date space .time ." UTC" cr -; : ntp-set-clock ( -- ) ntp-time&date " set-time" clock-node @ $call-method .clock Modified: cpu/x86/pc/olpc/via/banner.fth ============================================================================== --- cpu/x86/pc/olpc/via/banner.fth Wed Nov 9 06:00:22 2011 (r2678) +++ cpu/x86/pc/olpc/via/banner.fth Thu Nov 10 05:32:25 2011 (r2679) @@ -65,7 +65,9 @@ ; : .storage ( -- ) - get-internal-disk-info ( ) + internal-disk-present? 0= if ( ) + get-internal-disk-info ( ) + then internal-disk-present? if ( ) internal-disk-size ( d.size ) d# 200,000,000. d+ ( d.size' ) \ Round up @@ -120,7 +122,7 @@ ?spaces cpu-model type ." , " .memory ." , " .storage ." , S/N " " SN" find-tag if type else ." Unknown" then cr - ?spaces .rom ." " .ec cr + ?spaces .rom ." " .ec ." " .clock check-internal-partitions ; ' (xbanner-basics) to banner-basics Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Wed Nov 9 06:00:22 2011 (r2678) +++ cpu/x86/pc/olpc/via/fw.bth Thu Nov 10 05:32:25 2011 (r2679) @@ -311,6 +311,9 @@ : user-ok "ok" ; \ This is supposed to check for authorization true value user-mode? +: .clock ( -- ) + time&date .date space .time ." UTC" cr +; fload ${BP}/cpu/x86/pc/olpc/via/banner.fth fload ${BP}/ofw/gui/loadmenu.fth @@ -525,9 +528,6 @@ ntp-timestamp abort" Can't contact NTP server" ntp>time&date ; -: .clock ( -- ) - time&date .date space .time ." UTC" cr -; : ntp-set-clock ( -- ) ntp-time&date " set-time" clock-node @ $call-method .clock Modified: dev/ds1385r.fth ============================================================================== --- dev/ds1385r.fth Wed Nov 9 06:00:22 2011 (r2678) +++ dev/ds1385r.fth Thu Nov 10 05:32:25 2011 (r2679) @@ -157,6 +157,9 @@ open drop check-battery \ Don't display the message here because "open" will do it check-tick or + get-time .date space .time cr + get-time 2nip 2nip nip + d# 2011 < dup if ." Date in RTC is too early" cr then close ;

1 0

[commit] r2678 - cpu/arm/mmp2
by repository service 09 Nov '11

09 Nov '11

Author: wmb Date: Wed Nov 9 06:00:22 2011 New Revision: 2678 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2678 Log: OLPC XO-1.75 - fixed high speed TWSI operation based on new information about how the registers work. Modified: cpu/arm/mmp2/twsi.fth Modified: cpu/arm/mmp2/twsi.fth ============================================================================== --- cpu/arm/mmp2/twsi.fth Tue Nov 8 20:20:58 2011 (r2677) +++ cpu/arm/mmp2/twsi.fth Wed Nov 9 06:00:22 2011 (r2678) @@ -15,11 +15,13 @@ : sr@ ( -- n ) twsi-chip h# 18 + io@ ; : sar@ ( -- n ) twsi-chip h# 20 + io@ ; : lcr@ ( -- n ) twsi-chip h# 28 + io@ ; +: wcr@ ( -- n ) twsi-chip h# 30 + io@ ; : dbr! ( n -- ) twsi-chip h# 08 + io! ; : cr! ( n -- ) twsi-chip h# 10 + io! ; : sr! ( n -- ) twsi-chip h# 18 + io! ; : sar! ( n -- ) twsi-chip h# 20 + io! ; : lcr! ( n -- ) twsi-chip h# 28 + io! ; +: wcr! ( -- n ) twsi-chip h# 30 + io! ; create channel-bases h# 011000 , h# 031000 , h# 032000 , h# 033000 , h# 033800 , h# 034000 , @@ -58,6 +60,10 @@ h# 1000 constant BBU_TWSI_TimeOut \ TWSI bus timeout loop counter value +d# 26 constant ftwsi-mhz \ +d# 1400 constant tlow-nsec \ The I2C spec calls for Tlow >= 1300 ns +ftwsi-mhz tlow-nsec d# 1000 */ constant tlow-ticks + bbu_ICR_IUE bbu_ICR_SCLE or value cr-set \ bits to maintain as set : init-twsi-channel ( channel# -- ) set-twsi-channel @@ -67,6 +73,9 @@ cr-set cr! \ Release the reset 0 sar! \ Set host slave address 0 cr! \ Disable interrupts + \ The COUNT field of TWSI_WCR establishes a minimum value for the SCL low time. + \ The minimum Tlow is the clock period * (12 + 2*COUNT) + wcr@ h# 1f invert and tlow-ticks d# 12 - 2/ or wcr! \ Setup and hold times ; : init-twsi ( -- ) 7 1 do i init-twsi-channel loop @@ -177,25 +186,25 @@ twsi-out ; -: set-bus-standard cr-set h# fffe7fff and to cr-set ; -: set-bus-fast cr-set h# fffe7fff and h# 8000 or to cr-set ; -\ The dividends below (12,600,000 and 11,600,000) are chosen to give the -\ same values that the LCR defaults to for the data rates 100,000 and 400,000 -\ The TWSI input clock is the 26 MHz VCXO, and the divided value generates -\ both the low phase and the high phase, so you would think that the dividend -\ should be 13,000,000 (half of 26M), but that doesn't give the right result. -\ Perhaps there is an additive factor in the divisor; the manual is quite vague. +: set-bus-standard cr-set h# 18000 invert and to cr-set ; +: set-bus-fast cr-set h# 18000 invert and h# 8000 or to cr-set ; + : set-bus-speed ( hz -- ) \ Useful range is 25K .. 400K - 100K and 400K are typical child-address set-twsi-target ( hz ) - dup d# 100,000 <= if ( hz ) - set-bus-standard ( hz ) - d# 12,600,000 swap / h# 1ff min h# 7e max ( divisor ) + ftwsi-mhz d# 1,000,000 2 pick */ ( hz ticks ) + swap d# 100,000 <= if ( ticks ) + \ In slow mode, Thi = Tclk * (8+slv), Tlow = Tclk * (1+slv) + 9 - 2/ 1+ ( slv ) lcr@ h# 1ff invert and or lcr! ( ) - else ( hz ) - set-bus-fast ( hz ) - d# 11,600,000 swap / h# 1ff min h# 1d max ( divisor ) - lcr@ h# 3.fe00 invert and swap 9 lshift or lcr! ( ) + set-bus-standard ( ) + else ( ticks ) + \ (The information below is poorly documented and was determined empirically) + \ In fast mode, Thi = Tclk * (10+flv), Tlo = Tclk * max(1+flv, tlow_ticks)) + dup d# 11 - 2/ 1+ tlow-ticks max ( ticks ticks-low ) + - d# 10 - ( flv ) + 9 lshift lcr@ h# 3.fe00 invert and or lcr! ( ) + set-bus-fast ( ) then ( ) ; : decode-unit ( adr len -- low high ) parse-2int ;

1 0

[commit] r2677 - cpu/arm/olpc/1.75
by repository service 08 Nov '11

08 Nov '11

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 08 Nov '11

08 Nov '11

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 08 Nov '11

08 Nov '11

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 08 Nov '11

08 Nov '11

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware