openfirmware June 2012

openfirmware@openfirmware.info

1 participants
34 discussions

[commit] r3007 - cpu/x86/pc/olpc
by repository service 13 Jun '12

13 Jun '12

Author: quozl Date: Wed Jun 13 07:05:13 2012 New Revision: 3007 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3007 Log: OLPC - security, add visual response to escape key when in secure mode, without consuming keystroke, to improve usability for service and support (since it is otherwise difficult to tell if a laptop is secured, or the keyboard is broken). #11609 Modified: cpu/x86/pc/olpc/security.fth Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Sat Jun 9 09:58:12 2012 (r3006) +++ cpu/x86/pc/olpc/security.fth Wed Jun 13 07:05:13 2012 (r3007) @@ -1304,6 +1304,12 @@ alternate? if " \boot-alt" else " \boot" then pn-buf place + key? if + pending-char c@ h# 1b = if + visible red-letters ." Secured, continuing" cancel cr + then + then + all-devices$ load-from-list if exit then \ Returns only if no images found " Boot failed" .security-failure

1 0

[commit] r3006 - ofw/core
by repository service 09 Jun '12

09 Jun '12

Author: wmb Date: Sat Jun 9 09:58:12 2012 New Revision: 3006 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3006 Log: OFW core - execute-device-method was using device-end, which sets the search order to a fixed value, inside of the wrapping code that modifies the search order reversibly. That's probably a holdover from some ancient behavior. Fixes OLPC trac #11926. Modified: ofw/core/ofwcore.fth Modified: ofw/core/ofwcore.fth ============================================================================== --- ofw/core/ofwcore.fth Sat Jun 9 05:53:59 2012 (r3005) +++ ofw/core/ofwcore.fth Sat Jun 9 09:58:12 2012 (r3006) @@ -2489,7 +2489,6 @@ else ( ??? ) close-chain true ( ??? true ) then ( false | ??? true ) - device-end ( false | ??? true ) r> push-device )package ( false | ??? true ) ;

1 0

[commit] r3005 - in cpu/arm: mmp2 olpc
by repository service 09 Jun '12

09 Jun '12

Author: quozl Date: Sat Jun 9 05:53:59 2012 New Revision: 3005 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3005 Log: OLPC XO-1.75 - banner, calculate and display actual processor core frequency instead of only displaying what the processor fuses say. Modified: cpu/arm/mmp2/clocks.fth cpu/arm/olpc/banner.fth cpu/arm/olpc/build-fw.fth Modified: cpu/arm/mmp2/clocks.fth ============================================================================== --- cpu/arm/mmp2/clocks.fth Thu Jun 7 08:05:24 2012 (r3004) +++ cpu/arm/mmp2/clocks.fth Sat Jun 9 05:53:59 2012 (r3005) @@ -38,6 +38,11 @@ h# 4000 h# 1024 +mpmu io-set \ APMU_PLL2 in PMUM_CGR_PJ h# 4000 h# 24 +mpmu io-set \ APMU_PLL2 in PMUM_CGR_SP ; +: pll2-ungated? ( -- flag ) + h# 4000 h# 1024 +mpmu io@ and +; +: pll2-fbdiv ( -- N ) h# 34 mpmu@ d# 10 rshift h# 1ff and 2+ ; +: pll2-refdiv ( -- M ) h# 34 mpmu@ d# 19 rshift h# 1f and 2+ ; : fccr@ ( -- n ) h# 05.0008 io@ ; : fccr! ( n -- ) h# 05.0008 io! ; @@ -45,11 +50,18 @@ d# 29 lshift ( field ) fccr@ h# e000.0000 invert and or fccr! ( ) ; +: pj4-clksel@ ( -- n ) + fccr@ h# e000.0000 and d# 29 rshift +; + : sp-clksel ( n -- ) d# 26 lshift ( field ) fccr@ h# 1c00.0000 invert and or fccr! ( ) ; + : pj4-cc! ( n -- ) h# 28.2804 io! ; +: pj4-cc@ ( -- n ) h# 28.2804 io@ ; +: pj4-clkdiv ( -- n ) pj4-cc@ h# 7 and ; : sp-cc! ( n -- ) h# 28.2800 io! ; \ cfraaADXBpP @@ -77,3 +89,14 @@ : pj4-910mhz ( -- ) set-pll2-910mhz 2 pj4-clksel o# 21742201100 pj4-cc! ; \ A 266, D 400, XP 400, B 400, P 910 : pj4-988mhz ( -- ) set-pll2-988mhz 2 pj4-clksel o# 21742201100 pj4-cc! ; \ A 266, D 400, XP 400, B 400, P 988 [then] + +: pj4-speed ( -- frequency ) + pj4-clksel@ + case + 0 of d# 400,000,000 pj4-clkdiv 1+ / endof ( hz ) + 1 of d# 800,000,000 endof ( hz ) + 2 of d# 26,000,000 pll2-fbdiv pll2-refdiv */ endof ( hz ) + endcase + d# 1,000,000 / ( mhz ) +; +\ FIXME: should be a property clock-frequency of /cpu@0 Modified: cpu/arm/olpc/banner.fth ============================================================================== --- cpu/arm/olpc/banner.fth Thu Jun 7 08:05:24 2012 (r3004) +++ cpu/arm/olpc/banner.fth Sat Jun 9 05:53:59 2012 (r3005) @@ -119,12 +119,10 @@ ; : .cpu-speed ( -- ) - rated-speed case - 0 of ." 800 MHz" endof - 1 of ." 910 MHz" endof - ." 1 GHz" - endcase + pj4-speed + dup d# 988 = if ." 1 GHz" else .d ." MHz" then ; + : .memory-brief ( -- ) memory-size dup d# 1024 / ?dup if ( mb gb ) nip " GiB" rot ( gb$ gb ) Modified: cpu/arm/olpc/build-fw.fth ============================================================================== --- cpu/arm/olpc/build-fw.fth Thu Jun 7 08:05:24 2012 (r3004) +++ cpu/arm/olpc/build-fw.fth Sat Jun 9 05:53:59 2012 (r3005) @@ -567,6 +567,7 @@ then ; +fload ${BP}/cpu/arm/mmp2/clocks.fth fload ${BP}/cpu/arm/olpc/banner.fth \- olpc-cl3 devalias keyboard /ap-sp/keyboard @@ -966,8 +967,6 @@ \+ olpc-cl3 fload ${BP}/cpu/arm/olpc/3.0/testinstructions.fth \+ olpc-cl2 fload ${BP}/cpu/arm/olpc/1.75/testinstructions.fth -fload ${BP}/cpu/arm/mmp2/clocks.fth - : startup ( -- ) standalone? 0= if exit then

1 0

[commit] r3004 - dev/usb2/hcd/ehci
by repository service 07 Jun '12

07 Jun '12

Author: quozl Date: Thu Jun 7 08:05:24 2012 New Revision: 3004 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3004 Log: OLPC - probe all ports of the EHC during a test, regardless of whether they are in use. Remove fisheye test from default testing, because it is not used in manufacturing, and had been incorrectly used in the field to verify a port is working. No change to manufacturing tests. #11845. Modified: dev/usb2/hcd/ehci/probe.fth Modified: dev/usb2/hcd/ehci/probe.fth ============================================================================== --- dev/usb2/hcd/ehci/probe.fth Thu Jun 7 02:04:14 2012 (r3003) +++ dev/usb2/hcd/ehci/probe.fth Thu Jun 7 08:05:24 2012 (r3004) @@ -60,6 +60,7 @@ then ( #testable-ports ) ; +\ Port owned by usb 1.1 controller (2000) or device is present (1) : port-connected? ( port# -- flag ) portsc@ h# 2001 and ; : wait-connect ( port# -- error? ) begin ( port# ) @@ -153,29 +154,60 @@ open-count 0= if free-dma-buf unmap-regs then ; -: selftest ( -- error? ) - ehci-reg dup 0= if map-regs then +: .occupied ( port -- ) ." USB 2.0 port " u. ." in use" cr ; +: regs{ ( -- prev ) ehci-reg dup 0= if map-regs then ; +: }regs ( prev -- ) 0= if unmap-regs then ; +: fisheye ( -- ) + regs{ #testable-ports 0 ?do - i port-connected? if \ Port owned by usb 1.1 controller (2000) or device is present (1) - ." USB 2.0 port " i u. ." in use" cr + i port-connected? if + i .occupied else - diagnostic-mode? if - ." Please connect a device to USB port " i u. cr - i wait-connect if true unloop exit then - else - ." Fisheye pattern out to USB 2.0 port " i u. cr - i test-port-begin - d# 2,000 ms - i test-port-end - 0 i portsc! i reset-port i power-port - then + ." Fisheye pattern out to USB 2.0 port " i u. cr + i test-port-begin + d# 2,000 ms + i test-port-end + 0 i portsc! i reset-port i power-port + then + loop + }regs +; + +: thorough ( -- error? ) + #testable-ports 0 ?do + i port-connected? if + i .occupied + else + ." Please connect a device to USB port " i u. cr + i wait-connect if true unloop exit then + then + loop + false +; + +: sagacity ( -- error? ) + #testable-ports 0 ?do + ." USB port " i u. ." ... " + i port-connected? if + i wait-connect if true unloop exit then + else + ." Empty" cr then loop - 0= if unmap-regs then false ; +: selftest ( -- error? ) + regs{ ( prev ) + diagnostic-mode? if + thorough + else + sagacity + then ( prev error? ) + swap }regs ( error? ) +; + headers \ LICENSE_BEGIN

1 0

[commit] r3003 - cpu/arm/olpc
by repository service 07 Jun '12

07 Jun '12

Author: quozl Date: Thu Jun 7 02:04:14 2012 New Revision: 3003 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3003 Log: OLPC XO-1.75 - trim the null properly, #11848 Modified: cpu/arm/olpc/banner.fth Modified: cpu/arm/olpc/banner.fth ============================================================================== --- cpu/arm/olpc/banner.fth Thu Jun 7 01:49:48 2012 (r3002) +++ cpu/arm/olpc/banner.fth Thu Jun 7 02:04:14 2012 (r3003) @@ -135,7 +135,7 @@ ; : check-tags ( -- ) - " TS" find-tag ?-null if " SHIP" $= if exit then + " TS" find-tag if ?-null " SHIP" $= if exit then red-letters ." WARNING! TS tag is not SHIP" cr cancel

1 0

[commit] r3002 - cpu/arm/olpc
by repository service 06 Jun '12

06 Jun '12

Author: quozl Date: Thu Jun 7 01:49:48 2012 New Revision: 3002 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3002 Log: OLPC XO-1.75 - trim the null, #11848 Modified: cpu/arm/olpc/banner.fth Modified: cpu/arm/olpc/banner.fth ============================================================================== --- cpu/arm/olpc/banner.fth Thu Jun 7 01:38:42 2012 (r3001) +++ cpu/arm/olpc/banner.fth Thu Jun 7 01:49:48 2012 (r3002) @@ -135,7 +135,7 @@ ; : check-tags ( -- ) - " TS" find-tag if " SHIP" $= if exit then + " TS" find-tag ?-null if " SHIP" $= if exit then red-letters ." WARNING! TS tag is not SHIP" cr cancel

1 0

[commit] r3001 - cpu/arm/olpc/1.75
by repository service 06 Jun '12

06 Jun '12

Author: quozl Date: Thu Jun 7 01:38:42 2012 New Revision: 3001 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3001 Log: Q4D16 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 Wed Jun 6 12:03:10 2012 (r3000) +++ cpu/arm/olpc/1.75/fw-version.fth Thu Jun 7 01:38:42 2012 (r3001) @@ -1,4 +1,4 @@ \ The overall firmware revision macro: FW_PREFIX Q4 macro: FW_MAJOR D -macro: FW_MINOR 15 +macro: FW_MINOR 16

1 0

[commit] r3000 - cpu/arm/olpc
by repository service 06 Jun '12

06 Jun '12

Author: quozl Date: Wed Jun 6 12:03:10 2012 New Revision: 3000 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3000 Log: OLPC XO-1.75 - warn on boot if TS tag is not SHIP, for boards such as spares that do not pass through final testing at factory, #11848 Modified: cpu/arm/olpc/banner.fth Modified: cpu/arm/olpc/banner.fth ============================================================================== --- cpu/arm/olpc/banner.fth Mon Jun 4 10:53:17 2012 (r2999) +++ cpu/arm/olpc/banner.fth Wed Jun 6 12:03:10 2012 (r3000) @@ -134,12 +134,21 @@ .d type ." memory" ( ) ; +: check-tags ( -- ) + " TS" find-tag if " SHIP" $= if exit then + red-letters + ." WARNING! TS tag is not SHIP" cr + cancel + then +; + : (xbanner-basics) ( -- ) ?spaces cpu-model type ." , " .cpu-speed ." , " .memory-brief ." , " .storage ." , S/N " " SN" find-tag if type else ." Unknown" then cr ?spaces .rom ." " .ec ." " .clock check-internal-partitions + check-tags ; ' (xbanner-basics) to banner-basics

1 0

[commit] r2999 - cpu/x86/pc/olpc/via
by repository service 04 Jun '12

04 Jun '12

Author: quozl Date: Mon Jun 4 10:53:17 2012 New Revision: 2999 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2999 Log: OLPC - keep menu active and display results after all tests completed. #11847 Modified: cpu/x86/pc/olpc/via/mfgtest.fth Modified: cpu/x86/pc/olpc/via/mfgtest.fth ============================================================================== --- cpu/x86/pc/olpc/via/mfgtest.fth Sat Jun 2 12:02:39 2012 (r2998) +++ cpu/x86/pc/olpc/via/mfgtest.fth Mon Jun 4 10:53:17 2012 (r2999) @@ -49,7 +49,7 @@ again ; -: mfg-test-result ( error? -- ) +: mfg-test-result ( return-code true | false -- ) if ( return-code ) ?dup if ( return-code ) ??cr ." Selftest failed. Return code = " .d cr @@ -77,41 +77,26 @@ cursor-off scroller-off gui-alerts refresh flush-keyboard ; -: (mfg-test-dev) ( $ -- error? ) +: (mfg-test-dev) ( $ -- return-code true | false ) 2dup locate-device if ( $ ) ." Can't find device node " type cr exit ( -- ) else ( $ phandle ) drop ( $ ) then ( $ ) - " selftest" execute-device-method ( error? ) + " selftest" execute-device-method ( return-code true | false ) ; : mfg-test-dev ( $ -- ) scroller-on ??cr ." Testing " 2dup type cr ( $ ) - (mfg-test-dev) + (mfg-test-dev) ( return-code true | false ) mfg-test-result ; : gfx-test-dev ( $ -- ) - (mfg-test-dev) - scroller-on + (mfg-test-dev) ( return-code true | false ) + scroller-on ( return-code true | false ) mfg-test-result ; -: overall ( -- ) - restore-scroller-bg - clear-screen - overall-fail? if - ." Some tests failed." cr cr cr - red-screen - else - ." All automatic tests passed successfully." cr cr cr - green-screen - then - wait-return - cursor-off scroller-off gui-alerts refresh - flush-keyboard -; - 0 value #mfgtests 0 value #mfgcols 0 value #mfgrows @@ -158,8 +143,13 @@ run-menu-item stop? if unloop exit then loop - 0 3 rc>sq set-current-sq \ quit-item - overall + overall-fail? if + 0 1 \ play-item + else + 0 3 \ quit-item + then + set-default-selection + refresh ; false value quit? @@ -231,8 +221,7 @@ play-item stop? if menu-interact exit then quit? if exit then - 0 3 rc>sq set-current-sq \ quit-item - pause-to-interact + menu-interact ; : gamekey-auto-menu ( -- )

1 0

[commit] r2998 - cpu/x86/pc/olpc/via
by repository service 02 Jun '12

02 Jun '12

Author: quozl Date: Sat Jun 2 12:02:39 2012 New Revision: 2998 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2998 Log: OLPC - test menu, automatic tests; maintain an overall failure state and report it at the end, handle any escape request from the hold message, make the quit item the default afterwards, and provide the timed menu again. #11847. Modified: cpu/x86/pc/olpc/via/mfgtest.fth Modified: cpu/x86/pc/olpc/via/mfgtest.fth ============================================================================== --- cpu/x86/pc/olpc/via/mfgtest.fth Fri Jun 1 20:57:38 2012 (r2997) +++ cpu/x86/pc/olpc/via/mfgtest.fth Sat Jun 2 12:02:39 2012 (r2998) @@ -31,6 +31,8 @@ warning on 0 value pass? +0 value overall-fail? +0 value stop? : mfg-wait-return ( -- ) ." ... Press any key to proceed ... " @@ -52,7 +54,7 @@ ?dup if ( return-code ) ??cr ." Selftest failed. Return code = " .d cr mfg-color-red sq-border! - false to pass? + false to pass? true to overall-fail? red-screen flush-keyboard mfg-wait-return @@ -62,12 +64,12 @@ cancel mfg-color-green sq-border! true to pass? - d# 2000 hold-message drop + d# 2000 hold-message if true to stop? then then else ??cr ." Selftest failed due to abort" cr mfg-color-red sq-border! - false to pass? + false to pass? true to overall-fail? red-screen flush-keyboard mfg-wait-return @@ -95,11 +97,16 @@ mfg-test-result ; -: all-tests-passed ( -- ) +: overall ( -- ) restore-scroller-bg clear-screen - ." All automatic tests passed successfully." cr cr cr - green-screen + overall-fail? if + ." Some tests failed." cr cr cr + red-screen + else + ." All automatic tests passed successfully." cr cr cr + green-screen + then wait-return cursor-off scroller-off gui-alerts refresh flush-keyboard @@ -140,6 +147,8 @@ icon: quit.icon rom:quit.565 : play-item ( -- ) \ Interactive autorun of all tests + false to overall-fail? + false to stop? #mfgcols #mfgtests + #mfgcols ?do i set-current-sq refresh @@ -147,12 +156,14 @@ d# 10 ms key? if unloop unloop exit then loop run-menu-item - pass? 0= if unloop exit then + stop? if unloop exit then loop - all-tests-passed + 0 3 rc>sq set-current-sq \ quit-item + overall ; -: quit-item ( -- ) menu-done ; +false value quit? +: quit-item ( -- ) true to quit? menu-done ; : init-menu ( -- ) ?open-screen ?open-pointer @@ -196,8 +207,8 @@ restore-scroller-bg ; -: autorun-from-gamekey ( -- ) - default-selection set-current-sq refresh +: pause-to-interact + refresh (cr kill-line 0 d# 30 do i d# 10 mod 0= if (cr i d# 10 / .d then @@ -205,12 +216,25 @@ key? or if ( ) drop ( ) menu-interact ( ) + true to quit? unloop exit ( -- ) then ( ) d# 100 ms ( ) -1 +loop +; + +: autorun-from-gamekey ( -- ) + false to quit? + default-selection set-current-sq + pause-to-interact + quit? if exit then play-item + stop? if menu-interact exit then + quit? if exit then + 0 3 rc>sq set-current-sq \ quit-item + pause-to-interact ; + : gamekey-auto-menu ( -- ) ['] run-menu behavior >r ['] autorun-from-gamekey to run-menu \ Run menu automatically after a timeout

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware June 2012