August 2011 - openfirmware - mail.coreboot.org

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

Aug. 9, 2011

Author: wmb Date: Wed Aug 10 01:13:17 2011 New Revision: 2455 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2455 Log: Alex - fit and finish improvements to diagnostics. Modified: cpu/x86/pc/alex/devices.fth cpu/x86/pc/alex/fw.bth cpu/x86/pc/alex/mfgtest.fth cpu/x86/pc/alex/probemem.fth cpu/x86/pc/alex/spiui.fth Modified: cpu/x86/pc/alex/devices.fth ============================================================================== --- cpu/x86/pc/alex/devices.fth Wed Aug 10 00:58:17 2011 (r2454) +++ cpu/x86/pc/alex/devices.fth Wed Aug 10 01:13:17 2011 (r2455) @@ -112,6 +112,7 @@ fload ${BP}/cpu/x86/pc/cpunode.fth fload ${BP}/cpu/x86/k6cputest.fth \ Burnin test for K6 CPU +dev /cpu 1 to default#passes dend fload ${BP}/ofw/core/countdwn.fth \ Startup countdown fload ${BP}/forth/lib/pattern.fth \ Text string pattern matching @@ -124,6 +125,7 @@ fload ${BP}/dev/intel/graphics/pineview.fth alias /scanline bytes/line fload ${BP}/dev/video/common/rectangle16.fth + alias color! 4drop end-package devalias screen /pci/display@2,0 \ Explicit, because it's not probed @@ -181,6 +183,7 @@ fload ${BP}/cpu/x86/pc/alex/spiui.fth \ User interface for SPI FLASH programming : urom ( -- ) " flash! u:\alex.rom" evaluate ; +: netrom ( -- ) " flash! http:\\10.20.0.105\alex.rom" evaluate ; \ LICENSE_BEGIN \ Copyright (c) 2011 FirmWorks Modified: cpu/x86/pc/alex/fw.bth ============================================================================== --- cpu/x86/pc/alex/fw.bth Wed Aug 10 00:58:17 2011 (r2454) +++ cpu/x86/pc/alex/fw.bth Wed Aug 10 01:13:17 2011 (r2455) @@ -61,7 +61,7 @@ dev / 1 encode-int " #address-cells" property 1 encode-int " #size-cells" property -" Generic PC" model +" Samsung Alex Chromebook" model " PC" encode-string " architecture" property \ XXX figure out bus frequency. How? @@ -81,6 +81,7 @@ fload ${BP}/ofw/core/allocmor.fth \ Secondary allocator fload ${BP}/cpu/x86/pc/rootnode.fth \ Platform-specific root node changes +dev / " Samsung Alex Chromebook" " banner-name" string-property dend fload ${BP}/cpu/x86/pc/isaio.fth fload ${BP}/dev/pci/configm1.fth \ Generic PCI configuration access @@ -259,8 +260,6 @@ : startup ( -- ) standalone? 0= if exit then - ." calibrate-ms" cr - calibrate-ms ." nvramrc" cr use-nvramrc? if nvramrc safe-evaluate then @@ -277,20 +276,16 @@ warning on only forth also definitions - ." Installing alarms" cr install-alarm #line off - ." Open Firmware demonstration version by FirmWorks (info(a)firmworks.com)" cr + ." Open Firmware demonstration version by FirmWorks" cr -[ifdef] linux-support ." See " - blue-letters ." http://www.firmworks.com/linux/demo.html" black-letters + blue-letters ." http://wiki.laptop.org/go/Forth_Lessons" black-letters cr cr - ." Type 'help-linux' to learn about Linux loading options" cr -[then] quit ; Modified: cpu/x86/pc/alex/mfgtest.fth ============================================================================== --- cpu/x86/pc/alex/mfgtest.fth Wed Aug 10 00:58:17 2011 (r2454) +++ cpu/x86/pc/alex/mfgtest.fth Wed Aug 10 01:13:17 2011 (r2455) @@ -46,23 +46,14 @@ : dummy-test-dev ( $ -- ) clear-n-restore-scroller - ??cr ." Testing " type ." in the future" cr + ??cr ." Testing " type ." - to be implemented" cr mfg-color-green sq-border! d# 2000 hold-message cursor-off gui-alerts refresh flush-keyboard ; -: mfg-test-dev ( $ -- ) - clear-n-restore-scroller - ??cr ." Testing " 2dup type cr - locate-device if - ." Can't find device node" cr - flush-keyboard - mfg-wait-return - exit - then ( phandle ) - " selftest" rot execute-phandle-method ( return abort? ) +: mfg-test-result ( return abort? -- ) if ?dup if ??cr ." Selftest failed. Return code = " .d cr @@ -90,6 +81,32 @@ cursor-off gui-alerts refresh flush-keyboard ; +: mfg-test-dev ( $ -- ) + clear-n-restore-scroller + ??cr ." Testing " 2dup type cr + locate-device if + ." Can't find device node" cr + flush-keyboard + mfg-wait-return + exit + then ( phandle ) + " selftest" rot execute-phandle-method ( return abort? ) + mfg-test-result +; +: mfg-test-disk ( name$ -- ) + clear-n-restore-scroller + ??cr ." Testing " 2dup type cr + + ['] $.partitions catch if + 2drop false + else + 0 true + then + + d# 2000 ms \ More time to inspect + + mfg-test-result +; : draw-error-border ( -- ) mfg-color-red d# 20 d# 20 d# 1160 d# 820 d# 20 box @@ -164,15 +181,16 @@ pass? 0= if unloop exit then loop all-tests-passed -; +; + : quit-item ( -- ) menu-done ; : cpu-item ( -- ) " /cpu" mfg-test-dev ; : battery-item ( -- ) " /battery" dummy-test-dev ; -: spiflash-item ( -- ) " /flash" dummy-test-dev ; +: spiflash-item ( -- ) " /flash" mfg-test-dev ; : memory-item ( -- ) " /memory" mfg-test-dev ; : usb-item ( -- ) " /usb" mfg-test-dev ; -: int-sd-item ( -- ) " disk:0" dummy-test-dev ; -: ext-sd-item ( -- ) " ext:0" mfg-test-dev ; +: int-sd-item ( -- ) " disk" mfg-test-disk ; +\ : ext-sd-item ( -- ) " ext:0" mfg-test-dev ; : rtc-item ( -- ) " /rtc" mfg-test-dev ; : display-item ( -- ) " screen" mfg-test-dev ; : audio-item ( -- ) " /audio" dummy-test-dev ; Modified: cpu/x86/pc/alex/probemem.fth ============================================================================== --- cpu/x86/pc/alex/probemem.fth Wed Aug 10 00:58:17 2011 (r2454) +++ cpu/x86/pc/alex/probemem.fth Wed Aug 10 01:13:17 2011 (r2455) @@ -15,10 +15,8 @@ \ for use as DMA memory. mem-info-pa 2 la+ l@ h# a.0000 release-range \ Below DOS hole - fw-pa h# 10.0000 u> if - h# 10.0000 fw-pa over - release - fw-pa /fw-ram + heap-base heap-size + umax /ram release - then + h# 10.0000 fw-pa release-range + fw-pa /fw-ram + heap-base heap-size + umax usable-ramtop release-range ; [ifndef] 8u.h Modified: cpu/x86/pc/alex/spiui.fth ============================================================================== --- cpu/x86/pc/alex/spiui.fth Wed Aug 10 00:58:17 2011 (r2454) +++ cpu/x86/pc/alex/spiui.fth Wed Aug 10 01:13:17 2011 (r2455) @@ -149,6 +149,8 @@ dev /flash : selftest ( -- error? ) .cbfs + d# 2000 ms \ More time to inspect + false ; device-end

1 0

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

Aug. 9, 2011

Author: wmb Date: Wed Aug 10 00:58:17 2011 New Revision: 2454 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2454 Log: x86 timestamp counter calibration loop needs a slightly longer sensing window to prevent miscalibration. Modified: cpu/x86/pc/tsccal1.fth Modified: cpu/x86/pc/tsccal1.fth ============================================================================== --- cpu/x86/pc/tsccal1.fth Wed Aug 10 00:42:06 2011 (r2453) +++ cpu/x86/pc/tsccal1.fth Wed Aug 10 00:58:17 2011 (r2454) @@ -24,7 +24,12 @@ al ah mov h# 40 # al in al ah xchg - d# 5 # ax cmp + \ The number 10 below gives a sufficient window to ensure that a count + \ value in the range from 0 to 9 is seen. The process of latching the + \ timer and reading the value is time-consuming because I/O port access + \ is slow, comparable to the clock that drives the ticker. For many + \ systems, a value of 5 is enough, but I have seen systems that need 8. + d# 10 # ax cmp < until h# f c, h# 31 c, \ Get time-stamp counter value into DX,AX

1 0

[commit] r2453 - in dev/usb2/device: . webcam
by repository service Aug. 9, 2011

Aug. 9, 2011

Author: lwalter Date: Wed Aug 10 00:42:06 2011 New Revision: 2453 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2453 Log: Automate video settings based on VC and VS descriptors Modified: dev/usb2/device/common.fth dev/usb2/device/webcam/desc.fth dev/usb2/device/webcam/webcam.fth Modified: dev/usb2/device/common.fth ============================================================================== --- dev/usb2/device/common.fth Tue Aug 9 20:41:09 2011 (r2452) +++ dev/usb2/device/common.fth Wed Aug 10 00:42:06 2011 (r2453) @@ -53,6 +53,8 @@ " iso-out-pipe" get-int-property to iso-out-pipe " iso-in-size" get-int-property to /iso-in-pipe " iso-out-size" get-int-property to /iso-out-pipe + " iso-in-interval" get-int-property to iso-in-interval + " iso-out-interval" get-int-property to iso-out-interval " intr-in-pipe" get-int-property to intr-in-pipe " intr-out-pipe" get-int-property to intr-out-pipe " intr-in-size" get-int-property to /intr-in-pipe Modified: dev/usb2/device/webcam/desc.fth ============================================================================== --- dev/usb2/device/webcam/desc.fth Tue Aug 9 20:41:09 2011 (r2452) +++ dev/usb2/device/webcam/desc.fth Wed Aug 10 00:42:06 2011 (r2453) @@ -23,14 +23,14 @@ d# 32 constant MAX_FRAME_DESC \ Maximum number of frame descriptors/format 0 value #fdesc \ Number of uncompressed frame descriptors 0 value #alt \ Number of alternate interface descriptors -MAX_FRAME_DESC /n* 2* buffer: farray \ Array of width and height per frame -MAX_ALT_DESC /n* buffer: iarray \ Array of /payload per alternate interface +MAX_FRAME_DESC /n* 2* buffer: frame-array \ Array of width and height per frame +MAX_ALT_DESC /n* buffer: alt-array \ Array of /payload per alternate interface : #fdesc! ( idx -- ) #fdesc max to #fdesc ; : #alt! ( idx -- ) #alt max to #alt ; -: alt-array! ( l idx -- ) /n* iarray + ! ; -: alt-array@ ( idx -- l ) /n* iarray + @ ; -: frame-array! ( w h idx -- ) /n* 2* farray + tuck na1+ ! ! ; +: alt-array! ( l idx -- ) /n* alt-array + ! ; +: alt-array@ ( idx -- l ) /n* alt-array + @ ; +: frame-array! ( w h idx -- ) /n* 2* frame-array + tuck na1+ ! ! ; : frame-array@ ( idx -- width height ) /n* 2* frame-array + dup @ swap na1+ @ ; : process-vc ( idx -- ) @@ -40,7 +40,7 @@ ; : process-vs-desc ( adr -- adr' ) - farray MAX_FRAME_DESC /n* 2* erase + frame-array MAX_FRAME_DESC /n* 2* erase begin dup desc-buf-end <> while ( adr ) dup 1+ c@ h# 24 <> if exit then \ CS_INTERFACE dup 2 + c@ case @@ -59,24 +59,24 @@ ; : process-alt-desc ( idx adr -- ) - iarray MAX_ALT_DESC /n* erase ( idx adr ) + alt-array MAX_ALT_DESC /n* erase ( idx adr ) begin dup desc-buf-end <> while ( idx adr ) dup 1+ c@ 4 = if ( idx adr ) 2dup 2 + c@ = if \ Alternate INTERFACE descriptor dup 3 + c@ dup #alt! ( idx adr alt ) - swap c@ + ( idx alt adr' ) + swap dup c@ + ( idx alt adr' ) dup 1+ c@ 5 = if \ Endpoint descriptor tuck 4 + le-w@ swap alt-array! ( idx adr ) dup 3 + c@ 1 and 0= if abort" Expect isochronous endpoint" then dup 2 + c@ h# f and ( idx adr pipe ) - dup 6 + c@ ( idx adr pipe interval ) + over 6 + c@ ( idx adr pipe interval ) 2 pick 2 + c@ h# 80 and if to iso-in-interval to iso-in-pipe else to iso-out-interval to iso-out-pipe then then then then dup c@ + - repeat drop + repeat 2drop ; : process-vs ( idx -- ) Modified: dev/usb2/device/webcam/webcam.fth ============================================================================== --- dev/usb2/device/webcam/webcam.fth Tue Aug 9 20:41:09 2011 (r2452) +++ dev/usb2/device/webcam/webcam.fth Wed Aug 10 00:42:06 2011 (r2453) @@ -49,31 +49,12 @@ then ; -create samsung-frame-array - 0 , 0 , \ width height - h# 280 , h# 1e0 , - h# a0 , h# 78 , - h# b0 , h# 90 , - h# 140 , h# f0 , - h# 160 , h# 120 , - h# 320 , h# 258 , - h# 500 , h# 2d0 , - 0 value hint 5 value frame-idx h# 160 value width h# 120 value height width height * 2* value /frame \ 16-bit per pixel -create samsung-alt-array - 0 , h# c0 , h# 180 , h# 200 , - h# 280 , h# 320 , h# 3b0 , h# a80 , - h# b20 , h# be0 , h# 1380 , h# 13fc , - -['] samsung-frame-array to frame-array \ Comment these 2 lines to use -['] samsung-alt-array to alt-array \ descriptor info - -\ Make sure the alt interface's endpoint and maxpayload matches d# 5 value alt-interface h# 320 value /payload d# 256 value #payload @@ -82,13 +63,13 @@ external : set-frame ( idx -- ) dup to frame-idx - /n * 2* frame-array + dup @ to width na1+ @ to height - width height * 2* to /frame + frame-array@ 2dup to height to width + * bytes/pixel * to /frame ; : set-alt ( idx -- ) dup to alt-interface - alt-array swap na+ @ dup to /payload + alt-array@ dup to /payload dup h# 7ff and swap d# 11 >> 1+ * to /xlen ; @@ -108,8 +89,6 @@ : init-stream \ Make sure the alt interface's endpoint and maxpayload matches - 1 to iso-in-pipe \ Remove when init is properly done - 1 to iso-in-interval \ Remove when init is properly done /payload iso-in-pipe set-pipe-maxpayload #payload iso-in-pipe iso-in-interval init-iso-in vs-interface alt-interface set-interface if abort" Failed to set alternate interface" then @@ -118,34 +97,34 @@ ; headers -\ Algorithm for selecting a particular alternate interface and the corresponding -\ uncompressed resolution: +\ Algorithm for selecting a particular alternate interface and +\ the corresponding uncompressed resolution: \ -\ Empirically, when the webcam sends a video line of data out at a time, -\ ofw can process the video data reasonably well. +\ Empirically, when the webcam sends a video line of data out at +\ a time, ofw can process the video data reasonably well. \ -\ Thus, choose the largest payload bandwidth without employing MULT. -\ Then, choose a best match video resolution. +\ Thus, choose a video highest resolution that satisfy: +\ width*byte/pixel+c < h# 400 +\ Then, choose a best match alternate interface +h# 400 constant MAX_PAYLOAD 0 value twidth 0 value tidx : select-alt ( -- idx ) 0 to tidx - 0 to twidth - #alt 1 do - i alt-array@ dup h# f800 and if - drop - else - dup twidth > if to twidth i to tidx else drop then - then + MAX_PAYLOAD to twidth + #alt 1+ 1 do + i alt-array@ dup h# 7ff and swap d# 11 >> 1+ * + dup width bytes/pixel * h# c + twidth between + if to twidth i to tidx else drop then loop tidx ; : select-frame ( -- idx ) 0 to twidth 0 to tidx - #fdesc 1 do + #fdesc 1+ 1 do i frame-array@ drop - dup bytes/pixel * h# c + /xlen <= if + dup bytes/pixel * h# c + MAX_PAYLOAD < if dup twidth > if to twidth i to tidx else drop then else drop @@ -154,11 +133,15 @@ ; : set-params ( -- ) - ['] farray to frame-array - ['] iarray to alt-array - - select-alt set-alt select-frame set-frame + select-alt set-alt +; + +: int-property ( n name$ -- ) rot encode-int 2swap property ; +: make-properties ( -- ) + iso-in-pipe " iso-in-pipe" int-property + iso-in-interval " iso-in-interval" int-property + /payload " iso-in-size" int-property ; : get-next-payload ( -- len ) @@ -235,8 +218,9 @@ : init ( -- ) init device set-target - ( init-params ) - ( set-params ) + init-params + set-params + make-properties ; 0 value selftest-adr

1 0

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

Aug. 9, 2011

Author: lwalter Date: Tue Aug 9 20:41:09 2011 New Revision: 2452 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2452 Log: Add mfgtest support Modified: cpu/x86/pc/alex/devices.fth Modified: cpu/x86/pc/alex/devices.fth ============================================================================== --- cpu/x86/pc/alex/devices.fth Tue Aug 9 20:33:10 2011 (r2451) +++ cpu/x86/pc/alex/devices.fth Tue Aug 9 20:41:09 2011 (r2452) @@ -79,6 +79,7 @@ fload ${BP}/cpu/x86/forthint.fth \ Low-level interrupt handling code fload ${BP}/dev/isa/irq.fth \ ISA interrupt dispatcher 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 [ifdef] resident-packages support-package: 16550 @@ -110,6 +111,7 @@ ; fload ${BP}/cpu/x86/pc/cpunode.fth +fload ${BP}/cpu/x86/k6cputest.fth \ Burnin test for K6 CPU fload ${BP}/ofw/core/countdwn.fth \ Startup countdown fload ${BP}/forth/lib/pattern.fth \ Text string pattern matching @@ -120,6 +122,8 @@ 0 0 " 2,0" " /pci" begin-package " display" name fload ${BP}/dev/intel/graphics/pineview.fth + alias /scanline bytes/line + fload ${BP}/dev/video/common/rectangle16.fth end-package devalias screen /pci/display@2,0 \ Explicit, because it's not probed

1 0

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

Aug. 9, 2011

Author: wmb Date: Tue Aug 9 20:33:10 2011 New Revision: 2451 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2451 Log: Alex - enabled timestamp counter and related timing words. Modified: cpu/x86/pc/alex/config.fth cpu/x86/pc/alex/devices.fth cpu/x86/pc/alex/fw.bth Modified: cpu/x86/pc/alex/config.fth ============================================================================== --- cpu/x86/pc/alex/config.fth Tue Aug 9 20:32:13 2011 (r2450) +++ cpu/x86/pc/alex/config.fth Tue Aug 9 20:33:10 2011 (r2451) @@ -7,6 +7,9 @@ create coreboot-qemu create debug-startup +create use-timestamp-counter +create use-tsc-timing + create serial-console \ In virtual mode, OFW runs with the MMU on. The advantages are Modified: cpu/x86/pc/alex/devices.fth ============================================================================== --- cpu/x86/pc/alex/devices.fth Tue Aug 9 20:32:13 2011 (r2450) +++ cpu/x86/pc/alex/devices.fth Tue Aug 9 20:33:10 2011 (r2451) @@ -16,19 +16,13 @@ fload ${BP}/dev/pciprobe.fth \ Generic PCI probing -[ifdef] use-timestamp-counter -\ Use the CPU chip's Time Stamp Counter for timing; it does just what we want +\ Use the CPU chip's Time Stamp Counter for timing fload ${BP}/cpu/x86/tsc.fth -[then] 0 0 " " " /" begin-package fload ${BP}/cpu/x86/pc/isabus.fth \ ISA Bus Bridge under root node end-package -[ifndef] use-timestamp-counter -fload ${BP}/cpu/x86/pc/getms.fth -[then] - dev /interrupt-controller h# 20 to vector-base0 h# 28 to vector-base1 @@ -95,9 +89,7 @@ fload ${BP}/dev/pci/isaall.fth devalias mouse /isa/8042/mouse -[ifdef] use-timestamp-counter fload ${BP}/cpu/x86/pc/tsccal1.fth -[then] 0 0 hex mem-uart-base (u.) " /" begin-package 4 encode-int 0 encode-int encode+ " interrupts" property Modified: cpu/x86/pc/alex/fw.bth ============================================================================== --- cpu/x86/pc/alex/fw.bth Tue Aug 9 20:32:13 2011 (r2450) +++ cpu/x86/pc/alex/fw.bth Tue Aug 9 20:33:10 2011 (r2451) @@ -177,9 +177,6 @@ fload ${BP}/ofw/inet/http.fth \ HTTP client end-support-package -[ifndef] use-timestamp-counter -fload ${BP}/cpu/x86/pc/mscal.fth -[then] fload ${BP}/cpu/x86/pc/boot.fth fload ${BP}/cpu/x86/pc/linux.fth

1 0

[commit] r2450 - in dev/usb2/device/webcam: . build
by repository service Aug. 9, 2011

Aug. 9, 2011

Author: lwalter Date: Tue Aug 9 20:32:13 2011 New Revision: 2450 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2450 Log: USB webcam driver Added: dev/usb2/device/webcam/ dev/usb2/device/webcam/build/ dev/usb2/device/webcam/desc.fth dev/usb2/device/webcam/webcam.bth dev/usb2/device/webcam/webcam.fth Added: dev/usb2/device/webcam/desc.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/usb2/device/webcam/desc.fth Tue Aug 9 20:32:13 2011 (r2450) @@ -0,0 +1,126 @@ +purpose: USB video class descriptors parsing code +\ See license at end of file + +hex +headers + +1 value vs-interface \ Interface id of VS_VIDEO_STREAMING + +0 value desc-buf +0 value desc-buf-end +h# 800 value /desc-buf + +defer alt-array +defer frame-array + +\ Support uncompressed video format only + +1 value format-idx +2 value bytes/pixel \ # bytes per uncompressed pixel +d# 16 buffer: guid \ Uncompressed frame format + +d# 32 constant MAX_ALT_DESC \ Maximum number of alternate interface descriptors +d# 32 constant MAX_FRAME_DESC \ Maximum number of frame descriptors/format +0 value #fdesc \ Number of uncompressed frame descriptors +0 value #alt \ Number of alternate interface descriptors +MAX_FRAME_DESC /n* 2* buffer: farray \ Array of width and height per frame +MAX_ALT_DESC /n* buffer: iarray \ Array of /payload per alternate interface + +: #fdesc! ( idx -- ) #fdesc max to #fdesc ; +: #alt! ( idx -- ) #alt max to #alt ; +: alt-array! ( l idx -- ) /n* iarray + ! ; +: alt-array@ ( idx -- l ) /n* iarray + @ ; +: frame-array! ( w h idx -- ) /n* 2* farray + tuck na1+ ! ! ; +: frame-array@ ( idx -- width height ) /n* 2* frame-array + dup @ swap na1+ @ ; + +: process-vc ( idx -- ) + desc-buf swap find-intf-desc dup 0= if abort" Failed to find 1st Interface Descriptor" then + dup 5 + c@ e = over 6 + c@ 1 = and swap 7 + c@ 0= and + not if abort" Expect SC_VIDEO_CONTROL class" then +; + +: process-vs-desc ( adr -- adr' ) + farray MAX_FRAME_DESC /n* 2* erase + begin dup desc-buf-end <> while ( adr ) + dup 1+ c@ h# 24 <> if exit then \ CS_INTERFACE + dup 2 + c@ case + 4 of \ VS_FORMAT_UNCOMPRESSED + dup 5 + guid d# 16 move + dup d# 21 + c@ 3 >> to bytes/pixel + dup 3 + c@ to format-idx + endof + 5 of \ VS_FRAME_UNCOMPRESSED + dup 5 + le-w@ over 7 + le-w@ 2 pick 3 + c@ + dup #fdesc! frame-array! + endof + endcase + dup c@ + + repeat +; + +: process-alt-desc ( idx adr -- ) + iarray MAX_ALT_DESC /n* erase ( idx adr ) + begin dup desc-buf-end <> while ( idx adr ) + dup 1+ c@ 4 = if ( idx adr ) + 2dup 2 + c@ = if \ Alternate INTERFACE descriptor + dup 3 + c@ dup #alt! ( idx adr alt ) + swap c@ + ( idx alt adr' ) + dup 1+ c@ 5 = if \ Endpoint descriptor + tuck 4 + le-w@ swap alt-array! ( idx adr ) + dup 3 + c@ 1 and 0= if abort" Expect isochronous endpoint" then + dup 2 + c@ h# f and ( idx adr pipe ) + dup 6 + c@ ( idx adr pipe interval ) + 2 pick 2 + c@ h# 80 and + if to iso-in-interval to iso-in-pipe else to iso-out-interval to iso-out-pipe then + then + then + then + dup c@ + + repeat drop +; + +: process-vs ( idx -- ) + dup to vs-interface + desc-buf over find-intf-desc dup 0= if abort" Failed to find 2nd Interface Descriptor" then + dup >r ( idx adr ) ( R: adr ) + 5 + c@ e = r@ 6 + c@ 2 = and r@ 7 + c@ 0= and not if abort" Expect SC_VIDEO_STREAMING class" then + r> dup c@ + process-vs-desc ( idx adr ) ( R: adr ) + #fdesc 0= if abort" Failed to find VS_FRAME_UNCOMPRESSED descriptors" then + ( idx adr' ) process-alt-desc ( ) + #alt 0= if abort" Failed to find Alternate Interface descriptors" then +; + +: init-params ( -- ) + /desc-buf dma-alloc to desc-buf + desc-buf dup 0 get-cfg-desc dup 0= if abort" Failed to get-desc" then + + to desc-buf-end + desc-buf INTERFACE_ASSO find-desc dup 0= if abort" Failed to find Interface Association Descriptor" then + dup 3 + c@ 2 < if abort" Expect at least 2 associated interfaces" then + 2 + c@ dup process-vc \ Process Video Control Interface + 1+ process-vs \ Process Video Streaming Interface + desc-buf /desc-buf dma-free 0 to desc-buf +; + +\ LICENSE_BEGIN +\ Copyright (c) 20011 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/usb2/device/webcam/webcam.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/usb2/device/webcam/webcam.bth Tue Aug 9 20:32:13 2011 (r2450) @@ -0,0 +1,45 @@ +purpose: USB webcam driver loader +\ See license at end of file + +command: &tokenize &this +build-now + +silent on + +begin-tokenizing webcam.fc + +FCode-version2 + +fload ${BP}/dev/usb2/device/common.fth \ USB device driver common routines +fload ${BP}/dev/usb2/pkt-func.fth \ Some USB descriptor manipulation code +fload ${BP}/dev/usb2/device/webcam/desc.fth \ Webcam descriptor manipulation code +fload ${BP}/dev/usb2/device/webcam/webcam.fth \ USB webcam driver + +end0 + +end-tokenizing + + +\ LICENSE_BEGIN +\ Copyright (c) 20011 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/usb2/device/webcam/webcam.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/usb2/device/webcam/webcam.fth Tue Aug 9 20:32:13 2011 (r2450) @@ -0,0 +1,315 @@ +purpose: USB webcam driver +\ See license at end of file + +hex +headers + +" camera" device-name +" camera" device-type + +defer selftest-hook ['] noop to selftest-hook +true value verbose? + +0 value ctrl-buf +h# 400 value /ctrl-buf +0 value intr-buf + +h# c00 value /data-buf \ Buffer to store one microframe of data +/data-buf buffer: data-buf + +: alloc-bufs ( -- ) + ctrl-buf if exit then + /ctrl-buf dma-alloc to ctrl-buf + /intr-in-pipe dma-alloc to intr-buf +; +: free-bufs ( -- ) + ctrl-buf 0= if exit then + ctrl-buf /ctrl-buf dma-free 0 to ctrl-buf +; + +: init-iso-in ( #payload pipe interval -- ) " init-iso-in" $call-parent ; +: begin-iso-in ( -- ) " begin-iso-in" $call-parent ; +: restart-iso-in ( -- ) " restart-iso-in" $call-parent ; +: end-iso-in ( -- ) " end-iso-in" $call-parent ; +: get-iso-in ( adr len -- false | actual error? true ) " get-iso-in" $call-parent ; + +: begin-intr ( -- ) + intr-buf /intr-in-pipe intr-in-pipe intr-in-interval begin-intr-in +; +: end-intr ( -- ) end-intr-in ; + +: get-intr? ( adr len -- actual ) + intr-in? if nip nip restart-intr-in exit then \ USB error; restart + ?dup if ( adr len actual ) + min tuck intr-buf -rot move ( actual ) + verbose? if ." Interrupt: " intr-buf over " cdump" evaluate cr then + restart-intr-in ( actual ) + else + 2drop 0 ( actual ) + then +; + +create samsung-frame-array + 0 , 0 , \ width height + h# 280 , h# 1e0 , + h# a0 , h# 78 , + h# b0 , h# 90 , + h# 140 , h# f0 , + h# 160 , h# 120 , + h# 320 , h# 258 , + h# 500 , h# 2d0 , + +0 value hint +5 value frame-idx +h# 160 value width +h# 120 value height +width height * 2* value /frame \ 16-bit per pixel + +create samsung-alt-array + 0 , h# c0 , h# 180 , h# 200 , + h# 280 , h# 320 , h# 3b0 , h# a80 , + h# b20 , h# be0 , h# 1380 , h# 13fc , + +['] samsung-frame-array to frame-array \ Comment these 2 lines to use +['] samsung-alt-array to alt-array \ descriptor info + +\ Make sure the alt interface's endpoint and maxpayload matches +d# 5 value alt-interface +h# 320 value /payload +d# 256 value #payload +/payload dup h# 7ff and swap d# 11 >> 1+ * value /xlen + +external +: set-frame ( idx -- ) + dup to frame-idx + /n * 2* frame-array + dup @ to width na1+ @ to height + width height * 2* to /frame +; + +: set-alt ( idx -- ) + dup to alt-interface + alt-array swap na+ @ dup to /payload + dup h# 7ff and swap d# 11 >> 1+ * to /xlen +; + +: init-dev + configuration set-config if abort" Failed to set-config" then + vs-interface 0 set-interface if abort" Failed to set-interface to 0" then + ctrl-buf d# 26 vs-interface 100 a1 87 control-get nip if abort" Failed to VS_PROBE_CONTROL GET_DEF" then + hint ctrl-buf le-w! \ bmHint + format-idx ctrl-buf 2 + c! \ bFormatIndex + frame-idx ctrl-buf 3 + c! \ bFrameIndex + /frame ctrl-buf d# 18 + le-l! \ dwMaxVideoFrameSize + ctrl-buf d# 26 vs-interface 100 21 01 control-set if abort" Failed to VS_PROBE_CONTROL SET_CUR" then + ctrl-buf d# 26 vs-interface 100 a1 81 control-get nip if abort" Failed to VS_PROBE_CONTROL GET_CUR" then + begin-intr + ctrl-buf d# 26 vs-interface 200 21 01 control-set if abort" Failed to VS_COMMIT_CONTROL SET_CUR" then +; + +: init-stream + \ Make sure the alt interface's endpoint and maxpayload matches + 1 to iso-in-pipe \ Remove when init is properly done + 1 to iso-in-interval \ Remove when init is properly done + /payload iso-in-pipe set-pipe-maxpayload + #payload iso-in-pipe iso-in-interval init-iso-in + vs-interface alt-interface set-interface if abort" Failed to set alternate interface" then + d# 10 ms + begin-iso-in +; +headers + +\ Algorithm for selecting a particular alternate interface and the corresponding +\ uncompressed resolution: +\ +\ Empirically, when the webcam sends a video line of data out at a time, +\ ofw can process the video data reasonably well. +\ +\ Thus, choose the largest payload bandwidth without employing MULT. +\ Then, choose a best match video resolution. + +0 value twidth +0 value tidx +: select-alt ( -- idx ) + 0 to tidx + 0 to twidth + #alt 1 do + i alt-array@ dup h# f800 and if + drop + else + dup twidth > if to twidth i to tidx else drop then + then + loop tidx +; +: select-frame ( -- idx ) + 0 to twidth + 0 to tidx + #fdesc 1 do + i frame-array@ drop + dup bytes/pixel * h# c + /xlen <= if + dup twidth > if to twidth i to tidx else drop then + else + drop + then + loop tidx +; + +: set-params ( -- ) + ['] farray to frame-array + ['] iarray to alt-array + + select-alt set-alt + select-frame set-frame +; + +: get-next-payload ( -- len ) + data-buf /xlen get-iso-in if + drop + debug? if + dup if data-buf ca1+ c@ u. dup u. then + then + else + 0 + then +; + +0 value dptr \ Current address of data buffer to read and read-frame +0 value rlen \ Remaining # of bytes to read into the data buffer +: copy-payload ( len -- ) + ?dup 0= if exit then + h# c - data-buf h# c + ( len' src ) + dptr rot rlen min dup >r move ( ) ( R: len ) + dptr r@ + to dptr + rlen r> - to rlen +; + +4 constant MAX_RESTART_READ_FRAME +4 constant MAX_RESTART_ISO_IN +0 value #restart-read-frame +0 value #restart-iso-in +0 value dadr \ Original adress argument to read-frame +0 value dlen \ Original len argument to read-frame +: restart-read-frame ( -- ) + dadr to dptr dlen to rlen + #restart-read-frame 1+ dup to #restart-read-frame + MAX_RESTART_READ_FRAME = if + 0 to #restart-read-frame + #restart-iso-in 1+ dup to #restart-iso-in + MAX_RESTART_ISO_IN = if abort" Too many retries" else restart-iso-in then + then +; +: ?copy-payload ( len -- ) + ?dup 0= if exit then + data-buf ca1+ c@ 2 and 2 = if + rlen over h# c - <= if copy-payload else drop restart-read-frame then + else + copy-payload + then +; + +external +: read ( adr len -- actual ) + tuck to rlen to dptr ( actual ) + begin rlen while + get-next-payload ( actual len ) + copy-payload ( actual ) + repeat ( actual ) +; + +: read-frame ( adr len -- actual ) + /frame min \ Read no more than one frame worth of data + dup to dlen to dptr dup to dadr to rlen + 0 to #restart-iso-in 0 to #restart-read-frame + begin rlen while + get-next-payload ( len ) + ?copy-payload ( ) + repeat dlen +; + +: open ( -- flag ) + alloc-bufs + set-device? if false exit then + device set-target + true +; +: close ( -- ) free-bufs ; + +: init ( -- ) + init device set-target + ( init-params ) + ( set-params ) +; + +0 value selftest-adr +: selftest ( -- error? ) + open if + " cfg-vs-test" $find if + >r guid width height /frame r> execute + to selftest-adr to selftest-hook + else + ." Warning: need " type cr + then + + init-dev init-stream + begin + selftest-adr /frame read-frame drop + selftest-hook + key? until + + close + false + else + true + then +; + +headers + +init + +[ifndef] notdef +\ Debug aids +: .restart ( -- ) ." read-frame restart # = " #restart-read-frame .d cr + ." iso-in restart # = " #restart-iso-in .d cr ; + +: (.buf) ( i -- ) /xlen * data-buf + h# c " cdump" evaluate cr ; +: .buf ( -- ) /data-buf /xlen /mod swap if 1+ then 0 do i (.buf) loop ; + +: test ( -- ) + " load-base /frame read-frame drop" evaluate + " load-base dup /frame + /frame yuv2>rgb" evaluate + " load-base /frame + 0 0 width height" evaluate " draw-rectangle" " screen-ih $call-method" evaluate +; + +: testa ( -- ) + begin test key? until +; +: testb ( -- ) + begin restart-iso-in test key? until +; +[then] + +\ open u. init-dev init-stream testa + +\ LICENSE_BEGIN +\ Copyright (c) 20011 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] r2449 - dev/intel
by repository service Aug. 9, 2011

Aug. 9, 2011

Author: wmb Date: Tue Aug 9 20:31:51 2011 New Revision: 2449 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2449 Log: Intel SPI driver - fixed write protect problem. Modified: dev/intel/spi.fth Modified: dev/intel/spi.fth ============================================================================== --- dev/intel/spi.fth Tue Aug 9 20:30:19 2011 (r2448) +++ dev/intel/spi.fth Tue Aug 9 20:31:51 2011 (r2449) @@ -1,5 +1,5 @@ \ See license at end of file -purpose: Driver for SPI FLASH chips connected via Intel NM10 SPI interface +purpose: Driver for SPI FLASH chips connected via Intel ICH7-style interface h# fed1f020 value spi-base : spi-reg-b! ( b offset -- ) spi-base + c! ; @@ -24,32 +24,54 @@ \ Commands \ # t DCOA P Op -\ 0 0 4102 5 <no address> <1 data in> read-status +\ 0 0 4002 5 <no address> <1 data in> read-status \ 1 2 4n12 3 <ADDR> <N data in> read -\ 2 0 4322 9f <no address> <3 data in> jedec-id -\ 3 2 4232 90 <ADDR=0> <2 data in> 90-id -\ 4 2 4142 ab <ADDR=0> <1 data in> ab-id -\ 5 1 4156 6 1 <no address> <1 data out> write-status +\ 2 0 4222 9f <no address> <3 data in> jedec-id +\ 3 2 4132 90 <ADDR=0> <2 data in> 90-id +\ 4 2 4042 ab <ADDR=0> <1 data in> ab-id +\ 5 1 4056 6 1 <no address> <1 data out> write-status \ 6 3 4n66 6 2 <ADDR> <N data out> write -\ 7 3 0076 6 d8 <ADDR> <no data> erase-block +\ 7 2 0076 6 d8 <ADDR> <no data> erase-block +\ 4 base ! 33122020 hex constant cycle-types 4 base ! 33122020 hex constant cycle-types -: intel-spi-start ( -- ) - h# 0406 spi-prefix! \ Prefix 0 is write-enable, 1 is write-disable +: ich7-uncache-flash ( -- ) + h# f8dc config-b@ h# c invert and 4 or h# f8dc config-b! +; +: ich7-cache-flash ( -- ) + h# f8dc config-b@ h# c invert and 8 or h# f8dc config-b! +; +: ich7-protect-flash ( -- ) + h# f8dc config-b@ 1 invert and h# f8dc config-b! +; +: ich7-unprotect-flash ( -- ) + h# f8dc config-b@ 1 or h# f8dc config-b! +; +: ich7-spi-start ( -- ) + \ Turn off SPI FLASH caching and prefetching, enable writing + ich7-unprotect-flash + h# 0606 spi-prefix! \ Write-enable for both prefixes h# d80201ab h# 5c spi-reg-l! \ opcodes 7-4 h# 909f0305 h# 58 spi-reg-l! \ opcodes 3-0 - cycle-types h# 56 spi-reg-w! + cycle-types spi-type! h# 0c spi-stat! ; -: spi-do-cmd ( code -- ) +: ich7-flash-close ( -- ) + ich7-protect-flash +; +: wait-ready ( -- ) begin spi-stat@ 1 and 0= until - spi-ctrl! - begin spi-stat@ 4 and until - 4 spi-stat! +; +: spi-do-cmd ( code -- ) + spi-ctrl! ( ) + begin spi-stat@ c and until ( ) + spi-stat@ 8 and abort" SPI access blocked" + h# c spi-stat! ; : spi-read-status ( -- b ) - h# 4002 spi-do-cmd - spi-data c@ + wait-ready ( ) + h# 4002 spi-do-cmd ( ) + spi-data c@ ( b ) ; : wait-write-done ( -- ) d# 100000 0 do @@ -58,30 +80,36 @@ loop ; : spi-read-n ( adr len offset -- ) + wait-ready ( adr len offset ) spi-addr! ( adr len ) dup 1- 8 lshift h# 4012 or spi-do-cmd ( adr len ) spi-data -rot move ( ) ; : jedec-id ( -- b3b2b1 ) - h# 4222 spi-do-cmd - spi-data w@ spi-data 2+ c@ wljoin + wait-ready ( ) + h# 4222 spi-do-cmd ( ) + spi-data w@ spi-data 2+ c@ wljoin ( b3b2b1 ) ; : 90-id ( -- b2b1 ) - 0 spi-addr! - h# 4132 spi-do-cmd - spi-data w@ + wait-ready ( ) + 0 spi-addr! ( ) + h# 4132 spi-do-cmd ( ) + spi-data w@ ( ) ; : ab-id ( -- b1 ) - 0 spi-addr! - h# 4042 spi-do-cmd - spi-data c@ + wait-ready ( ) + 0 spi-addr! ( ) + h# 4042 spi-do-cmd ( ) + spi-data c@ ( b ) ; : spi-write-status ( b -- ) + wait-ready ( b ) spi-data c! ( ) h# 4056 spi-do-cmd ( ) wait-write-done ( ) ; : spi-write-n ( adr len offset -- ) + wait-ready ( adr len offset ) spi-addr! ( adr len ) tuck ( len adr len ) spi-data swap move ( len ) @@ -89,6 +117,7 @@ wait-write-done ( ) ; : erase-spi-block ( offset -- ) + wait-ready ( offset ) spi-addr! ( ) h# 0076 spi-do-cmd ( ) wait-write-done ( ) @@ -220,18 +249,18 @@ \ Install the SPI FLASH versions as their implementations. : use-spi-flash ( -- ) ['] spi-flash-open to flash-open - ['] noop to flash-close + ['] ich7-flash-close to flash-close ['] spi-flash-write-enable to flash-write-enable - ['] noop to flash-write-disable + ['] flash-close to flash-write-disable ['] write-spi-flash to flash-write ['] verify-spi-flash to flash-verify ['] erase-spi-block to flash-erase-block - use-mem-flash-read \ Might be overridden + use-spi-flash-read h# 40.0000 to /flash /spi-eblock to /flash-block ; use-spi-flash -' intel-spi-start to spi-start +' ich7-spi-start to spi-start \ LICENSE_BEGIN \ Copyright (c) 2011 FirmWorks

1 0

[commit] r2448 - dev
by repository service Aug. 9, 2011

Aug. 9, 2011

Author: lwalter Date: Tue Aug 9 20:30:19 2011 New Revision: 2448 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2448 Log: Add test Modified: dev/ds1385r.fth Modified: dev/ds1385r.fth ============================================================================== --- dev/ds1385r.fth Tue Aug 9 20:29:50 2011 (r2447) +++ dev/ds1385r.fth Tue Aug 9 20:30:19 2011 (r2448) @@ -39,6 +39,13 @@ h# 80 constant battery-error-bit [then] +\ Make sure that the RTC is ticking +: check-tick ( -- error? ) + 0 rtc@ d# 1100 ms 0 rtc@ = dup if + ." RTC did not tick" cr + then +; + \ make sure that the battery is charged - reg D/13 should be 80x : check-battery ( -- error? ) @@ -149,6 +156,7 @@ : selftest ( -- flag ) open drop check-battery \ Don't display the message here because "open" will do it + check-tick or close ;

1 0

[commit] r2447 - ofw/gui
by repository service Aug. 9, 2011

Aug. 9, 2011

Author: lwalter Date: Tue Aug 9 20:29:50 2011 New Revision: 2447 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2447 Log: Modify icon rows and columns Modified: ofw/gui/iconmenu.fth Modified: ofw/gui/iconmenu.fth ============================================================================== --- ofw/gui/iconmenu.fth Tue Aug 9 20:28:35 2011 (r2446) +++ ofw/gui/iconmenu.fth Tue Aug 9 20:29:50 2011 (r2447) @@ -38,8 +38,8 @@ headers d# 32 value version-height -4 value rows -5 value cols +5 value rows +7 value cols headerless : squares rows cols * ; d# 180 value sq-size

1 0

[commit] r2446 - in dev/usb2: . device hcd hcd/ehci
by repository service Aug. 9, 2011

Aug. 9, 2011

Author: lwalter Date: Tue Aug 9 20:28:35 2011 New Revision: 2446 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2446 Log: Add isochronous support Added: dev/usb2/hcd/ehci/iso.fth Modified: dev/usb2/device/common.fth dev/usb2/hcd/control.fth dev/usb2/hcd/device.fth dev/usb2/hcd/ehci/loadpkg.fth dev/usb2/hcd/ehci/qhtd.fth dev/usb2/hcd/hcd-call.fth dev/usb2/pkt-data.fth Modified: dev/usb2/device/common.fth ============================================================================== --- dev/usb2/device/common.fth Tue Aug 9 20:24:45 2011 (r2445) +++ dev/usb2/device/common.fth Tue Aug 9 20:28:35 2011 (r2446) @@ -25,6 +25,8 @@ 0 value iso-in-pipe 0 value iso-out-pipe +0 value iso-in-interval +0 value iso-out-interval 0 value /iso-in-pipe 0 value /iso-out-pipe Modified: dev/usb2/hcd/control.fth ============================================================================== --- dev/usb2/hcd/control.fth Tue Aug 9 20:24:45 2011 (r2445) +++ dev/usb2/hcd/control.fth Tue Aug 9 20:28:35 2011 (r2446) @@ -87,7 +87,7 @@ >r 0 0 0 r> DR_DEVICE DR_OUT or SET_CONFIGURATION control-set ; -: set-interface ( alt intf -- usberr ) +: set-interface ( intf alt -- usberr ) 0 0 2swap DR_INTERFACE DR_OUT or SET_INTERFACE control-set ; @@ -107,6 +107,7 @@ : (unstall-pipe) ( pipe -- ) 0 DR_ENDPOINT clear-feature drop ; ' (unstall-pipe) to unstall-pipe +external : get-cfg-desc ( adr idx -- actual ) swap >r ( idx ) ( R: adr ) r@ 9 0 3 pick CONFIGURATION DR_DEVICE get-desc nip 0= if @@ -115,6 +116,8 @@ r> 2drop 0 ( actual ) then ; +headers + : get-dev-desc ( adr len -- actual ) 0 0 DEVICE DR_DEVICE get-desc drop ( actual ) ; Modified: dev/usb2/hcd/device.fth ============================================================================== --- dev/usb2/hcd/device.fth Tue Aug 9 20:24:45 2011 (r2445) +++ dev/usb2/hcd/device.fth Tue Aug 9 20:28:35 2011 (r2446) @@ -38,17 +38,26 @@ ; : dev-desc@ ( index -- byte ) dev-desc-buf + c@ ; +: asso-class? ( -- asso? ) + 4 dev-desc@ h# ef = 5 dev-desc@ 2 = and 6 dev-desc@ 1 = and +; : get-class ( -- class subclass protocol ) - 4 dev-desc@ ?dup if ( class ) + asso-class? if + \ Class is in interface association descriptor + true to class-in-dev? + cfg-desc-buf INTERFACE_ASSO find-desc ( intf-adr ) + >r r@ 4 + c@ r@ 5 + c@ r> 6 + c@ ( class subclass protocol ) + else + 4 dev-desc@ ?dup if ( class ) \ Class is in device descriptor true to class-in-dev? ( class ) 5 dev-desc@ 6 dev-desc@ ( class subclass protocol ) - else ( ) + else \ Class is in interface descriptor - false to class-in-dev? ( ) + false to class-in-dev? cfg-desc-buf my-address find-intf-desc ( intf-adr ) >r r@ 5 + c@ r@ 6 + c@ r> 7 + c@ ( class subclass protocol ) - then + then then ; : make-class-properties ( -- ) @@ -410,7 +419,8 @@ : make-device-node ( port dev -- ) dup " get-initial-descriptors" my-self $call-method ( port dev ) /cfg-desc-buf 0= if 2drop exit then ( port dev ) - cfg-desc-buf 4 + c@ 0 ?do ( port dev ) + asso-class? if 1 else cfg-desc-buf 4 + c@ then ( port dev #intf ) + 0 ?do ( port dev ) dup " refresh-desc-bufs" my-self $call-method ( port dev ) 2dup swap i (make-device-node) ( port dev ) loop 2drop ( ) Added: dev/usb2/hcd/ehci/iso.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/usb2/hcd/ehci/iso.fth Tue Aug 9 20:28:35 2011 (r2446) @@ -0,0 +1,358 @@ +purpose: EHCI USB Controller Isochronous Pipes Transaction Processing +\ See license at end of file + +hex +headers + +\ XXX Need to implement isochronous OUT +\ XXX Need to implement siTD for devices behind a hub + +1 constant ISO_LAG \ # of frames to skip when inserting new iTDs + +\ --------------------------------------------------------------------------- +\ Example device driver usage: +\ init-iso-in \ To allocate and initialize isochronous data structures +\ begin-iso-in \ To link the framelist and iTDs +\ get-iso-in \ To read streamed data +\ end-iso-in \ To deallocate data structures (e.g., during close) +\ restart-iso-in \ To restart after a long lapse in order to get fresh data +\ --------------------------------------------------------------------------- + +\ --------------------------------------------------------------------------- +\ Internal isochronus IN variables +\ --------------------------------------------------------------------------- + +0 instance value iso-in-itd +0 instance value iso-in-itd-phys +0 instance value iso-in-itd-unaligned +0 instance value iso-in-#itd + +0 instance value iso-in-buf +0 instance value iso-in-buf-phys +0 instance value iso-in-buf-unaligned +0 instance value iso-in-/buf + +0 instance value iso-in-pipe +0 instance value iso-in-/payload +0 instance value iso-in-mult +0 instance value iso-in-interval + +0 instance value iso-in-cur-itd \ Next IN iTD to process +0 instance value iso-in-frame \ Last framelist[] used by the IN iTDs +0 instance value iso-in-#uframe \ Total # of micro-frames in the IN iTDs +0 instance value iso-in-uframe-cnt \ Micro-frame count in processing iTDs + +\ --------------------------------------------------------------------------- +\ Isochronous Transaction Descriptor (iTD) as defined by the EHCI Spec; 32-byte aligned +\ --------------------------------------------------------------------------- + +0 instance value itd-struct + +4 8 * constant /itd-xstat +4 7 * constant /itd-bptr +struct + \ DMA fields + 4 field >itd-link \ Next iTD or QH pointer + /itd-xstat field >itd-xstat \ iTD Transaction Status & Control List + /itd-bptr field >itd-bptr \ iTD Buffer Page Pointer List + /itd-bptr field >itd-xptrs \ 64-bit buffer pointer extensions +dup constant /itd-sync + \ Non-dma fields + /n field >itd-phys \ iTD's physical address + /n field >itd-buf \ Virtual address of the first >itd-bptr + /n field >itd-frame \ Index into framelist where iTD resides + /itd-xstat field >itd-xstat-copy \ original >itd-xstat for easy restart +d# 32 round-up +constant /itd-struct + +: set-itd-struct ( itd# -- ) /itd-struct * iso-in-itd + to itd-struct ; + +h# 7000.0000 constant ITD_STATUS +h# 8000.0000 constant ITD_ACTIVE +h# 4000.0000 constant ITD_ERR_OVERRUN +h# 2000.0000 constant ITD_ERR_BABBLE +h# 1000.0000 constant ITD_ERR_CRC +h# 0000.0800 constant ITD_IN +h# 0000.0000 constant ITD_OUT + +: alloc-itd ( #itd -- unaligned-virt aligned-virt phys ) + /itd-struct * dup >r aligned32-alloc-map-in ( unalign virt phys ) ( R: /itd ) + over r> erase +; +: free-itd ( -- ) + iso-in-itd-unaligned iso-in-itd iso-in-itd-phys + iso-in-#itd /itd-struct * aligned32-free-map-out +; + +: copy-itd-xstat ( -- ) + itd-struct dup >itd-xstat swap >itd-xstat-copy /itd-xstat move +; +: restore-itd-xstat ( -- ) + TERMINATE itd-struct >itd-link le-l! + itd-struct dup >itd-xstat-copy swap >itd-xstat /itd-xstat move +; + +0 value pbuf \ Next physical data buffer address +0 value vbuf \ Next virtual data buffer address +0 value rlen \ Remaining data len +0 value tlen \ Transaction length + +: init-itd-xstat ( -- ) + pbuf h# fff and ( offset ) + 8 0 do ( offset ) + rlen 0 max tlen min ?dup if ( offset len ) + d# 16 << ITD_ACTIVE or ( offset xctrl ) + over or itd-struct >itd-xstat 4 i * + le-l! ( offset ) + tlen + ( offset ) + rlen tlen - to rlen + then + loop drop + copy-itd-xstat +; +: init-itd ( itd# -- ) + dup set-itd-struct + /itd-struct * iso-in-itd-phys + itd-struct >itd-phys ! + TERMINATE itd-struct >itd-link le-l! + vbuf pbuf h# fff and - itd-struct >itd-buf ! + init-itd-xstat + pbuf dup h# fff and tlen 8 * + d# 12 >> 7 and 1+ 0 do ( pbuf ) + dup h# ffff.f000 and itd-struct >itd-bptr 4 i * + le-l! ( pbuf ) + h# 1000 + ( pbuf' ) + loop drop + tlen 8 * dup pbuf + to pbuf + vbuf + to vbuf + itd-struct >itd-bptr dup le-l@ target or iso-in-pipe 8 << or swap le-l! + itd-struct >itd-bptr 4 + dup le-l@ ITD_IN or iso-in-/payload or swap le-l! + itd-struct >itd-bptr 8 + dup le-l@ iso-in-mult or swap le-l! +; + +: free-iso ( -- ) + iso-in-itd 0= if exit then + free-itd + iso-in-buf iso-in-buf-phys iso-in-/buf dma-map-out + iso-in-buf-unaligned iso-in-/buf h# 1000 aligned-free + 0 to iso-in-buf +; +: (init-iso-in) ( #uframe pipe interval -- ) + 1 swap 1- << to iso-in-interval ( #uframe pipe ) + dup to iso-in-pipe ( #uframe pipe ) + over to iso-in-#uframe ( #uframe pipe ) + target di-maxpayload@ ( #uframe max ) + dup d# 11 >> 3 and 1+ dup to iso-in-mult ( #uframe mult max ) + swap h# 7ff and dup to iso-in-/payload ( #uframe mult xlen ) + * * dup to iso-in-/buf ( #uframe /buf ) + dup h# 1000 aligned-alloc ( /buf buf-unalign buf ) + tuck to iso-in-buf to iso-in-buf-unaligned ( /buf buf ) + swap true dma-map-in to iso-in-buf-phys ( ) +; + +external +: init-iso-in ( #uframe pipe interval -- ) + \ Round up #uframe to multiple of 8 + rot 8 round-up -rot + + \ Initialize the iso in variables and allocate data buffers + (init-iso-in) + + \ Setup temporary variables for init-itd + iso-in-/payload iso-in-mult * to tlen \ Transaction length + iso-in-buf-phys to pbuf \ Data buffer physical addr + iso-in-buf to vbuf \ Data buffer virtual addr + iso-in-/buf to rlen \ Remaining data buffer len + + \ Allocate and initialize the iTDs + iso-in-#uframe 8 / dup to iso-in-#itd ( #itd ) + dup alloc-itd to iso-in-itd-phys to iso-in-itd to iso-in-itd-unaligned ( #itd ) + ( #itd ) 0 do i init-itd loop +; +headers + +: framelist@ ( idx -- n ) 4 * framelist + le-l@ ; +: framelist@! ( itd-phys idx -- ) + dup >r framelist@ dup TERMINATE and if \ Nothing in the entry + drop ( itd-phys ) ( R: idx ) + else \ Link and replace the entry + itd-struct >itd-link le-l! ( itd-phys ) ( R: idx ) + then + itd-struct over /itd-sync dma-sync ( itd-phys ) ( R: idx ) + TYP_ITD or r> framelist! ( ) +; + +0 value cur-fidx +: interval+ ( frame -- frame' ) iso-in-interval + h# 3ff and ; +: cur-fidx+ ( -- ) cur-fidx interval+ to cur-fidx ; +: get-cur-fidx ( -- fidx ) frindex@ 2 + ISO_LAG + 3 >> h# 3ff and ; + +external +: begin-iso-in ( -- ) + \ Find the next frame and start putting into the framelist and link + \ to any existing qhs + 0 to iso-in-cur-itd + get-cur-fidx to cur-fidx + iso-in-#itd 0 do + i set-itd-struct + itd-struct >itd-phys @ cur-fidx framelist@! \ Link into framelist + cur-fidx itd-struct >itd-frame ! \ Save itd's framelist index + cur-fidx to iso-in-frame \ Update last frame in iTDs + cur-fidx+ \ Next framelist index + loop + #intr #iso or 0= if enable-periodic then + #iso++ +; + +headers +: wait-frame-safe ( idx -- ) + 3 << + begin + frindex@ h# ffff.fff8 and over <> + until drop +; +: restore-framelist ( -- ) + \ Remove an iTD from the framelist + itd-struct >itd-link le-l@ itd-struct >itd-frame @ framelist! +; + +: restart-itd ( -- ) + \ Restore the link for the framelist[itd.frame] + restore-framelist + + \ Init link and restore the transaction fields in the iTD + restore-itd-xstat + + \ Put the iTD in framelist[lastframe+interval] + iso-in-frame interval+ dup to iso-in-frame dup itd-struct >itd-frame ! + itd-struct >itd-phys @ swap framelist@! +; + +: .itd-error ( xstat -- ) + ITD_STATUS and ?dup 0= if exit then + dup ITD_ERR_OVERRUN and if " Data Overrun; " USB_ERR_DATAOVERRUN set-usb-error then + dup ITD_ERR_BABBLE and if " Babble Detected; " USB_ERR_BABBLE set-usb-error then + ITD_ERR_CRC and if " CRC/Timeout/Bad PID; " USB_ERR_CRC set-usb-error then +; + +: cur-in-itd++ ( -- ) + iso-in-cur-itd 1+ dup iso-in-#itd = if drop 0 then + to iso-in-cur-itd +; + +external +\ Process the iTDs. Returns false when the microframe is not ready. +\ Otherwise copy data into adr,len and return the actual len and status nibble. +\ +\ When the last uframe in the iTD is processed, inc cur-itd and restart-itd +\ +: get-iso-in ( adr len -- false | actual error? true ) + clear-usb-error + iso-in-cur-itd set-itd-struct ( adr len ) + itd-struct >itd-frame @ wait-frame-safe ( adr len ) + itd-struct dup >itd-phys @ /itd-sync dma-sync + iso-in-uframe-cnt 7 and ( adr len uframe# ) + 4 * itd-struct >itd-xstat + le-l@ ( adr len xstat ) + dup ITD_ACTIVE and if 3drop false exit then \ Not done yet + dup >r .itd-error ( adr len xstat ) ( R: xstat ) + r@ h# 7fff and ( adr len buf-offset ) ( R: xstat ) + itd-struct >itd-buf @ + -rot ( buf adr len ) ( R: xstat ) + + r> d# 16 >> h# fff and min dup >r move ( ) ( R: actual ) + r> usb-error true ( actual error? true ) + iso-in-uframe-cnt 1+ dup to iso-in-uframe-cnt ( actual error? true uframe# ) + 7 and 0= if restart-itd cur-in-itd++ then ( actual error? true ) +; + +: end-iso-in ( -- ) + \ Remove itds from the framelist + iso-in-#itd 0 do + i set-itd-struct + itd-struct >itd-frame @ wait-frame-safe + restore-framelist + loop 1 ms + + #iso-- + #intr #iso or 0= if disable-periodic then +; + +: restart-iso-in ( -- ) + end-iso-in + + \ Restore fields in the iTD + iso-in-#itd 0 do + i set-itd-struct + restore-itd-xstat + loop + + begin-iso-in +; + +headers +: (end-extra) ( -- ) + (end-extra) + iso-in-itd 0= if exit then + end-iso-in + free-iso +; +' (end-extra) to end-extra + +[ifndef] notdef +\ Debug aids +: ldump ( adr len -- ) " ldump" evaluate ; +: .itd ( -- ) + iso-in-itd iso-in-#itd /itd-struct * ldump +; +: .xstat ( -- ) + iso-in-#itd 0 do + i set-itd-struct + itd-struct >itd-xstat /itd-xstat ldump + loop +; +\ Debug aids for video streaming only (and only if ITD_ACTIVE are all 0s) +0 value tln +0 value tframe +: push-decimal ( -- ) " push-decimal" evaluate ; +: tlen+ ( len -- ) dup if h# c - then tln + to tln ; +: tframe++ ( -- ) tframe 1+ to tframe ; +: 0vid ( -- ) 0 to tln 0 to tframe ; +: .tlen ( -- ) tframe push-decimal (.) type pop-base ." :" tln u. cr ; +: .vid ( -- ) + 0vid + iso-in-#itd 0 do + i set-itd-struct + 8 0 do + itd-struct >itd-xstat i la+ le-l@ ( xstat ) + dup d# 16 >> h# fff and ( xstat len ) + dup tlen+ tframe++ if ( xstat ) + h# 7fff and itd-struct >itd-buf @ + ca1+ c@ + dup u. 2 and if .tlen 0vid then + else + drop + then + loop + loop + .tlen +; +[then] + +\ 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: dev/usb2/hcd/ehci/loadpkg.fth ============================================================================== --- dev/usb2/hcd/ehci/loadpkg.fth Tue Aug 9 20:24:45 2011 (r2445) +++ dev/usb2/hcd/ehci/loadpkg.fth Tue Aug 9 20:28:35 2011 (r2446) @@ -14,6 +14,7 @@ fload ${BP}/dev/usb2/hcd/ehci/control.fth \ EHCI control pipe operations fload ${BP}/dev/usb2/hcd/ehci/bulk.fth \ EHCI bulk pipes operations fload ${BP}/dev/usb2/hcd/ehci/intr.fth \ EHCI interrupt pipes operations +fload ${BP}/dev/usb2/hcd/ehci/iso.fth \ EHCI isochronous operations fload ${BP}/dev/usb2/hcd/control.fth \ Common control pipe API \ EHCI usb bus probing stuff Modified: dev/usb2/hcd/ehci/qhtd.fth ============================================================================== --- dev/usb2/hcd/ehci/qhtd.fth Tue Aug 9 20:24:45 2011 (r2445) +++ dev/usb2/hcd/ehci/qhtd.fth Tue Aug 9 20:28:35 2011 (r2446) @@ -456,6 +456,12 @@ \ Empirically, the 4 ms poll interval works optimally with the usb keyboard. \ --------------------------------------------------------------------------- +\ Isochronous count +0 value #iso +: #iso++ ( -- ) #iso 1+ to #iso ; +: #iso-- ( -- ) #iso 1- to #iso ; + +\ Interrupt count 0 value #intr d# 32 constant intr-interval \ 4 ms poll interval @@ -493,7 +499,7 @@ speed-high = if h# 0020 else h# 1c01 then over >hcqh-endp-cap dup le-l@ rot or swap le-l! ( qh ) #framelist 0 do dup i (insert-intr-qh) intr-interval +loop drop - #intr 0= if enable-periodic then + #intr #iso or 0= if enable-periodic then #intr++ ; @@ -514,7 +520,7 @@ : remove-intr-qh ( qh -- ) #intr-- ( qh ) #framelist 0 do dup i (remove-intr-qh) intr-interval +loop drop - #intr 0= if disable-periodic then + #intr #iso or 0= if disable-periodic then ; \ --------------------------------------------------------------------------- Modified: dev/usb2/hcd/hcd-call.fth ============================================================================== --- dev/usb2/hcd/hcd-call.fth Tue Aug 9 20:24:45 2011 (r2445) +++ dev/usb2/hcd/hcd-call.fth Tue Aug 9 20:28:35 2011 (r2446) @@ -35,6 +35,9 @@ : refresh-desc-bufs ( dev -- ) " refresh-desc-bufs" $call-parent ; +: get-cfg-desc ( adr idx -- actual ) + " get-cfg-desc" $call-parent +; \ Control pipe operations : control-get ( adr len idx value rtype req -- actual usberr ) @@ -55,7 +58,7 @@ : set-config ( cfg -- usberr ) " set-config" $call-parent ; -: set-interface ( alt intf -- usberr ) +: set-interface ( intf alt -- usberr ) " set-interface" $call-parent ; : clear-feature ( intf/endp feature rtype -- usberr ) @@ -109,7 +112,6 @@ " wait-out" $call-parent ; - \ Interrupt pipe operations : begin-intr-in ( buf len pipe interval -- ) " begin-intr-in" $call-parent @@ -131,8 +133,6 @@ " reset?" $call-parent ; - - headers \ LICENSE_BEGIN Modified: dev/usb2/pkt-data.fth ============================================================================== --- dev/usb2/pkt-data.fth Tue Aug 9 20:24:45 2011 (r2445) +++ dev/usb2/pkt-data.fth Tue Aug 9 20:28:35 2011 (r2446) @@ -60,6 +60,7 @@ 03 constant STRING 04 constant INTERFACE 05 constant ENDPOINT +0b constant INTERFACE_ASSO 29 constant HUB \ Hub Class Feature Selectors (dr-value)

1 0