openfirmware October 2012

openfirmware@openfirmware.info

2 participants
62 discussions

[commit] r3375 - cpu/arm/mmp2
by repository service 20 Oct '12

20 Oct '12

Author: rsmith Date: Sat Oct 20 03:42:59 2012 New Revision: 3375 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3375 Log: OLPC ARM: convert s3-selftest to use sus power measurement ec-sus-pwr reads a power measurement from the EC that only happens after the EC senses the SoC is in suspend. This reading gives much more consistent results as long as the SoC is suspended for long enough for the EC to update. (1s or more) Modified: cpu/arm/mmp2/rtc.fth Modified: cpu/arm/mmp2/rtc.fth ============================================================================== --- cpu/arm/mmp2/rtc.fth Sat Oct 20 02:20:13 2012 (r3374) +++ cpu/arm/mmp2/rtc.fth Sat Oct 20 03:42:59 2012 (r3375) @@ -67,7 +67,7 @@ \ on the operator. ." Testing suspend/resume" cr ." Sleeping for 3 seconds .. " d# 1000 ms - ec-rst-pwr ['] cancel-alarm 3 rtc-wake str ec-max-pwr ( power ) + ec-rst-pwr ['] cancel-alarm 3 rtc-wake str ec-sus-pwr ( power ) \ Negative power is consumed from battery, positive is supplied to battery dup suspend-power-limit < if ( power ) ." System used too much power during suspend - " negate .d ." mW" cr ( )

1 0

[commit] r3374 - dev dev/ath9k ofw/wifi
by repository service 20 Oct '12

20 Oct '12

Author: quozl Date: Sat Oct 20 02:20:13 2012 New Revision: 3374 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3374 Log: WLAN - scan buffer display overran actual length, only seen with 8787, see http://dev.laptop.org/ticket/12144 Modified: dev/ath9k/rx.fth dev/libertas.fth ofw/wifi/eapol.fth Modified: dev/ath9k/rx.fth ============================================================================== --- dev/ath9k/rx.fth Sat Oct 20 01:47:51 2012 (r3373) +++ dev/ath9k/rx.fth Sat Oct 20 02:20:13 2012 (r3374) @@ -338,7 +338,7 @@ restart-scan-response ." Scanning channel: " dup idx>ch .d ." ..." cr re-set-channel (scan-ch) - scanbuf .ssids + scanbuf /tsbuf .ssids ; : scan-ch-2GHz ( -- ) d# 11 0 do i scan-ch loop ; : scan-ch-5GHz-1 ( -- ) d# 18 d# 14 do i scan-ch loop ; Modified: dev/libertas.fth ============================================================================== --- dev/libertas.fth Sat Oct 20 01:47:51 2012 (r3373) +++ dev/libertas.fth Sat Oct 20 02:20:13 2012 (r3374) @@ -19,7 +19,7 @@ : supplicant-associate ( -- flag ) " do-associate" $call-supplicant ; : supplicant-process-eapol ( adr len -- ) " process-eapol" $call-supplicant ; : .scan ( adr -- ) " .scan" $call-supplicant ; -: .ssids ( adr -- ) " .ssids" $call-supplicant ; +: .ssids ( adr len -- ) " .ssids" $call-supplicant ; defer load-all-fw ( -- error? ) ' false to load-all-fw defer ?process-eapol ['] 2drop to ?process-eapol @@ -485,6 +485,7 @@ 0075 of ." CMD_802_11_SUBSCRIBE_EVENT" endof 0076 of ." CMD_802_11_RATE_ADAPT_RATESET" endof 007f of ." CMD_TX_RATE_QUERY" endof + 00a4 of ." CMD_802_11_RSSI_INFO" endof 00a5 of ." CMD_SET_BOOT2_VER" endof \ Thin firmware only 00a9 of ." CMD_FUNC_INIT" endof \ Multifunction versions 00aa of ." CMD_FUNC_SHUTDOWN" endof @@ -1811,6 +1812,31 @@ respbuf .log ; +0 [if] +: set-rssi-v14 ( nbcn ndata -- ) + swap >r >r ( r: antenna action ) + 6 h# a4 ( CMD_802_11_RSSI_INFO ) prepare-cmd + 1 +xw \ ACT_SET + r> +xw \ Ndata + r> +xw \ Nbcn + outbuf-wait drop +; + +: get-rssi-v14 ( -- avg_nf avg_snr nf snr ) + 6 h# a4 ( CMD_802_11_RSSI_INFO ) prepare-cmd + 0 +xw \ ACT_GET + 0 +xw \ Ndata + 0 +xw \ Nbcn + outbuf-wait drop + respbuf >fw-data >r + r@ h# 14 + le-w@ w->n ( avg_nf ) \ dBm + r@ h# 12 + le-w@ w->n ( avg_nf avg_rssi ) \ dBm + r@ h# 10 + le-w@ w->n ( avg_nf avg_rssi nf ) \ dBm + r@ h# 0e + le-w@ w->n ( avg_nf avg_rssi nf rssi ) \ dBm + r> drop +; +[then] + : get-rssi ( -- avg_nf avg_snr nf snr ) 2 h# 1f ( CMD_802_11_RSSI ) prepare-cmd d# 32 +xw \ number of beacons (N) to average the SNR and NF over @@ -2326,7 +2352,7 @@ quiet? if ( adr len ) 2drop false ( error? ) else - over .ssids ( adr len ) + 2dup .ssids ( adr len ) test-association ( error? ) then ( error? ) then @@ -2414,7 +2440,7 @@ : ta-scan ( -- ) ." scan" cr (scan) ( adr len error? ) - 0= if drop .ssids cr then ( ) + 0= if .ssids cr then ( ) ; : ta-n ( n -- ) Modified: ofw/wifi/eapol.fth ============================================================================== --- ofw/wifi/eapol.fth Sat Oct 20 01:47:51 2012 (r3373) +++ ofw/wifi/eapol.fth Sat Oct 20 02:20:13 2012 (r3374) @@ -641,7 +641,11 @@ endcase ; +0 value scanbuf-end + : .ap-ssid ( adr -- ) + dup le-w@ over + 2 + scanbuf-end >= if drop exit then + ." RSSI: " dup 8 + c@ .d dup le-w@ swap 2 + swap d# 19 /string ( adr' len' ) begin dup 0> while ( adr len ) @@ -650,14 +654,22 @@ repeat 2drop ( ) ; -: .ssids ( adr -- ) - dup 3 + ( 'ap ) +: .ssids ( adr len -- ) + over + to scanbuf-end ( adr ) + + dup le-w@ ( adr size ) + over + scanbuf-end >= if + ." scan truncated" cr + then ( adr ) + + dup 3 + ( adr 'ap ) swap 2 + c@ ( 'ap #ap ) 0 ?do ( 'ap ) dup .ap-ssid cr ( 'ap ) dup le-w@ + 2 + ( 'ap' ) + dup scanbuf-end >= if drop unloop exit then loop drop ( ) -; +; : #ssids ( adr -- n ) 2 + c@ ;

1 0

[commit] r3373 - cpu/arm/olpc
by repository service 20 Oct '12

20 Oct '12

Author: quozl Date: Sat Oct 20 01:47:51 2012 New Revision: 3373 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3373 Log: OLPC - accelerometer stack effect comment fix Modified: cpu/arm/olpc/accelerometer.fth Modified: cpu/arm/olpc/accelerometer.fth ============================================================================== --- cpu/arm/olpc/accelerometer.fth Wed Oct 17 09:05:36 2012 (r3372) +++ cpu/arm/olpc/accelerometer.fth Sat Oct 20 01:47:51 2012 (r3373) @@ -109,7 +109,7 @@ error? if accelerometer-off true exit then false ; -: lis3dhtr-selftest ( -- ) +: lis3dhtr-selftest ( -- error? ) \ Use the device's selftest function to force a change in one direction delay ( ) average-acceleration@ ( x y z )

1 0

[commit] r3372 - forth/lib
by repository service 17 Oct '12

17 Oct '12

Author: quozl Date: Wed Oct 17 09:05:36 2012 New Revision: 3372 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3372 Log: decompiler - for strings with embedded control characters, render the characters as #, to fix visual debugger rendering, http://dev.laptop.org/ticket/12104 Modified: forth/lib/decomp.fth Modified: forth/lib/decomp.fth ============================================================================== --- forth/lib/decomp.fth Tue Oct 16 02:01:45 2012 (r3371) +++ forth/lib/decomp.fth Wed Oct 17 09:05:36 2012 (r3372) @@ -330,10 +330,21 @@ 2 pick count ( ip name$ $ ) 2swap ( ip $ name$ ) ; + +: type# ( $ -- ) \ render control characters as green # + bounds ?do + i c@ dup h# 20 < if + drop green-letters ." #" red-letters + else + emit + then + loop +; + : .string-tail ( $ name$ -- ) 2 pick over + 3 + ?line ( $ name$ ) \ Keep word and string on the same line cr". space ( $ ) - red-letters type ( ) + red-letters type# ( ) magenta-letters ( ) ." "" " ( ) cancel ( )

1 0

[commit] r3371 - cpu/x86/pc/olpc/via
by repository service 16 Oct '12

16 Oct '12

Author: quozl Date: Tue Oct 16 02:01:45 2012 New Revision: 3371 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3371 Log: OLPC - signed fs-update, fix for uninitialised buffer pointer, #12186 Modified: cpu/x86/pc/olpc/via/fsupdate.fth Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Sat Oct 13 03:44:30 2012 (r3370) +++ cpu/x86/pc/olpc/via/fsupdate.fth Tue Oct 16 02:01:45 2012 (r3371) @@ -72,7 +72,6 @@ also nand-commands definitions : zblocks: ( "eblock-size" "#eblocks" ... -- ) - load-base to data-buffer ?compare-spec-line get-hex# to /nand-block get-hex# to #image-eblocks @@ -269,6 +268,7 @@ load-crypto abort" Can't load hash routines" open-nand ( file$ ) + load-base to data-buffer false to secure-fsupdate? ( file$ ) r/o open-file ( fd error? ) @@ -308,6 +308,7 @@ ['] noop to show-progress ( adr len ) ['] open-nand catch ?dup if .error security-failure then ( adr len ) + load-base to data-buffer \ clear-context nand-commands t-hms(

1 0

[commit] r3370 - cpu/arm/olpc/4.0
by repository service 13 Oct '12

13 Oct '12

Author: wmb Date: Sat Oct 13 03:44:30 2012 New Revision: 3370 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3370 Log: OLPC XO-4 - reverted bundle suffix from 5 to 4, as we are not going to distinguish between A and B revs of XO-4 in the bundle files. Modified: cpu/arm/olpc/4.0/config.fth Modified: cpu/arm/olpc/4.0/config.fth ============================================================================== --- cpu/arm/olpc/4.0/config.fth Sat Oct 13 03:42:23 2012 (r3369) +++ cpu/arm/olpc/4.0/config.fth Sat Oct 13 03:44:30 2012 (r3370) @@ -23,7 +23,7 @@ : model$ " olpc,XO-4.0" ; : compatible$ " olpc,xo-cl4" ; : ec-platform$ ( -- adr len ) " 7" ; -: bundle-suffix$ ( -- adr len ) " 5" ; +: bundle-suffix$ ( -- adr len ) " 4" ; d# 10001 constant machine-type \ Backwards compatibility with non-device-tree kernel

1 0

[commit] r3369 - cpu/x86/pc/olpc/via
by repository service 13 Oct '12

13 Oct '12

Author: wmb Date: Sat Oct 13 03:42:23 2012 New Revision: 3369 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3369 Log: OLPC - fixed a possible unitialized buffer address in fs-update. Modified: cpu/x86/pc/olpc/via/fsupdate.fth Modified: cpu/x86/pc/olpc/via/fsupdate.fth ============================================================================== --- cpu/x86/pc/olpc/via/fsupdate.fth Sat Oct 13 03:41:13 2012 (r3368) +++ cpu/x86/pc/olpc/via/fsupdate.fth Sat Oct 13 03:42:23 2012 (r3369) @@ -72,6 +72,7 @@ also nand-commands definitions : zblocks: ( "eblock-size" "#eblocks" ... -- ) + load-base to data-buffer ?compare-spec-line get-hex# to /nand-block get-hex# to #image-eblocks @@ -84,8 +85,7 @@ \ Separate the two buffers by enough space for both the compressed \ and uncompressed copies of the data. 4x is overkill, but there \ is plenty of space at load-base - load-base to dma-buffer - load-base /nand-block 4 * + to data-buffer + load-base /nand-block 4 * + to dma-buffer /nand-block /nand-page / to nand-pages/block t-update \ Handle possible timer rollover ;

1 0

[commit] r3368 - cpu/arm/mmp2
by repository service 13 Oct '12

13 Oct '12

Author: wmb Date: Sat Oct 13 03:41:13 2012 New Revision: 3368 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3368 Log: OLPC XO-4 - additional info in device tree for the interrupt controller node on MMP3. Modified: cpu/arm/mmp2/irq.fth Modified: cpu/arm/mmp2/irq.fth ============================================================================== --- cpu/arm/mmp2/irq.fth Sat Oct 13 03:40:00 2012 (r3367) +++ cpu/arm/mmp2/irq.fth Sat Oct 13 03:41:13 2012 (r3368) @@ -5,7 +5,12 @@ " interrupt-controller" device-name \ my-address my-space h# 400 reg +[ifdef] mmp3 + h# d4282000 encode-int h# 1000 encode-int encode+ + h# d4284000 encode-int encode+ h# 100 encode-int encode+ " reg" property +[else] my-address my-space h# 1000 reg +[then] 0 value base-adr d# 64 constant #levels @@ -46,6 +51,8 @@ : close ( -- ) ; " mrvl,mmp2-intc" " compatible" string-property +[ifdef] mmp3 " mrvl,mmp3-intc" +compatible [then] + 1 " #address-cells" integer-property 1 " #size-cells" integer-property : encode-unit ( phys.. -- str ) push-hex (u.) pop-base ; @@ -97,100 +104,6 @@ [then] h# 128 h# 11c d# 48 d# 24 make-mux-node \ DMA mux - 16 PDMA, 4 ADMA, 2 VDMA channels -0 [if] -new-device - " interrupt-controller" name - " mrvl,mmp2-mux-intc" +compatible - - 0 0 - h# 150 encode-int encode+ 4 encode-int encode+ - h# 168 encode-int encode+ 4 encode-int encode+ " reg" property - \ h# 150 " mrvl,intc-status" integer-property - \ h# 168 " mrvl,intc-mask" integer-property - - 4 " interrupts" integer-property - d# 2 " mrvl,intc-nr-irqs" integer-property - \ 0: USB_CHARGER 1: PMIC -finish-device - -new-device - " interrupt-controller" name - " mrvl,mmp2-mux-intc" +compatible - - 0 0 - h# 154 encode-int encode+ 4 encode-int encode+ - h# 16c encode-int encode+ 4 encode-int encode+ " reg" property - - 5 " interrupts" integer-property - d# 2 " mrvl,intc-numbers" integer-property - d# 1 " mrvl,clr-mfp-irq" integer-property - \ 0: RTC_ALARM 1: RTC -finish-device - -new-device - " interrupt-controller" name - - " mrvl,mmp2-mux-intc" +compatible - - 0 0 - h# 180 encode-int encode+ 4 encode-int encode+ - h# 17c encode-int encode+ 4 encode-int encode+ " reg" property - - d# 9 " interrupts" integer-property - d# 3 " mrvl,intc-numbers" integer-property - \ 0:KPC (keypad) 1:ROT (rotary) 2: TBALL (trackball) - \ h# 15c " mrvl,intc-status" integer-property - \ h# 174 " mrvl,intc-mask" integer-property -finish-device - -new-device - " interrupt-controller" name - " mrvl,mmp2-mux-intc" +compatible - - 0 0 - h# 158 encode-int encode+ 4 encode-int encode+ - h# 170 encode-int encode+ 4 encode-int encode+ " reg" property - - d# 17 " interrupts" integer-property - d# 5 " mrvl,intc-numbers" integer-property - \ 0: TWSI2 1: TWSI3 2: TWSI4 3: TWSI5 4: TWSI6 -finish-device - -new-device - " interrupt-controller" name - - " mrvl,mmp2-mux-intc" +compatible - - 0 0 - h# 15c encode-int encode+ 4 encode-int encode+ - h# 174 encode-int encode+ 4 encode-int encode+ " reg" property - \ h# 15c " mrvl,intc-status" integer-property - \ h# 174 " mrvl,intc-mask" integer-property - - d# 35 " interrupts" integer-property - d# 15 " mrvl,intc-numbers" integer-property - \ 0: PERF 1: L2_PA_ECC 2: L2_ECC 3: L2_UECC 4: DDR - \ 5: FABRIC0_TO 6: FABRIC1_TO 7: FABRIC2_TO 8: resv 9: THERMAL - \ 10: MAIN_PMU 11: WDT2 12: CORESIGHT 13: COMMTX 14: COMMRX -finish-device - -new-device - " interrupt-controller" name - 0 0 " interrupt-controller" property - " mrvl,mmp2-mux-intc" +compatible - - 0 0 - h# 160 encode-int encode+ 4 encode-int encode+ - h# 178 encode-int encode+ 4 encode-int encode+ " reg" property - - d# 51 " interrupts" integer-property - d# 2 " mrvl,intc-numbers" integer-property - \ 0:HSI_CAWAKE 1:MIPI_HSI_INT1 - \ h# 15c " mrvl,intc-status" integer-property - \ h# 174 " mrvl,intc-mask" integer-property -finish-device -[then] - end-package \ LICENSE_BEGIN

1 0

[commit] r3367 - cpu/x86
by repository service 13 Oct '12

13 Oct '12

Author: wmb Date: Sat Oct 13 03:40:00 2012 New Revision: 3367 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3367 Log: x86 kernel - added bscan code word used by new substring variant. Modified: cpu/x86/kerncode.fth Modified: cpu/x86/kerncode.fth ============================================================================== --- cpu/x86/kerncode.fth Sat Oct 13 03:30:13 2012 (r3366) +++ cpu/x86/kerncode.fth Sat Oct 13 03:40:00 2012 (r3367) @@ -657,6 +657,30 @@ 2 # cx shl cx push c; +\ Find the first occurence of bvalue, returning the residual string +code bscan ( adr1 len1 char -- adr' len' ) + si dx mov + cld + bx pop \ bx: char + cx pop \ cx: count + si pop \ si: adr + cx cx or 0<> if + begin + al lods + bl al cmp + loopne + = if + si dec si push ( adr' ) + cx inc cx push ( adr' len' ) + dx si mov + next + then + then + si push ( adr' ) + cx push ( adr' len' ) + dx si mov +c; + code noop (s -- ) c; code n->l (s n.unsigned -- l ) c;

1 0

[commit] r3366 - cpu/x86/pc/olpc ofw/core
by repository service 13 Oct '12

13 Oct '12

Author: wmb Date: Sat Oct 13 03:30:13 2012 New Revision: 3366 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/3366 Log: OLPC trac #12106 and #12181 - inflate initrd images from inside a .zip bundle. Modified: cpu/x86/pc/olpc/security.fth ofw/core/infltdi.fth Modified: cpu/x86/pc/olpc/security.fth ============================================================================== --- cpu/x86/pc/olpc/security.fth Sat Oct 13 01:08:50 2012 (r3365) +++ cpu/x86/pc/olpc/security.fth Sat Oct 13 03:30:13 2012 (r3366) @@ -796,7 +796,7 @@ " RD found - " ?lease-debug img$ sig$ sha-valid? if show-unlock - img$ place-ramdisk + img$ $inflated? drop place-ramdisk exit else show-unlock Modified: ofw/core/infltdi.fth ============================================================================== --- ofw/core/infltdi.fth Sat Oct 13 01:08:50 2012 (r3365) +++ ofw/core/infltdi.fth Sat Oct 13 03:30:13 2012 (r3366) @@ -51,12 +51,27 @@ ; ' try-inflate to ?inflate +\ Inflates the image at adr len if it is compressed. +\ The uncompressed image is placed after the compressed image in memory, +\ so sufficient space must be available there. In practice, this +\ usually means that adr should be in the region beginning at load-base . + +: $inflated? ( adr len -- adr' len' true | adr len false ) + over " "(1f8b08)" comp 0= if ( adr len ) + over + 4 round-up tuck ( adr+len adr adr+len ) + inflate true ( adr' len' true ) + else ( adr len ) + false ( adr len false ) + then +; : (?inflate-loaded) ( -- ) - load-base " "(1f8b08)" comp 0= if - load-base loaded + tuck inflate !load-size ( infl-adr ) - loaded move ( ) + loaded $inflated? if ( adr len ) + !load-size loaded move ( ) + else ( adr len ) + 2drop ( ) then ; + ' (?inflate-loaded) to ?inflate-loaded headers \ LICENSE_BEGIN

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware October 2012