July 2011 - openfirmware - mail.coreboot.org

[commit] r2386 - cpu/arm/olpc/1.75
by repository service July 17, 2011

July 17, 2011

Author: wmb Date: Sun Jul 17 10:57:58 2011 New Revision: 2386 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2386 Log: Q4B05 Modified: cpu/arm/olpc/1.75/fw-version.fth Modified: cpu/arm/olpc/1.75/fw-version.fth ============================================================================== --- cpu/arm/olpc/1.75/fw-version.fth Sun Jul 17 10:56:25 2011 (r2385) +++ cpu/arm/olpc/1.75/fw-version.fth Sun Jul 17 10:57:58 2011 (r2386) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR B -macro: FW_MINOR 04 +macro: FW_MINOR 05

1 0

[commit] r2385 - cpu/arm/olpc/1.75
by repository service July 17, 2011

July 17, 2011

Author: wmb Date: Sun Jul 17 10:56:25 2011 New Revision: 2385 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2385 Log: OLPC XO-1.75 - completed the change begun by svn 2371, this time modifying the copy of the affected code that is actually used by XO-1.75. Modified: cpu/arm/olpc/1.75/mfgtest.fth Modified: cpu/arm/olpc/1.75/mfgtest.fth ============================================================================== --- cpu/arm/olpc/1.75/mfgtest.fth Sat Jul 16 14:20:43 2011 (r2384) +++ cpu/arm/olpc/1.75/mfgtest.fth Sun Jul 17 10:56:25 2011 (r2385) @@ -34,18 +34,21 @@ : mfg-test-dev ( $ -- ) restore-scroller - ??cr ." Testing " 2dup type cr - locate-device if ." Can't find device node" cr exit then ( phandle ) - " selftest" rot execute-phandle-method ( return abort? ) - if - ?dup if + ??cr ." Testing " 2dup type cr ( $ ) + 2dup locate-device if ( $ ) + 2drop ." Can't find device node" cr exit ( -- ) + else + drop ( $ ) + then ( $ phandle ) + " selftest" execute-device-method if ( return-code ) + ?dup if ( return-code ) ??cr ." Selftest failed. Return code = " .d cr mfg-color-red sq-border! false to pass? red-screen flush-keyboard mfg-wait-return - else + else ( ) green-letters ." Okay" cr black-letters

1 0

[commit] r2384 - in dev: . pci
by repository service July 16, 2011

July 16, 2011

Author: wmb Date: Sat Jul 16 14:20:43 2011 New Revision: 2384 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2384 Log: PCI and PCI bridge drivers - better support for preassigned addresses. Modified: dev/pci/pcibridg.fth dev/pcibus.fth Modified: dev/pci/pcibridg.fth ============================================================================== --- dev/pci/pcibridg.fth Sat Jul 16 14:18:36 2011 (r2383) +++ dev/pci/pcibridg.fth Sat Jul 16 14:20:43 2011 (r2384) @@ -11,10 +11,6 @@ : my-l! ( l offset -- ) my-space + " config-l!" $call-parent ; 0 value my-bus# -0 value my-io-base -0 value my-io-limit -0 value my-mem-base -0 value my-mem-limit defer parent-decode-unit @@ -153,43 +149,58 @@ 2swap drop r> swap - encode-int encode+ ( adr' len' ) ; -: make-ranges-property ( -- ) - 0 0 encode-bytes - my-io-base my-io-limit h# 8100.0000 +range-entry - my-mem-base my-mem-limit h# 8200.0000 +range-entry - " ranges" property -; - \ decode-unit and encode-unit must be static methods, so they can't use \ $call-parent at run-time " decode-unit" parent-phandle find-method drop ( xt ) to parent-decode-unit " encode-unit" parent-phandle find-method drop ( xt ) to encode-unit +: assign-addresses? ( -- flag ) +\ " addresses-preassigned" my-parent ihandle>phandle get-package-property if + " addresses-preassigned" get-inherited-property if + \ Property not present + true + else ( propval$ ) + \ Property present + 2drop false + then +; : prefetch-ranges-off ( -- ) \ Turn off prefetchable memory forwarding range h# 0000ffff h# 24 my-l! \ Prefetchable Limit,Base h# ffffffff h# 28 my-l! \ Prefetchable Base upper 32 bits h# 0 h# 2c my-l! \ Prefetchable Limit upper 32 bits ; -: set-bases ( mem-base io-base -- ) - 2dup to my-io-base to my-mem-base - - \ Set I/O forwarding base - lwsplit h# 30 my-w! wbsplit h# 1c my-b! drop ( mem-base ) - - \ Set non-prefetchable memory forwarding base - lwsplit h# 20 my-w! drop ( ) +: io-base@ ( -- base ) + 0 h# 1c my-b@ bwjoin h# 30 my-w@ wljoin ; -: set-limits ( mem-limit+1 io-limit+1 -- ) - 2dup to my-io-limit to my-mem-limit - - \ Set I/O forwarding limit - 1- lwsplit h# 32 my-w! wbsplit h# 1d my-b! drop ( mem-limit ) +: io-base! ( base -- ) + lwsplit h# 30 my-w! wbsplit h# 1c my-b! drop +; +: io-limit@ ( -- limit+1 ) + 0 h# 1d my-b@ bwjoin h# 32 my-w@ wljoin 1+ +; +: io-limit! ( limit+1 -- ) + 1- lwsplit h# 32 my-w! wbsplit h# 1d my-b! drop +; +: mem-base@ ( -- base ) 0 h# 20 my-w@ wljoin ; +: mem-base! ( base -- ) lwsplit h# 20 my-w! drop ; +: mem-limit@ ( -- limit+1 ) 0 h# 22 my-w@ wljoin 1+ ; +: mem-limit! ( limit+1 -- ) 1- lwsplit h# 22 my-w! drop ; +: pri-bus! ( bus# -- ) h# 18 my-b! ; +: pri-bus@ ( -- bus# ) h# 18 my-b@ ; +: sec-bus! ( bus# -- ) h# 19 my-b! ; +: sec-bus@ ( -- bus# ) h# 19 my-b@ ; +: bus-limit! ( bus# -- ) h# 1a my-b! ; +: bus-limit@ ( -- bus# ) h# 1a my-b@ ; - \ Set non-prefetchable memory forwarding range - 1- lwsplit h# 22 my-w! drop ( ) +: make-ranges-property ( -- ) + 0 0 encode-bytes + io-base@ io-limit@ h# 8100.0000 +range-entry + mem-base@ mem-limit@ h# 8200.0000 +range-entry + " ranges" property ; + \ Paranoia, perhaps justified : disable-children ( -- ) my-bus# d# 16 lshift 4 + ( template ) @@ -198,19 +209,7 @@ 7 value my-bridge-modes -: setup-bridge ( -- ) - " pci" device-name - - " pci" encode-string " device_type" property - - 0 0 my-space encode-phys 0 encode-int encode+ 0 encode-int encode+ - " reg" property - - 2 encode-int " #size-cells" property - 3 encode-int " #address-cells" property - - start-interrupt-map - +: set-bridge-registers ( -- ) \ Turn off memory and I/O response and bus mastership while setting up 0 4 my-w! @@ -218,19 +217,19 @@ h# 3e my-b@ dup h# 40 or h# 3e my-b! h# 40 invert and h# 3e my-b! - my-space d# 16 rshift h# ff and h# 18 my-b! \ Primary bus# - 1 " allocate-bus#" $call-parent rot dup h# 19 my-b! \ Secondary bus# + my-space d# 16 rshift h# ff and pri-bus! \ Primary bus# + 1 " allocate-bus#" $call-parent rot dup sec-bus! \ Secondary bus# to my-bus# ( next-mem next-io ) \ Set the subordinate bus number to ff in order to pass through any \ type 1 cycle with a bus number higher then the secondary bus# - h# ff h# 1a my-b! ( next-mem next-io ) - disable-children - 2dup set-bases ( next-mem next-io ) + h# ff bus-limit! ( next-mem next-io ) + disable-children ( next-mem next-io ) + over mem-base! dup io-base! ( next-mem next-io ) \ Initially set the limits to encompassing the rest of the address space - 2drop mem-space-top io-space-top set-limits + 2drop mem-space-top mem-limit! io-space-top io-limit! \ Clear status bits h# ffff h# 1e my-w! ( ) @@ -242,6 +241,33 @@ \ rebind the (global) value bridge-modes. " bridge-modes" $find if execute else 2drop my-bridge-modes then 4 my-w@ or 4 my-w! ( ) +; +: reduce-bridge-limits ( -- ) + \ Reduce the subordinate bus# to the maximum bus number of any of + \ our children, and the memory and IO forwarding limits to the + \ limits of the address space actually allocated. + 0 " allocate-bus#" $call-parent rot bus-limit! ( final-mem final-io ) + io-limit! mem-limit! +; +: setup-bridge ( -- ) + " pci" device-name + + " pci" encode-string " device_type" property + + 0 0 my-space encode-phys 0 encode-int encode+ 0 encode-int encode+ + " reg" property + + 2 encode-int " #size-cells" property + 3 encode-int " #address-cells" property + + start-interrupt-map + + assign-addresses? if + set-bridge-registers + else + sec-bus@ to my-bus# + 0 0 " addresses-preassigned" property + then \ [ifdef] firepower \ \ The IBM bridge is somewhat funny @@ -254,20 +280,17 @@ " 0,1,2,3,4,5,6,7,8,9,a,b,c,d,e,f" prober-xt execute - \ Reduce the subordinate bus# to the maximum bus number of any of - \ our children, and the memory and IO forwarding limits to the - \ limits of the address space actually allocated. - 0 " allocate-bus#" $call-parent rot h# 1a my-b! ( final-mem final-io ) - set-limits + assign-addresses? if reduce-bridge-limits then make-ranges-property finish-interrupt-map - my-bus# encode-int h# 1a my-b@ encode-int encode+ + my-bus# encode-int bus-limit@ encode-int encode+ " bus-range" property ; setup-bridge + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: dev/pcibus.fth ============================================================================== --- dev/pcibus.fth Sat Jul 16 14:18:36 2011 (r2383) +++ dev/pcibus.fth Sat Jul 16 14:20:43 2011 (r2384) @@ -55,6 +55,18 @@ headers \ These headers are for debugging convenience 0 value current-bus# +: have-property? ( propname$ -- flag ) + get-my-property if false else 2drop true then +; +: assign-addresses? ( -- flag ) " addresses-preassigned" have-property? 0= ; +: parent-assign-addresses? ( -- flag ) + " addresses-preassigned" get-inherited-property if ( ) + true + else ( propval$ ) + 2drop false + then +; + \ These cannot be package values because some words that use them are called \ directly from different contexts - both from the root of the PCI domain \ and also from child nodes and subordinate PCI-PCI bridge nodes. They need @@ -744,7 +756,7 @@ : find-fcode? ( -- false | adr len true ) next-mem to save-mem - temp-assign-addresses + parent-assign-addresses? if temp-assign-addresses then expansion-rom ( offset ) \ \ Map the expansion ROM at a high physical address that does not @@ -770,12 +782,14 @@ \ Turn on address decode enable in Expansion ROM Base Address Register r@ my-l@ 1 or r@ my-l! ( r: size virt offset ) ( virt ) - 2 4 my-w! \ Turn on memory enable ( virt ) + 4 my-w@ 2 or 4 my-w! \ Turn on memory enable ( virt ) - locate-fcode ( false | adr len true ) + locate-fcode ( r: size virt offset ) ( false | adr len true ) \ Turn off memory enable - 0 4 my-w! ( r: size virt offset ) ( false | adr len true ) + parent-assign-addresses? if ( r: size virt offset ) ( false | adr len true ) + 4 my-w@ 2 invert and 4 my-w! + then ( r: size virt offset ) ( false | adr len true ) \ Turn off address decode enable in Expansion ROM Base Address Register r@ my-l@ 1 invert and r> my-l! ( r: size virt ) ( false | adr len true ) @@ -944,7 +958,7 @@ make-child-properties ( ) card-bus? if make-common-properties exit then ( ) - clear-addresses ( ) + parent-assign-addresses? if clear-addresses then ( ) \ Interpret FCode if present; if not, invent "name" and "reg" properties find-fcode? if ( adr len ) @@ -954,9 +968,11 @@ then ( ) bridge? 0= if - clear-addresses ( ) - b my-b@ 6 <> if - 0 4 my-w! \ Disables all card response + parent-assign-addresses? if + clear-addresses ( ) + b my-b@ 6 <> if + 0 4 my-w! \ Disables all card response + then then then restore-fcodes @@ -1289,11 +1305,11 @@ update-pointers \ Re-init the temporary allocation pointers, \ thus erasing any probe-state mappings - assign-all-addresses + assign-addresses? if assign-all-addresses then \ XXX TODO set-latency-timers set-fast-back-to-backs ; : master-probe ( adr len -- ) - true to probe-state? + assign-addresses? to probe-state? prober \ Make permanent any address assignments that occurred during the

1 0

[commit] r2383 - cpu/x86/pc dev/isa
by repository service July 16, 2011

July 16, 2011

Author: wmb Date: Sat Jul 16 14:18:36 2011 New Revision: 2383 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2383 Log: Support for memory-mapped x86 UARTs. Modified: cpu/x86/pc/report.fth dev/isa/diaguart.fth Modified: cpu/x86/pc/report.fth ============================================================================== --- cpu/x86/pc/report.fth Sat Jul 16 14:16:14 2011 (r2382) +++ cpu/x86/pc/report.fth Sat Jul 16 14:18:36 2011 (r2383) @@ -3,23 +3,37 @@ \ write a byte to an ISA port : isa-c! ( n a - ) " # dx mov # al mov al dx out " evaluate ; +: mem-c! ( n a -- ) " >r # r> #) byte mov" evaluate ; +: ureg! ( byte offset -- ) + [ifdef] mem-uart-base + mem-uart-base + mem-c! + [else] + h# 3f8 + isa-c! + [then] +; [ifdef] debug-startup : init-com1 ( -- ) - h# 1 h# 3fc isa-c! \ DTR on - h# 80 h# 3fb isa-c! \ Enable divisor latch - h# 01 h# 3f8 isa-c! \ Baud rate divisor low - 115200 baud - h# 0 h# 3f9 isa-c! \ Baud rate divisor high - 115200 baud - h# 3 h# 3fb isa-c! \ 8 bits, no parity - h# 0 h# 3f9 isa-c! \ Interrupts off - h# 1 h# 3fa isa-c! \ Enable FIFO + h# 1 4 ureg! \ DTR on + h# 80 3 ureg! \ Enable divisor latch + h# 01 0 ureg! \ Baud rate divisor low - 115200 baud + h# 0 1 ureg! \ Baud rate divisor high - 115200 baud + h# 3 3 ureg! \ 8 bits, no parity + h# 0 1 ureg! \ Interrupts off + h# 1 2 ureg! \ Enable FIFO ; \ Assembler macro to assemble code to send the character "char" to COM1 : report ( char -- ) +[ifdef] mem-uart-base + " begin h# 20 # mem-uart-base 5 + #) byte test 0<> until" evaluate + ( char ) " # mem-uart-base #) byte mov" evaluate + " begin h# 20 # mem-uart-base 5 + #) byte test 0<> until" evaluate +[else] " begin h# 3fd # dx mov dx al in h# 20 # al and 0<> until" evaluate ( char ) " # al mov h# 3f8 # dx mov al dx out " evaluate " begin h# 3fd # dx mov dx al in h# 20 # al and 0<> until" evaluate +[then] ; [else] : init-com1 ( -- ) ; Modified: dev/isa/diaguart.fth ============================================================================== --- dev/isa/diaguart.fth Sat Jul 16 14:16:14 2011 (r2382) +++ dev/isa/diaguart.fth Sat Jul 16 14:18:36 2011 (r2383) @@ -4,10 +4,15 @@ headerless d# 1843200 constant uart-clock-frequency -h# 3f8 value uart-base \ Virtual address of UART; set later +h# 3f8 value uart-base \ Virtual address of UART; perhaps overridden later +[ifdef] mem-uart-base +: uart@ ( reg# -- byte ) mem-uart-base + c@ ; \ Read from a UART register +: uart! ( byte reg# -- ) mem-uart-base + c! ; \ Write to a UART register +[else] : uart@ ( reg# -- byte ) uart-base + pc@ ; \ Read from a UART register : uart! ( byte reg# -- ) uart-base + pc! ; \ Write to a UART register +[then] : baud ( baud-rate -- ) uart-clock-frequency d# 16 / swap rounded-/ ( baud-rate-divisor ) @@ -20,11 +25,13 @@ ; : inituarts ( -- ) +[ifndef] mem-uart-base 3 3 uart! \ 8 bits, no parity 7 2 uart! \ Clear and enable FIFOs \ d# 38400 baud \ d# 9600 baud d# 115200 baud +[then] ; : ukey? ( -- flag ) 5 uart@ 1 and 0<> ; \ Test for rcv character

1 0

[commit] r2382 - dev/intel/graphics
by repository service July 16, 2011

July 16, 2011

Author: wmb Date: Sat Jul 16 14:16:14 2011 New Revision: 2382 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2382 Log: Checked in Intel Pineview graphics driver. Added: dev/intel/graphics/pineview.fth Added: dev/intel/graphics/pineview.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ dev/intel/graphics/pineview.fth Sat Jul 16 14:16:14 2011 (r2382) @@ -0,0 +1,419 @@ +\ See license at end of file +purpose: Display driver for Intel Pineview using 1280x800 LCD panel on LVDS + +\ This is an i915 variant. The driver hardcodes some assumptions about display +\ resolution and output device. + +\ 0 0 " 2,0" " /pci" begin-package + +" display" device-name + +\ Configuration space registers +my-address my-space encode-phys + 0 encode-int encode+ 0 encode-int encode+ + +\ MMIO register bank +0 0 my-space 0200.0010 + encode-phys encode+ + 0 encode-int encode+ h# 80000 encode-int encode+ + +\ I/O Space registers +0 0 my-space h# 0100.0014 + encode-phys encode+ + 0 encode-int encode+ 8 encode-int encode+ + +\ Aperture +0 0 my-space h# 0200.0018 + encode-phys encode+ + 0 encode-int encode+ h# 1000.0000 encode-int encode+ + +\ GATT +0 0 my-space h# 0200.001c + encode-phys encode+ + 0 encode-int encode+ h# 0004.0000 encode-int encode+ + + " reg" property + +: my-l@ ( offset -- l ) my-space + " config-l@" $call-parent ; +: my-l! ( l offset -- ) my-space + " config-l!" $call-parent ; +: my-w@ ( offset -- w ) my-space + " config-w@" $call-parent ; +: my-w! ( w offset -- ) my-space + " config-w!" $call-parent ; + +false value scaled? + +d# 16 value depth + +0 value vdc +: page-bits ( n -- n' ) h# fff invert and ; + +: pci-len ( bar-offset -- len ) + >r + r@ my-l@ ( oldval ) + -1 r@ my-l! ( oldval ) + r@ my-l@ ( oldval writable-bits ) + swap r> my-l! ( writable-bits ) + h# f invert and ( top-bits ) + invert 1+ ( len ) +; + +0 value gtt +0 value gatt + +0 value gtt-phys +0 value gatt-phys +0 value gtt-start +0 value /gtt +0 value /gatt +0 value stolen-base +0 value scratch-page +0 value scratch-page-pa + +h# 20.0000 value /fb \ Enough for 1280x800x16bpp + +: mmio@ ( offset -- l ) vdc + rl@ ; +: mmio! ( l offset -- ) vdc + rl! ; + +: adr>page# ( adr -- page# ) d# 12 rshift ; +: page#>adr ( page# -- adr ) d# 12 lshift ; +h# 1000 constant /page + +: map-bar ( phys.lo len bar# -- vadr ) + swap >r ( phys.lo bar# r: len ) + my-space + h# 200.0000 + ( phys.lo phys.hi r: len ) + 0 swap r> ( phys.lo,mid,hi len ) + " map-in" $call-parent +; + +: /stolen ( -- n ) + h# 52 my-w@ 4 >> h# f and case + 0 of 0 endof + 1 of h# 10.0000 endof + 3 of h# 80.0000 endof + true abort" Invalid value in Graphics Mode Select field" + endcase +; +: init-gtt ( -- ) + h# 18 my-l@ page-bits to gatt-phys + h# 1c my-l@ page-bits to gtt-start + h# 1c pci-len to /gtt \ Can also be determined from config register 52 + h# 18 pci-len to /gatt + h# 5c my-l@ to stolen-base + + h# 0 /gtt h# 1c map-bar to gtt + + \ Insert the stolen pages into the GTT + stolen-base 1 + ( pte-template ) + /stolen 0 do ( pte-template ) + dup i + gtt i adr>page# la+ rl! ( pte-template ) + /page +loop ( pte-template ) + drop + + \ Fill the rest of the GTT with PTEs for a scratch page + /page " dma-alloc" $call-parent to scratch-page + scratch-page h# 1000 false " dma-map-in" $call-parent to scratch-page-pa + + /gatt /stolen ?do + scratch-page-pa 1+ gtt i adr>page# la+ rl! + /page +loop + + gtt /gtt + /page - rl@ drop \ Sync +; +: memory-setup ( -- ) + h# 0 h# 80000 h# 10 map-bar to vdc \ & + 4 my-w@ 7 or 4 my-w! \ Enable bus mastering, memory and I/O access + + init-gtt + + " address" get-my-property if + gatt-phys encode-int " address" property + h# 0 /fb h# 18 map-bar to frame-buffer-adr + else + decode-int to frame-buffer-adr + 2drop + then +; + +\ Geometry for 1280x800 LCD + +d# 1280 constant hdisplay +d# 1296 constant hsstart +d# 1344 constant hsend +d# 1440 constant htotal + +d# 800 constant vdisplay +d# 801 constant vsstart +d# 804 constant vsend +d# 818 constant vtotal + +d# 1024 value width \ If scaled is false, will be replaced with hdisplay +d# 768 value height \ If scaled is false, will be replaced with vdisplay + +\ h# d804.0000 constant dpll-val \ VCO, high speed, VGA disable, LVDS, clock div 10, post div 4 +h# 8480.0000 constant dpll-val-a \ Pipe A & +h# 9802.0000 constant dpll-val-b \ Pipe B & +dpll-val-b constant dpll-val + +h# 0020.0074 constant fp-val \ N, M1, M2 divisors & +h# 9500.0000 constant dspcntr-val \ Enable, NoGamma, 16bpp ? no alpha, pipe b & + +\ Empirically this has no effect. It is probably for CRT output +\ : dac-on ( -- ) +\ h# c000.0018 h# 61100 mmio! \ 80000000-DAC_ON 40000000-PIPEB 10-PVSYNC 8-PHSYNC +\ ; + +: bytes/line ( -- n ) width depth 8 / * ; + +h# 0000 constant pipe-a +h# 1000 constant pipe-b +pipe-b value pipe + +: mmio!! ( value offset -- ) tuck mmio! mmio@ drop ; + +: pipe@ ( offset -- n ) pipe + mmio@ ; +: pipe! ( n offset -- ) pipe + mmio! ; +: pipe!! ( n offset -- ) pipe + mmio!! ; + +h# 70180 constant dspcntr-reg +h# 70184 constant dspbase-reg +h# 70008 constant pipeconf-reg +h# 61230 constant pfit-reg +h# 61180 constant lvds-reg + +\ Packs two 16-bit values into a 32-bit register, offsetting +\ each value by -1 +: crtconf! ( low high reg -- ) + >r swap 1- swap 1- wljoin r> pipe! +; + +\ A few of the pipe-dependent registers are at offsets of 4 +\ instead of h# 1000. + +: +pipe ( offset -- offset' ) pipe if 4 + then ; + +: fpreg! ( value -- ) h# 6040 +pipe mmio! ; + +: dpll! ( value -- ) + h# 6014 +pipe mmio!! + d# 150 " us" evaluate +; +: dpll@ ( -- value ) h# 6014 +pipe mmio@ ; +: wait-vblank ( -- ) d# 30 ms ; + +h# 8000.0000 constant enable-bit + +: load-lut ( -- ) + 100 0 do + i i i 0 bljoin h# a000 pipe 2/ + i la+ l! + loop +; + +: crtc-dpms-off ( -- ) \ CRTC prepare method + \ Disable display plane + dspcntr-reg pipe@ ( val ) + dup enable-bit and if ( val ) + enable-bit invert and dspcntr-reg pipe! + dspbase-reg pipe@ dspbase-reg pipe!! + else + drop + then + wait-vblank + + \ Disable display pipes + pipeconf-reg pipe@ ( val ) + dup enable-bit and if ( val ) + enable-bit invert and pipeconf-reg pipe!! + else + drop + then + wait-vblank + + dpll@ dup enable-bit and if + enable-bit invert and dpll! + else + drop + then +; + +: crtc-dpms-on ( -- ) \ CRTC commit method + dpll@ dup enable-bit and 0= if ( value ) + dup dpll! ( value ) + enable-bit or dup dpll! dpll! ( ) + else ( value ) + drop ( ) + then + + pipeconf-reg pipe@ dup enable-bit and 0= if + enable-bit or pipeconf-reg pipe! + else + drop + then + + dspcntr-reg pipe@ dup enable-bit and if + enable-bit or dspcntr-reg pipe! + dspbase-reg pipe@ dspbase-reg pipe! + else + drop + then + + load-lut +; + +: lvds-set-mode ( -- ) + \ When using LVDS, you have to do this little dance to turn on the PLL + + fp-val fpreg! + dpll-val enable-bit invert and dpll! \ VCO_ENABLE off for now + + lvds-reg mmio@ \ LVDS configuration + h# c030.0300 or \ LVDS_PORT_EN , LVDS_PIPEB_SELECT , LVDS_A0A2_CLKA_POWER_UP ?? what is 30.0000 bit + h# 0000.003c invert and \ ! LVDS_CLKB_POWER_UP , ! LVDS_B0B3_POWER_UP + lvds-reg mmio!! + + fp-val fpreg! + dpll-val dpll! \ VCO_ENABLE on + + \ Double write because Linux driver does it because BIOS does it + dpll-val dpll! \ VCO_ENABLE on + + \ Now that the dance is over we can configure the geometry + + hdisplay htotal h# 60000 crtconf! \ H Display + hdisplay htotal h# 60004 crtconf! \ H Blanking + hsstart hsend h# 60008 crtconf! \ H Sync + vdisplay vtotal h# 6000c crtconf! \ V Display + vdisplay vtotal h# 60010 crtconf! \ V Blanking + vsstart vsend h# 60014 crtconf! \ V Sync + + bytes/line h# 70188 pipe! \ Pitch (stride) + width height h# 70190 crtconf! \ Size + 0 h# 7018c pipe! \ Position + height width h# 6001c crtconf! \ Pipe source + enable-bit pipeconf-reg pipe!! \ Pipe config + + wait-vblank + + dspcntr-val dspcntr-reg pipe! \ Display control + + 0 dspbase-reg pipe! \ PIPExBASE + + enable-bit h# 71400 mmio! \ Disable VGA plane + + wait-vblank +; + +false value backlight-inverse? +: set-backlight ( percentage -- ) + h# 61254 mmio@ lwsplit nip ( percent max ) + 1 invert and >r ( percent r: max' ) + d# 20 max ( percentage' r: max ) + r@ * d# 100 / ( duty-cycle r: max ) + backlight-inverse? if ( duty-cycle r: max ) + r@ swap - ( duty-cycle' ) + then ( duty-cycle r: max ) + 1 invert and ( duty-cycle r: max ) \ Low bit must be 0 + r> wljoin h# 61254 mmio! ( ) \ BLC_PWM_CTL +; + +d# 100 value backlight-val + +h# 61200 constant pp-status +h# 61204 constant pp-control +: lvds-on ( -- ) + pp-control mmio@ 1 or pp-control mmio! \ POWER_TARGET_ON + begin pp-status mmio@ enable-bit and until + backlight-val set-backlight +; +: lvds-off ( -- ) + 0 set-backlight + pp-control mmio@ 1 invert and pp-control mmio! + begin pp-status mmio@ enable-bit and 0= until +; + +: .ps pp-status mmio@ . ; +: pctl pp-control mmio! ; + +: lvds-scaling ( -- ) + scaled? if h# 8000.2668 else 0 then + pfit-reg mmio! +\ pipe h# 1000 / d# 29 lshift pfit-reg mmio! +; +: setmode ( -- ) + scaled? if d# 1024 d# 768 else hdisplay vdisplay then + to height to width + memory-setup + lvds-off \ Output prepare method + crtc-dpms-off \ CRTC prepare method + lvds-set-mode \ CRTC mode_set method + lvds-scaling \ Output mode_set method + crtc-dpms-on \ CRTC commit method + lvds-on \ Output commit method +; + +: erase-frame-buffer ( -- ) + frame-buffer-adr /fb ( adr len ) + depth case + 8 of h# 0f fill endof + d# 16 of h# ffff " wfill" evaluate endof + d# 32 of h# ffff.ffff " lfill" evaluate endof + ( default ) nip nip + endcase + h# f to background-color +; +: map-frame-buffer ( -- ) + 0 /fb h# 18 map-bar to frame-buffer-adr +; +: dump-regs ( -- ) + h# 80000 0 do + i mmio@ dup 0<> swap h# ffffffff <> and if + i 5 u.r i mmio@ 9 u.r cr + then + 4 +loop +; + +: declare-props ( -- ) \ Instantiate screen properties + " width" get-my-property if + width encode-int " width" property + height encode-int " height" property + depth encode-int " depth" property + bytes/line encode-int " linebytes" property + else + 2drop + then +; + +defer gp-install ' noop to gp-install + +: set-terminal ( -- ) + width height ( width height ) + over char-width / over char-height / ( width height rows cols ) + bytes/line depth " fb-install" evaluate gp-install ( ) +; + + +0 value open-count + +: display-remove ( -- ) + open-count 1 = if + then + open-count 1- 0 max to open-count +; + +: display-install ( -- ) + open-count 0= if + setmode + declare-props \ Setup properites + map-frame-buffer + erase-frame-buffer + else + map-frame-buffer + then + default-font set-font + set-terminal + open-count 1+ to open-count +; + +: display-selftest ( -- failed? ) false ; + +' display-install is-install +' display-remove is-remove +' display-selftest is-selftest + +" display" device-type +" ISO8859-1" encode-string " character-set" property +0 0 encode-bytes " iso6429-1983-colors" property

1 0

[commit] r2381 - cpu/x86/pc/neptune/build
by repository service July 16, 2011

July 16, 2011

Author: wmb Date: Sat Jul 16 14:13:27 2011 New Revision: 2381 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2381 Log: Checked in atomrom.bth Added: cpu/x86/pc/neptune/build/atomrom.bth Added: cpu/x86/pc/neptune/build/atomrom.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/neptune/build/atomrom.bth Sat Jul 16 14:13:27 2011 (r2381) @@ -0,0 +1,26 @@ +purpose: Add CRC to atomic.rom + +command: &builder &this + +build-now + +fload ${BP}/forth/lib/crc32.fth + +h# 80000 constant romsize + +writing atomrom.rom + " atomic.rom" $add-file + + /l buffer: crcbuf + + romsize buffer: filebuf + 0 ofd @ fseek + + \ Read the entire image, compute the CRC, and store it h# 30 from the end + filebuf romsize ofd @ fgets romsize <> abort" Can't read back image" + 0 crctab filebuf romsize ($crc) crcbuf ! + + romsize h# 30 - ofd @ fseek + crcbuf /l ofd @ fputs + +ofd @ fclose

1 0

[commit] r2380 - cpu/x86/pc/biosload
by repository service July 16, 2011

July 16, 2011

Author: wmb Date: Sat Jul 16 14:10:50 2011 New Revision: 2380 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2380 Log: Added some commentary about standard VESA modes to c32vesa.fth Modified: cpu/x86/pc/biosload/c32vesa.fth Modified: cpu/x86/pc/biosload/c32vesa.fth ============================================================================== --- cpu/x86/pc/biosload/c32vesa.fth Sat Jul 16 14:09:24 2011 (r2379) +++ cpu/x86/pc/biosload/c32vesa.fth Sat Jul 16 14:10:50 2011 (r2380) @@ -195,3 +195,12 @@ d# 12 # sp add [then] + +\ VESA modes: +\ RESv BPP> 4 8 15 16 24 +\ 320x200 10d 10e 10f +\ 640x400 100 +\ 640x480 101 110 111 112 +\ 800x600 102 103 113 114 115 +\ 1024x768 104 105 116 117 118 +\ 1280x1024 106 107 119 11a 11b

1 0

[commit] r2379 - cpu/x86/pc/olpc/via
by repository service July 16, 2011

July 16, 2011

Author: wmb Date: Sat Jul 16 14:09:24 2011 New Revision: 2379 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2379 Log: OLPC XO-1.5 - better value for turning off PCIe clock generator outputs. Modified: cpu/x86/pc/olpc/via/clkgen.fth Modified: cpu/x86/pc/olpc/via/clkgen.fth ============================================================================== --- cpu/x86/pc/olpc/via/clkgen.fth Sat Jul 16 14:08:23 2011 (r2378) +++ cpu/x86/pc/olpc/via/clkgen.fth Sat Jul 16 14:09:24 2011 (r2379) @@ -25,8 +25,8 @@ \ We don't need to call disable-unused-clocks in stand-init because \ it is done in early-startup so it will affect resume-from-S3 too. -: disable-unused-clocks ( -- ) h# 02 5 clkgen-b! ; -: enable-unused-clocks ( -- ) h# de 5 clkgen-b! ; +: disable-unused-clocks ( -- ) h# 03 5 clkgen-b! ; +: enable-unused-clocks ( -- ) h# df 5 clkgen-b! ; \ LICENSE_BEGIN \ Copyright (c) 2009 FirmWorks

1 0

[commit] r2378 - cpu/x86/pc/olpc/via
by repository service July 16, 2011

July 16, 2011

Author: wmb Date: Sat Jul 16 14:08:23 2011 New Revision: 2378 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2378 Log: OLPC XO-1.5 - better value for turning off PCIe clock generator outputs. Modified: cpu/x86/pc/olpc/via/startclkgen.fth Modified: cpu/x86/pc/olpc/via/startclkgen.fth ============================================================================== --- cpu/x86/pc/olpc/via/startclkgen.fth Sat Jul 16 14:05:42 2011 (r2377) +++ cpu/x86/pc/olpc/via/startclkgen.fth Sat Jul 16 14:08:23 2011 (r2378) @@ -11,6 +11,6 @@ h# 05 smbus-io-base 3 + port-wb \ Register number inside clock generator (output config) h# 01 smbus-io-base 5 + port-wb \ Byte count smbus-io-base 2 + port-rb \ Read to reset the byte counter for the next write -h# 02 smbus-io-base 7 + port-wb \ Value to put in the clock generator output config reg - turns of PCIe clocks +h# 03 smbus-io-base 7 + port-wb \ Value to put in the clock generator output config reg - turns off PCIe clocks h# 54 smbus-io-base 2 + port-wb \ Fire off the command. 40 is the start bit, 14 is the "SMBus block data" command \ We don't wait for it to finish

1 0

[commit] r2377 - forth/lib
by repository service July 16, 2011

July 16, 2011

Author: wmb Date: Sat Jul 16 14:05:42 2011 New Revision: 2377 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2377 Log: Checked in linear feedback shift register code, unused at present, but related code is in cpu/arm/memtest.fth . Added: forth/lib/lfsr.fth Added: forth/lib/lfsr.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ forth/lib/lfsr.fth Sat Jul 16 14:05:42 2011 (r2377) @@ -0,0 +1,238 @@ +\ See license at end of file +purpose: Linear feedback shift register code and related memory tests + +0 value lfsr-state + +0 value lfsr-poly +: lfsr-step ( state -- state' ) + dup 2/ swap 1 and if lfsr-poly xor then +; + +[ifdef] arm-assembler +code lfsr-step ( state -- state' ) + movs tos,tos,lsr #1 + u>= if \ Carry set + set r0,`'user# lfsr-poly` + ldr r0,[up,r0] + eor tos,tos,r0 + then +c; +code lfsr-fill ( adr seed polynomial -- adr' ) + \ tos:polynomial + ldmia sp!,{r0,r1} \ r0:seed r1:adr + mov r2,r0 \ r2:lfsr + begin + str r2,[r1],#4 + movs r2,r2,lsr #1 + eorcs r2,r2,tos + cmp r2,r0 + = until + mov tos,r1 +c; +code random-fill ( adr len data index polynomial -- ) + ldmia sp!,{r1,r2,r3,r4} \ tos:poly r1:index r2:data r3:len r4:adr + + movs r3,r3,lsr #2 \ Convert to longword count + nxteq + + sub r0,r3,#1 \ r0:remaining count + + \ r3:address-lfsr r4:data-lfsr r5:data-poly + set r5,#0x80200003 \ 32-bit polynomial + + begin + \ Compute new data value with an LFSR step + movs r2,r2,lsr #1 + eorcs r2,r2,r5 + + \ Compute new address index, discarding values >= len + begin + movs r1,r1,lsr #1 + eorcs r1,r1,tos + cmp r1,r3 + u< until + + \ Write the "random" value to the "random" address (adr[index]) + str r2,[r4,r1,lsl #2] + + decs r0,#1 + 0= until + + pop tos,sp +c; +code random-check ( adr len data index remain polynomial -- false | adr len data index remain true ) + ldmia sp!,{r0,r1,r2,r3,r4} \ tos:poly r0:remain r1:index r2:data r3:len r4:adr + + cmp r0,#0 + moveq tos,#0 \ Return false + nxteq + + mov r7,r3,lsr #2 \ Convert to longword count + + set r5,#0x80200003 \ 32-bit polynomial + + begin + \ Compute new data value with an LFSR step + movs r2,r2,lsr #1 + eorcs r2,r2,r5 + + \ Compute new address index, discarding values >= len + begin + movs r1,r1,lsr #1 + eorcs r1,r1,tos + cmp r1,r7 + u< until + + \ Read the value at the "random" address (adr[index]) + ldr r6,[r4,r1,lsl #2] + + \ Compare it to the calculated value + cmp r6,r2 + + decne r0,#1 + stmnedb sp!,{r0,r1,r2,r3,r4} \ Push results + mvnne tos,#0 \ True on top of stack + nxtne + + decs r0,#1 + 0= until + + mov tos,#0 +c; +[then] +0 [if] \ This is for testing the period of various polynomials +code lfsr-period ( polynomial -- period ) + \ tos:polynomial + mov r0,#1 \ r0:seed + mov r2,r0 \ r2:lfsr + mov r1,#0 \ r1:count + begin + inc r1,#1 + movs r2,r2,lsr #1 + eorcs r2,r2,tos + cmp r2,r0 + = until + mov tos,r1 +c; +[then] +[then] +[ifdef] x86-assembler +code lfsr-step ( state -- state' ) + ax pop + 1 # ax shr + carry? if + 'user lfsr-poly bx mov + bx ax xor + then + ax push +c; +[then] + +0 [if] +\ Given a list of bit numbers for the polynomial taps, compute the mask value +\ If the polynomial is x^15 + x^14 + 1, the bit numbers are 15, 14, and 0, so +\ the argument list would be 0 14 15 . The 0 must be first to end the list. +\ The order of the others is irrelevant. +: bits>poly ( 0 bit#0 ... bit#n -- mask ) + 0 begin ( 0 bit#0 ... bit#m mask ) + over ( 0 bit# ... bit#m mask bit#m ) + while ( 0 bit#0 ... bit#m mask ) + 1 rot 1- lshift or ( 0 bit#0 ... bit#m-1 mask' ) + repeat ( 0 mask ) + nip ( mask ) +; +[then] + +\ Polynomials for maximal length LFSRs for different bit lengths +\ The values come from the Wikipedia article for Linear Feedback Shift Register and from +\ http://www.xilinx.com/support/documentation/application_notes/xapp052.pdf +create polynomials \ #bits period +h# 0 , \ 0 0 +h# 1 , \ 1 1 +h# 3 , \ 2 3 +h# 6 , \ 3 7 +h# c , \ 4 f +h# 14 , \ 5 1f +h# 30 , \ 6 3f +h# 60 , \ 7 7f +h# b8 , \ 8 ff +h# 110 , \ 9 1ff +h# 240 , \ 10 3ff +h# 500 , \ 11 7ff +h# e08 , \ 12 fff +h# 1c80 , \ 13 1fff +h# 3802 , \ 14 3fff +h# 6000 , \ 15 7fff +h# b400 , \ 16 ffff +h# 12000 , \ 17 1ffff +h# 20400 , \ 18 3ffff +h# 72000 , \ 19 7ffff +h# 90000 , \ 20 fffff +h# 140000 , \ 21 1fffff +h# 300000 , \ 22 3fffff +h# 420000 , \ 23 7fffff +h# e10000 , \ 24 ffffff +h# 1200000 , \ 25 1ffffff +h# 2000023 , \ 26 3ffffff +h# 4000013 , \ 27 7ffffff +h# 9000000 , \ 28 fffffff +h# 14000000 , \ 29 1fffffff +h# 20000029 , \ 30 3fffffff +h# 48000000 , \ 31 7fffffff +h# 80200003 , \ 32 ffffffff + +: round-up-log2 ( n -- log2 ) + dup log2 ( n log2 ) + tuck 1 swap lshift ( log2 n 2^log2 ) + > - ( log2' ) +; + +defer .lfsr-mem-error +: (.lfsr-mem-error) ( adr len data index remain -- adr len data index remain ) + push-hex + ." Error at address " 4 pick 2 pick la+ dup 8 u.r ( adr len data index remain err-adr ) + ." - expected " 3 pick 8 u.r ( adr len data index remain err-adr ) + ." got " l@ 8 u.r cr + pop-base +; +' (.lfsr-mem-error) to .lfsr-mem-error +: random-test ( adr len -- ) + dup /l <= if 2drop exit then ( adr len #bits ) + dup /l / round-up-log2 ( adr len #bits ) + polynomials swap la+ l@ ( adr len polynomial ) + + 3dup 1 1 rot random-fill ( adr len polynomial ) + + >r ( adr len r: polynomial ) + 1 1 third /l / 1- ( adr len data index remain r: polynomial ) + begin ( adr len data index remain r: polynomial ) + r@ random-check ( false | adr len data index remain true r: polynomial ) + while ( adr len data index remain r: polynomial ) + .lfsr-mem-error ( adr len data index remain r: polynomial ) + repeat ( r: polynomial ) + r> drop +; + +\ LICENSE_BEGIN +\ Copyright (c) 2010 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0