August 2011 - openfirmware - mail.coreboot.org

[commit] r2465 - in dev: olpc/viacamera via/unichrome
by repository service Aug. 17, 2011

Aug. 17, 2011

Author: wmb Date: Thu Aug 18 03:20:23 2011 New Revision: 2465 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2465 Log: OLPC XO-1.5 - Changed the camera test to use CCIR601 instead of CCIR656 transmission format, thus making it sensitive to problems with the VSYNC and HSYNC lines. The new test can also operate in either RBG565 or YCrCb color spaces. Modified: dev/olpc/viacamera/camera.fth dev/olpc/viacamera/loadpkg.fth dev/olpc/viacamera/ycrcbtorgb.fth dev/via/unichrome/accel2d.fth Modified: dev/olpc/viacamera/camera.fth ============================================================================== --- dev/olpc/viacamera/camera.fth Wed Aug 17 09:04:49 2011 (r2464) +++ dev/olpc/viacamera/camera.fth Thu Aug 18 03:20:23 2011 (r2465) @@ -30,6 +30,8 @@ \ ============================= camera operations ============================= +0 value use-ycrcb? + false value ov7670-detected? : ((camera-init) ( -- ) @@ -42,7 +44,7 @@ 13 17 ov! \ Horiz start high bits 01 18 ov! \ Horiz stop high bits b6 32 ov! \ HREF pieces - 0a 19 ov! \ Vert start high bits + 02 19 ov! \ Vert start high bits - !! 02 7a 1a ov! \ Vert stop high bits 0a 03 ov! \ GAIN, VSTART, VSTOP pieces @@ -61,7 +63,8 @@ \ AGC and AEC parameters e0 13 ov! \ Control 8 - 00 00 ov! \ Gain lower 8 bits + 00 00 ov! \ Gain lower 8 bits !! Linux then sets REG_AECH to 0 + 00 10 ov! 40 0d ov! \ Control 4 magic reserved bit 18 14 ov! \ Control 9: 4x gain + magic reserved bit 05 a5 ov! \ 50hz banding step limit @@ -116,7 +119,7 @@ 12 3b ov! \ Control 11 88 a4 ov! 00 96 ov! 30 97 ov! 20 98 ov! 30 99 ov! 84 9a ov! 29 9b ov! 03 9c ov! - 5c 9d ov! 3f 9e ov! 04 78 ov! + 4c 9d ov! 3f 9e ov! 04 78 ov! \ Extra-weird stuff. Some sort of multiplexor register 01 79 ov! f0 c8 ov! @@ -134,7 +137,7 @@ \ OVT says that rewrite this works around a bug in 565 mode. \ The symptom of the bug is red and green speckles in the image. - 01 11 ov! \ 30 fps def 80 +\ 01 11 ov! \ 30 fps def 80 !! Linux doesn't do this ; : config-check ( -- ) @@ -146,7 +149,7 @@ 13 17 ovc \ Horiz start high bits 01 18 ovc \ Horiz stop high bits b6 32 ovc \ HREF pieces - ( 0a 19 ovc ) \ Vert start high bits + 02 19 ovc \ Vert start high bits 7a 1a ovc \ Vert stop high bits 0a 03 ovc \ GAIN, VSTART, VSTOP pieces @@ -166,6 +169,7 @@ \ AGC and AEC parameters ( e0 13 ovc ) \ Control 8 ( 00 00 ovc ) \ Gain lower 8 bits + ( 00 10 ovc ) \ Automatic exposure control 9:2 40 0d ovc \ Control 4 magic reserved bit ( 18 14 ovc ) \ Control 9: 4x gain + magic reserved bit 05 a5 ovc \ 50hz banding step limit @@ -236,7 +240,7 @@ : init-rgb565 ( -- ) 04 12 ov! \ VGA, RGB565 00 8c ov! \ No RGB444 - 40 04 ov! \ Control 1: CCIR656 (CaFe value is 00) + 00 04 ov! \ Control 1: CCIR601 (H/VSYNC framing) 10 40 ov! \ RGB565 output 38 14 ov! \ 16x gain ceiling b3 4f ov! \ v-red @@ -246,6 +250,10 @@ a7 53 ov! \ u-green e4 54 ov! \ u-blue c0 3d ov! \ Gamma enable, UV saturation auto adjust + + \ OVT says that rewrite this works around a bug in 565 mode. + \ The symptom of the bug is red and green speckles in the image. + 01 11 ov! \ 30 fps def 80 !! Linux doesn't do this ; : read-agc ( -- n ) @@ -270,7 +278,7 @@ : camera-config ( -- ) ((camera-init) - init-rgb565 + use-ycrcb? 0= if init-rgb565 then d# 490 d# 10 d# 14 d# 158 set-hw \ VGA window info ; @@ -294,44 +302,11 @@ : 'dma-buf ( i -- virt ) /dma-buf * dma-bufs + ; : 'dma-buf-phys ( i -- phys ) /dma-buf * dma-bufs-phys + ; -0 [if] -: alloc-dma-bufs ( -- ) - dma-bufs 0= if - /dma-buf #dma-bufs * dup dma-alloc dup to dma-bufs - swap false dma-map-in to dma-bufs-phys - then -; -: free-dma-bufs ( -- ) - dma-bufs ?dup if - /dma-buf #dma-bufs 1+ * 2dup dma-bufs-phys swap dma-map-out - dma-free - 0 to dma-bufs 0 to dma-bufs-phys - then -; +: temp-buf ( -- adr ) #dma-bufs 'dma-buf ; -: setup-dma ( -- ) - #dma-bufs 0 do - i 'dma-buf-phys 2 or i 4 * 340 + cl! \ Capture frame buffers - loop -; -[else] - -[ifdef] notdef -\ XXX Capture video to video memory only. I don't know why I can't capture to -\ XXX system memory. I'm using an arbitrary offset into the video memory. - -h# 200.0000 constant capture-base : alloc-dma-bufs ( -- ) dma-bufs 0= if - capture-base dup frame-buffer-adr + to dma-bufs - to dma-bufs-phys - then -; -: free-dma-bufs ( -- ) 0 to dma-bufs 0 to dma-bufs-phys ; -[else] -: alloc-dma-bufs ( -- ) - dma-bufs 0= if /dma-buf #dma-bufs * " alloc-capture-buffer" $call-parent to dma-bufs-phys to dma-bufs then ; @@ -339,16 +314,14 @@ dma-bufs dma-bufs-phys /dma-buf #dma-bufs * " free-capture-buffer" $call-parent 0 to dma-bufs 0 to dma-bufs-phys ; -[then] + : setup-dma ( -- ) #dma-bufs 0 do i 'dma-buf-phys 340 i 4 * + cl! \ Capture frame buffers loop ; -[then] - -\ VGA RGB565 +\ VGA : setup-image ( -- ) 0 31c cl! \ Active video scaling control 01e2.00f0 334 cl! \ Maximum data count of active video @@ -375,8 +348,10 @@ : (init) ( -- ) 0 300 cl! \ Mask all interrupts - 8850.2114 310 cl! \ Enable CLK, FIFO threshold, UYVY, 8-bit CCIR656, + 8850.2104 310 cl! \ Enable CLK, FIFO threshold, UYVY, 8-bit CCIR601, \ Capture odd/even in interlace, triple buffers + 0620.0120 314 cl! \ Horizontal end and start cycles for CCIR601 + 01de.0000 318 cl! \ Vertical end and start cycles for CCIR601 VGA_WIDTH 2* 350 cl! \ Disable coring and 640*2 stride ; @@ -446,6 +421,7 @@ : open ( -- flag ) init + my-args " yuv" $= to use-ycrcb? ov7670-detected? 0= if false exit then alloc-dma-bufs read-setup @@ -473,12 +449,21 @@ ; : full-brightness ( -- ) h# f " bright!" $call-parent ; -: display-frame ( adr -- ) +: display-ycrcb-frame ( adr -- ) + temp-buf VGA_WIDTH VGA_HEIGHT * ycbcr422>rgba8888 + temp-buf VGA_WIDTH 4* ( src-adr src-pitch ) + 0 0 d# 280 d# 210 VGA_WIDTH VGA_HEIGHT " copy32>32" $call-parent +; + +: display-rgb-frame ( adr -- ) VGA_WIDTH 2* ( src-adr src-pitch ) 0 0 d# 280 d# 210 VGA_WIDTH VGA_HEIGHT " copy16>32" $call-parent - autobright ; +: display-frame ( adr -- ) + use-ycrcb? if display-ycrcb-frame else display-rgb-frame then +\ autobright +; : timeout-read ( adr len timeout -- actual ) >r 0 -rot r> 0 ?do ( actual adr len ) 2dup read ?dup if 3 roll drop -rot leave then Modified: dev/olpc/viacamera/loadpkg.fth ============================================================================== --- dev/olpc/viacamera/loadpkg.fth Wed Aug 17 09:04:49 2011 (r2464) +++ dev/olpc/viacamera/loadpkg.fth Thu Aug 18 03:20:23 2011 (r2465) @@ -27,6 +27,7 @@ " camera" device-name 0 0 reg \ A reg property makes "test-all" consider this device fload ${BP}/dev/olpc/viacamera/smbus.fth + fload ${BP}/dev/olpc/viacamera/ycrcbtorgb.fth fload ${BP}/dev/olpc/viacamera/camera.fth finish-device Modified: dev/olpc/viacamera/ycrcbtorgb.fth ============================================================================== --- dev/olpc/viacamera/ycrcbtorgb.fth Wed Aug 17 09:04:49 2011 (r2464) +++ dev/olpc/viacamera/ycrcbtorgb.fth Thu Aug 18 03:20:23 2011 (r2465) @@ -135,7 +135,7 @@ 8 [sp] dec 0= until - d# 12 [sp] sp lea \ Clean stack - 0 [sp] di xchg \ Restore EDI - 4 [sp] si xchg \ Restore ESI + d# 12 [sp] sp lea \ Clean stack, removing Cr, Cb, and count values + di pop \ Restore EDI + si pop \ Restore ESI c; Modified: dev/via/unichrome/accel2d.fth ============================================================================== --- dev/via/unichrome/accel2d.fth Wed Aug 17 09:04:49 2011 (r2464) +++ dev/via/unichrome/accel2d.fth Thu Aug 18 03:20:23 2011 (r2465) @@ -55,6 +55,18 @@ r> h# 1c mmio! r> 8 mmio! r> h# 30 mmio! ; +: copy32>32 ( src-base src-pitch src-x,y dst-x,y w,h -- ) + wh! dst! src! ( src-base src-pitch ) + h# 30 mmio@ >r 8 mmio@ >r ( src-base src-pitch r: reg30 reg8 ) + 3 rshift r@ lwsplit nip wljoin 8 mmio! ( src-base r: reg30 reg8 ) + h# 1c mmio@ >r ( src-base ) + fb-va - 3 rshift h# 1c mmio! ( ) + 0 h# 30 mmio! ( ) \ No color format conversion + h# cc.00.00.01 0 mmio! ( ) \ Perform BLT Output = source + wait-done + r> h# 1c mmio! r> 8 mmio! r> h# 30 mmio! +; + \ some tests 1 [if] : gp-fill-screen ( color -- )

1 0

[commit] r2464 - cpu/arm/olpc/1.75
by repository service Aug. 17, 2011

Aug. 17, 2011

Author: quozl Date: Wed Aug 17 09:04:49 2011 New Revision: 2464 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2464 Log: OLPC XO-1.75 - add a compatible property for device tree to convey model Modified: cpu/arm/olpc/1.75/devices.fth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Wed Aug 17 03:47:50 2011 (r2463) +++ cpu/arm/olpc/1.75/devices.fth Wed Aug 17 09:04:49 2011 (r2464) @@ -363,6 +363,7 @@ model-name$ 2dup model ( name$ ) " OLPC " encode-bytes 2swap encode-string encode+ " banner-name" property board-revision " board-revision-int" integer-property + " olpc,xo-1.75" " compatible" string-property \ The "1-" removes the null byte " SN" find-tag if 1- else " Unknown" then " serial-number" string-property

1 0

[commit] r2463 - dev/olpc/dcon
by repository service Aug. 16, 2011

Aug. 16, 2011

Author: wmb Date: Wed Aug 17 03:47:50 2011 New Revision: 2463 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2463 Log: OLPC XO-1.75 - Enable/disable DCON freezing based on presence of DCON RAM (in turn based on board ID). If RAM is absent, the /display/dcon device node now has a "no-freeze" property. Modified: dev/olpc/dcon/mmp2dcon.fth Modified: dev/olpc/dcon/mmp2dcon.fth ============================================================================== --- dev/olpc/dcon/mmp2dcon.fth Tue Aug 16 03:06:53 2011 (r2462) +++ dev/olpc/dcon/mmp2dcon.fth Wed Aug 17 03:47:50 2011 (r2463) @@ -1,11 +1,28 @@ \ See license at end of file \ " dcon" device-name +also forth definitions +: has-dcon-ram? ( -- flag ) + board-revision h# 1b18 = if true exit then + board-revision h# 1b48 >= if true exit then + false +; +previous definitions + new-device " dcon" device-name " olpc,xo1-dcon" +compatible +" olpc,xo1.75-dcon" +compatible finish-device +stand-init: + has-dcon-ram? 0= if + " /dcon? find-device + 0 0 " no-freeze" property + device-end + then +; + \ DCON internal registers, accessed via I2C \ 0 constant DCON_ID \ 1 constant DCON_MODE @@ -103,14 +120,16 @@ d# 25 ms \ Ensure that that DCON sees the DCONLOAD high \ display-on else - begin ( ) - dcon-unload \ Put the DCON in self-refresh mode - lock[ wait-dcon-mode ]unlock ( retry? ) -\ display-off ( retry? ) - while ( ) - \ We got a false ack from the DCON so start over from LOAD state - dcon-load d# 25 ms ( ) - repeat ( ) + has-dcon-ram? if + begin ( ) + dcon-unload \ Put the DCON in self-refresh mode + lock[ wait-dcon-mode ]unlock ( retry? ) + \ display-off ( retry? ) + while ( ) + \ We got a false ack from the DCON so start over from LOAD state + dcon-load d# 25 ms ( ) + repeat ( ) + then then ;

1 0

[commit] r2462 - cpu/arm
by repository service Aug. 15, 2011

Aug. 15, 2011

Author: wmb Date: Tue Aug 16 03:06:53 2011 New Revision: 2462 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2462 Log: OLPC XO-1.75 - removed unused debugging word from bootascall.fth . Modified: cpu/arm/bootascall.fth Modified: cpu/arm/bootascall.fth ============================================================================== --- cpu/arm/bootascall.fth Tue Aug 16 02:45:53 2011 (r2461) +++ cpu/arm/bootascall.fth Tue Aug 16 03:06:53 2011 (r2462) @@ -108,7 +108,6 @@ ['] (quit) to user-interface ; ps-buf drop rs-buf drop -: foo boot-as-call( emacs )boot-as-call cr ." Hello" cr ; \ LICENSE_BEGIN \ Copyright (c) 2010 FirmWorks

1 0

[commit] r2461 - dev/olpc/dcon
by repository service Aug. 15, 2011

Aug. 15, 2011

Author: wmb Date: Tue Aug 16 02:45:53 2011 New Revision: 2461 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2461 Log: OLPC XO-1.75 - enabled DCON freeze functionality since some machines now support it. Modified: dev/olpc/dcon/mmp2dcon.fth Modified: dev/olpc/dcon/mmp2dcon.fth ============================================================================== --- dev/olpc/dcon/mmp2dcon.fth Sat Aug 13 02:51:41 2011 (r2460) +++ dev/olpc/dcon/mmp2dcon.fth Tue Aug 16 02:45:53 2011 (r2461) @@ -1,6 +1,11 @@ \ See license at end of file \ " dcon" device-name +new-device +" dcon" device-name +" olpc,xo1-dcon" +compatible +finish-device + \ DCON internal registers, accessed via I2C \ 0 constant DCON_ID \ 1 constant DCON_MODE @@ -52,7 +57,7 @@ : dcon-unload ( -- ) d# 142 gpio-clr ; [then] \ : dcon-blnk? ( -- flag ) ; \ Not hooked up -: dcon-stat@ ( -- n ) h# d4019100 l@ 4 rshift 3 and ; +: dcon-stat@ ( -- n ) h# 019100 io@ 4 rshift 3 and ; : dcon-irq? ( -- flag ) d# 124 gpio-pin@ 0= ; \ DCONSTAT values: 0 SCANINT 1 SCANINT_DCON 2 DISPLAYLOAD 3 MISSED @@ -60,8 +65,6 @@ 1 value vga? \ VGA 0 value color? \ COLOUR -\ : gxfb! ( l offset -- ) gxfb-dc-regs + rl! ; \ Probably should be IO mapped - d# 905 value resumeline \ Configurable; should be set from args : wait-output ( -- ) d# 40 ms ; @@ -99,7 +102,6 @@ dcon-load \ Put the DCON in VGA-refreshed mode d# 25 ms \ Ensure that that DCON sees the DCONLOAD high \ display-on -[ifdef] notdef else begin ( ) dcon-unload \ Put the DCON in self-refresh mode @@ -109,7 +111,6 @@ \ We got a false ack from the DCON so start over from LOAD state dcon-load d# 25 ms ( ) repeat ( ) -[then] then ;

1 0

[commit] r2460 - cpu/x86/pc/alex dev
by repository service Aug. 12, 2011

Aug. 12, 2011

Author: wmb Date: Sat Aug 13 02:51:41 2011 New Revision: 2460 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2460 Log: Alex - Added interface to the EC and its internal access to battery, AC, CPU temperature, and fan. Added: cpu/x86/pc/alex/ec.fth dev/acpiec.fth Modified: cpu/x86/pc/alex/devices.fth Modified: cpu/x86/pc/alex/devices.fth ============================================================================== --- cpu/x86/pc/alex/devices.fth Thu Aug 11 03:35:51 2011 (r2459) +++ cpu/x86/pc/alex/devices.fth Sat Aug 13 02:51:41 2011 (r2460) @@ -192,6 +192,9 @@ fload ${BP}/cpu/x86/pc/reset.fth \ reset-all +fload ${BP}/dev/acpiec.fth \ Access to ACPI EC internal variables +fload ${BP}/cpu/x86/pc/alex/ec.fth \ Battery, AC, CPU temperature, Fan controls + : ?enough-power ; \ Implement based on AC presence and battery status fload ${BP}/cpu/x86/pc/alex/spiui.fth \ User interface for SPI FLASH programming Added: cpu/x86/pc/alex/ec.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/alex/ec.fth Sat Aug 13 02:51:41 2011 (r2460) @@ -0,0 +1,68 @@ +\ See license at end of file +purpose: Access to platform functions controlled by the Embedded Controller + +[ifdef] notdef +\ The following is an alternative interface to EC internals. It seems to +\ accomplish the same thing as the standard port 66/62 ACPI interface. +: ec-i@ ( index -- b ) h# a00 pc! h# a01 pc@ ; +: ec-i! ( b index -- ) h# a00 pc! h# a01 pc! ; +: ec-rdy? ( -- flag ) h# 82 ec-i@ 0= ; +: wait-ec-rdy ( -- ) + h# 800 0 do ec-rdy? if unloop exit then d# 10 us loop + true abort" EC timeout" +; +: ec-cmd ( cmd -- ) wait-ec-rdy h# 82 ec-i! wait-ec-rdy ; +: ec-cmd-data ( data cmd -- ) wait-ec-rdy swap h# 84 ec-i! h# 82 ec-i! wait-ec-rdy ; + +: ec-b@ ( adr -- b ) h# 88 ec-cmd-data h# 84 ec-i@ ; +: ec-b! ( b adr -- ) h# 84 ec-i! h# 85 ec-i! h# 89 h# 82 ec-i! ; + +: ec-w@ ( adr -- b ) dup ec-b@ swap 1+ ec-b@ bwjoin ; +: ec-w! ( w adr -- b ) >r wbsplit r@ 1+ ec-b! r> ec-b! ; +[then] + +\ Alex has one fan, but it appears that the EC supports up to 5 fans. +\ Alex's fan goes on if you turn on either of EC fans 0,1, or 2 +: fan-on? ( -- flag ) h# ca ec-b@ 7 and 0<> ; +: fan-on ( -- ) h# 81 h# ca ec-b! ; +: fan-off ( -- ) h# 80 h# ca ec-b! ; + +: battery-remaining-capacity ( -- w ) h# a2 ec-w@ ; +: battery-present-rate ( -- w ) h# a4 ec-w@ ; +: battery-present-voltage ( -- w ) h# a6 ec-w@ ; + +: battery-design-capacity ( -- w ) h# b0 ec-w@ ; +: battery-last-charge ( -- w ) h# b2 ec-w@ ; +: battery-design-voltage ( -- w ) h# b4 ec-w@ ; +: battery-design-full ( -- w ) h# b6 ec-w@ ; + +: cpu-temperature ( -- degrees-c ) h# c0 ec-b@ ; + +: battery-state ( -- b ) h# 84 ec-b@ ; \ 0:discharging 1:charging 2:critical +: lid-open? ( -- flag ) h# 83 ec-b@ 1 and 0<> ; +: ac? ( -- flag ) h# 80 ec-b@ 4 and 0<> ; +: battery? ( -- flag ) h# 80 ec-b@ 1 and 0<> ; + +\ LICENSE_BEGIN +\ Copyright (c) 2011 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 Added: dev/acpiec.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/acpiec.fth Sat Aug 13 02:51:41 2011 (r2460) @@ -0,0 +1,48 @@ +\ See license at end of file +purpose: Interface to ACPI Embedded Controller internal variables + +: ec-obf? ( -- flag ) h# 66 pc@ 1 and 0<> ; +: ec-ibf? ( -- flag ) h# 66 pc@ 2 and 0<> ; +: wait-ibf0 + h# 800 0 do ec-ibf? 0= if unloop exit then d# 10 us loop + true abort" EC timeout" +; +: wait-obf ( -- ) + h# 800 0 do ec-obf? if unloop exit then d# 10 us loop + true abort" EC timeout" +; +: ec-cmd ( cmd -- ) wait-ibf0 h# 66 pc! ; +: ec-data! ( data -- ) wait-ibf0 h# 62 pc! ; +: ec-data@ ( data -- ) wait-obf h# 62 pc@ ; +: ec-cmd-data ( data cmd -- ) ec-cmd ec-data! ; +: ec-sci@ ( -- b ) h# 84 ec-cmd ec-data@ ; + +: ec-b@ ( adr -- b ) h# 80 ec-cmd-data ec-data@ ; +: ec-b! ( b adr -- ) h# 81 ec-cmd-data ec-data! ; + +: ec-w@ ( adr -- b ) dup ec-b@ swap 1+ ec-b@ bwjoin ; +: ec-w! ( b adr -- ) >r wbsplit r@ 1+ ec-b! r> ec-b! ; + +\ LICENSE_BEGIN +\ Copyright (c) 2011 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

1 0

[commit] r2459 - cpu/arm/mmp2
by repository service Aug. 10, 2011

Aug. 10, 2011

Author: wmb Date: Thu Aug 11 03:35:51 2011 New Revision: 2459 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2459 Log: DRAM recalibration - added explanatory comments. Modified: cpu/arm/mmp2/dramrecal.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Thu Aug 11 02:46:27 2011 (r2458) +++ cpu/arm/mmp2/dramrecal.fth Thu Aug 11 03:35:51 2011 (r2459) @@ -1,6 +1,15 @@ \ See license at end of file purpose: Recalibrate DDR3 DRAM +\ DDR3 DRAM requires periodic recalibration to cope with parameter drift from +\ temperature variation. The recalibration below affects both the DLL and +\ the "ZQ" driver strength. + +\ DDR3 recalibration will cause the display to glitch if done during display DMA. +\ The glitch can be avoided by doing the recal just after display frame done. +\ For example (from inside the screen driver): +\ : wait-frame-done 0 1c4 lcd! begin 1c4 lcd@ cc00.0000 tuck and = until ; + \ This code must be executed from SRAM because it touches the DRAM memory controller label ddr-recal ( r0: memctrl-va -- ) mov r1, #0x80000000 \ PHY Sync Enable (WO) - Synchronize dclk2x and dclk in the PHY

1 0

[commit] r2458 - in cpu/arm: mmp2 olpc/1.75
by repository service Aug. 10, 2011

Aug. 10, 2011

Author: wmb Date: Thu Aug 11 02:46:27 2011 New Revision: 2458 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2458 Log: OLPC XO-1.75 - Added DRAM recalibration. Added: cpu/arm/mmp2/dramrecal.fth Modified: cpu/arm/olpc/1.75/devices.fth Added: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/mmp2/dramrecal.fth Thu Aug 11 02:46:27 2011 (r2458) @@ -0,0 +1,98 @@ +\ See license at end of file +purpose: Recalibrate DDR3 DRAM + +\ This code must be executed from SRAM because it touches the DRAM memory controller +label ddr-recal ( r0: memctrl-va -- ) + mov r1, #0x80000000 \ PHY Sync Enable (WO) - Synchronize dclk2x and dclk in the PHY + str r1, [r0, #0x240] \ PHY_CTRL14 + + \ The value "f" for the reset timer is in units of 256 (memory clock?) cycles, thus + \ the timer is set to 256*15 + ldr r1, [r0, #0x230] + orr r1, r1, #0xf0000000 \ DLL Reset timer + str r1, [r0, #0x230] \ PHY_CTRL13 + + \ Block all Memory Controller accesses until the DLL Reset timer expires + mov r1, #0x20000000 \ PHY DLL Reset (WO) + str r1, [r0, #0x240] \ PHY_CTRL14 + + mov r1, #0x40000000 \ DLL Update enable + str r1, [r0, #0x240] \ PHY_CTRL14 + + mov r1, #0x80 \ Exit self-refresh + str r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 + + ldr r1, [r0, #0x80] \ SDRAM_CTRL1 + orr r1, r1, #0x40 \ DLL_RESET + str r1, [r0, #0x80] \ SDRAM_CTRL1 + + mov r1, #0x01000000 \ Chip select 0 + orr r1, r1, #0x00000100 \ Initiate Mode Register Set + str r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 + + mov r1, #0x01000000 \ Chip select 0 + orr r1, r1, #0x00001000 \ Initiate ZQ calibration long + str r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 + + \ ZQ calibration long takes 512 memory clock cycles after a reset + \ At 400 MHz, that's a little more than 2 us. We spin here to + \ ensure that the recal is complete before we touch the DRAM again. + mov r1, #0x100000 \ 512K spins, takes about 2.6 us + begin + decs r1, #1 + 0= until + + mov r1, #0x0 \ Normal operation (unblock data requests) + str r1, [r0, #0x7e0] \ SDRAM_CTRL14 + + mov pc,lr +end-code +here ddr-recal - constant /ddr-recal + +h# d000.0000 constant memctrl-pa +h# d000.0000 constant memctrl-va +h# d100.0000 constant sram-pa +h# d100.0000 constant sram-va +sram-va h# 2.0000 + constant 'ddr-recal + +: ddr-recal-to-sram ( -- ) + memctrl-pa h# c02 or memctrl-va map-section \ Map the memory controller + sram-pa h# c0e or sram-va map-section \ Make the code cacheable + ddr-recal 'ddr-recal /ddr-recal move +; + +stand-init: Setup DDR3 recalibration + ddr-recal-to-sram +; + +\ Call this from OFW to perform a recalibration +code do-recal ( -- ) + set r0,`memctrl-va #` \ Memory controller virtual address + set r1,`'ddr-recal #` \ Address of ddr-recal routine in SRAM + mov lr,pc + mov pc,r1 +c; + +\ LICENSE_BEGIN +\ Copyright (c) 2011 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/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Wed Aug 10 02:57:09 2011 (r2457) +++ cpu/arm/olpc/1.75/devices.fth Thu Aug 11 02:46:27 2011 (r2458) @@ -390,6 +390,8 @@ fload ${BP}/cpu/arm/mmp2/thermal.fth +fload ${BP}/cpu/arm/mmp2/dramrecal.fth + \ LICENSE_BEGIN \ Copyright (c) 2010 FirmWorks \

1 0

[commit] r2457 - cpu/x86/pc/alex dev dev/olpc/touchpad ofw/gui
by repository service Aug. 9, 2011

Aug. 9, 2011

Author: wmb Date: Wed Aug 10 02:57:09 2011 New Revision: 2457 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2457 Log: Alex - more fit-and-finish improvements, mainly to handle screen dimension and mouse issues. Modified: cpu/x86/pc/alex/fw.bth cpu/x86/pc/alex/mfgtest.fth dev/nulluart.fth dev/olpc/touchpad/syntpad.fth ofw/gui/iconmenu.fth Modified: cpu/x86/pc/alex/fw.bth ============================================================================== --- cpu/x86/pc/alex/fw.bth Wed Aug 10 01:54:30 2011 (r2456) +++ cpu/x86/pc/alex/fw.bth Wed Aug 10 02:57:09 2011 (r2457) @@ -197,6 +197,8 @@ fload ${BP}/ofw/gui/bmptools.fth fload ${BP}/ofw/gui/loadmenu.fth +d# 1280 d# 800 to max-xy +patch noop set-menu-colors setup-graphics patch merge-rect-565 merge-rect merge-cursor \ Hack since we do all our user-level graphics in 565 patch merge-rect-565 merge-rect merge-cursor \ Hack since we do all our user-level graphics in 565 fload ${BP}/cpu/x86/pc/alex/mfgtest.fth @@ -206,7 +208,10 @@ : backlight-off ( -- ) ; fload ${BP}/cpu/x86/pc/alex/disptest.fth fload ${BP}/cpu/x86/pc/alex/kbdtest.fth \ Keyboard diagnostic -fload ${BP}/dev/olpc/touchpad/touchpad.fth \ Touchpad diagnostic +dev /mouse +fload ${BP}/dev/olpc/touchpad/syntpad.fth \ Touchpad diagnostic +base @ decimal patch 24 27 background base ! +dend fload ${BP}/cpu/x86/pc/alex/yuv2rgb.fth \ YUV2 to RGB conversion fload ${BP}/cpu/x86/pc/alex/vstest.fth \ Video stream test helpers @@ -246,7 +251,7 @@ " probe-" do-drop-in probe-pci report-pci-fb - silent-probe-usb +\ silent-probe-usb ; \ This reduces processor use when waiting for a key. It helps Modified: cpu/x86/pc/alex/mfgtest.fth ============================================================================== --- cpu/x86/pc/alex/mfgtest.fth Wed Aug 10 01:54:30 2011 (r2456) +++ cpu/x86/pc/alex/mfgtest.fth Wed Aug 10 02:57:09 2011 (r2457) @@ -203,6 +203,7 @@ : leds-item ( -- ) " /leds" mfg-test-dev ; : olpc-menu-items ( -- ) + silent-probe-usb clear-menu 1 0 set-col-row Modified: dev/nulluart.fth ============================================================================== --- dev/nulluart.fth Wed Aug 10 01:54:30 2011 (r2456) +++ dev/nulluart.fth Wed Aug 10 02:57:09 2011 (r2457) @@ -3,17 +3,17 @@ : inituarts ( -- ) ; : ukey? ( -- flag ) false ; -: uemit? ( -- flag ) false ; +: uemit? ( -- flag ) true ; : uemit ( char -- ) drop ; -: ukey ( -- char ) drop ; +: ukey ( -- char ) 0 ; : ubreak? ( -- flag ) false ; : clear-break ( -- ) ; : install-uart-io ( -- ) ['] lf-pstr is newline-pstring - ['] false is key? - ['] 0 is (key - ['] drop is (emit + ['] ukey? is key? + ['] ukey is (key + ['] uemit is (emit ['] default-type is (type ['] emit1 is emit ['] type1 is type Modified: dev/olpc/touchpad/syntpad.fth ============================================================================== --- dev/olpc/touchpad/syntpad.fth Wed Aug 10 01:54:30 2011 (r2456) +++ dev/olpc/touchpad/syntpad.fth Wed Aug 10 02:57:09 2011 (r2457) @@ -166,6 +166,9 @@ fill-rectangle-noff ( ) ; +: restore-bg ( -- ) + background 0 0 screen-w screen-h fill-rectangle-noff +; : background ( -- ) black 0 0 screen-w screen-h fill-rectangle-noff final-test? if @@ -174,7 +177,7 @@ draw-left-target draw-right-target else - 0 d# 27 at-xy ." Touchpad test. Both buttons clears screen. Type a key to exit" cr + 0 d# 27 at-xy ." Touchpad test. Both buttons clears screen. Type a key to exit" then mouse-xy dot ; @@ -261,7 +264,7 @@ then close cursor-on - page + restore-bg page final-test? if selftest-failed? else false then ; Modified: ofw/gui/iconmenu.fth ============================================================================== --- ofw/gui/iconmenu.fth Wed Aug 10 01:54:30 2011 (r2456) +++ ofw/gui/iconmenu.fth Wed Aug 10 02:57:09 2011 (r2457) @@ -299,7 +299,7 @@ : restore-scroller-white ( -- ) 0 f (restore-scroller) ; headers defer restore-scroller -' restore-scroller-white to restore-scroller +' restore-scroller-bg to restore-scroller defer do-title ' noop to do-title headerless @@ -532,7 +532,7 @@ ['] root-menu ['] nest-menu catch drop - f ( color ) + background ( color ) 0 0 ( color x y ) screen-wh ( color x y w y ) fill-rectangle-noff ( )

1 0

[commit] r2456 - cpu/x86/pc/alex dev
by repository service Aug. 9, 2011

Aug. 9, 2011

Author: wmb Date: Wed Aug 10 01:54:30 2011 New Revision: 2456 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2456 Log: Alex - turn off serial output. Added: dev/null2.fth dev/nulluart.fth Modified: cpu/x86/pc/alex/config.fth cpu/x86/pc/alex/devices.fth cpu/x86/pc/alex/fw.bth cpu/x86/pc/alex/usb.fth Modified: cpu/x86/pc/alex/config.fth ============================================================================== --- cpu/x86/pc/alex/config.fth Wed Aug 10 01:13:17 2011 (r2455) +++ cpu/x86/pc/alex/config.fth Wed Aug 10 01:54:30 2011 (r2456) @@ -5,12 +5,12 @@ create coreboot-loaded create coreboot-qemu -create debug-startup +\ create debug-startup create use-timestamp-counter create use-tsc-timing -create serial-console +\ create serial-console \ In virtual mode, OFW runs with the MMU on. The advantages are \ that OFW can automatically locate itself out of the way, at the Modified: cpu/x86/pc/alex/devices.fth ============================================================================== --- cpu/x86/pc/alex/devices.fth Wed Aug 10 01:13:17 2011 (r2455) +++ cpu/x86/pc/alex/devices.fth Wed Aug 10 01:54:30 2011 (r2456) @@ -81,16 +81,18 @@ fload ${BP}/cpu/x86/pc/isatick.fth \ Use ISA timer as the alarm tick timer fload ${BP}/cpu/x86/pc/olpc/timertest.fth \ Selftest for PIT timer +fload ${BP}/dev/pci/isaall.fth +devalias mouse /isa/8042/mouse + +fload ${BP}/cpu/x86/pc/tsccal1.fth + [ifdef] resident-packages support-package: 16550 fload ${BP}/dev/16550pkg/16550.fth \ Serial port support package end-support-package [then] -fload ${BP}/dev/pci/isaall.fth -devalias mouse /isa/8042/mouse - -fload ${BP}/cpu/x86/pc/tsccal1.fth +fload ${BP}/dev/null2.fth 0 0 hex mem-uart-base (u.) " /" begin-package 4 encode-int 0 encode-int encode+ " interrupts" property @@ -99,7 +101,13 @@ fload ${BP}/dev/16550pkg/isa-int.fth end-package devalias com1 /serial:115200 -: com1 ( -- adr len ) " com1" ; ' com1 to fallback-device +: com1 ( -- adr len ) " com1" ; +[ifdef] serial-console +' com1 to fallback-device +[else] +: devnull ( -- adr len ) " /null" ; +' devnull to fallback-device +[then] 0 0 " i70" " /isa" begin-package \ Real-time clock node fload ${BP}/dev/ds1385r.fth @@ -166,8 +174,13 @@ ; fload ${BP}/cpu/x86/inoutstr.fth \ Multiple I/O port read/write + +[ifdef] serial-console fload ${BP}/dev/isa/diaguart.fth \ ISA COM port driver fload ${BP}/forth/lib/sysuart.fth \ Use UART for key and emit +[else] +fload ${BP}/dev/nulluart.fth \ Null UART driver +[then] 0 value keyboard-ih 0 value screen-ih Modified: cpu/x86/pc/alex/fw.bth ============================================================================== --- cpu/x86/pc/alex/fw.bth Wed Aug 10 01:13:17 2011 (r2455) +++ cpu/x86/pc/alex/fw.bth Wed Aug 10 01:54:30 2011 (r2456) @@ -210,8 +210,8 @@ fload ${BP}/cpu/x86/pc/alex/yuv2rgb.fth \ YUV2 to RGB conversion fload ${BP}/cpu/x86/pc/alex/vstest.fth \ Video stream test helpers -\ false to stand-init-debug? -true to stand-init-debug? +false to stand-init-debug? +\ true to stand-init-debug? hex stand-init-debug? [if] @@ -244,13 +244,9 @@ : probe-all ( -- ) " probe-" do-drop-in - ." probe-pci" cr -\ debug-me probe-pci - probe-usb - report-net - report-disk report-pci-fb + silent-probe-usb ; \ This reduces processor use when waiting for a key. It helps @@ -261,13 +257,15 @@ : startup ( -- ) standalone? 0= if exit then - ." nvramrc" cr - use-nvramrc? if nvramrc safe-evaluate then + use-nvramrc? if nvramrc safe-evaluate then auto-banner? if " Probing" ?type probe-all install-mux-io -\ " Install console" ?type install-console +[ifndef] serial-console + fallback-in-ih remove-input + fallback-out-ih remove-output +[then] \ ?usb-keyboard banner then @@ -285,6 +283,7 @@ ." See " blue-letters ." http://wiki.laptop.org/go/Forth_Lessons" black-letters cr cr + ." Type menu to run diagnostics" cr quit ; Modified: cpu/x86/pc/alex/usb.fth ============================================================================== --- cpu/x86/pc/alex/usb.fth Wed Aug 10 01:13:17 2011 (r2455) +++ cpu/x86/pc/alex/usb.fth Wed Aug 10 01:54:30 2011 (r2456) @@ -41,7 +41,13 @@ pwd$ $nopage-show-devs then ; +: show-usb ( -- ) + ." USB2 devices:" cr + " /" ['] (show-usb2) scan-subtree + ." USB1 devices:" cr + " /" ['] (show-usb1) scan-subtree +; : silent-probe-usb ( -- ) " /" ['] (probe-usb2) scan-subtree " /" ['] (probe-usb1) scan-subtree @@ -49,12 +55,7 @@ ; : probe-usb ( -- ) silent-probe-usb - - ." USB2 devices:" cr - " /" ['] (show-usb2) scan-subtree - - ." USB1 devices:" cr - " /" ['] (show-usb1) scan-subtree + show-usb ; alias p2 probe-usb Added: dev/null2.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/null2.fth Wed Aug 10 01:54:30 2011 (r2456) @@ -0,0 +1,41 @@ +\ See license at end of file +purpose: Null I/O package - discards output, provides no input + +dev / +new-device + +" null" device-name + +: open ( -- flag ) true ; +: close ( -- ) ; +: size ( -- ud ) 0 0 ; +: seek ( ud -- error? ) or ; \ error if ud is not 0 0 +: write ( adr len -- actual ) nip ; \ Return actual = len +: read ( adr len -- actual ) 2drop -2 ; \ Return -2, indicating no input + +finish-device +device-end + +\ 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 Added: dev/nulluart.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/nulluart.fth Wed Aug 10 01:54:30 2011 (r2456) @@ -0,0 +1,47 @@ +\ See license at end of file +purpose: Null diagnostic UART driver + +: inituarts ( -- ) ; +: ukey? ( -- flag ) false ; +: uemit? ( -- flag ) false ; +: uemit ( char -- ) drop ; +: ukey ( -- char ) drop ; +: ubreak? ( -- flag ) false ; +: clear-break ( -- ) ; + +: install-uart-io ( -- ) + ['] lf-pstr is newline-pstring + ['] false is key? + ['] 0 is (key + ['] drop is (emit + ['] default-type is (type + ['] emit1 is emit + ['] type1 is type + ['] crlf is cr + ['] true is (interactive? + ['] cancel is light +; + +\ LICENSE_BEGIN +\ Copyright (c) 2011 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

1 0