openfirmware January 2010

openfirmware@openfirmware.info

1 participants
85 discussions

r1676 - in dev/usb2: device/net hcd hcd/ehci
by svn＠openfirmware.info 16 Jan '10

16 Jan '10

Author: wmb Date: 2010-01-16 21:02:47 +0100 (Sat, 16 Jan 2010) New Revision: 1676 Modified: dev/usb2/device/net/ax8817x.fth dev/usb2/device/net/ethernet.fth dev/usb2/hcd/control.fth dev/usb2/hcd/ehci/bulk.fth dev/usb2/hcd/ehci/qhtd.fth Log: OLPC trac 9423 - Fixed the longstanding problem with losing the first receive packet with USB Ethernet devices. The problem was much deeper, involving data toggle mismatches in the EHCI driver when the driver is re-opened and a new bulk-in ring is established. Modified: dev/usb2/device/net/ax8817x.fth =================================================================== --- dev/usb2/device/net/ax8817x.fth 2010-01-15 02:48:23 UTC (rev 1675) +++ dev/usb2/device/net/ax8817x.fth 2010-01-16 20:02:47 UTC (rev 1676) @@ -168,8 +168,9 @@ \ I increase the loop count in case the partner is slow in negotiating. \ And if there's no connection at all, let's not wait too long. ax-mii-sw - d# 2000 0 do 1 ax-mii@ 4 and ?leave 1 ms loop + d# 3000 0 do 1 ax-mii@ h# 20 and ?leave 1 ms loop ax-mii-hw + d# 10 ms \ Just in case the link status bit isn't ready just yet ; : select-phy ( -- ) Modified: dev/usb2/device/net/ethernet.fth =================================================================== --- dev/usb2/device/net/ethernet.fth 2010-01-15 02:48:23 UTC (rev 1675) +++ dev/usb2/device/net/ethernet.fth 2010-01-16 20:02:47 UTC (rev 1676) @@ -147,14 +147,10 @@ headers -\ This loopback test is a reliability improvement. The AX88772, -\ and perhaps other chips, sometimes loses the first received -\ packet. That's annoying, as the first packet is often a -\ reply that we care about, thus causing a timeout and retry. -\ We work around that by sending ourselves a few loopback packets -\ until we receive one. In most cases, the first loopback packet -\ is received correctly, and if not, the second one is okay. -\ We try 5 times just to be safe, exiting as soon as we "win". +\ This loopback code is here just in case it might be useful later. +\ It was originally written as a workaround for a first-packet lossage +\ problem, but the problem was eventually tracked down to a data toggle +\ issue in the EHCI layer. 0 value scratch-buf : clear-rx ( -- ) @@ -181,7 +177,6 @@ clear-rx 5 0 do try-loopback? ?leave loop }loopback - d# 20 ms \ Settling time after switching back scratch-buf d# 2000 free-mem ; @@ -190,8 +185,6 @@ link-up? 0= if ." Network not connected." cr - end-bulk-in - free-buf true exit then @@ -199,7 +192,6 @@ inbuf /inbuf bulk-in-pipe begin-bulk-in start-mac - loopback-test false ; Modified: dev/usb2/hcd/control.fth =================================================================== --- dev/usb2/hcd/control.fth 2010-01-15 02:48:23 UTC (rev 1675) +++ dev/usb2/hcd/control.fth 2010-01-16 20:02:47 UTC (rev 1676) @@ -78,6 +78,9 @@ : set-config ( cfg -- usberr ) >r 0 0 0 r> DR_DEVICE DR_OUT or SET_CONFIGURATION control-set + \ Setting the configuration initializes the endpoint's bulk data toggles + 0 bulk-out-pipe target di-out-data! + 0 bulk-in-pipe target di-in-data! ; : set-interface ( alt intf -- usberr ) Modified: dev/usb2/hcd/ehci/bulk.fth =================================================================== --- dev/usb2/hcd/ehci/bulk.fth 2010-01-15 02:48:23 UTC (rev 1675) +++ dev/usb2/hcd/ehci/bulk.fth 2010-01-16 20:02:47 UTC (rev 1676) @@ -207,19 +207,26 @@ r> swap attach-qtds ( ) ; -: make-ring ( /buf #bufs -- qh qtd ) - 2dup * alloc&map ( /buf #bufs va pa ) - dup 4 pick 4 pick alloc-ring-qhqtds ( /buf #bufs va pa qh qtd ) - >r >r ( /buf #bufs va pa r: qtd qh ) - r@ >qh-buf-pa l! r@ >qh-buf l! ( /buf #bufs ) - r@ >qh-#bufs l! r@ >qh-/buf l! ( r: qtd qh ) +: make-ring ( /buf #bufs in? -- qh qtd ) + -rot ( in? /buf #bufs ) + 2dup * alloc&map ( in? /buf #bufs va pa ) + dup 4 pick 4 pick alloc-ring-qhqtds ( in? /buf #bufs va pa qh qtd ) + >r >r ( in? /buf #bufs va pa r: qtd qh ) + r@ >qh-buf-pa l! r@ >qh-buf l! ( in? /buf #bufs ) + r@ >qh-#bufs l! r@ >qh-/buf l! ( in? r: qtd qh ) - \ Start bulk in transaction - r@ pt-bulk fill-qh ( r: qtd qh ) + r@ pt-bulk fill-qh ( in? r: qtd qh ) - \ Let the QH keep track of the data toggle + \ Let the QH keep track of the data toggle on an ongoing basis ... r@ >hcqh-endp-char dup le-l@ QH_TD_TOGGLE invert and swap le-l! + \ But we have to initialize it here based on the last state + r@ >hcqh-overlay >hcqtd-token ( in? token-adr r: qtd qh ) + dup le-l@ ( in? token-adr token-val r: qtd qh ) + rot if bulk-in-data@ else bulk-out-data@ then ( token-adr token-val toggle r: qtd qh ) + or ( token-adr token-val' r: qtd qh ) + swap le-l! ( r: qtd qh ) + r> r> ( qh qtd ) 2dup link-ring ( qh qtd ) over insert-qh ( qh qtd ) @@ -282,7 +289,7 @@ dup to bulk-out-pipe ( /buf #bufs pipe ) set-bulk-vars ( /buf #bufs ) - make-ring ( qh qtd ) + false make-ring ( qh qtd ) to bulk-out-qtd to bulk-out-qh ( ) bulk-out-timeout bulk-out-qh >qh-timeout l! ( ) ; @@ -294,7 +301,7 @@ dup to bulk-in-pipe ( /buf #bufs pipe ) set-bulk-vars ( /buf #bufs ) - make-ring ( qh qtd ) + true make-ring ( qh qtd ) dup activate-in-ring ( qh qtd ) to bulk-in-qtd to bulk-in-qh ( ) bulk-in-timeout bulk-in-qh >qh-timeout l! ( ) @@ -359,8 +366,10 @@ dup >qtd-/buf l@ d# 16 << ( qtd token_word ) TD_STAT_ACTIVE or TD_C_ERR3 or TD_PID_IN or ( qtd token_word' ) - \ Maybe unnecessary based on using dt in QH - bulk-in-data@ or toggle-bulk-in-data ( qtd token_word' ) + \ We need not adjust the data toggle here, as the controller handles + \ it automatically while the queue is active. We set it initially + \ when creating the the queue head, and save it for later after + \ detaching the queue head. over >hcqtd-token le-l! ( qtd ) more-qtds? while ( qtd ) Modified: dev/usb2/hcd/ehci/qhtd.fth =================================================================== --- dev/usb2/hcd/ehci/qhtd.fth 2010-01-15 02:48:23 UTC (rev 1675) +++ dev/usb2/hcd/ehci/qhtd.fth 2010-01-16 20:02:47 UTC (rev 1676) @@ -244,7 +244,8 @@ \ operations, where ping transactions can help significantly. \ (I'm not sure this matters, as the overlay will overwrite it). - TD_TOGGLE_DATA1 TD_STAT_OUT or swap >hcqtd-token le-l! ( ) + \ The data toggle will be set later + TD_STAT_OUT swap >hcqtd-token le-l! ( ) ; : link-qhqtds ( qtd.v qtd.p #qtds qh -- )

1 0

r1675 - dev/usb2/device/net
by svn＠openfirmware.info 15 Jan '10

15 Jan '10

Author: wmb Date: 2010-01-15 03:48:23 +0100 (Fri, 15 Jan 2010) New Revision: 1675 Modified: dev/usb2/device/net/ax8817x.fth dev/usb2/device/net/common.fth dev/usb2/device/net/ethernet.fth dev/usb2/device/net/pegasus.fth Log: OLPC trac 9691 - changed the order of some steps in the USB ethernet start code in hopes of eliminating the "lost first receive packet" syndrome. With these changes, the two Asix-based adapters that I have in hand both start reliably with no DHCP retries. Modified: dev/usb2/device/net/ax8817x.fth =================================================================== --- dev/usb2/device/net/ax8817x.fth 2010-01-14 06:27:28 UTC (rev 1674) +++ dev/usb2/device/net/ax8817x.fth 2010-01-15 02:48:23 UTC (rev 1675) @@ -217,8 +217,7 @@ h# 88 value def-rx-ctl \ SO (MAC ON) and AB (accept broadcast) -: ax-start-nic ( -- ) - ax-auto-neg-wait +: ax-start-mac ( -- ) h# 88 use-promiscuous? if 1 or @@ -228,9 +227,13 @@ to def-rx-ctl def-rx-ctl rx-ctl! ; + +: ax-start-phy ( -- ) + ax-auto-neg-wait +; : ax-promiscuous ( -- ) rx-ctl@ 1 or rx-ctl! ; : ax-set-multicast ( adr len -- ) 2drop rx-ctl@ 2 or rx-ctl! ; -: ax-stop-nic ( -- ) 0 rx-ctl! ; +: ax-stop-mac ( -- ) 0 rx-ctl! ; : ax-init-nic ( -- ) \ Per ax8817x_bind bulk-out-pipe 3 > if @@ -249,8 +252,7 @@ ax-toggle-gpio ax-get-phyid select-phy - h# 80 rx-ctl! \ Turn off receiver during setup - \ ax-stop-nic + ax-stop-mac ax-get-mac-address 2drop ax-set-ipg ax-init-mii @@ -273,8 +275,9 @@ : init-ax ( -- ) ['] ax-init-nic to init-nic ['] ax-link-up? to link-up? - ['] ax-start-nic to start-nic - ['] ax-stop-nic to stop-nic + ['] ax-start-mac to start-mac + ['] ax-start-phy to start-phy + ['] ax-stop-mac to stop-mac ['] ax-get-mac-address to get-mac-address ['] ax-mii@ to mii@ ['] ax-mii! to mii! Modified: dev/usb2/device/net/common.fth =================================================================== --- dev/usb2/device/net/common.fth 2010-01-14 06:27:28 UTC (rev 1674) +++ dev/usb2/device/net/common.fth 2010-01-15 02:48:23 UTC (rev 1675) @@ -18,12 +18,13 @@ false value use-multicast? defer init-nic ( -- ) ' noop to init-nic +defer reset-nic ( -- ) ' noop to reset-nic defer wrap-msg ( adr len -- adr' len' ) ' noop to wrap-msg defer unwrap-msg ( adr len -- adr' len' ) ' noop to unwrap-msg defer link-up? ( -- up? ) ' true to link-up? -defer reset-nic ( -- ) ' noop to reset-nic -defer start-nic ( -- ) ' noop to start-nic -defer stop-nic ( -- ) ' noop to stop-nic +defer start-phy ( -- ) ' noop to start-phy +defer start-mac ( -- ) ' noop to start-mac +defer stop-mac ( -- ) ' noop to stop-mac defer mii{ ( -- ) ' noop to mii{ \ Acquire defer }mii ( -- ) ' noop to }mii \ Release defer mii@ ( reg -- val ) ' noop to mii@ @@ -80,7 +81,7 @@ : property-or-abort ( name$ -- n ) 2dup get-my-property if ( name$ ) - ." Can't find property " type cr stop-nic abort + ." Can't find property " type cr stop-mac abort then ( name$ value$ ) 2swap 2drop decode-int nip nip ( n ) ; Modified: dev/usb2/device/net/ethernet.fth =================================================================== --- dev/usb2/device/net/ethernet.fth 2010-01-14 06:27:28 UTC (rev 1674) +++ dev/usb2/device/net/ethernet.fth 2010-01-15 02:48:23 UTC (rev 1675) @@ -28,7 +28,7 @@ ; : stop-net ( -- ) - stop-nic + stop-mac end-bulk-in free-buf ; @@ -41,7 +41,7 @@ : copy-packet ( adr len -- len' ) dup multi-packet? if 4 + then ( adr len len' ) - /outbuf > if ." USB Ethernet write packet too long" cr stop-nic abort then ( adr len ) + /outbuf > if ." USB Ethernet write packet too long" cr stop-mac abort then ( adr len ) multi-packet? if ( adr len ) dup wbsplit ( adr len len.low len.high ) @@ -71,7 +71,7 @@ \ The data format is: \ length.leword ~length.leword data [ pad-to-even ] : extract-packet ( -- data-adr len ) - residue 4 < if ." Short residue from USB Ethernet" cr stop-nic abort then + residue 4 < if ." Short residue from USB Ethernet" cr stop-mac abort then pkt-adr dup 4 + swap >r r@ c@ r@ 1+ c@ bwjoin ( data-adr length ) @@ -130,7 +130,7 @@ 0 ( adr 0 ) then ( adr ihandle|0 ) - dup 0= if ." Can't open obp-tftp support package" stop-nic abort then + dup 0= if ." Can't open obp-tftp support package" stop-mac abort then ( adr ihandle ) >r @@ -181,23 +181,25 @@ clear-rx 5 0 do try-loopback? ?leave loop }loopback + d# 20 ms \ Settling time after switching back scratch-buf d# 2000 free-mem ; : do-start? ( -- error? ) - start-nic + start-phy link-up? 0= if ." Network not connected." cr - stop-nic + end-bulk-in + free-buf true exit then init-buf inbuf /inbuf bulk-in-pipe begin-bulk-in + start-mac loopback-test - false ; Modified: dev/usb2/device/net/pegasus.fth =================================================================== --- dev/usb2/device/net/pegasus.fth 2010-01-14 06:27:28 UTC (rev 1674) +++ dev/usb2/device/net/pegasus.fth 2010-01-15 02:48:23 UTC (rev 1675) @@ -127,8 +127,7 @@ pg-sync-link-status ; -: pg-start-nic ( -- ) - pg-sync-link-status +: pg-start-mac ( -- ) \ force 100Mbps full-duplex h# 0130c9 use-promiscuous? if @@ -138,10 +137,15 @@ then ectl0 3 pg-write-reg ; + +: pg-start-phy ( -- ) + pg-sync-link-status +; + : pg-promiscuous ( -- ) ectl2 pg-reg-c@ 4 or ectl2 pg-reg-c! ; : pg-set-multicast ( -- ) ectl0 pg-reg-c@ 2 or ectl0 pg-reg-c! ; -: pg-stop-nic ( -- ) +: pg-stop-mac ( -- ) 0 ectl0 2 pg-write-reg ; @@ -155,8 +159,9 @@ : init-pegasus ( -- ) ['] pg-init-nic to init-nic ['] pg-link-up? to link-up? - ['] pg-start-nic to start-nic - ['] pg-stop-nic to stop-nic + ['] pg-start-phy to start-phy + ['] pg-start-mac to start-mac + ['] pg-stop-mac to stop-mac ['] pg-get-mac-address to get-mac-address ['] pg-unwrap-msg to unwrap-msg ['] pg-mii@ to mii@

1 0

r1674 - in dev/usb2: device device/keyboard device/net device/serial device/storage device/userial device/wlan hcd
by svn＠openfirmware.info 14 Jan '10

14 Jan '10

Author: wmb Date: 2010-01-14 07:27:28 +0100 (Thu, 14 Jan 2010) New Revision: 1674 Modified: dev/usb2/device/common.fth dev/usb2/device/keyboard/kbd.fth dev/usb2/device/net/ethernet.fth dev/usb2/device/serial/uart.fth dev/usb2/device/storage/scsi.fth dev/usb2/device/userial/userial.fth dev/usb2/device/wlan/usb8388.fth dev/usb2/hcd/dev-info.fth dev/usb2/hcd/device.fth Log: OLPC trac 9969 - comment:5 - fixed regression that happens when you remove and reinstert a USB device. Modified: dev/usb2/device/common.fth =================================================================== --- dev/usb2/device/common.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/device/common.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -36,8 +36,11 @@ get-my-property if 0 else decode-int nip nip then ; +\ This needs to be called every time that the device could have changed +: set-device ( -- ) " assigned-address" get-int-property to device ; + : init ( -- ) - " assigned-address" get-int-property to device + set-device " configuration#" get-int-property to configuration " bulk-in-pipe" get-int-property to bulk-in-pipe " bulk-out-pipe" get-int-property to bulk-out-pipe Modified: dev/usb2/device/keyboard/kbd.fth =================================================================== --- dev/usb2/device/keyboard/kbd.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/device/keyboard/kbd.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -327,6 +327,7 @@ \ kbd-buf and led-buf must have been allocated : setup-hardware? ( -- error? ) + set-device device set-target " reset?" $call-parent if configuration set-config if Modified: dev/usb2/device/net/ethernet.fth =================================================================== --- dev/usb2/device/net/ethernet.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/device/net/ethernet.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -223,6 +223,7 @@ : open ( -- ok? ) parse-args + set-device device set-target opencount @ 0= if @@ -248,12 +249,6 @@ headers -: init ( -- ) - init - device set-target - configuration set-config if ." Failed to set ethernet configuration" cr then -; - init \ LICENSE_BEGIN Modified: dev/usb2/device/serial/uart.fth =================================================================== --- dev/usb2/device/serial/uart.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/device/serial/uart.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -52,6 +52,7 @@ : write ( adr len -- actual ) dup if write-bytes else nip then ; : open ( -- flag ) + set-device device set-target refcount @ 0= if @@ -88,8 +89,6 @@ : init ( -- ) init init-buf - device set-target - configuration set-config if ." Failed set serial port configuration" cr then init-hook free-buf ; Modified: dev/usb2/device/storage/scsi.fth =================================================================== --- dev/usb2/device/storage/scsi.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/device/storage/scsi.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -79,7 +79,6 @@ init-execute-command alloc-bulk device set-target - configuration set-config if ." Failed to set storage configuration" cr then get-max-lun free-bulk ; @@ -182,6 +181,7 @@ : set-address ( lun -- ) 0 max max-lun min to lun + set-device \ The device number may have changed if we recycled the node device set-target " reset?" $call-parent if configuration set-config if Modified: dev/usb2/device/userial/userial.fth =================================================================== --- dev/usb2/device/userial/userial.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/device/userial/userial.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -17,6 +17,7 @@ ; : open ( -- flag ) + set-device device set-target " reset?" $call-parent if configuration set-config if Modified: dev/usb2/device/wlan/usb8388.fth =================================================================== --- dev/usb2/device/wlan/usb8388.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/device/wlan/usb8388.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -58,7 +58,7 @@ : end-out-ring ( -- ) " end-out-ring" $call-parent ; -: set-parent-channel ( -- ) device set-target ; +: set-parent-channel ( -- ) set-device device set-target ; : setup-bus-io ( /inbuf /outbuf -- error? ) 4 bulk-out-pipe " begin-out-ring" $call-parent ( /inbuf ) @@ -77,9 +77,6 @@ " vendor-id" property-or-abort to vid " device-id" property-or-abort to pid set-parent-channel - configuration set-config if - ." Failed to set USB configuration for wireless" cr - then ; init Modified: dev/usb2/hcd/dev-info.fth =================================================================== --- dev/usb2/hcd/dev-info.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/hcd/dev-info.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -41,6 +41,10 @@ : di-hub@ ( idx -- hub ) 'di >di-hub c@ ; : di-port! ( port idx -- ) 'di >di-port c! ; : di-port@ ( idx -- port ) 'di >di-port c@ ; +: di-is-reset ( idx -- ) + 'di >di-reset ( adr ) + 0 swap c! +; : di-reset? ( idx -- flag ) 'di >di-reset ( adr ) dup c@ 0= ( adr reset? ) Modified: dev/usb2/hcd/device.fth =================================================================== --- dev/usb2/hcd/device.fth 2010-01-14 04:55:17 UTC (rev 1673) +++ dev/usb2/hcd/device.fth 2010-01-14 06:27:28 UTC (rev 1674) @@ -244,6 +244,7 @@ dup c@ over + swap 4 + c@ ( dev adr' #endpoints ) swap ENDPOINT find-desc ( dev #endpoints adr' ) swap 0 ?do ( dev adr' ) + over di-is-reset ( dev adr ) dup 4 + le-w@ ( dev adr size ) over 2 + c@ h# f and ( dev adr size pipe ) 3 pick di-maxpayload! ( dev adr )

1 0

r1673 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 14 Jan '10

14 Jan '10

Author: rsmith Date: 2010-01-14 05:55:17 +0100 (Thu, 14 Jan 2010) New Revision: 1673 Modified: cpu/x86/pc/olpc/via/versions.fth Log: OLPC 1.5: EC version to 1.9.21 Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2010-01-14 04:55:14 UTC (rev 1672) +++ cpu/x86/pc/olpc/via/versions.fth 2010-01-14 04:55:17 UTC (rev 1673) @@ -5,7 +5,7 @@ macro: FW_MINOR 26 \ The EC microcode -macro: EC_VERSION 1_9_20 +macro: EC_VERSION 1_9_21 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

r1672 - dev/olpc/kb3700
by svn＠openfirmware.info 14 Jan '10

14 Jan '10

Author: rsmith Date: 2010-01-14 05:55:14 +0100 (Thu, 14 Jan 2010) New Revision: 1672 Modified: dev/olpc/kb3700/battery.fth Log: OLPC: Add IO status for GPIO_08-0F to the bat-debug. Charge mosfet is GPIO_0E Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2010-01-14 04:55:12 UTC (rev 1671) +++ dev/olpc/kb3700/battery.fth 2010-01-14 04:55:14 UTC (rev 1672) @@ -656,6 +656,8 @@ >sdx logstr $cat h# 70 bat-b@ \ AbnormalCauseCode >sdx logstr $cat + h# fc21 ec@ \ GPIO_08-0F 0E is chg mosfet + >sdx logstr $cat decimal bat-V@ bg-V>V >sd.ddd logstr $cat " " logstr $cat \ V

1 0

r1671 - dev/olpc/kb3700
by svn＠openfirmware.info 14 Jan '10

14 Jan '10

Author: rsmith Date: 2010-01-14 05:55:12 +0100 (Thu, 14 Jan 2010) New Revision: 1671 Modified: dev/olpc/kb3700/battery.fth Log: OLPC: Update bat-debug comments so they match the variable names in EC code Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2010-01-14 04:55:10 UTC (rev 1670) +++ dev/olpc/kb3700/battery.fth 2010-01-14 04:55:12 UTC (rev 1671) @@ -644,15 +644,15 @@ >sdx logstr $cat h# F780 ec@ \ w1 state >sdx logstr $cat - h# 40 ec-ram@ \ pwr_flag + h# 40 ec-ram@ \ sPOWER_FLAG >sdx logstr $cat - h# a4 ec-ram@ \ bat_status + h# a4 ec-ram@ \ sMBAT_STATUS >sdx logstr $cat - h# a5 ec-ram@ \ chg status + h# a5 ec-ram@ \ sMCHARGE_STATUS >sdx logstr $cat - h# a6 ec-ram@ \ bat misc + h# a6 ec-ram@ \ sMBAT_MISC >sdx logstr $cat - h# a7 ec-ram@ \ bat misc2 + h# a7 ec-ram@ \ sMBAT_MISC2 >sdx logstr $cat h# 70 bat-b@ \ AbnormalCauseCode >sdx logstr $cat

1 0

r1670 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 14 Jan '10

14 Jan '10

Author: rsmith Date: 2010-01-14 05:55:10 +0100 (Thu, 14 Jan 2010) New Revision: 1670 Modified: cpu/x86/pc/olpc/via/acpi.fth Log: Mod ACPI reset to use cmd 0xd7 rather than 0xdb Modified: cpu/x86/pc/olpc/via/acpi.fth =================================================================== --- cpu/x86/pc/olpc/via/acpi.fth 2010-01-13 00:39:17 UTC (rev 1669) +++ cpu/x86/pc/olpc/via/acpi.fth 2010-01-14 04:55:10 UTC (rev 1670) @@ -59,7 +59,7 @@ ( 070 4 ) h# 5a5 l, \ Flags - see below for bit definitions ( 074 12 ) 1 c, 8 c, 0 c, 1 c, h# 66. d, \ Reset register - I/O, 8 bits, 0 offset, byte access -( 080 1 ) h# db c, \ Reset value +( 080 1 ) h# d7 c, \ Reset value ( 081 3 ) 0 c, 0 c, 0 c, \ Reserved fadt set-acpi-table-length

1 0

r1669 - dev/usb2/device/net
by svn＠openfirmware.info 13 Jan '10

13 Jan '10

Author: wmb Date: 2010-01-13 01:39:17 +0100 (Wed, 13 Jan 2010) New Revision: 1669 Modified: dev/usb2/device/net/ax8817x.fth dev/usb2/device/net/common.fth dev/usb2/device/net/ethernet.fth dev/usb2/device/net/pegasus.fth Log: Added promiscuous and multicast reception capability to USB Ethernet drivers. Modified: dev/usb2/device/net/ax8817x.fth =================================================================== --- dev/usb2/device/net/ax8817x.fth 2010-01-13 00:38:24 UTC (rev 1668) +++ dev/usb2/device/net/ax8817x.fth 2010-01-13 00:39:17 UTC (rev 1669) @@ -215,12 +215,21 @@ 0 value has-internal-loopback? -h# 88 constant def-rx-ctl \ SO (MAC ON) and AB (accept broadcast) +h# 88 value def-rx-ctl \ SO (MAC ON) and AB (accept broadcast) : ax-start-nic ( -- ) ax-auto-neg-wait - def-rx-ctl my-args " promiscuous" $= if 1 or then rx-ctl! + h# 88 + use-promiscuous? if + 1 or + else + use-multicast? if 2 or then + then + to def-rx-ctl + def-rx-ctl rx-ctl! ; +: ax-promiscuous ( -- ) rx-ctl@ 1 or rx-ctl! ; +: ax-set-multicast ( adr len -- ) 2drop rx-ctl@ 2 or rx-ctl! ; : ax-stop-nic ( -- ) 0 rx-ctl! ; : ax-init-nic ( -- ) \ Per ax8817x_bind @@ -273,6 +282,8 @@ ['] ax-mii-hw to }mii ['] ax-loopback{ to loopback{ ['] ax-}loopback to }loopback + ['] ax-promiscuous to promiscuous + ['] ax-set-multicast to set-multicast vid h# 2001 = pid h# 1a00 = and if h# 009f.9d9f to ax-gpio then vid h# 07b8 = pid h# 420a = and if h# 001f.1d1f to ax-gpio then Modified: dev/usb2/device/net/common.fth =================================================================== --- dev/usb2/device/net/common.fth 2010-01-13 00:38:24 UTC (rev 1668) +++ dev/usb2/device/net/common.fth 2010-01-13 00:39:17 UTC (rev 1669) @@ -14,6 +14,9 @@ 6 constant /mac-adr : mac-adr$ ( -- adr len ) mac-adr /mac-adr ; +false value use-promiscuous? +false value use-multicast? + defer init-nic ( -- ) ' noop to init-nic defer wrap-msg ( adr len -- adr' len' ) ' noop to wrap-msg defer unwrap-msg ( adr len -- adr' len' ) ' noop to unwrap-msg @@ -25,6 +28,10 @@ defer }mii ( -- ) ' noop to }mii \ Release defer mii@ ( reg -- val ) ' noop to mii@ defer mii! ( val reg -- ) ' drop to mii@ +external +defer promiscuous ( -- ) ' noop to promiscuous +defer set-multicast ( adr len -- ) ' 2drop to set-multicast +headers : phy-loopback{ ( -- ) mii{ 0 mii@ h# 4000 or 0 mii! }mii Modified: dev/usb2/device/net/ethernet.fth =================================================================== --- dev/usb2/device/net/ethernet.fth 2010-01-13 00:38:24 UTC (rev 1668) +++ dev/usb2/device/net/ethernet.fth 2010-01-13 00:39:17 UTC (rev 1669) @@ -201,6 +201,19 @@ false ; +: parse-args ( -- ) + false to use-promiscuous? + false to use-multicast? + my-args + begin ?dup while + ascii , left-parse-string + 2dup " debug" $= if debug-on then + 2dup " promiscuous" $= if true to use-promiscuous? then + 2dup " multicast" $= if true to use-multicast? then + 2drop + repeat drop +; + external : close ( -- ) @@ -209,7 +222,7 @@ ; : open ( -- ok? ) - my-args " debug" $= if debug-on then + parse-args device set-target opencount @ 0= if Modified: dev/usb2/device/net/pegasus.fth =================================================================== --- dev/usb2/device/net/pegasus.fth 2010-01-13 00:38:24 UTC (rev 1668) +++ dev/usb2/device/net/pegasus.fth 2010-01-13 00:39:17 UTC (rev 1669) @@ -9,9 +9,9 @@ h# f1 constant SET_REG \ Select register definitions -: ec0 0 ; -: ec1 1 ; -: ec2 2 ; +: ectl0 0 ; +: ectl1 1 ; +: ectl2 2 ; : gpio10c h# 7e ; : gpio32c h# 7f ; : phya h# 25 ; @@ -97,8 +97,8 @@ : pg-link-up? ( -- flag ) 1 pg-mii@ 4 and 0<> ; -: pg-reset-mac ( -- ) 8 ec1 pg-reg-c! ; -: pg-mac-reset? ( -- ) ec1 pg-reg-c@ 8 and 0= ; +: pg-reset-mac ( -- ) 8 ectl1 pg-reg-c! ; +: pg-mac-reset? ( -- ) ectl1 pg-reg-c@ 8 and 0= ; : pg-init-mac ( -- ) pg-reset-mac begin pg-mac-reset? until @@ -130,11 +130,19 @@ : pg-start-nic ( -- ) pg-sync-link-status \ force 100Mbps full-duplex - h# 0130c9 ec0 3 pg-write-reg + h# 0130c9 + use-promiscuous? if + h# 040000 or + else + use-multicast? if 2 or then + then + ectl0 3 pg-write-reg ; +: pg-promiscuous ( -- ) ectl2 pg-reg-c@ 4 or ectl2 pg-reg-c! ; +: pg-set-multicast ( -- ) ectl0 pg-reg-c@ 2 or ectl0 pg-reg-c! ; : pg-stop-nic ( -- ) - 0 ec0 2 pg-write-reg + 0 ectl0 2 pg-write-reg ; \ Process the length header that's inlined after the frame @@ -153,6 +161,8 @@ ['] pg-unwrap-msg to unwrap-msg ['] pg-mii@ to mii@ ['] pg-mii! to mii! + ['] pg-promiscuous to promiscuous + ['] pg-set-multicast to set-multicast ; : init ( -- ) init vid pid pegasus? if init-pegasus then ;

1 0

r1668 - ofw/inet
by svn＠openfirmware.info 13 Jan '10

13 Jan '10

Author: wmb Date: 2010-01-13 01:38:24 +0100 (Wed, 13 Jan 2010) New Revision: 1668 Modified: ofw/inet/netload.fth Log: obp-tftp package - can now specify either multicast sending or reception, according to whether my-ip-address or server-ip-address is in the multicast range. net:239.255.1.2 - send multicast; net:,,239.255.1.2 - receive multicast Modified: ofw/inet/netload.fth =================================================================== --- ofw/inet/netload.fth 2010-01-13 00:33:41 UTC (rev 1667) +++ ofw/inet/netload.fth 2010-01-13 00:38:24 UTC (rev 1668) @@ -417,15 +417,7 @@ 2drop false ; -: setup-multicast ( -- ) - server-ip-addr my-ip-addr copy-ip-addr - " set-multicast" my-parent ihandle>phandle find-method if ( acf ) - " "(01 00 5e)" his-en-addr swap move ( acf ) - my-ip-addr 1+ his-en-addr 3 + 3 move ( acf ) - his-en-addr 3 + c@ h# 7f and his-en-addr 3 + c! ( ) - his-en-addr /e rot my-parent call-package ( ) - exit - then +: try-promiscuous ( -- ) " enable-promiscuous" my-parent ihandle>phandle find-method if ( acf ) my-parent call-package exit @@ -442,11 +434,31 @@ ." Can't enable multicast reception in network driver" cr ; +: send-multicast ( -- ) + server-ip-addr his-ip-addr copy-ip-addr + " "(01 00 5e)" his-en-addr swap move ( acf ) + his-ip-addr 1+ his-en-addr 3 + 3 move ( acf ) + his-en-addr 3 + c@ h# 7f and his-en-addr 3 + c! ( ) +; + +: receive-multicast ( -- ) +\ server-ip-addr my-ip-addr copy-ip-addr + " set-multicast" my-parent ihandle>phandle find-method if ( acf ) + " "(01 00 5e)" his-en-addr swap move ( acf ) + my-ip-addr 1+ his-en-addr 3 + 3 move ( acf ) + his-en-addr 3 + c@ h# 7f and his-en-addr 3 + c! ( ) + his-en-addr /e rot my-parent call-package ( ) + exit + then + try-promiscuous +; + defer configured ' noop to configured : configure ( -- ) use-last? if configured exit then - server-ip-addr multicast? if setup-multicast exit then + my-ip-addr multicast? if receive-multicast exit then + server-ip-addr multicast? if send-multicast exit then use-bootp? if nvram-ip? 0= if process-bootp then

1 0

r1667 - ofw/disklabel
by svn＠openfirmware.info 13 Jan '10

13 Jan '10

Author: wmb Date: 2010-01-13 01:33:41 +0100 (Wed, 13 Jan 2010) New Revision: 1667 Modified: ofw/disklabel/methods.fth Log: disklabel package - added the ability to specify a "partition" as the last N blocks of a device. This is useful for NANDblaster. Modified: ofw/disklabel/methods.fth =================================================================== --- ofw/disklabel/methods.fth 2010-01-13 00:32:30 UTC (rev 1666) +++ ofw/disklabel/methods.fth 2010-01-13 00:33:41 UTC (rev 1667) @@ -58,6 +58,9 @@ ; : select-partition ( -- ) + \ If parse-partition set #part to -2, it already mapped the partition + #part -2 = if exit then + \ Partition 0 is the raw disk, in which case we leave sector-offset at 0 \ and avoid reading the disk. Otherwise, we try to determine what sort \ of partition map the disk has, if any, and from that determine the @@ -184,6 +187,23 @@ dup 0= if 2drop exit then ( adr len ) then ( adr len ) + \ If the first character is "-", it is followed by a decimal number N and + \ the "partition" is the last N blocks + over c@ ascii - = if ( adr len ) + 1 /string ( adr' len' ) + push-decimal $number pop-base if ( ) + ." Bad decimal number after '-' in partition spec" cr + exit + then ( n ) + /sector um* ( d.partition-size ) + get-disk-size size-low size-high ( d.partition-size d.disk-size ) + 2over d- /sector um/mod nip ( d.partition-size partition-sector ) + to sector-offset ( d.partition-size ) + to size-high to size-low ( ) + -2 to #part ( ) \ Tell select-partition + exit + then ( adr len ) + \ If the first character of the string is ",", discard it over c@ ascii , = if ( adr len ) 1 /string ( adr' len' )

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware January 2010