May 2010 - openfirmware - mail.coreboot.org

[commit] r1813 - cpu/x86/pc/olpc
by repository service May 21, 2010

May 21, 2010

Author: wmb Date: Fri May 21 22:53:41 2010 New Revision: 1813 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1813 Log: Q2E44 Modified: cpu/x86/pc/olpc/versions.fth Modified: cpu/x86/pc/olpc/versions.fth ============================================================================== --- cpu/x86/pc/olpc/versions.fth Tue May 18 05:44:02 2010 (r1812) +++ cpu/x86/pc/olpc/versions.fth Fri May 21 22:53:41 2010 (r1813) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 43 +macro: FW_MINOR 44 \ The EC microcode macro: EC_VERSION e34

1 0

[commit] r1812 - cpu/x86/pc/olpc
by repository service May 18, 2010

May 18, 2010

Author: wmb Date: Tue May 18 05:44:02 2010 New Revision: 1812 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1812 Log: OLPC trac 10146 - tweak to last checkin for even more reliable timer selftest. Modified: cpu/x86/pc/olpc/timertest.fth Modified: cpu/x86/pc/olpc/timertest.fth ============================================================================== --- cpu/x86/pc/olpc/timertest.fth Tue May 18 01:31:18 2010 (r1811) +++ cpu/x86/pc/olpc/timertest.fth Tue May 18 05:44:02 2010 (r1812) @@ -9,7 +9,7 @@ \ depend on being able to see any specific value. : wait-rollover ( -- error? ) get-msecs d# 100 + begin ( time-limit ) - 0 count@ 5 < if drop false exit then + 0 count@ 6 < if drop false exit then dup get-msecs - ( time-limit diff ) 0<= until drop true

1 0

[commit] r1811 - cpu/x86/pc/olpc
by repository service May 17, 2010

May 17, 2010

Author: wmb Date: Tue May 18 01:31:18 2010 New Revision: 1811 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1811 Log: OLPC trac 10146 - fixed reliability problem with ISA timer selftest. Modified: cpu/x86/pc/olpc/timertest.fth Modified: cpu/x86/pc/olpc/timertest.fth ============================================================================== --- cpu/x86/pc/olpc/timertest.fth Tue May 18 00:42:46 2010 (r1810) +++ cpu/x86/pc/olpc/timertest.fth Tue May 18 01:31:18 2010 (r1811) @@ -3,9 +3,13 @@ dev /isa/timer +\ "0 count@" takes 4.5 uS on XO-1 and 6.3 uS on XO-1.5, due to the +\ several I/O port accesses involved. That is longer than the per-count +\ time, so the test for rollover needs some slop ("5 <") because you can't +\ depend on being able to see any specific value. : wait-rollover ( -- error? ) - get-msecs d# 200 + begin ( time-limit ) - 0 count@ 1 = if drop false exit then + get-msecs d# 100 + begin ( time-limit ) + 0 count@ 5 < if drop false exit then dup get-msecs - ( time-limit diff ) 0<= until drop true @@ -20,14 +24,19 @@ then then - wait-rollover if + lock[ wait-rollover if + ]unlock ." The ISA PIT timer did not reach a count of 1." cr true exit then - 1 ms + \ Ensure that rollover has completed so the first count below + \ is higher than the second count (the counter counts down). + d# 10 us - 0 count@ d# 10000 d# 11000 between 0= if + 0 count@ 1 ms 0 count@ ]unlock - ( delta-ticks ) + + d# 1150 d# 1250 between 0= if \ Nominal delta is 1199 ." The ISA PIT timer is ticking at the wrong rate." cr true exit then

1 0

[commit] r1810 - dev/olpc/cafecamera
by repository service May 17, 2010

May 17, 2010

Author: wmb Date: Tue May 18 00:42:46 2010 New Revision: 1810 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1810 Log: OLPC XO-1 - Turned off auto-brightness code in camera selftest because people report it as a bug. Modified: dev/olpc/cafecamera/cafecamera.fth Modified: dev/olpc/cafecamera/cafecamera.fth ============================================================================== --- dev/olpc/cafecamera/cafecamera.fth Thu May 13 22:54:00 2010 (r1809) +++ dev/olpc/cafecamera/cafecamera.fth Tue May 18 00:42:46 2010 (r1810) @@ -509,7 +509,7 @@ : display-frame ( adr -- ) \ test-x test-y VGA_WIDTH VGA_HEIGHT " draw-rectangle" " $call-screen" evaluate " expand-to-screen" " $call-screen" evaluate - autobright +\ autobright ; : timeout-read ( adr len timeout -- actual )

1 0

[commit] r1809 - cpu/x86/pc/olpc
by repository service May 13, 2010

May 13, 2010

Author: wmb Date: Thu May 13 22:54:00 2010 New Revision: 1809 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1809 Log: Q2E43 Modified: cpu/x86/pc/olpc/versions.fth Modified: cpu/x86/pc/olpc/versions.fth ============================================================================== --- cpu/x86/pc/olpc/versions.fth Wed May 12 10:51:43 2010 (r1808) +++ cpu/x86/pc/olpc/versions.fth Thu May 13 22:54:00 2010 (r1809) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 42d +macro: FW_MINOR 43 \ The EC microcode macro: EC_VERSION e34

1 0

[commit] r1808 - cpu/x86/pc/olpc/via
by repository service May 12, 2010

May 12, 2010

Author: wmb Date: Wed May 12 10:51:43 2010 New Revision: 1808 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1808 Log: OLPC trac 10128 - added internal SD storage size and check for reasonable OS image size to banner. Added: cpu/x86/pc/olpc/via/banner.fth Modified: cpu/x86/pc/olpc/via/fw.bth Added: cpu/x86/pc/olpc/via/banner.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/olpc/via/banner.fth Wed May 12 10:51:43 2010 (r1808) @@ -0,0 +1,157 @@ +\ See license at end of file +purpose: Banner customization for this system + +headerless + + +: partition-end ( name$ -- false | d.end true ) + open-dev ?dup if ( ihandle ) + >r ( r: ihandle ) + " offset-low" r@ $call-method ( offset.low r: ihandle ) + " offset-high" r@ $call-method ( d.offset r: ihandle ) + " size" r@ $call-method ( d.offset d.size r: ihandle ) + d+ ( d.end r: ihandle ) + r> close-dev ( d.end ) + true ( d.end true ) + else ( ) + false ( false ) + then ( false | d.end true ) +; + +: .storage ( -- ) + " int:0" partition-end if ( d.size ) + d# 200,000,000. d+ ( d.size' ) \ Round up + d# 1,000,000,000 um/mod ( rem Gb ) + nip .d ." GB " ( ) + else ( ) + ." No " ( ) + then ( ) + ." internal storage" ( ) +; + +h# 40 buffer: partition-map +: partition-end ( offset -- sector# ) + partition-map + dup le-l@ ( adr start ) + swap la1+ le-l@ + ( sector# ) +; + +0 value internal-disk-present? +0. 2value internal-disk-size +0. 2value internal-partition-end + +: get-internal-disk-info ( -- ) + " int:0" open-dev ?dup if ( ihandle ) + true to internal-disk-present? ( ihandle ) + >r ( r: ihandle ) + " size" r@ $call-method to internal-disk-size ( r: ihandle ) + + h# 1be. " seek" r@ $call-method drop ( r: ihandle ) + partition-map h# 40 " read" r@ $call-method drop ( r: ihandle ) + r> close-dev ( ) + + 0 ( max-sector ) + h# 40 h# 8 do ( max-sector ) + i partition-end max ( max-sector' ) + h# 10 +loop ( max-sector' ) + dup 0< if ( max-sector' ) + 2drop ( ) + else + d# 512 um* to internal-partition-end + then + else ( ) + false to internal-disk-present? + then +; + +: .storage ( -- ) + get-internal-disk-info ( ) + internal-disk-present? if ( ) + internal-disk-size ( d.size ) + d# 200,000,000. d+ ( d.size' ) \ Round up + d# 1,000,000,000 um/mod ( rem Gb ) + nip .d ." GB " ( ) + else ( ) + ." No " ( ) + then ( ) + ." internal storage" ( ) +; + +: check-internal-partitions ( -- ) + internal-disk-present? 0= if exit then ( ) + internal-partition-end d0= if exit then ( ) + + internal-disk-size internal-partition-end d< if ( ) + red-letters + ." WARNING! OS image larger than internal storage device!" cr + black-letters + exit + then + + internal-partition-end d# 1,000,000,000. d+ internal-disk-size d< if + red-letters + ." WARNING! OS image much smaller than internal storage device" cr + black-letters + then +; + +: .rom ( -- ) + ." OpenFirmware " + \ push-decimal + \ major-release (.) type ." ." minor-release (.) type sub-release type + \ pop-base + \ This is the manufacturing signature +[ifdef] rom-loaded + h# ffff.ffc0 h# 10 type +[then] +; + +: .ec + " ec-name" ['] root-node get-package-property 0= if ( adr len ) + get-encoded-string ." EC Firmware " type + then +; + +: (xbanner-basics) ( -- ) + ?spaces cpu-model type ." , " .memory + ." , " .storage + ." , S/N " " SN" find-tag if type else ." Unknown" then cr + ?spaces .rom ." " .ec cr + check-internal-partitions +; +' (xbanner-basics) to banner-basics + +' (banner-warnings) to banner-warnings + +: stop-auto? ( -- flag ) idprom-valid? 0= auto-boot? and ; + +defer gui-banner ' true to gui-banner +: ?gui-banner ( -- ) + stop-auto? if suppress-auto-boot then + + gui-banner drop +; + +headers +\ 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 Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Wed May 12 09:17:16 2010 (r1807) +++ cpu/x86/pc/olpc/via/fw.bth Wed May 12 10:51:43 2010 (r1808) @@ -305,7 +305,7 @@ : user-ok "ok" ; \ This is supposed to check for authorization true value user-mode? -fload ${BP}/cpu/x86/pc/olpc/banner.fth +fload ${BP}/cpu/x86/pc/olpc/via/banner.fth fload ${BP}/ofw/gui/loadmenu.fth patch merge-rect-565 merge-rect merge-cursor \ Hack since we do all our user-level graphics in 565

1 0

[commit] r1807 - cpu/x86
by repository service May 12, 2010

May 12, 2010

Author: wmb Date: Wed May 12 09:17:16 2010 New Revision: 1807 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1807 Log: x86 memory test - Fixed reporting bug - memory bits test failures reported the wrong address and wrong data, and then page faulted. Modified: cpu/x86/memtest.fth Modified: cpu/x86/memtest.fth ============================================================================== --- cpu/x86/memtest.fth Sat May 8 12:06:55 2010 (r1806) +++ cpu/x86/memtest.fth Wed May 12 09:17:16 2010 (r1807) @@ -4,7 +4,7 @@ 3dup lskip ( adr len pattern residue ) dup if ( adr len pattern residue ) ." FAILED - got " ( adr len pattern residue ) - nip >r - + ( adr' ) + nip - + ( adr' ) dup l@ .x ." at " .x cr ( ) true else ( adr len pattern residue )

1 0

[commit] r1806 - cpu/x86/pc/olpc/via
by repository service May 8, 2010

May 8, 2010

Author: rsmith Date: Sat May 8 12:06:55 2010 New Revision: 1806 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1806 Log: Ver q3a39 Modified: cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Sat May 8 12:06:53 2010 (r1805) +++ cpu/x86/pc/olpc/via/fw-version.fth Sat May 8 12:06:55 2010 (r1806) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 38 +macro: FW_MINOR 39

1 0

[commit] r1805 - cpu/x86/pc/olpc/via
by repository service May 8, 2010

May 8, 2010

Author: rsmith Date: Sat May 8 12:06:53 2010 New Revision: 1805 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1805 Log: Pickup EC Ver 1.9.28 Modified: cpu/x86/pc/olpc/via/ec-version.fth Modified: cpu/x86/pc/olpc/via/ec-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/ec-version.fth Tue May 4 20:17:32 2010 (r1804) +++ cpu/x86/pc/olpc/via/ec-version.fth Sat May 8 12:06:53 2010 (r1805) @@ -1,5 +1,5 @@ \ The EC microcode -macro: EC_VERSION 1_9_27 +macro: EC_VERSION 1_9_28 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

[commit] r1804 - cpu/x86/pc/olpc/via
by repository service May 4, 2010

May 4, 2010

Author: wmb Date: Tue May 4 20:17:32 2010 New Revision: 1804 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1804 Log: OLPC XO-1.5 - checked in some commented-out code to restore additional display register state in resume-from-S3. That new code is unnecessary because the Linux driver does it now. Modified: cpu/x86/pc/olpc/via/startgfxrestore.fth cpu/x86/pc/olpc/via/startmacros.fth Modified: cpu/x86/pc/olpc/via/startgfxrestore.fth ============================================================================== --- cpu/x86/pc/olpc/via/startgfxrestore.fth Tue May 4 18:58:33 2010 (r1803) +++ cpu/x86/pc/olpc/via/startgfxrestore.fth Tue May 4 20:17:32 2010 (r1804) @@ -196,6 +196,96 @@ \ end of lower-power +[ifdef] extra-gfx-restore +\ VT-fixups +seq-table + ae 15 ireg \ 8 bit LUT, enable wrap, 32bpp, extended display enable + 08 16 ireg \ FIFO threshold + 08 1a ireg \ Extended mode memory access enable + 30 1c ireg \ Horizontal display fetch count + 01 1d ireg \ Horizontal display fetch count + 08 22 ireg \ Display queue request expire number +++ + 0f 2a ireg \ LVDS Channel 1 and DVI I/O pad control +++ + 9d 44 ireg \ VCK PLL + 8c 45 ireg \ VCK PLL + 85 46 ireg \ VCK PLL + 9d 4a ireg \ 2nd PLL + 8c 4b ireg \ 2nd PLL + 85 4c ireg \ 2nd PLL + 00 58 ireg \ Display FIFO low threshold select + 00 59 ireg \ clock gating XXX the driver really should gate the clocks +end-table + +\ VT-fixups +crtc-table + 99 00 ireg \ VGA timing stuff + 95 01 ireg \ + 95 02 ireg \ + 1D 03 ireg \ + 97 04 ireg \ + 1B 05 ireg \ + 8E 06 ireg \ + FF 07 ireg \ + 00 08 ireg \ + 60 09 ireg \ + 1E 0a ireg \ + 84 10 ireg \ VGA stuff + 8E 11 ireg \ + 83 12 ireg \ + 58 13 ireg \ + 00 14 ireg \ + 83 15 ireg \ + 8F 16 ireg \ + E3 17 ireg \ + FF 18 ireg \ + 06 33 ireg \ HSYNC adj + 00 34 ireg + 50 35 ireg \ extended overflow + 31 36 ireg \ 01 - monitor control - 30 is DPMS standby state + B8 56 ireg \ Hsync low + C0 57 ireg \ Hsyncend low + 89 5e ireg \ Vsync low + 6C 5f ireg \ Vsyncend all and Vsync overflow + 88 68 ireg \ Display queue depth f, Display queue read threshold 8 + E8 6a ireg \ Enable secondary display - 20 bit set is 8 (not 6) bits for second display LUT + 40 88 ireg \ LVDS sequential + 88 8a ireg \ LCD adjust LP + 00 8b ireg \ LCD power sequence control - ca is default + 00 8c ireg \ LCD power sequence control - ca is default + 00 8d ireg \ LCD power sequence control - ca is default + 00 8e ireg \ LCD power sequence control - ca is default + 00 8f ireg \ LCD power sequence control - 11 is default + 00 90 ireg \ LCD power sequence control - 11 is default + 08 92 ireg \ Read threshold 2 - 00 is default + D0 94 ireg \ 80 is Display Queue depth bit [4], rest is display 2 Expire number bits [6:0] + 22 95 ireg \ Read threshold 1 (bits 6:4) and read threshold 2 (bit 2:0) + 10 99 ireg \ ? LVDS channel 1 function select + 00 9b ireg \ O Digital video Port 1 Function Select 0 !!! setting this to 00 messes up the display +end-table + +grf-table + 40 05 ireg \ graphics mode + 05 06 ireg \ graphics misc + 0F 07 ireg \ color don't care +end-table + +\ Attribute registers +3da port-rb \ reset-attr-addr +10 3c0 port-wb 41 3c0 port-wb \ mode control +11 3c0 port-wb ff 3c0 port-wb \ overscan color +12 3c0 port-wb 0f 3c0 port-wb \ color plane enable +13 3c0 port-wb 00 3c0 port-wb \ horizontal pixel pan +3da port-rb \ reset-attr-addr +20 3c0 port-wb \ palette on + +seq-table + 04 40 ireg \ Pulse LCDCK PLL reset + 00 40 ireg \ Release LCDCK PLL reset +end-table + +cf 3c2 port-wb \ use external clock (MISC register reads at 3cc, writes at 3c2) + +[else] seq-table 9f 4a ireg \ 2nd PLL value 0 0c 4b ireg \ 2nd PLL value 1 @@ -205,6 +295,7 @@ end-table 3cc port-rb 0c bitset 3c2 # dx mov al dx out \ use external clock (MISC register reads at 3cc, writes at 3c2) +[then] 80 17 crt-set \ Release reset Modified: cpu/x86/pc/olpc/via/startmacros.fth ============================================================================== --- cpu/x86/pc/olpc/via/startmacros.fth Tue May 4 18:58:33 2010 (r1803) +++ cpu/x86/pc/olpc/via/startmacros.fth Tue May 4 20:17:32 2010 (r1804) @@ -27,6 +27,7 @@ ; : crtc-table ( -- ) h# 3d4 index-table ; : seq-table ( -- ) h# 3c4 index-table ; +: grf-table ( -- ) h# 3ce index-table ; : seq-setup ( index -- ) [ also assembler ]

1 0