openfirmware

openfirmware@openfirmware.info

3007 discussions

r1451 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 30 Oct '09

30 Oct '09

Author: wmb Date: 2009-10-30 09:02:23 +0100 (Fri, 30 Oct 2009) New Revision: 1451 Modified: cpu/x86/pc/olpc/via/versions.fth Log: Q3A15 Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2009-10-30 07:59:49 UTC (rev 1450) +++ cpu/x86/pc/olpc/via/versions.fth 2009-10-30 08:02:23 UTC (rev 1451) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 14 +macro: FW_MINOR 15 \ The EC microcode macro: EC_VERSION 1_9_14 @@ -10,7 +10,7 @@ \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary \ macro: GET_EC cp ~rsmith/olpc/ec/ec-code15/image/ecimage.bin ec.img -macro: GET_EC wget -q http://dev.laptop.org/pub/ec/ec_test.img -O ec.img +\ macro: GET_EC wget -q http://dev.laptop.org/pub/ec/ec_test.img -O ec.img macro: KEYS mpkeys \ macro: KEYS testkeys

1 0

r1450 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 30 Oct '09

30 Oct '09

Author: wmb Date: 2009-10-30 08:59:49 +0100 (Fri, 30 Oct 2009) New Revision: 1450 Modified: cpu/x86/pc/olpc/via/usb.fth Log: OLPC trac 9567 - Moved "usb-quiet" from "go-hook" to "linux-hook" to leave the USB devices active when booting other programs such as EMACS or (eventually) NANDblaster. Modified: cpu/x86/pc/olpc/via/usb.fth =================================================================== --- cpu/x86/pc/olpc/via/usb.fth 2009-10-30 07:52:42 UTC (rev 1449) +++ cpu/x86/pc/olpc/via/usb.fth 2009-10-30 07:59:49 UTC (rev 1450) @@ -92,13 +92,13 @@ ; : usb-quiet ( -- ) - [ ' go-hook behavior compile, ] \ Chain to old behavior + [ ' linux-hook behavior compile, ] \ Chain to old behavior " /usb@10,0" " reset-usb" execute-device-method drop " /usb@10,1" " reset-usb" execute-device-method drop " /usb@10,2" " reset-usb" execute-device-method drop " /usb@10,4" " reset-usb" execute-device-method drop ; -' usb-quiet to go-hook +' usb-quiet to linux-hook \ Turn on USB power after a delay, to ensure that USB devices are reset correctly on boot : usb-power-off ( -- ) h# 4c acpi-l@ h# 400 invert and h# 4c acpi-l! ;

1 0

r1449 - dev/usb2/device/storage
by svn＠openfirmware.info 30 Oct '09

30 Oct '09

Author: wmb Date: 2009-10-30 08:52:42 +0100 (Fri, 30 Oct 2009) New Revision: 1449 Modified: dev/usb2/device/storage/scsi.fth dev/usb2/device/storage/scsidisk.fth Log: OLPC trac 9423 - USB mass storage driver - Made csw timeouts retryable to work around a problem with a Kingston USB key. The problem could be in the hardware but I was unable to solve it and the retry seems to make the system work stably. Modified: dev/usb2/device/storage/scsi.fth =================================================================== --- dev/usb2/device/storage/scsi.fth 2009-10-30 07:46:16 UTC (rev 1448) +++ dev/usb2/device/storage/scsi.fth 2009-10-30 07:52:42 UTC (rev 1449) @@ -104,12 +104,14 @@ r> /cbw ( cbw-adr,len ) ; -: (get-csw) ( -- len usberr ) csw /csw bulk-in-pipe bulk-in ; +: (get-csw) ( -- len usberr ) csw /csw erase csw /csw bulk-in-pipe bulk-in ; : get-csw ( -- len usberr ) (get-csw) dup if 2drop (get-csw) then ; -d# 15,000 constant bulk-timeout +\ This used to be 15 seconds but I shortened it so timeouts can be +\ retried without having to wait too long. +d# 2,000 constant bulk-timeout : (execute-command) ( data-adr,len dir cbw-adr,len -- actual-len cswStatus ) debug? if @@ -136,7 +138,13 @@ rot drop ( actual csw-len csw-usberror ) - ?dup if nip exit then ( actual csw-len csw-usberror ) + ?dup if ( actual csw-len csw-usberror ) + nip ( actual csw-usberror ) + dup h# 10000000 = if ( actual csw-usberror ) + 2drop 0 2 ( 0 2 ) \ Convert timeout error to a retry + then ( actual usberror ) + exit + then ( actual csw-len csw-usberror ) drop ( actual ) debug? if Modified: dev/usb2/device/storage/scsidisk.fth =================================================================== --- dev/usb2/device/storage/scsidisk.fth 2009-10-30 07:46:16 UTC (rev 1448) +++ dev/usb2/device/storage/scsidisk.fth 2009-10-30 07:52:42 UTC (rev 1449) @@ -213,6 +213,8 @@ read-block-extent if false exit then ( block-size #blocks ) to #blocks to block-size + d# 2000 set-timeout + init-deblocker 0= if false exit then init-label-package 0= if

1 0

r1448 - dev/usb2/hcd/ehci
by svn＠openfirmware.info 30 Oct '09

30 Oct '09

Author: wmb Date: 2009-10-30 08:46:16 +0100 (Fri, 30 Oct 2009) New Revision: 1448 Modified: dev/usb2/hcd/ehci/control.fth dev/usb2/hcd/ehci/intr.fth Log: USB EHCI driver - minor factoring tweaks to make the code a little bit tidier. Modified: dev/usb2/hcd/ehci/control.fth =================================================================== --- dev/usb2/hcd/ehci/control.fth 2009-10-30 07:44:26 UTC (rev 1447) +++ dev/usb2/hcd/ehci/control.fth 2009-10-30 07:46:16 UTC (rev 1448) @@ -153,6 +153,18 @@ usb-error ( actual usberr ) ; +: run-control ( -- usberr ) + \ Start control transaction + my-qh pt-ctrl fill-qh + my-qh insert-qh + + \ Process results + my-qh done? 0= if my-qh error? drop then + + my-qh dup remove-qh free-qhqtds + usb-error +; + : (control-set) ( sbuf sphy slen buf phy len -- usberr ) process-control-args ( sbuf sphy slen ) 2 alloc-control-qhqtds ( sbuf sphy slen ) @@ -167,15 +179,7 @@ TD_TOGGLE_DATA1 TD_C_ERR3 or TD_PID_IN or TD_STAT_ACTIVE or swap >hcqtd-token le-l! ( ) - \ Start control transaction - my-qh pt-ctrl fill-qh - my-qh insert-qh - - \ Process results - my-qh done? 0= if my-qh error? drop then - - my-qh dup remove-qh free-qhqtds - usb-error + run-control ; : (control-set-nostat) ( sbuf sphy slen buf phy len -- usberr ) @@ -188,15 +192,7 @@ \ OUT TD TD_PID_OUT fill-control-io-qtds drop ( ) - \ Start control transaction - my-qh pt-ctrl fill-qh - my-qh insert-qh - - \ Process results - my-qh done? 0= if my-qh error? drop then - - my-qh dup remove-qh free-qhqtds - usb-error + run-control ( usberr ) ; headers Modified: dev/usb2/hcd/ehci/intr.fth =================================================================== --- dev/usb2/hcd/ehci/intr.fth 2009-10-30 07:44:26 UTC (rev 1447) +++ dev/usb2/hcd/ehci/intr.fth 2009-10-30 07:46:16 UTC (rev 1448) @@ -66,12 +66,11 @@ : intr-in? ( -- actual usberr ) intr-in-qh 0= if 0 USB_ERR_INV_OP exit then clear-usb-error - process-hc-status - intr-in-qh dup sync-qhqtds - qh-done? if + intr-in-qh qh-done? if intr-in-qh error? if 0 else + intr-in-qh dup sync-qhqtds intr-in-qtd dup intr-in-qh >qh-#qtds l@ get-actual over >qtd-buf rot >qtd-pbuf l@ 2 pick dma-sync then

1 0

r1447 - dev/usb2/hcd/ehci
by svn＠openfirmware.info 30 Oct '09

30 Oct '09

Author: wmb Date: 2009-10-30 08:44:26 +0100 (Fri, 30 Oct 2009) New Revision: 1447 Modified: dev/usb2/hcd/ehci/qhtd.fth Log: USB EHCI driver - fixed a latent problem in which the type bits were not being set in the next queue head pointer. Empirically, this wasn't causing any problems, but it does violate the spec. Modified: dev/usb2/hcd/ehci/qhtd.fth =================================================================== --- dev/usb2/hcd/ehci/qhtd.fth 2009-10-30 07:36:39 UTC (rev 1446) +++ dev/usb2/hcd/ehci/qhtd.fth 2009-10-30 07:44:26 UTC (rev 1447) @@ -382,7 +382,7 @@ qh-ptr >qh-next l@ r@ >qh-next l! qh-ptr >hcqh-next le-l@ r@ >hcqh-next le-l! r@ qh-ptr >qh-next l! - r@ >qh-phys l@ qh-ptr >hcqh-next le-l! + r@ >qh-phys l@ TYP_QH or qh-ptr >hcqh-next le-l! r> sync-qhqtds qh-ptr sync-qh @@ -538,22 +538,25 @@ or ( done?' ) ; -: qh-done? ( qh -- done? ) >hcqh-overlay qtd-done? ; +: qh-done? ( qh -- done? ) + process-hc-status ( qh ) + dup sync-qh ( qh ) + >hcqh-overlay qtd-done? ( done? ) +; : done? ( qh -- usberr ) begin - process-hc-status ( qh ) - dup sync-qh ( qh ) dup qh-done? ?dup 0= if ( qh ) 1 ms dup >qh-timeout ( qh timeout-adr ) dup l@ 1- ( qh timeout-adr timeout' ) dup rot l! ( qh timeout' ) - 0= - then - until + 0= ( qh timed-out? ) + dup if " Timeout" USB_ERR_TIMEOUT set-usb-error noop then ( qh timed-out? ) + then ( qh exit-loop? ) + until ( qh ) + drop ( ) - ( qh ) qh-done? 0= if " Timeout" USB_ERR_TIMEOUT set-usb-error then usb-error ;

1 0

r1446 - dev/olpc/kb3700
by svn＠openfirmware.info 30 Oct '09

30 Oct '09

Author: wmb Date: 2009-10-30 08:36:39 +0100 (Fri, 30 Oct 2009) New Revision: 1446 Modified: dev/olpc/kb3700/ecio.fth Log: Added new "no-kbc-reboot" command for EC in support of OLPC trac 9564. It takes advantage of a new EC feature that lets you turn the EC back on without a CPU reboot after shutting it off for the purpose of reprogramming the SPI FLASH. This should only be used for the manufacturing data area, because you want to reboot after reprogramming the CPU firmware. Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2009-10-29 02:18:53 UTC (rev 1445) +++ dev/olpc/kb3700/ecio.fth 2009-10-30 07:36:39 UTC (rev 1446) @@ -288,6 +288,8 @@ true to kbc-off? ; +: no-kbc-reboot ( -- ) 7 h# ff01 ec! ; + : io-spi@ ( reg# -- b ) h# fea8 + ec@ ; : io-spi! ( b reg# -- ) h# fea8 + ec! ;

1 0

r1445 - cpu/x86/pc/olpc
by svn＠openfirmware.info 29 Oct '09

29 Oct '09

Author: rsmith Date: 2009-10-29 03:18:53 +0100 (Thu, 29 Oct 2009) New Revision: 1445 Modified: cpu/x86/pc/olpc/gamekeys.fth Log: OLPC: Gamekey/pad display command 'check-keys' - Same display as what happens when you hold a key on boot but can be run from the ok prompt. Modified: cpu/x86/pc/olpc/gamekeys.fth =================================================================== --- cpu/x86/pc/olpc/gamekeys.fth 2009-10-28 23:56:45 UTC (rev 1444) +++ cpu/x86/pc/olpc/gamekeys.fth 2009-10-29 02:18:53 UTC (rev 1445) @@ -62,3 +62,15 @@ ' (hold-message) to hold-message : bypass-bios-boot? ( -- flag ) button-square game-key? ; + +: check-keys + clear-screen + ." Press a key to exit" + cursor-off + begin + 0 to game-key-mask + d# 100 ms key? game-key@ update-game-keys ( key? ) + until + 0 7 at-xy + cursor-on +;

1 0

r1444 - dev/mmc/sdhci
by svn＠openfirmware.info 28 Oct '09

28 Oct '09

Author: wmb Date: 2009-10-29 00:56:45 +0100 (Thu, 29 Oct 2009) New Revision: 1444 Modified: dev/mmc/sdhci/sdhcixo.bth dev/mmc/sdhci/sdmmc.fth dev/mmc/sdhci/selftest.fth Log: OLPC trac 9546 - clarify SDMMC selftest messages for the case where no card is in the slot. Modified: dev/mmc/sdhci/sdhcixo.bth =================================================================== --- dev/mmc/sdhci/sdhcixo.bth 2009-10-28 23:32:13 UTC (rev 1443) +++ dev/mmc/sdhci/sdhcixo.bth 2009-10-28 23:56:45 UTC (rev 1444) @@ -27,11 +27,13 @@ new-device 1 encode-int " reg" property " sdmmc" " $load-driver" eval drop + " internal" " slot-name" string-property finish-device new-device 2 encode-int " reg" property " sdmmc" " $load-driver" eval drop + " external" " slot-name" string-property finish-device new-device Modified: dev/mmc/sdhci/sdmmc.fth =================================================================== --- dev/mmc/sdhci/sdmmc.fth 2009-10-28 23:32:13 UTC (rev 1443) +++ dev/mmc/sdhci/sdmmc.fth 2009-10-28 23:56:45 UTC (rev 1444) @@ -44,8 +44,9 @@ : dma-alloc ( size -- vadr ) " dma-alloc" $call-parent ; : dma-free ( vadr size -- ) " dma-free" $call-parent ; +: set-unit ( -- ) 0 my-unit " set-address" $call-parent ; : open ( -- ) - 0 my-unit " set-address" $call-parent + set-unit " attach-card" $call-parent 0= if false exit then " " " deblocker" $open-package ?dup if Modified: dev/mmc/sdhci/selftest.fth =================================================================== --- dev/mmc/sdhci/selftest.fth 2009-10-28 23:32:13 UTC (rev 1443) +++ dev/mmc/sdhci/selftest.fth 2009-10-28 23:56:45 UTC (rev 1444) @@ -36,6 +36,15 @@ ; external : selftest ( -- error? ) + set-unit + " card-inserted?" $call-parent 0= if + ." No card in " + " slot-name" get-my-property 0= if + decode-string type space + then + ." SD slot" cr + true exit + then open 0= if ." Open sdmmc failed" cr true exit then alloc-test-bufs ['] (selftest) catch if true then

1 0

r1443 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 28 Oct '09

28 Oct '09

Author: wmb Date: 2009-10-29 00:32:13 +0100 (Thu, 29 Oct 2009) New Revision: 1443 Modified: cpu/x86/pc/olpc/via/suspend.fth Log: OLPC trac 9521 - close audio device before suspending to prevent crashes after resume when someone presses a louder or softer button. Modified: cpu/x86/pc/olpc/via/suspend.fth =================================================================== --- cpu/x86/pc/olpc/via/suspend.fth 2009-10-28 23:19:25 UTC (rev 1442) +++ cpu/x86/pc/olpc/via/suspend.fth 2009-10-28 23:32:13 UTC (rev 1443) @@ -40,6 +40,7 @@ again ; : s3-suspend + audio-ih if audio-ih close-dev 0 to audio-ih then " video-save" screen-ih $call-method \ Freeze display s3 " video-restore" screen-ih $call-method \ Unfreeze display

1 0

r1442 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 28 Oct '09

28 Oct '09

Author: wmb Date: 2009-10-29 00:19:25 +0100 (Thu, 29 Oct 2009) New Revision: 1442 Modified: cpu/x86/pc/olpc/via/fw.bth cpu/x86/pc/olpc/via/ioinit.fth cpu/x86/pc/olpc/via/romreset.bth cpu/x86/pc/olpc/via/usb.fth Log: OLPC trac 9423 - lengthen USB power off time during a reboot, thus giving the power rail time to discharge enough to reset attached devices. Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-10-28 21:51:49 UTC (rev 1441) +++ cpu/x86/pc/olpc/via/fw.bth 2009-10-28 23:19:25 UTC (rev 1442) @@ -268,6 +268,13 @@ protect-fw ." Interacting" cr hex interact then + \ This is a good place to turn on USB power. It is about 2 seconds after + \ early startup, giving the USB power rail time to discharge and stay + \ off long enough to reset attached devices. The total "off" time is + \ about 2.6 seconds - part of that is EC time - but the rail droops + \ slowly depending on what is plugged in. It droops hardly at all + \ with nothing plugged in. + usb-power-on then ; warning ! Modified: cpu/x86/pc/olpc/via/ioinit.fth =================================================================== --- cpu/x86/pc/olpc/via/ioinit.fth 2009-10-28 21:51:49 UTC (rev 1441) +++ cpu/x86/pc/olpc/via/ioinit.fth 2009-10-28 23:19:25 UTC (rev 1442) @@ -207,6 +207,15 @@ 64 05 05 mreg \ Bump NULL-SOF valid time to 8 micro frames (04), Inhibit C4 state on USB 1.1 ISO activity (01) end-table +[ifdef] xo-board + \ On a boot we turn off USB power to ensure that USB devices are reset + \ properly after a reboot. A "stand-init" routine in via/usb.fth turns + \ it back on, after the implicit delay of uncompressing OFW and other + \ startup activities. We must do this before selecting GPO10 below, else + \ the enable will start to float high before we can turn it off. + acpi-io-base h# 4c + port-rl h# 400 bitclr ax dx out \ Turn off USB power +[then] + d# 17 0 devfunc \ Bus control and power management 40 44 44 mreg \ Enable I/O Recovery time (40), Enable ports 4d0/4d1 for edge/level setting (04) [ifdef] xo-board @@ -404,6 +413,5 @@ \ acpi-io-base h# 26 + port-rb h# 07 bitset al dx out \ Settings to support C4 state acpi-io-base h# 26 + port-rb h# 06 bitset al dx out \ Settings to support C3 state -acpi-io-base h# 4c + port-rl h# 400 bitset ax dx out \ Set USB power high 3 # io-apic-mmio-base #) byte mov 1 # io-apic-mmio-base h# 10 + #) mov \ IO-APIC FSB delivery type Modified: cpu/x86/pc/olpc/via/romreset.bth =================================================================== --- cpu/x86/pc/olpc/via/romreset.bth 2009-10-28 21:51:49 UTC (rev 1441) +++ cpu/x86/pc/olpc/via/romreset.bth 2009-10-28 23:19:25 UTC (rev 1442) @@ -230,6 +230,8 @@ fload ${BP}/cpu/x86/pc/olpc/via/startgfxrestore.fth \ Display restoration + acpi-io-base h# 4c + port-rl h# 400 bitset ax dx out \ Set USB power high + cli facs-adr h# 18 + #) ax mov ax ax or 0<> if \ X_Firmware_Waking_Vector Modified: cpu/x86/pc/olpc/via/usb.fth =================================================================== --- cpu/x86/pc/olpc/via/usb.fth 2009-10-28 21:51:49 UTC (rev 1441) +++ cpu/x86/pc/olpc/via/usb.fth 2009-10-28 23:19:25 UTC (rev 1442) @@ -100,6 +100,11 @@ ; ' usb-quiet to go-hook +\ Turn on USB power after a delay, to ensure that USB devices are reset correctly on boot +: usb-power-off ( -- ) h# 4c acpi-l@ h# 400 invert and h# 4c acpi-l! ; +: usb-power-on ( -- ) h# 4c acpi-l@ h# 400 or h# 4c acpi-l! ; +: usb-power-cycle ( -- ) usb-power-off d# 1000 ms usb-power-on ; + \ LICENSE_BEGIN \ Copyright (c) 2007 FirmWorks \

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware