openfirmware August 2011

openfirmware@openfirmware.info

1 participants
99 discussions

[commit] r2495 - cpu/arm/olpc/1.75
by repository service 31 Aug '11

31 Aug '11

Author: wmb Date: Wed Aug 31 10:31:46 2011 New Revision: 2495 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2495 Log: OLPC XO-1.75 - turned off most of the serial messages for early startup, their diagnostic value being limited at this point. Modified: cpu/arm/olpc/1.75/fw.bth Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Wed Aug 31 10:27:55 2011 (r2494) +++ cpu/arm/olpc/1.75/fw.bth Wed Aug 31 10:31:46 2011 (r2495) @@ -79,8 +79,8 @@ ; ' (ofw-tag,) to ofw-tag, -\ false to stand-init-debug? -true to stand-init-debug? +false to stand-init-debug? +\ true to stand-init-debug? false value secure?

1 0

[commit] r2494 - in cpu: arm arm/olpc/1.75 x86
by repository service 31 Aug '11

31 Aug '11

Author: wmb Date: Wed Aug 31 10:27:55 2011 New Revision: 2494 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2494 Log: XO-1.75 - Implemented an upsampling filter using iwMMX instructions and used it to upsample the audio for the startup jingle, thus eliminating the aliasing that was occurring when trying to play 8khz audio directly. The XO-1.75's codec can play at 8khz, but it doesn't do antialiasing at the frequency, so the sound is bad. Added: cpu/arm/firfilter.fth cpu/arm/iwmmx.fth Modified: cpu/arm/olpc/1.75/devices.fth cpu/arm/olpc/1.75/sound.fth cpu/x86/adpcm.fth Added: cpu/arm/firfilter.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/firfilter.fth Wed Aug 31 10:27:55 2011 (r2494) @@ -0,0 +1,182 @@ +\ See license at end of file +purpose: Polyphase audio interpolation (upsampling) filter + +\needs enable fload ${BP}/cpu/arm/iwmmx.fth + +d# 15 constant mulscale \ Bits for fractional multipliers + +\ Convert a decimal fraction to a scaled integer multiplier +: mul: ( "coef" -- ) + safe-parse-word push-decimal $number drop pop-base ( n ) + 1 mulscale lshift d# 1,000,000,000 */ ( n' ) + w, +; + +\ This is a polyphase interpolation filter that uses 16 taps per phase. +\ The upsampling ratio is equal to the number of phases. +\ The number of phases and the array of filter weights are arguments, +\ so the code could be used for different length filters, given suitable +\ weight arrays. + +\ Taps/phase=16 +\ Stride=2 (mono) + +code 16tap-upsample ( 'out 'in /in 'weights #phases -- ) + ldmia sp!,{r0,r1,r2,r3} \ r0:'weights r1:/in r2:'in r3:'out tos:#phases + + mov r4,#15 \ Multiplier scale factor + tmcr wcgr0,r4 + +\ wr0-4 - unaligned samples +\ wr5,6 - aligned samples +\ wr15 - accum +\ wr8,9 - weights +\ wcgr1 - alignment + + and r7,r2,#7 \ Alignment shift count + bic r2,r2,#7 \ r5 - aligned address + + wldrd wr0,[r2],#8 + wldrd wr1,[r2],#8 + wldrd wr2,[r2],#8 + wldrd wr3,[r2],#8 + wldrd wr4,[r2],#8 + + begin + \ r4: inner loop phase counter + \ r5: aligned source address + tmcr wcgr1,r7 \ wcgr1: alignment shift count + walignr1 wr5,wr0,wr1 \ Shift samples into place + walignr1 wr6,wr1,wr2 \ Shift samples into place + walignr1 wr7,wr2,wr3 \ Shift samples into place + walignr1 wr8,wr3,wr4 \ Shift samples into place + + mov r6,r0 \ Restore weights pointer + mov r4,tos \ Restore phase counter + begin + wldrd wr9,[r6],#8 \ W Get the first four weights + + wldrd wr10,[r6],#8 \ W Get the second four weights + wmacsz wr15,wr5,wr9 \ First multiply-accumulate, pipelined + + wldrd wr9,[r6],#8 \ W Get the third four weights + wmacs wr15,wr6,wr10 \ Second multiply-accumulate, pipelined + + wldrd wr10,[r6],#8 \ W Get the fourth four weights + wmacs wr15,wr7,wr9 \ Third multiply-accumulate, pipelined + + wmacs wr15,wr8,wr10 \ Fourth multiply-accumulate (stalls?) + + wrordg wr15,wr15,wcgr0 \ Scale the output sample by the multiplier fraction point + + wstrh wr15,[r3] \ Store the output sample + inc r3,#2 \ This cannot be combined with the preceding because STC requires a word offset + + decs r4,#1 \ Decrement phase counter + 0= until + + inc r7,#2 \ Increment alignment counter + ands r7,r7,#7 \ Check for next word needed + 0= if + wor wr0,wr1,wr1 \ Shift samples + wor wr1,wr2,wr2 + wor wr2,wr3,wr3 + wor wr3,wr4,wr4 + wldrd wr4,[r2],#8 \ Get next group of input samples + then + + decs r1,#2 \ Decrement input length by the sample size + 0<= until + + pop tos,sp +c; + +\ Filter coefficients for 6x upsampling. The following filter was +\ computed with GNU Octave using the program shown at the end of the array. +\ The transition band is centered on Fs/6. The stopband attenuation is 78dB. +\ The -3dB point is about 95% of Fs/6. +\ The coefficients are ordered by phase for easy addressing in the inner loop. +\ The coefficients are in reverse order so they can be accessed by an +\ incrementing pointer - the conventional convolutional filter algorithm +\ runs the data and filter tap pointers in opposite directions but the code +\ above runs both pointers forward for ease of use with MMX instructions. + +d# 6 constant #phases + +create weights-6phase +\ Phase 0 +mul: -0.000631880 mul: 0.002025107 mul: -0.004881022 mul: 0.010022601 +mul: -0.018817755 mul: 0.034801841 mul: -0.074732552 mul: 0.976279469 +mul: 0.080446668 mul: -0.031397096 mul: 0.015062052 mul: -0.007235622 +mul: 0.003214694 mul: -0.001237886 mul: 0.000375061 mul: 0.000190788 + +\ Phase 1 +mul: -0.001092645 mul: 0.003821226 mul: -0.009784496 mul: 0.021106533 +mul: -0.041296857 mul: 0.078608864 mul: -0.166749609 mul: 0.885823376 +mul: 0.283737941 mul: -0.105580171 mul: 0.052425455 mul: -0.026661852 +mul: 0.012716422 mul: -0.005327045 mul: 0.001786043 mul: -0.000511063 + +\ Phase 2 +mul: -0.001079175 mul: 0.004090325 mul: -0.010977550 mul: 0.024446032 +mul: -0.048873931 mul: 0.093827768 mul: -0.194040773 mul: 0.720544802 +mul: 0.508384704 mul: -0.167272365 mul: 0.082398233 mul: -0.042537000 +mul: 0.020831489 mul: -0.009060710 mul: 0.003214599 mul: -0.000795594 + +\ Phase 3 +mul: -0.000795594 mul: 0.003214599 mul: -0.009060710 mul: 0.020831489 +mul: -0.042537000 mul: 0.082398233 mul: -0.167272365 mul: 0.508384704 +mul: 0.720544802 mul: -0.194040773 mul: 0.093827768 mul: -0.048873931 +mul: 0.024446032 mul: -0.010977550 mul: 0.004090325 mul: -0.001079175 + +\ Phase 4 +mul: -0.000511063 mul: 0.001786043 mul: -0.005327045 mul: 0.012716422 +mul: -0.026661852 mul: 0.052425455 mul: -0.105580171 mul: 0.283737941 +mul: 0.885823376 mul: -0.166749609 mul: 0.078608864 mul: -0.041296857 +mul: 0.021106533 mul: -0.009784496 mul: 0.003821226 mul: -0.001092645 + +\ Phase 5 +mul: 0.000190788 mul: 0.000375061 mul: -0.001237886 mul: 0.003214694 +mul: -0.007235622 mul: 0.015062052 mul: -0.031397096 mul: 0.080446668 +mul: 0.976279469 mul: -0.074732552 mul: 0.034801841 mul: -0.018817755 +mul: 0.010022601 mul: -0.004881022 mul: 0.002025107 mul: -0.000631880 + +0 [if] +\ This Matlab/Octave code computes the weights. +\ The 95 is one less than the filter length 96 = 6 * 16 +weights = remez(95, [0 .12 .215 1], [1 1 0 0]); +for phase=1:6 + for tap=16:-1:1 + printf("mul: %.9f ", 5.9 * weights((tap-1)*6+phase)); + end + printf("\n"); +end +[then] + +: upsample6 ( src-adr /src dst-adr -- ) + enable-iwmmx ( src-adr #src-samples dst-adr ) + -rot weights-6phase #phases 16tap-upsample ( ) +; + +\ 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 Added: cpu/arm/iwmmx.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/iwmmx.fth Wed Aug 31 10:27:55 2011 (r2494) @@ -0,0 +1,120 @@ +\ See license at end of file +purpose: Intel Wireless MMX support + +: enable-iwmmx ( -- ) + coprocessor-access@ h# f or coprocessor-access! +; + +d# 16 8 * d# 8 4 * + buffer: iwmmx-buf +code get-iwmmx ( adr -- ) + wstrd wr0,[tos],#8 + wstrd wr1,[tos],#8 + wstrd wr2,[tos],#8 + wstrd wr3,[tos],#8 + wstrd wr4,[tos],#8 + wstrd wr5,[tos],#8 + wstrd wr6,[tos],#8 + wstrd wr7,[tos],#8 + wstrd wr8,[tos],#8 + wstrd wr9,[tos],#8 + wstrd wr10,[tos],#8 + wstrd wr11,[tos],#8 + wstrd wr12,[tos],#8 + wstrd wr13,[tos],#8 + wstrd wr14,[tos],#8 + wstrd wr15,[tos],#8 + wstrw wcgr0,[tos],#4 + wstrw wcgr1,[tos],#4 + wstrw wcgr2,[tos],#4 + wstrw wcgr3,[tos],#4 + wstrw wcgr0,[tos],#4 + wstrw wcid,[tos],#4 + wstrw wcon,[tos],#4 + wstrw wcssf,[tos],#4 + wstrw wcasf,[tos],#4 +c; +: dump-iwmmx ( -- ) + iwmmx-buf get-iwmmx + push-hex + d# 16 0 do + i 4 bounds do + iwmmx-buf i 8 * + d@ d# 17 ud.r + loop + cr + 4 +loop + space + ." wCGRs: " + 4 0 do + iwmmx-buf h# 40 + i la+ l@ d# 9 u.r + loop + cr + ." cid, con, cssf, casf: " + 4 0 do + iwmmx-buf h# 50 + i la+ l@ d# 9 u.r + loop + cr + pop-base +; + +0 [if] \ These code words are not expected to be used much; they are examples +: mcr 0e00.0010 {cond} amode-copr ; +: mrc 0e10.0010 {cond} amode-copr ; + +code wcid@ ( -- n ) psh tos,sp tmrc tos,wcid c; \ Coprocessor ID + +code wcon@ ( -- n ) psh tos,sp tmrc tos,wcon c; \ Control +code wcon! ( n -- ) tmcr wcon,tos pop tos,sp c; + +code wcasf@ ( -- n ) psh tos,sp tmrc tos,wcasf c; \ Arithmetic flags +code wcasf! ( n -- ) tmcr wcasf,tos pop tos,sp c; + +code wcssf@ ( -- n ) psh tos,sp tmrc tos,wcssf c; \ Saturation flags +code wcssf! ( n -- ) tmcr wcssf,tos pop tos,sp c; + +code wcgr0@ ( -- n ) psh tos,sp tmrc tos,wcgr0 c; \ General registers for constants +code wcgr0! ( n -- ) tmcr wcgr0,tos pop tos,sp c; +code wcgr1@ ( -- n ) psh tos,sp tmrc tos,wcgr1 c; +code wcgr1! ( n -- ) tmcr wcgr1,tos pop tos,sp c; +code wcgr2@ ( -- n ) psh tos,sp tmrc tos,wcgr2 c; +code wcgr2! ( n -- ) tmcr wcgr2,tos pop tos,sp c; +code wcgr3@ ( -- n ) psh tos,sp tmrc tos,wcgr3 c; +code wcgr3! ( n -- ) tmcr wcgr3,tos pop tos,sp c; +[then] + + + + +code wtest + wldrd wr1,[sp],#8 + tmrrc r3,r4,wr1 + psh r3,sp + mov r4,tos +c; + +code firstep ( adr1 adr2 -- adr1' adr2' d.acc ) + ldr r0,[sp] + + wldrd wr0,[r0],#8 + wldrd wr1,[tos],#8 + + wldrd wr2,[r0],#8 + wmacsz wr4,wr1,wr0 + wldrd wr3,[tos],#8 + + wldrd wr0,[r0],#8 + wmacs wr4,wr2,wr3 + wldrd wr1,[tos],#8 + + wldrd wr2,[r0],#8 + wmacs wr4,wr1,wr0 + wldrd wr3,[tos],#8 + + wmacs wr4,wr2,wr3 + + str r0,[sp] + psh tos,sp + + tmrrc r3,tos,wr4 + psh r3,sp +c; + Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Wed Aug 31 10:24:22 2011 (r2493) +++ cpu/arm/olpc/1.75/devices.fth Wed Aug 31 10:27:55 2011 (r2494) @@ -351,6 +351,8 @@ fload ${BP}/dev/olpc/mmp2camera/loadpkg.fth +fload ${BP}/cpu/arm/firfilter.fth + fload ${BP}/cpu/x86/adpcm.fth \ ADPCM decoding d# 32 is playback-volume Modified: cpu/arm/olpc/1.75/sound.fth ============================================================================== --- cpu/arm/olpc/1.75/sound.fth Wed Aug 31 10:24:22 2011 (r2493) +++ cpu/arm/olpc/1.75/sound.fth Wed Aug 31 10:27:55 2011 (r2494) @@ -187,7 +187,7 @@ : copy-in ( -- ) in-len /audio-buf min ( this-len ) - my-in-desc 2 la+ l@ in-adr third move ( this-len ) + my-in-desc 2 la+ l@ in-adr third move ( this-len ) in-adr over + to in-adr ( this-len ) in-len over - to in-len ( this-len ) drop ( ) @@ -477,6 +477,10 @@ dup set-ctlr-sample-rate set-codec-sample-rate ; +: set-get-sample-rate ( rate -- actual-rate ) + drop d# 48000 ( actual-rate ) + dup set-sample-rate ( actual-rate ) +; \ This is called from "record" in "mic-test" in "selftest" : set-record-gain ( db -- ) Modified: cpu/x86/adpcm.fth ============================================================================== --- cpu/x86/adpcm.fth Wed Aug 31 10:24:22 2011 (r2493) +++ cpu/x86/adpcm.fth Wed Aug 31 10:27:55 2011 (r2494) @@ -234,8 +234,22 @@ : wav-blk-size ( -- blk-size ) wav-fmt-adr dup if h# 14 + le-w@ then ; : set-volume ( -- ) " set-volume" $call-audio ; -: set-sample-rate ( -- ) - wav-fmt-adr ?dup if h# c + le-l@ " set-sample-rate" $call-audio then +0 value src-sample-rate +0 value dst-sample-rate +: try-set-sample-rate ( desired-rate -- ) + dup to src-sample-rate + dup " set-get-sample-rate" ['] $call-audio catch if ( desired x x x ) + 3drop ( desired ) + dup " set-sample-rate" $call-audio ( desired ) + else ( desired actual ) + nip ( actual ) + then ( actual ) + to dst-sample-rate ( ) +; +: wav-set-sample-rate ( -- ) + wav-fmt-adr ?dup if + h# c + le-l@ try-set-sample-rate ( desired-rate ) + then ; 0 value out-move @@ -243,35 +257,37 @@ \ Collapse a sample array with "#output-ch" channels/sample into a smaller \ array with "wav-in-#ch" channels/sample, discarding the excess channels. -: condense-pcm ( adr in-len -- ) - wav-in-#ch #output-ch - /w* to in-skip ( adr in-len ) - #output-ch /w* to out-move ( adr in-len ) - over swap bounds ?do ( out ) - i over out-move move ( out ) - out-move + ( out' ) - in-skip +loop drop ( ) +: condense-pcm ( adr in-len -- adr out-len ) + 2dup #output-ch wav-in-#ch */ 2swap ( adr out-len adr in-len ) + wav-in-#ch #output-ch - /w* to in-skip ( adr out-len adr in-len ) + #output-ch /w* to out-move ( adr out-len adr in-len ) + over swap bounds ?do ( adr out-len out ) + i over out-move move ( adr out-len out ) + out-move + ( adr out-len out' ) + in-skip +loop drop ( adr out-len ) ; \ Spread a sample array with "wav-in-#ch" channels/sample into a larger \ array with "#output-ch" channels/sample, zeroing the new channels. -: expand-pcm ( adr in-len -- ) - #output-ch wav-in-#ch - /w* to out-skip ( adr in-len ) - wav-in-#ch /w* to out-move ( adr in-len ) - 2dup wav-in-#ch / #output-ch * ( adr in-len adr out-len ) - + -rot ( out-adr in-start in-len ) - over + out-move - do ( out-adr ) - out-skip - dup out-skip erase ( out-adr' ) - out-move - i over out-move move ( out-adr' ) - out-move negate +loop ( out-adr ) - drop +: expand-pcm ( adr in-len -- adr out-len ) + 2dup #output-ch wav-in-#ch */ 2swap ( adr out-len adr in-len ) + #output-ch wav-in-#ch - /w* to out-skip ( adr out-len adr in-len ) + wav-in-#ch /w* to out-move ( adr out-len adr in-len ) + 2dup wav-in-#ch / #output-ch * ( adr out-len adr in-len adr out-len ) + + -rot ( adr out-len out-adr in-start in-len ) + over + out-move - do ( adr out-len out-adr ) + out-skip - dup out-skip erase ( adr out-len out-adr' ) + out-move - i over out-move move ( adr out-len out-adr' ) + out-move negate +loop ( adr out-len out-adr ) + drop ( adr out-len ) ; \ Given a sample array of the form L0, R0, L1, R1, ..., copy the left \ channel into the right, giving L0, L0, L1, L1, etc. This is \ particularly useful when the R samples are initially 0. -: mono16>stereo16 ( adr len -- ) bounds ?do i w@ i wa1+ w! /l +loop ; +: mono16>stereo16 ( adr len -- adr len ) 2dup bounds ?do i w@ i wa1+ w! /l +loop ; : play-wait ( -- ) " write-done" $call-audio ; @@ -287,27 +303,55 @@ 0 value pcm-base -: play-raw-pcm ( adr -- error? ) - wav-in-#ch 0= if drop true exit then ( adr ) - - \ Allocate DMA memory for the decoded output - wav-data-adr 4 - le-l@ ( adr in-len ) - dup wav-in-#ch / #output-ch * to /pcm-output ( adr in-len ) - /pcm-output " dma-alloc" $call-audio to pcm-base ( adr in-len ) - - tuck pcm-base swap move ( in-len ) - - #output-ch wav-in-#ch < if pcm-base over condense-pcm then \ Skip extra channel data - #output-ch wav-in-#ch > if pcm-base over expand-pcm then \ Spread out channel data - #output-ch 2 = wav-in-#ch 1 = and if pcm-base over 2* mono16>stereo16 then \ Stereo from mono - drop +: allocate-playback-buffer ( -- in-len ) + dst-sample-rate src-sample-rate ( num denom ) + 2dup = if ( num denom ) + false ( num denom error? ) + else ( num denom ) +[ifdef] upsample6 + 2dup 6 * <> ( num denom error? ) +[else] + true ( num denom error? ) +[then] + then ( num denom error? ) + abort" Unsupported sample rate conversion" ( num denom ) + + 2>r ( r: num denom ) + wav-data-adr 4 - le-l@ ( in-len r: num denom ) + dup 2r> */ ( in-len out-len ) + #output-ch wav-in-#ch */ ( in-len out-len' ) + to /pcm-output ( in-len ) + /pcm-output " dma-alloc" $call-audio to pcm-base ( in-len ) +; + +: move-or-upsample ( adr -- adr' len ) + allocate-playback-buffer ( adr in-len ) + + src-sample-rate dst-sample-rate = if ( adr in-len ) + tuck pcm-base swap move ( in-len ) + else ( adr in-len ) +[ifdef] upsample6 + dup 6 * -rot ( out-len adr in-len ) + pcm-base upsample6 ( out-len ) +[then] + then ( len ) + pcm-base swap ( adr' len ) +; +: play-raw-pcm ( -- error? ) + wav-in-#ch 0= if true exit then ( ) + + wav-data-adr move-or-upsample ( adr in-len ) + + #output-ch wav-in-#ch < if condense-pcm then ( adr len' ) \ Skip extra channel data + #output-ch wav-in-#ch > if expand-pcm then ( adr len' ) \ Spread out channel data + #output-ch 2 = wav-in-#ch 1 = and if mono16>stereo16 then ( adr len ) \ Stereo from mono - pcm-base /pcm-output (play-pcm) - false + (play-pcm) ( ) + false ( error? ) ; -: play-ima-adpcm ( adr -- error? ) - wav-fact-adr 0= if drop true exit then +: play-ima-adpcm ( -- error? ) + wav-fact-adr 0= if true exit then wav-#sample #output-ch * /w* to /pcm-output @@ -315,11 +359,12 @@ /pcm-output " dma-alloc" $call-audio to pcm-base pcm-base /pcm-output erase ( in ) - pcm-base wav-#sample wav-in-#ch wav-blk-size adpcm-decoder ( ) - #output-ch 2 = wav-in-#ch 1 = and if ( ) - pcm-base /pcm-output mono16>stereo16 ( ) - then ( ) - pcm-base /pcm-output (play-pcm) ( ) + wav-data-adr pcm-base wav-#sample wav-in-#ch wav-blk-size adpcm-decoder ( ) + pcm-base /pcm-output ( adr len ) + #output-ch 2 = wav-in-#ch 1 = and if ( adr len ) + mono16>stereo16 ( adr len ) + then ( adr len ) + (play-pcm) ( ) false ( error? ) ; @@ -340,14 +385,15 @@ then playback-volume set-volume - set-sample-rate + wav-set-sample-rate wav-cc case - 1 of wav-data-adr play-raw-pcm endof - h# 11 of wav-data-adr play-ima-adpcm endof + 1 of play-raw-pcm endof + h# 11 of play-ima-adpcm endof ( default ) ." Cannot play .wav format type: " dup .wav-cc true swap cr endcase \ audio-ih close-dev + free-wav ; : ($play-wav) ( file-str -- )

1 0

[commit] r2493 - dev/olpc/dcon
by repository service 31 Aug '11

31 Aug '11

Author: wmb Date: Wed Aug 31 10:24:22 2011 New Revision: 2493 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2493 Log: XO-1.75 - DCON driver - Use GPIO edge detection hardware to avoid the need for disabling interrupts while waiting for DCON freeze - prevents audio buffer underrun. Modified: dev/olpc/dcon/mmp2dcon.fth Modified: dev/olpc/dcon/mmp2dcon.fth ============================================================================== --- dev/olpc/dcon/mmp2dcon.fth Wed Aug 31 10:22:38 2011 (r2492) +++ dev/olpc/dcon/mmp2dcon.fth Wed Aug 31 10:24:22 2011 (r2493) @@ -75,7 +75,8 @@ [then] \ : dcon-blnk? ( -- flag ) ; \ Not hooked up : dcon-stat@ ( -- n ) h# 019100 io@ 4 rshift 3 and ; -: dcon-irq? ( -- flag ) d# 124 gpio-pin@ 0= ; +: setup-dcon-irq ( -- ) d# 124 dup gpio-set-fer gpio-clr-edge ; +: dcon-irq? ( -- flag ) d# 124 gpio-edge@ ; \ DCONSTAT values: 0 SCANINT 1 SCANINT_DCON 2 DISPLAYLOAD 3 MISSED @@ -122,8 +123,9 @@ else has-dcon-ram? if begin ( ) + setup-dcon-irq dcon-unload \ Put the DCON in self-refresh mode - lock[ wait-dcon-mode ]unlock ( retry? ) + wait-dcon-mode ( retry? ) \ display-off ( retry? ) while ( ) \ We got a false ack from the DCON so start over from LOAD state

1 0

[commit] r2492 - cpu/x86
by repository service 31 Aug '11

31 Aug '11

Author: wmb Date: Wed Aug 31 10:22:38 2011 New Revision: 2492 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2492 Log: X86 - Added "upsample6" word to firfilter.fth Modified: cpu/x86/firfilter.fth Modified: cpu/x86/firfilter.fth ============================================================================== --- cpu/x86/firfilter.fth Wed Aug 31 10:21:10 2011 (r2491) +++ cpu/x86/firfilter.fth Wed Aug 31 10:22:38 2011 (r2492) @@ -60,7 +60,7 @@ \ Convert a decimal fraction to a scaled integer multiplier : mul: ( "coef" -- ) safe-parse-word push-decimal $number drop pop-base ( n ) - 1 mulscale lshift d# 1,000,000,000 */ ( n' ) + 1 mulscale lshift d# 1,000,000,000 */ ( n' ) , ; @@ -146,6 +146,8 @@ r> 3drop ( ) ; +: upsample6 ( inbuf /inbuf outbuf -- ) 2 8khz>khz ; + 0 [if] \ Here is some Matlab/Octave code to compute the weights weights = remez(95, [0 .12 .215 1], [1 1 0 0]);

1 0

[commit] r2491 - cpu/arm
by repository service 31 Aug '11

31 Aug '11

Author: wmb Date: Wed Aug 31 10:21:10 2011 New Revision: 2491 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2491 Log: ARM - Added some comments to ARM multiplication code words. No functional change. Modified: cpu/arm/muldiv.fth Modified: cpu/arm/muldiv.fth ============================================================================== --- cpu/arm/muldiv.fth Wed Aug 31 10:19:47 2011 (r2490) +++ cpu/arm/muldiv.fth Wed Aug 31 10:21:10 2011 (r2491) @@ -208,23 +208,23 @@ c; code fm/mod ( d.dividend s.divisor -- s.rem s.quot ) - mov r3,tos - mov r2,tos,asr #0 \ sign extend divisor - pop r0,sp - pop r1,sp - stmdb sp!,{r8,r9} + mov r3,tos \ r3:divisor.low + mov r2,tos,asr #0 \ r2:divisor.high (sign extended) + pop r0,sp \ r0:dividend.high + pop r1,sp \ r1:dividend.low + stmdb sp!,{r8,r9} \ save r8 and r9 cmp r0,#0 - < if + < if \ negative dividend? rsbs r1,r1,#0 - rsc r0,r0,#0 + rsc r0,r0,#0 \ r0,r1: abs(dividend) cmp r2,#0 - < if + < if \ negative divisor? rsbs r3,r3,#0 - rsc r2,r2,#0 + rsc r2,r2,#0 \ r2,r3: abs(divisor) bl 'code (u64division) rsbs r1,r1,#0 - rsc r0,r0,#0 - else + rsc r0,r0,#0 \ negate remainder for floored division + else \ nonnegative divisor mov r8,r2 mov r9,r3 bl 'code (u64division)

1 0

[commit] r2490 - cpu/arm
by repository service 31 Aug '11

31 Aug '11

Author: wmb Date: Wed Aug 31 10:19:47 2011 New Revision: 2490 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2490 Log: ARM - Improvements to assembler support for iwMMX instructions. Modified: cpu/arm/assem.fth Modified: cpu/arm/assem.fth ============================================================================== --- cpu/arm/assem.fth Wed Aug 31 09:33:46 2011 (r2489) +++ cpu/arm/assem.fth Wed Aug 31 10:19:47 2011 (r2490) @@ -884,47 +884,21 @@ )op ; +: g? ( -- flag ) newword 0000.0100 land 0<> ; +: {g} ( -- ) ascii g parse-1 if 0000.0100 xop then ; + : wcx adt-wcx 0f 10 get-this ; +: wcx0 adt-wcx 0f 0 get-this ; : wrd adt-wmmx 0f 0c get-this ; : wrd5 adt-wmmx 0f 05 get-this ; : wrn adt-wmmx 0f 10 get-this ; : wrm adt-wmmx 0f 00 get-this ; -: amode-wmmx-cdp ( -- ) - \ wrd, wrn, wrm - op( - wrd - wrn - wrm - )op -; -: amode-wmmx-cdp2 ( -- ) - \ wrd, wrn - op( - wrd - wrn - )op -; -: imm3-0 - adt-immed 07 00 get-this -; -: amode-wmmx-cdp-imm ( -- ) - \ wrn, wrd, wrm - op( - wrn - wrd - wrm - adt-immed 07 14 get-this - )op -; - -: amode-wmmx-transfer ( -- ) - \ wrd, rn, wrm - op( - wrd - adt-reg 0f 0c get-this - wrm - )op -; +: amode-wmmx-cdp ( -- ) op( wrd wrn wrm )op ; +: amode-wmmx-cdp-g ( -- ) op( wrd wrn g? if wcx0 else wrm then )op ; +: amode-wmmx-cdp2 ( -- ) op( wrd wrn )op ; +: imm3-0 ( -- ) adt-immed 07 00 get-this ; +: amode-wmmx-cdp-imm ( -- ) op( wrn wrd wrm adt-immed 07 14 get-this )op ; +: amode-wmmx-transfer ( -- ) op( wrd get-r12 wrm )op ; \ Get the offset for ldc, stc instructions. : get-off-c ( -- ) @@ -1056,9 +1030,6 @@ ascii s parse-1 if 0030.0000 xop need-s exit then " us or ss" expecting ; -: {g} - ascii g parse-1 if 0000.0100 xop ( !! need to change mode of last operand from wrN to rN ) then -; : parse-condition? ( -- cond true | false ) \ The next two characters of the input string will be checked for a @@ -1092,6 +1063,9 @@ ; : {cond/s} ( opcode -- ) {cond} {s} ; +: do-mmx ( opc -- ) 0e00.0000 or {cond} amode-wmmx-cdp ; +: do-mmx-shift ( opc -- ) 0e00.0000 or {hwd} {g} +{cond} amode-wmmx-cdp-g ; + : amode-wldst ( -- ) op( get-whatever @@ -1099,7 +1073,7 @@ adt-wcx of 0c set-field f000.0000 iop - newword 0040.0010 and 0000.0010 <> if + newword 0040.0100 and 0000.0100 <> if " Size must be W for WLDR or WSTR with wCX" ad-error then endof @@ -1261,7 +1235,6 @@ : mcr 0e00.0010 {cond} amode-copr ; : mrc 0e10.0010 {cond} amode-copr ; -: do-mmx ( opc -- ) 0e00.0000 or {cond} amode-wmmx-cdp ; : wor 0000.0000 do-mmx ; : wxor 0010.0000 do-mmx ; : wand 0020.0000 do-mmx ; @@ -1277,7 +1250,6 @@ : walignr2 00a0.0020 do-mmx ; : walignr3 00b0.0020 do-mmx ; -: do-mmx-shift ( opc -- ) 0e00.0000 or {hwd} {g} +{cond} amode-wmmx-cdp ; : wsra 0000.0040 do-mmx-shift ; : wsll 0010.0040 do-mmx-shift ; : wsll 0020.0040 do-mmx-shift ;

1 0

[commit] r2489 - cpu/arm
by repository service 31 Aug '11

31 Aug '11

Author: wmb Date: Wed Aug 31 09:33:46 2011 New Revision: 2489 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2489 Log: ARM simulator - order of operands was wrong for SBC, leading to failures in m* when the result was negative and > 2^32. Modified: cpu/arm/armsim.c Modified: cpu/arm/armsim.c ============================================================================== --- cpu/arm/armsim.c Wed Aug 31 07:35:10 2011 (r2488) +++ cpu/arm/armsim.c Wed Aug 31 09:33:46 2011 (r2489) @@ -917,7 +917,7 @@ case 0x13: INSTR("rsb"); SBB(RD, IMM32, RN, 1); break; case 0x14: INSTR("add"); ADC(RD, RN, IMM32, 0); break; case 0x15: INSTR("adc"); ADC(RD, RN, IMM32, C); break; -case 0x16: INSTR("sbc"); SBB(RD, IMM32, RN, C); break; +case 0x16: INSTR("sbc"); SBB(RD, RN, IMM32, C); break; case 0x17: INSTR("rsc"); SBB(RD, IMM32, RN, C); break; case 0x18: INSTR("movw"); RD = IMM16; break; case 0x19: switch (BXTYPE) {

1 0

[commit] r2488 - cpu/arm/olpc/1.75 cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev/olpc/spiflash
by repository service 31 Aug '11

31 Aug '11

Author: quozl Date: Wed Aug 31 07:35:10 2011 New Revision: 2488 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2488 Log: OLPC XO-1.5 XO-1.75 - move storage LED manipulation to fw.bth for XO-1.5 and XO-1.75, use storage LED when writing to EC or OpenFirmware FLASH, show a display indicator of EC automatic reflash, fixes #11117. The indicator is on the bottom left of display, and is a green laptop followed by three grey dots as an ellipsis ... no progress reported to display, only to serial port. Modified: cpu/arm/olpc/1.75/devices.fth cpu/arm/olpc/1.75/ecflash.fth cpu/arm/olpc/1.75/fw.bth cpu/arm/olpc/1.75/leds.fth cpu/x86/pc/olpc/gui.fth cpu/x86/pc/olpc/via/fw.bth cpu/x86/pc/olpc/via/leds.fth dev/olpc/spiflash/spiui.fth Modified: cpu/arm/olpc/1.75/devices.fth ============================================================================== --- cpu/arm/olpc/1.75/devices.fth Wed Aug 31 03:12:52 2011 (r2487) +++ cpu/arm/olpc/1.75/devices.fth Wed Aug 31 07:35:10 2011 (r2488) @@ -179,6 +179,10 @@ false constant tethered? \ We only support reprogramming our own FLASH +: hdd-led-off ( -- ) d# 10 gpio-clr ; +: hdd-led-on ( -- ) d# 10 gpio-set ; +: hdd-led-toggle ( -- ) d# 10 gpio-pin@ if hdd-led-off else hdd-led-on then ; + fload ${BP}/dev/olpc/spiflash/spiui.fth \ User interface for SPI FLASH programming \ fload ${BP}/dev/olpc/spiflash/recover.fth \ XO-to-XO SPI FLASH recovery : ofw-fw-filename$ " disk:\boot\olpc.rom" ; Modified: cpu/arm/olpc/1.75/ecflash.fth ============================================================================== --- cpu/arm/olpc/1.75/ecflash.fth Wed Aug 31 03:12:52 2011 (r2487) +++ cpu/arm/olpc/1.75/ecflash.fth Wed Aug 31 07:35:10 2011 (r2488) @@ -37,6 +37,7 @@ \ Tells the EC to auto-restart after power cycling : set-ec-reboot ( -- ) 1 h# f018 edi-b! ; : reflash-ec + hdd-led-on [ifdef] cl2-a1 " enter-updater" $call-ec ." Erasing ..." cr " erase-flash" $call-ec cr @@ -53,6 +54,7 @@ load-base load-base /ec-flash + /ec-flash comp abort" Miscompare!" cr + hdd-led-off [ifndef] cl2-a1 ." Restarting EC and rebooting" cr d# 2000 ms @@ -92,7 +94,8 @@ bl left-parse-string 2nip ( version$ ) ec-name$ $caps-compare 0<= ( flag ) ; -: ?update-ec-flash ( -- ) + +: update-ec-flash ( -- ) " ecimage.bin" find-drop-in if ( adr len ) 2dup ec-up-to-date? if ( adr len ) free-mem ( ) @@ -110,6 +113,13 @@ then ; +: update-ec-flash? ( -- flag ) + " ecimage.bin" find-drop-in if ( adr len ) + 2dup ec-up-to-date? 0= ( adr len flag ) + >r free-mem r> ( flag ) + then +; + \ LICENSE_BEGIN \ Copyright (c) 2010 FirmWorks \ Modified: cpu/arm/olpc/1.75/fw.bth ============================================================================== --- cpu/arm/olpc/1.75/fw.bth Wed Aug 31 03:12:52 2011 (r2487) +++ cpu/arm/olpc/1.75/fw.bth Wed Aug 31 07:35:10 2011 (r2488) @@ -333,10 +333,6 @@ fload ${BP}/cpu/x86/pc/olpc/via/nbrx.fth fload ${BP}/cpu/x86/pc/olpc/via/blockfifo.fth -: hdd-led-off ( -- ) d# 10 gpio-clr ; -: hdd-led-on ( -- ) d# 10 gpio-set ; -: hdd-led-toggle ( -- ) d# 10 gpio-pin@ if hdd-led-off else hdd-led-on then ; - alias fast-hash crypto-hash \ fast-hash uses acceleration when available fload ${BP}/cpu/x86/pc/olpc/via/fsupdate.fth fload ${BP}/cpu/x86/pc/olpc/via/fsverify.fth @@ -478,7 +474,7 @@ show-child - ?update-ec-flash + update-ec-flash? if show-reflash update-ec-flash then install-alarm ?sound Modified: cpu/arm/olpc/1.75/leds.fth ============================================================================== --- cpu/arm/olpc/1.75/leds.fth Wed Aug 31 03:12:52 2011 (r2487) +++ cpu/arm/olpc/1.75/leds.fth Wed Aug 31 07:35:10 2011 (r2488) @@ -6,8 +6,6 @@ " leds" device-name : open ( -- okay? ) true ; : close ( -- ) ; -: hdd-led-on ( -- ) d# 10 gpio-set ; -: hdd-led-off ( -- ) d# 10 gpio-clr ; : ols-led-on ( -- ) h# 57 ec-cmd ; : ols-led-off ( -- ) h# 58 ec-cmd ; : ols-assy-mode-on ( -- ) h# 59 ec-cmd ; Modified: cpu/x86/pc/olpc/gui.fth ============================================================================== --- cpu/x86/pc/olpc/gui.fth Wed Aug 31 03:12:52 2011 (r2487) +++ cpu/x86/pc/olpc/gui.fth Wed Aug 31 07:35:10 2011 (r2488) @@ -373,6 +373,12 @@ d# 588 d# 638 to icon-xy " bigdot" show-icon " vga?" $call-screen 0= if dcon-unfreeze dcon-freeze then ; + +: show-reflash ( -- ) \ bottom left corner, laptop and ellipsis + d# 0 d# 810 to icon-xy " int" show-icon + d# 450 d# 150 do i d# 844 to icon-xy " bigdot" show-icon d# 100 +loop +; + : show-x ( -- ) " x" show-icon ; : show-sad ( -- ) icon-xy Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Wed Aug 31 03:12:52 2011 (r2487) +++ cpu/x86/pc/olpc/via/fw.bth Wed Aug 31 07:35:10 2011 (r2488) @@ -110,6 +110,13 @@ fload ${BP}/cpu/x86/acpiio.fth \ ACPI register access +: hdd-led@ h# 4c acpi-l@ ; +: hdd-led! h# 4c acpi-l! ; +h# 400000 constant hdd-led +: hdd-led-toggle ( -- ) hdd-led@ hdd-led xor hdd-led! ; +: hdd-led-off ( -- ) hdd-led@ hdd-led or hdd-led! ; +: hdd-led-on ( -- ) hdd-led@ hdd-led invert and hdd-led! ; + fload ${BP}/cpu/x86/pc/olpc/via/probemem.fth \ Memory probing [ifdef] virtual-mode @@ -496,8 +503,7 @@ fload ${BP}/cpu/x86/pc/olpc/via/nbtx.fth fload ${BP}/cpu/x86/pc/olpc/via/nbrx.fth fload ${BP}/cpu/x86/pc/olpc/via/blockfifo.fth -: hdd-led-toggle ( -- ) h# 4c acpi-l@ h# 400000 xor h# 4c acpi-l! ; -: hdd-led-off ( -- ) h# 4c acpi-l@ h# 400000 or h# 4c acpi-l! ; + : fast-hash ( adr len hashname$ -- ) 2dup " sha256" $= if ( eblock# hashname$ r: hash$ ) 2drop sha-256 ( eblock# calc-hash$ r: hash$ ) Modified: cpu/x86/pc/olpc/via/leds.fth ============================================================================== --- cpu/x86/pc/olpc/via/leds.fth Wed Aug 31 03:12:52 2011 (r2487) +++ cpu/x86/pc/olpc/via/leds.fth Wed Aug 31 07:35:10 2011 (r2488) @@ -6,10 +6,6 @@ " leds" device-name : open ( -- okay? ) true ; : close ( -- ) ; -: gpio-lo ( mask -- ) h# 4c acpi-l@ swap invert and h# 4c acpi-l! ; -: gpio-hi ( mask -- ) h# 4c acpi-l@ swap or h# 4c acpi-l! ; -: hdd-led-on ( -- ) h# 400000 gpio-lo ; -: hdd-led-off ( -- ) h# 400000 gpio-hi ; : selftest ( -- ) ." Flashing LEDs" cr " /wlan" test-dev " /wlan" test-dev \ Twice for longer flashing Modified: dev/olpc/spiflash/spiui.fth ============================================================================== --- dev/olpc/spiflash/spiui.fth Wed Aug 31 03:12:52 2011 (r2487) +++ dev/olpc/spiflash/spiui.fth Wed Aug 31 07:35:10 2011 (r2488) @@ -192,6 +192,7 @@ ; : reflash ( -- ) \ Flash from data already in memory + hdd-led-on ?file flash-write-enable @@ -208,6 +209,7 @@ else .verify-msg then + hdd-led-off ; defer fw-filename$ ' null$ to fw-filename$

1 0

[commit] r2487 - cpu/arm
by repository service 31 Aug '11

31 Aug '11

Author: wmb Date: Wed Aug 31 03:12:52 2011 New Revision: 2487 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2487 Log: ARM simulator - implemented smull and umull instructions. There is still a problem lurking, as "m*" fails on certain numbers when arm4? is false. An example failure is "false to arm4? decimal 1,000,000,000 -5 m* d.". The carry out into the high word doesn't happen. Modified: cpu/arm/armsim.c Modified: cpu/arm/armsim.c ============================================================================== --- cpu/arm/armsim.c Mon Aug 29 03:46:46 2011 (r2486) +++ cpu/arm/armsim.c Wed Aug 31 03:12:52 2011 (r2487) @@ -447,6 +447,18 @@ } switch (BXTYPE) { // P=0, U=1, bit22=0, W=0 - post-index, subtract offset, register, no writeback + case 0x9: INSTR("umull"); + { unsigned long long result; + result = (unsigned long long)RM * (unsigned long long)RS; + RN = (u32)((result >> 32) & 0xffffffffLL); + RD = (u32)(result & 0xffffffffLL); + if (S) { + N = (result < 0); + Z = (result == 0); + } + } + break; + case 0xb: if (L) { INSTR("ldrh"); @@ -487,7 +499,8 @@ case 0xf: UNIMP("ldrsh"); break; // UNPREDICTABLE default: UNIMP("BXTYPE"); break; } break; -case 0x06: if (OP1 == 0 || OP2 == 0) { +case 0x06: + if (OP1 == 0 || OP2 == 0) { INSTR("sbc"); SHFT(res); // printf("sbc RN %x res %x ~res %x C %x -- ", RN, res, ~(res), C); // ADC(RD, RN, ~(res), C); @@ -502,7 +515,19 @@ case 0x3: case 0x5: case 0x7: INSTR("sbc"); SHFT(res); SBB(RD, res, RN, C); break; - case 0x9: UNIMP("smull"); break; + case 0x9: INSTR("smull"); + { long long result, a, b; + a = (int)RM; + b = (int)RS; + result = a * b; + RN = (u32)((result >> 32) & 0xffffffffLL); + RD = (u32)(result & 0xffffffffLL); + if (S) { + N = (result < 0); + Z = (result == 0); + } + } + break; // P=0, U=1, bit22=1, W=0 - post-index, subtract offset, immediate, no writeback case 0xb: if (L) {

1 0

[commit] r2486 - cpu/arm/mmp2
by repository service 29 Aug '11

29 Aug '11

Author: wmb Date: Mon Aug 29 03:46:46 2011 New Revision: 2486 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2486 Log: OLPC XO-1.75 - improvements to suspend/resume code; still not 100% working. Modified: cpu/arm/mmp2/dramrecal.fth Modified: cpu/arm/mmp2/dramrecal.fth ============================================================================== --- cpu/arm/mmp2/dramrecal.fth Mon Aug 29 03:36:56 2011 (r2485) +++ cpu/arm/mmp2/dramrecal.fth Mon Aug 29 03:46:46 2011 (r2486) @@ -58,20 +58,102 @@ end-code here ddr-recal - constant /ddr-recal -h# d000.0000 constant memctrl-pa -h# d000.0000 constant memctrl-va -h# d100.0000 constant sram-pa -h# d100.0000 constant sram-va -sram-va h# 2.0000 + constant 'ddr-recal +label ddr-self-refresh ( r0:memctrl-va -- ) + mov r1, #0x1 \ Block all data requests + str r1, [r0, #0x7e0] \ SDRAM_CTRL14 -: ddr-recal-to-sram ( -- ) + ldr r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 + bic r1, r1, #0xc0 \ USER_SR_REQUEST field + orr r1, r1, #0x40 \ Enter Self Refresh value + str r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 + + \ This block was commented-out in the Linux code, and the value is incorrect for OLPC in any case + \ mov r1, #0x03000000 \ PAD_TERM_SWITCH_MODE: Termination disabled + \ orr r1, r1, #0x000a \ ODT{1,0}_SWITCH_MODE: Termination controlled by Read and Write enables + \ str r1, [r0, #0x770] \ SDRAM_CTRL7_SDRAM_ODT_CTRL2 + +[ifdef] notdef + ldr r1, [r0, #0x1e0] \ PHY_CTRL8 + bic r1,r1,#0x07700000 \ PHY_ADCM_ZPDRV: 0 PHY_ADCM_ZNDRV: 0 (Disable drivers 6:0) + str r1, [r0, #0x1e0] \ PHY_CTRL8 +[then] + + set r2, #0xfe086000 + set r3, #0xfe050000 + str r2, [r3] \ Final write to SP votes + + mcr p15,0,r0,7,10,4 \ Data Synchronization Barrier +\ dsb \ Data Synchronization Barrier + wfi \ Wait for interrupt + +[ifdef] notdef + ldr r1, [r0, #0x1e0] \ PHY_CTRL8 + orr r1,r1,#0x07700000 \ PHY_ADCM_ZPDRV: 7 PHY_ADCM_ZNDRV: 7 (Enable drivers 6:0) + str r1, [r0, #0x1e0] \ PHY_CTRL8 +[then] + + \ This block was commented-out in the Linux code, and the value is incorrect for OLPC in any case + \ mov r1, #0x02000000 \ PAD_TERM_SWITCH_MODE: Termination enabled during all reads + \ orr r1, r1, #0x000a \ ODT{1,0}_SWITCH_MODE: Termination controlled by Read and Write enables + \ str r1, [r0, #0x770] \ SDRAM_CTRL7_SDRAM_ODT_CTRL2 + + mov r1, #0x80000000 \ PHY_SYNC_EN + str r1, [r0, #0x240] \ PHY_CTRL14 + + ldr r1, [r0, #230] \ PHY_CTRL13 + orr r1,r1,#0xf0000000 \ DLL_RESET_TIMER: 15*256 memory clocks +\ mov r1, #0xf0000000 \ DLL_RESET_TIMER: 15*256 memory clocks +\ orr r1, r1, #0x0040 \ DLL_PHSEL: 4 (45 + 4*3 = 57 degrees) - adjust? + str r1, [r0, #230] \ PHY_CTRL13 + + mov r1, #0x20000000 \ PHY_DLL_RESET + str r1, [r0, #0x240] \ PHY_CTRL14 + + mov r1, #0x40000000 \ DLL_UPDATE_EN + str r1, [r0, #0x240] \ PHY_CTRL14 + + ldr r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 + bic r1, r1, #0xc0 \ USER_SR_REQUEST field + orr r1, r1, #0x80 \ Exit Self Refresh value + str r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 + + ldr r1, [r0, #0x80] \ SDRAM_CTRL1 + orr r1, r1, #0x40 \ DLL_RESET + str r1, [r0, #0x80] \ SDRAM_CTRL1 + + mov r1, #0x01000000 \ Chip select 0 + orr r1, r1, #0x0100 \ USER_LMR0_REQ - Initiate Mode Register Set + str r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 + + \ ldr r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 + \ bic r1, r1, #0xc0 \ USER_SR_REQUEST field + \ orr r1, r1, #0x80 \ Exit Self Refresh value + \ str r1, [r0, #0x120] \ USER_INITIATED_COMMAND0 + + mov r1, #0x0 \ Unblock data requests + str r1, [r0, #0x7e0] \ SDRAM_CTRL14 + + mov pc, lr +end-code +here ddr-self-refresh - constant /ddr-self-refresh + +memctrl-pa constant memctrl-va + +: ddr-code-to-sram ( -- ) memctrl-pa h# c02 or memctrl-va map-section \ Map the memory controller - sram-pa h# c0e or sram-va map-section \ Make the code cacheable + +\ sram is already mapped by initmmu.fth +\ sram-pa h# c0e or sram-va map-section \ Make the code cacheable + ddr-recal 'ddr-recal /ddr-recal move + 'ddr-recal /ddr-recal sync-cache + + ddr-self-refresh 'ddr-self-refresh /ddr-self-refresh move + 'ddr-self-refresh /ddr-self-refresh sync-cache ; stand-init: Setup DDR3 recalibration - ddr-recal-to-sram + ddr-code-to-sram ; \ Call this from OFW to perform a recalibration @@ -82,6 +164,259 @@ mov pc,r1 c; +\ Call this from OFW to enter self-refresh +code do-self-refresh ( -- ) + set r0,`memctrl-va #` \ Memory controller virtual address + set r1,`'ddr-self-refresh #` \ Address of ddr-self-refresh routine in SRAM + mov lr,pc + mov pc,r1 +c; + +: +apbc ( offset -- io-offset ) h# 01.5000 + ; +: +apmu ( offset -- io-offset ) h# 28.2800 + ; +: +mpmu ( offset -- io-offset ) h# 05.0000 + ; +: +scu ( offset -- io-offset ) h# 28.2c00 + ; +: +icu ( offset -- io-offset ) h# 28.2000 + ; + +: io-set ( mask offset -- ) dup io@ rot or swap io! ; +: io-clr ( mask offset -- ) dup io@ rot invert and swap io! ; + +: apbc-clr-rst ( offset -- ) +apbc 4 swap io-clr ; +: apbc-set-rst ( offset -- ) +apbc 4 swap io-set ; + +: disable-apbc-clks ( -- ) + \ 3 h# 38 +apbc io-clr \ GPIO + 3 h# 74 +apbc io-clr \ MPMU + 3 h# 78 +apbc io-clr \ IPC + 3 h# 90 +apbc io-clr \ THSENS1 + + \ h# 38 apbc-set-rst + h# 74 apbc-set-rst \ MPMU + h# 78 apbc-set-rst \ IPC + h# 90 apbc-set-rst \ THSENS1 +; +: enable-apbc-clks ( -- ) + \ 3 h# 38 +apbc io-set \ GPIO + 3 h# 74 +apbc io-set \ MPMU + 3 h# 78 +apbc io-set \ IPC + 3 h# 90 +apbc io-set \ THSENS1 + + \ h# 38 apbc-clr-rst + h# 74 apbc-clr-rst \ MPMU + h# 78 apbc-clr-rst \ IPC + h# 90 apbc-clr-rst \ THSENS1 +; +: disable-scu-clks ( -- ) + 0 h# 64 +scu io! \ SCU_AXIFAB_CKGT_CTRL0 - Close AXI fabric clock gate + 0 h# 68 +scu io! \ SCU_AXIFAB_CKGT_CTRL1 + h# f0 h# 1c +scu io-set \ SCU_MCB_CONF +; +: enable-scu-clks ( -- ) + h# 3003003 h# 64 +scu io! \ SCU_AXIFAB_CKGT_CTRL0 - Open AXI fabric clock gate + h# 0303030 h# 68 +scu io! \ SCU_AXIFAB_CKGT_CTRL1 + h# f0 h# 1c +scu io-clr \ SCU_MCB_CONF +; +: disable-apmu-clks ( -- ) + h# 3f h# d8 +apmu io-clr \ PMUA_MSPRO_CLK_RES_CTRL + h# 1fffd h# dc +apmu io-clr \ PMUA_GLB_CLK_RES_CTRL +\ 0 h# 68 +apmu io! \ PMUA_WTM_CLK_RES_CTRL + h# 9 h# 5c +apmu io-clr \ PMUA_USB_CLK_RES_CTRL +; +: enable-apmu-clks ( -- ) + h# 3f h# d8 +apmu io-set \ PMUA_MSPRO_CLK_RES_CTRL + h# 1fffd h# dc +apmu io-set \ PMUA_GLB_CLK_RES_CTRL +\ h# 1b h# 68 +apmu io! \ PMUA_WTM_CLK_RES_CTRL + h# 9 h# 5c +apmu io-set \ PMUA_USB_CLK_RES_CTRL +; +: disable-mpmu-clks ( -- ) + h# a010 h# 1024 +mpmu io! \ MPMU_ACGR + + h# a010 h# 0024 +mpmu io! \ MPMU_CGR_SP ??? + +\ h# 2000.0000 h# 414 +mpmu io-clr \ MPMU_PLL2_CTRL1 + h# 8000.0000 h# 0040 +mpmu io-clr \ MPMU_ISCCR1 + h# 8000.0000 h# 0044 +mpmu io-clr \ MPMU_ISCCR2 +; +: enable-mpmu-clks ( -- ) + h# dffe.fffe h# 1024 +mpmu io! \ MPMU_ACGR +\ h# 2000.0000 h# 0414 +mpmu io-set \ MPMU_PLL2_CTRL1 + h# 8000.0000 h# 0040 +mpmu io-set \ MPMU_ISCCR1 + h# 8000.0000 h# 0044 +mpmu io-set \ MPMU_ISCCR2 +; +: disable-twsi-clks ( -- ) + \ set RST in APBC_TWSIx_CLK_RST registers + +[ifdef] notdef + \ just disable TWSI1 clk rather than reset it since it's needed to access PMIC onkey + \ when system is waken up from low power mode */ + 0 4 +apbc io! \ Disable TWSI1 clock +[else] + h# 04 apbc-set-rst \ TWSI1 +[then] + h# 08 apbc-set-rst \ TWSI2 + h# 0c apbc-set-rst \ TWSI3 + h# 10 apbc-set-rst \ TWSI4 + h# 7c apbc-set-rst \ TWSI5 + h# 80 apbc-set-rst \ TWSI6 +; +: enable-twsi-clks ( -- ) +[ifdef] notdef + 3 4 +apbc io! \ Enable TWSI1 clock +[else] + h# 04 apbc-clr-rst \ TWSI1 +[then] + h# 08 apbc-clr-rst \ TWSI2 + h# 0c apbc-clr-rst \ TWSI3 + h# 10 apbc-clr-rst \ TWSI4 + h# 7c apbc-clr-rst \ TWSI5 + h# 80 apbc-clr-rst \ TWSI6 +; +: disable-clks ( -- ) + disable-twsi-clks + disable-apbc-clks + disable-scu-clks + disable-apmu-clks + disable-mpmu-clks +; +: enable-clks ( -- ) + enable-mpmu-clks + enable-apmu-clks + enable-scu-clks + enable-apbc-clks + enable-twsi-clks +; + +\ Wakeup ports - from datasheet page 718 +\ WAKEUP0: CAWAKE (MIPI-HSI wakeup) +\ WAKEUP1: Audio Island +\ WAKEUP2: GPIO +\ WAKEUP3: Keypress,Trackball,Rotary +\ WAKEUP4: Timers, RTC ALARM, WDT +\ WAKEUP5: USB PHY +\ WAKEUP6: SDH1_CD, SDH3_CD, MSP_INS +\ WAKEUP7: PMIC INT +5 value sleep-depth +: setup-wakeup-sources ( -- mask ) + h# 0002.0094 h# 4c +mpmu io! \ RTC_ALARM, WAKEUP7, WAKEUP4, WAKEUP2 +\ h# 0002.0094 h# 104c +mpmu io! \ RTC_ALARM, WAKEUP7, WAKEUP4, WAKEUP2 ??? + h# ff08.7fff ( mask ) \ Enable all wakeup ports +; +: block-irqs ( -- ) 1 h# 110 +icu io! ; + +0 value save-apcr +0 value save-idlecfg + +: restore-run-state ( -- ) + save-apcr h# 1000 +mpmu io! ( ) \ Restore APCR + save-idlecfg h# 18 +apmu io! ( ) \ Restore IDLE_CFG +; +: setup-sleep-state ( -- ) + \ begin mmp2_pm_enter_lowpower_mode(state) + + h# 1000 +mpmu io@ to save-apcr + h# 18 +apmu io@ to save-idlecfg + + save-apcr ( apcr ) + h# ac08.0000 invert and ( apcr' ) \ Clear AXISD, SLPEN, DDRCORSD, APBSD, VCXOSD + + sleep-depth 5 >= if \ state at least POWER_MODE_SYS_SLEEP (turn off oscillator) + h# 0008.0000 or ( apcr' ) \ Set VCXOSD + then + + h# 2000.0000 0 +mpmu io-clr \ In SP, clear SLPEN - we might set it later + + sleep-depth 4 >= if \ state at least POWER_MODE_CHIP_SLEEP (turn off most of SoC) + h# 2008.0000 0 +mpmu io-set \ In SP, also set SLPEN, VCXOSD + h# 2000.0000 or ( apcr' ) \ Set SLPEN + setup-wakeup-sources and ( apcr' ) + then + + sleep-depth 3 >= if \ state at least POWER_MODE_APPS_SLEEP (turn off slow IO) + h# de00.0000 0 +mpmu io-set \ In SP, set AXISD, resvd, SPSD, DDRCORSD, APBSD resvd, + h# 0400.0000 or ( apcr' ) \ Set APBSD + then + + h# 8030.0020 h# 14 +apmu io! ( apcr ) \ IN PMUA_SP_IDLE_CFG, set , DIVIDER_RESET_EN, SP_DIS_MC_SW_REQ, SP_MC_WAKE_EN, TCM_STATE_RETAIN + + sleep-depth 2 >= if \ state at least POWER_MODE_APPS_IDLE (turn off fast IO and DDR) + h# 8800.0000 or ( apcr' ) \ Set AXISD, DDRCORSD + then + + h# 5200.0000 or ( apcr' ) \ Set DSPSD (bit 30, reserved), SPSD (bit 28), BBSD (bit 25, resvd) + + save-idlecfg 1 invert and ( apcr idle ) \ PMUA_MOH_IDLE + + sleep-depth 2 >= if \ state at least POWER_MODE_APPS_IDLE + h# 0000.0020 or ( apcr idle' ) \ PJ_PWRDWN + then + + sleep-depth 1 >= if \ state at least POWER_MODE_CORE_EXTIDLE + h# 3000.0000 invert and ( apcr idle' ) \ PJ_ISO_MODE_CNTRL - isolation controlled by processor logic and active + h# 000a.0000 or ( apcr idle' ) \ 2 L2 power switches, 1 L1 power switch, 3 core power switches + then + + h# 0020.0000 or ( apcr idle' ) \ PJ_DIS_MC_SW_REQ - disable idle entry using software register bits + h# 0010.0000 or ( apcr idle' ) \ PJ_MC_WAKE_EN - wake memory controller when core wakes + + 0 h# b0 +apmu io! ( apcr idle ) \ PMUA_MC_HW_SLP_TYPE - self-refresh power down + + h# 18 +apmu io! ( apcr ) \ Set IDLE_CFG register + h# 1000 +mpmu io! ( ) \ Set APCR register + + \ end mmp2_pm_enter_lowpower_mode(state) +; + +: screen-dark + " screen-ih iselect h# 12 mode! 0 h# 190 lcd! iunselect" eval \ Saves 1.05W + 0 h# 4c +apmu io! \ Kill the display clocks - saves 100 mW + \ 0 h# 54 +apmu io! \ Kill the SDIO 0 clocks - insignificant savings + \ 0 h# 58 +apmu io! \ Kill the SDIO 1 clocks - insignificant savings + d# 34 gpio-clr \ Kill the WLAN power - saves 100 mW +; +: stdin-idle-on ['] safe-idle to stdin-idle d# 15 enable-interrupt ; +: stdin-idle-off ['] noop to stdin-idle install-uart-io d# 15 disable-interrupt ; + +: str ( -- ) + stdin-idle-off + 5 h# 38 +mpmu io! \ Use 32 kHz clock instead of VCXO for slow clock + +\ OLPC: Unmask main PMU interrupt - don't know if this is necessary +\ h# 400 h# 174 +icu io-clr +\ d# 35 enable-interrupt + +\ The PMIC_INT line is unconnected on XO-1.75. Normally it would come from the EC, +\ presumably for the purpose of waking on a keystroke. +\ 4 enable-interrupt \ Route PMIC interrupt to PJ4 IRQ +\ 2 h# 168 +icu io-clr \ Enable PMIC interrupt + + setup-sleep-state + +\ h# 00c0.0000 h# 8c +apmu io-set \ Power down CoreSight SRAM + + \ TODO - need to power down sram/l2$ + \ mmp2_cpu_disable_l2(0); + \ outer_cache.flush_range(0, -1ul); + + \ TODO - handle low power island? + + disable-clks + + \ begin mmp2_cpu_do_idle() + block-irqs ( ) \ Block IRQs - will be cleared by PMU + do-self-refresh ( ) + + restore-run-state + \ end mmp2_cpu_do_idle() + + enable-clks + + ." STR out" cr + \ mmp2_cpu_enable_l2(0); + + \ idle_cfg &= (~PMUA_MOH_SRAM_PWRDWN); + stdin-idle-on +; + \ LICENSE_BEGIN \ Copyright (c) 2011 FirmWorks \

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware August 2011