November 2009 - openfirmware - mail.coreboot.org

r1479 - dev/usb2/hcd/ehci
by svn＠openfirmware.info Nov. 14, 2009

Nov. 14, 2009

Author: wmb Date: 2009-11-14 02:07:09 +0100 (Sat, 14 Nov 2009) New Revision: 1479 Modified: dev/usb2/hcd/ehci/qhtd.fth Log: OLPC trac 9423 - Rearranged the EHCI qh-done? routine to make the logic clearer and to add an initial delay before polling the queue header. Without that delay, USB probing fails. I think this might be a Via quirk, but I'm not sure. Modified: dev/usb2/hcd/ehci/qhtd.fth =================================================================== --- dev/usb2/hcd/ehci/qhtd.fth 2009-11-14 01:05:23 UTC (rev 1478) +++ dev/usb2/hcd/ehci/qhtd.fth 2009-11-14 01:07:09 UTC (rev 1479) @@ -538,6 +538,7 @@ or ( done?' ) ; +: poll-delay ( -- ) d# 50 " us" evaluate ; : qh-done? ( qh -- done? ) process-hc-status ( qh ) dup sync-qh ( qh ) @@ -545,19 +546,22 @@ ; : done? ( qh -- usberr ) - begin - dup qh-done? ?dup 0= if ( qh ) - 1 ms - dup >qh-timeout ( qh timeout-adr ) - dup l@ 1- ( qh timeout-adr timeout' ) - dup rot l! ( qh timeout' ) - 0= ( qh timed-out? ) - dup if " Timeout" USB_ERR_TIMEOUT set-usb-error noop then ( qh timed-out? ) - then ( qh exit-loop? ) - until ( qh ) - drop ( ) + poll-delay \ This may be a VIA quirk - if we poll too soon, we never see the done bit + begin dup qh-done? 0= while ( qh ) + 1 ms + dup >qh-timeout ( qh timeout-adr ) + dup l@ 1- ( qh timeout-adr timeout' ) + dup rot l! ( qh timeout' ) + 0= if ( qh ) + " Timeout" USB_ERR_TIMEOUT set-usb-error ( qh ) + drop ( ) + usb-error ( usberr ) + exit + then + repeat ( qh ) + drop ( ) - usb-error + usb-error ( usberr ) ; : qtd-error? ( qtd qh -- usberr )

1 0

r1478 - dev/usb2/device/storage
by svn＠openfirmware.info Nov. 14, 2009

Nov. 14, 2009

Author: wmb Date: 2009-11-14 02:05:23 +0100 (Sat, 14 Nov 2009) New Revision: 1478 Modified: dev/usb2/device/storage/scsi.fth Log: OLPC trac 9423 - Added commented-out code to report occurences of the USB problem reported in that ticket, which has been suppressed by a retry workaround. Modified: dev/usb2/device/storage/scsi.fth =================================================================== --- dev/usb2/device/storage/scsi.fth 2009-11-13 22:53:08 UTC (rev 1477) +++ dev/usb2/device/storage/scsi.fth 2009-11-14 01:05:23 UTC (rev 1478) @@ -141,6 +141,15 @@ ?dup if ( actual csw-len csw-usberror ) nip ( actual csw-usberror ) dup h# 10000000 = if ( actual csw-usberror ) +[ifdef] notdef +\ This is for testing the problem described in OLPC trac #9423 +\ The problem has been worked around so users no longer see it, +\ apart from a short delay when it happens, but for testing you +\ can enable this code to report the problem and count occurrences. +cr 7 emit ." TIMEOUT " 7 emit +" h# 72 cmos@ 1+ dup .d h# 72 cmos!" evaluate +cr +[then] 2drop 0 2 ( 0 2 ) \ Convert timeout error to a retry then ( actual usberror ) exit

1 0

r1477 - cpu/x86/pc cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev/geode dev/via
by svn＠openfirmware.info Nov. 13, 2009

Nov. 13, 2009

Author: wmb Date: 2009-11-13 23:53:08 +0100 (Fri, 13 Nov 2009) New Revision: 1477 Modified: cpu/x86/pc/biosints.fth cpu/x86/pc/olpc/security.fth cpu/x86/pc/olpc/via/addrs.fth cpu/x86/pc/olpc/via/sound.fth dev/geode/smi.fth dev/via/smi.fth Log: OLPC trac 9486 - Suite of fixes to the SMI handler and related BIOS emulation code. Modified: cpu/x86/pc/biosints.fth =================================================================== --- cpu/x86/pc/biosints.fth 2009-11-13 22:51:37 UTC (rev 1476) +++ cpu/x86/pc/biosints.fth 2009-11-13 22:53:08 UTC (rev 1477) @@ -1,7 +1,7 @@ purpose: Emulate legacy PC BIOS real-mode INTs \ See license at end of file -8 /l* buffer: init-regs +/rm-regs buffer: init-regs h# 80 value bios-boot-dev# : rm-es@ caller-regs >rm-es w@ ; @@ -60,10 +60,24 @@ : rm-si@ caller-regs >rm-esi w@ ; +[ifdef] >rm-retaddr : rm-retaddr@ caller-regs >rm-retaddr seg:off@ ; +[then] +[ifdef] >rm-eip +\ : rm-retaddr@ caller-regs >rm-eip @ ; +: rm-caller-sp caller-regs >rm-esp @ caller-regs >rm-ss w@ seg:off> ; +: rm-retaddr@ rm-caller-sp seg:off@ ; +: .rm-stack rm-caller-sp h# 40 wdump ; +[then] +[ifdef] >rm-flags : rm-flags@ caller-regs >rm-flags w@ ; : rm-flags! caller-regs >rm-flags w! ; +[then] +[ifdef] >rm-eflags +: rm-flags@ caller-regs >rm-eflags @ ; +: rm-flags! caller-regs >rm-eflags ! ; +[then] : rm-set-cf rm-flags@ 1 or rm-flags! ; : rm-clr-cf rm-flags@ 1 invert and rm-flags! ; @@ -110,7 +124,9 @@ : set-mode3 ( -- ) text-off \ Stop using OFW screen output +[ifdef] smi-access-fb smi-access-fb [then] " text-mode3" screen-ih $call-method +[ifdef] smi-unaccess-fb smi-unaccess-fb [then] ; \ VBE status: AL = 4f -> function supported else not supported \ AH = 0: success 1: fail 2: not supported in this config 3: invalid in this mode @@ -401,8 +417,10 @@ ; : set-mode12 ( -- ) + text-off \ Stop using OFW output to screen +[ifdef] smi-access-fb smi-access-fb [then] " graphics-mode12" " screen-ih" eval $call-method - text-off \ Stop using OFW output to screen +[ifdef] smi-unaccess-fb smi-unaccess-fb [then] ; : set-video-mode ( mode -- ) case @@ -781,7 +799,7 @@ : get-conf ( -- ) sysconf rm-buf 8 move - rm-buf >seg:off 0 rm-es! rm-bx! + rm-buf >seg:off rm-es! rm-bx! 0 rm-ax! ; @@ -792,10 +810,19 @@ endcase ; +: gate-a20 ( -- ) + rm-al@ case + h# 00 of rm-set-cf endof \ Disable - We don't support disabling A20 + h# 01 of 0 rm-ah! endof \ Enable - We always leave it enabled, so return OK (00) status + h# 02 of 1 rm-ax! endof \ Status - Enabled (01) in AL , OK (00) in AH + h# 03 of 1 rm-bx! 0 rm-ah! endof \ Which - Port92 (01) in BX, OK (00) in AH + endcase +; : system-int ( -- ) \ INT 15 handler noshow rm-clr-cf rm-ah@ case + h# 24 of gate-a20 endof h# 91 of noshow 0 rm-ah! endof \ "pause" while waiting for I/O noop h# 53 of apm endof @@ -1061,17 +1088,18 @@ loaded is-mbr? if prep-rm loaded mbr-base swap move -\ init-regs /sregs+gregs erase - \ XXX + init-regs /rm-regs erase bios-boot-dev# init-regs >rm-edx c! \ DL exit then init-program ; +defer rm-go-hook ' noop to rm-go-hook \ " rm-go" ' boot-command set-config-string-default : execute-buffer ( adr len -- ) rm-prepped? if ( adr len ) 2drop ( ) + rm-go-hook \ usb-quiet ( ) init-regs mbr-base rm-run ( ) exit \ Precautionary; rm-run shouldn't return @@ -1141,8 +1169,10 @@ " xp" device-name : open bypass-bios-boot? if false exit then - " sd:1" ntfs? if - " sd:0" set-hd-boot + " ext:1" ntfs? if + " ext:0" set-hd-boot + " sound-end" evaluate + true exit then false @@ -1185,10 +1215,13 @@ label xx h# 99 # al mov al h# 80 # out begin again end-code here xx - constant /xx +: @.w ( -- ) w@ 5 u.r ; +: @.l ( -- ) @ 9 u.r ; : put-xx ( adr -- ) xx swap /xx move ; : .lreg ( adr -- adr' ) 4 - dup l@ 9 u.r ; : .wreg ( adr -- adr' ) 2 - dup w@ 5 u.r ; : .caller-regs ( -- ) +[ifdef] >rm-retaddr ." AX CX DX BX SP BP SI DI" cr caller-regs >rm-eax 4 + 8 0 do .lreg loop cr cr @@ -1197,6 +1230,27 @@ drop rm-retaddr@ 9 u.r 2 spaces rm-flags@ 5 u.r cr +[else] + ." AX BX CX DX BP SI DI SP" cr + caller-regs >rm-eax @.l + caller-regs >rm-ebx @.l + caller-regs >rm-ecx @.l + caller-regs >rm-edx @.l + caller-regs >rm-ebp @.l + caller-regs >rm-esi @.l + caller-regs >rm-edi @.l + caller-regs >rm-esp @.l + cr cr + ." CS DS ES FS GS SS PC FLAGS" cr + caller-regs >rm-cs @.w + caller-regs >rm-ds @.w + caller-regs >rm-es @.w + caller-regs >rm-fs @.w + caller-regs >rm-gs @.w + caller-regs >rm-ss @.w + rm-retaddr@ 9 u.r 2 spaces + rm-flags@ 5 u.r cr +[then] ; : egadump ( -- ) Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2009-11-13 22:51:37 UTC (rev 1476) +++ cpu/x86/pc/olpc/security.fth 2009-11-13 22:53:08 UTC (rev 1477) @@ -3,6 +3,15 @@ \ Specs at http://wiki.laptop.org/go/Firmware_Security +patch noop suspend-interact suspend + +: rm-chain-visible ( -- ) + [ ' rm-go-hook behavior compile, ] \ Chain to old behavior + visible +; +' rm-chain-visible to rm-go-hook + + : ?unfreeze ( -- ) game-key@ button-check and if frozen? if unfreeze visible banner then Modified: cpu/x86/pc/olpc/via/addrs.fth =================================================================== --- cpu/x86/pc/olpc/via/addrs.fth 2009-11-13 22:51:37 UTC (rev 1476) +++ cpu/x86/pc/olpc/via/addrs.fth 2009-11-13 22:53:08 UTC (rev 1477) @@ -73,6 +73,11 @@ h# e01c0 constant dbgp-adr h# e0200 constant madt-adr \ MADT is 5a bytes long h# e0280 constant hpet-adr + +h# e1000 constant smm-sp0 +h# e1400 constant smm-rp0 +h# e1800 constant smm-gdt + h# fc000 constant dsdt-adr h# fd000 constant ssdt-adr @@ -82,6 +87,8 @@ h# fff48 constant video-mode-adr \ Saves display mode for resume code \ h# fff4c constant next-adr +h# fff80 constant 'int10-dispatch + h# 4fff constant native-mode# h# 3e.0000 constant inflate-base Modified: cpu/x86/pc/olpc/via/sound.fth =================================================================== --- cpu/x86/pc/olpc/via/sound.fth 2009-11-13 22:51:37 UTC (rev 1476) +++ cpu/x86/pc/olpc/via/sound.fth 2009-11-13 22:53:08 UTC (rev 1477) @@ -1,8 +1,16 @@ -: audio-quiet ( -- ) - [ ' go-hook behavior compile, ] \ Chain to old behavior +: close-audio ( -- ) audio-ih if audio-ih close-dev 0 to audio-ih then ; +: audio-quiet ( -- ) + [ ' go-hook behavior compile, ] \ Chain to old behavior + close-audio +; ' audio-quiet to go-hook +: xp-wait-audio ( -- ) + [ ' rm-go-hook behavior compile, ] \ Chain to old behavior + sound-end close-audio +; +' xp-wait-audio to rm-go-hook Modified: dev/geode/smi.fth =================================================================== --- dev/geode/smi.fth 2009-11-13 22:51:37 UTC (rev 1476) +++ dev/geode/smi.fth 2009-11-13 22:53:08 UTC (rev 1477) @@ -1319,4 +1319,4 @@ 4 field >rm-eax 4 field >rm-retaddr 2 field >rm-flags -drop +constant /rm-regs Modified: dev/via/smi.fth =================================================================== --- dev/via/smi.fth 2009-11-13 22:51:37 UTC (rev 1476) +++ dev/via/smi.fth 2009-11-13 22:53:08 UTC (rev 1477) @@ -60,14 +60,14 @@ : pm-data ( offset "name" -- offset' ) +smm constant ; \ Layout of SMM memory area: -h# 8000 smm-data smm-gdt \ Entry/exit handler code at the entry offset +\ h# 8000 smm-data smm-gdt \ Entry/exit handler code at the entry offset \ The GDT is embedded in the code wad \ The handler code takes about h# 160 bytes -h# f400 pm-data smm-sp0 \ SMM Forth data stack - h# 400 bytes -h# f800 pm-data smm-rp0 \ SMM Forth return stack - h# 400 bytes +\ h# f400 pm-data smm-sp0 \ SMM Forth data stack - h# 400 bytes +\ h# f800 pm-data smm-rp0 \ SMM Forth return stack - h# 400 bytes -h# fc00 pm-data 'int10-dispatch \ Array of instruction sequences for bouncing INTs through SMI +\ h# fc00 pm-data 'int10-dispatch \ Array of instruction sequences for bouncing INTs through SMI \ fcxx - fcff available @@ -123,8 +123,11 @@ h# ff70 smm-data smm-gs-base h# ff74 smm-data smm-gs-access +h# ff78 smm-data smm-ldtr-limit +h# ff7c smm-data smm-ldtr-base +h# ff80 smm-data smm-ldtr-access + h# ff84 smm-data smm-gdtr-limit - h# ff88 smm-data smm-gdtr-base h# ff8c smm-data smm-gdtr-access @@ -159,15 +162,53 @@ h# fff8 smm-data smm-cr3 h# fffc smm-data smm-cr0 +\ Layout of saved registers, used by biosints.fth + +: caller-regs ( -- adr ) smm-es +smm ; + +0 value rm-regs + +struct + 4 field >rm-es + 4 field >rm-cs + 4 field >rm-ss + 4 field >rm-ds + 4 field >rm-fs + 4 field >rm-gs + d# 16 + \ LDTR, TR, DR7, DR6 + 4 field >rm-eax + 4 field >rm-ecx + 4 field >rm-edx + 4 field >rm-ebx + 4 field >rm-esp + 4 field >rm-ebp + 4 field >rm-esi + 4 field >rm-edi + 4 field >rm-eip + 4 field >rm-eflags +constant /rm-regs + \ The basic SMI gateway. This code lives at (is copied to) smm-base + h# 8000. \ It executes when the processor enters System Management Mode (SMM) \ for whatever reason. It saves a bunch of state, sets up the world \ so Forth code can run (in 32-bit protected mode), and runs the Forth \ handler - typically "smi-dispatch" (via smm-exec and handle-smi). +create smm-gdt-template + /smm-gdt 1- w, smm-gdt l, \ GDT pointer - limit.w base.l + 0 w, + + smm-base smm-size 1- code16 format-descriptor swap l, l, \ 8 - smm-c16 + smm-base smm-size 1- data16 format-descriptor swap l, l, \ 10 - smm-d16 + 0 -1 code32 format-descriptor swap l, l, \ 18 - smm-c32 + 0 -1 data32 format-descriptor swap l, l, \ 20 - smm-d32 + \ End of GDT + + label smi-handler 16-bit - + +0 [if] \ GDT (with jump tucked in at the beginning) \ We put the GDT right at the beginning and use the first entry (which \ cannot be used as a selector) for a 2-byte jmp and the 6-byte GDT pointer @@ -180,14 +221,19 @@ 0 -1 code32 format-descriptor swap l, l, \ 18 - smm-c32 0 -1 data32 format-descriptor swap l, l, \ 20 - smm-d32 \ End of GDT +[then] cs ax mov ax ds mov wbinvd +0 [if] \ Get into protected mode using the same segments \ Don't bother with the IDT; we won't enable interrupts op: smm-gdt 2+ #) lgdt +[else] + ad: op: smm-gdt smm-base - #) lgdt +[then] \ ascii a report @@ -262,6 +308,7 @@ here smi-handler - constant /smi-handler : smm@ ( offset -- n ) +smm @ ; +: smm! ( n offset -- ) +smm ! ; \ Address of segment registers : 'smm-eax ( -- adr ) smm-eax +smm ; @@ -272,19 +319,43 @@ rshift h# ffc and + l@ dup h# fff invert and swap 1 and 0= ; +\ Finds a page table or page directory entry +\ Implementation factor of (smm>physical) +: >ptable64 ( table vadr shift -- table' unmapped? ) + rshift h# ff8 and + l@ \ Ignore high word for now + dup h# fff invert and swap 1 and 0= +; \ Converts a virtual address to a physical address via the page tables \ This is used by debugging tools, so that we can look at OS resources \ via their virtual addresses while we are running with paging disabled. \ XXX need to handle mapped-at-pde-level defer smm>physical +: ?unmapped ( unmapped? -- ) +\ abort" Unmapped" + if ." Unmapped " debug-me then +; +: vadr>pframe64 ( vadr pdpt -- padr ) + over d# 27 >ptable64 ?unmapped ( vadr pdir ) + over d# 18 >ptable64 ?unmapped ( vadr ptab ) + over d# 9 >ptable64 ?unmapped ( vadr pframe ) +; +: vadr>pframe32 ( vadr pdir -- vadr pframe ) + over d# 20 >ptable ?unmapped ( vadr ptab ) + over d# 10 >ptable ?unmapped ( vadr pframe ) +; + : (smm>physical) ( vadr -- padr ) -\ smm-cr0 smm@ h# 8000.0000 and 0= if exit then - cr3@ ( vadr pdir ) - over d# 20 >ptable abort" Unmapped" ( vadr ptab ) - over d# 10 >ptable abort" Unmapped" ( vadr pframe ) + smm-cr3 smm@ ( vadr pdir ) + smm-cr4 smm@ h# 20 and if \ Physical Address Extension enabled + vadr>pframe64 + else + vadr>pframe32 + then swap h# fff and + + ; + ' (smm>physical) to smm>physical : smm-map? ( vadr -- ) smm>physical . ; @@ -335,18 +406,25 @@ \ bios-int-smi is for accesses to the 0x30..0x3f I/O port bank that we "steal" for \ bouncing BIOS INTs into SMM. +: caller-32bit? ( -- flag ) smm-cs-access smm@ h# 4000 and ; + +: caller-sp ( -- laddr ) + caller-32bit? if smm-esp smm@ else rm-sp then +; + : bios-int-smi ( -- ) + caller-32bit? if noop exit then \ Handle BIOS INTs that were bounced into SMM by accessing \ I/O ports 0x30..0x3f h# 58 acpi-w@ dup h# fff0 and h# 30 = if \ Via h# 20 - to rm-int@ - rm-sp la1+ >caller-physical w@ smm-eflags +smm w! + caller-sp la1+ >caller-physical w@ smm-eflags +smm w! \ Bias by -2 to point to INT instruction [ifdef] notyet - rm-sp >caller-physical l@ 2- smm-retaddr l! + rm-sp >caller-physical l@ 2- smm-eip l! [then] handle-bios-call - smm-eflags +smm w@ rm-sp la1+ >caller-physical w! + smm-eflags +smm w@ caller-sp la1+ >caller-physical w! exit else drop @@ -363,12 +441,9 @@ \ It's used to implement the ACPI "resume from S3" semantics that \ require jumping to a given address in real mode. --1 value rm-entry-adr -0 value rm-regs - : #smint ( n -- ) h# 2f acpi-b! ; \ Via -: rm-run ( 'gregs eip -- ) to rm-entry-adr to rm-regs h# f0 #smint ; +: rm-run ( 'gregs eip -- ) swap to rm-regs rm-regs >rm-eip ! h# f0 #smint ; defer suspend-devices ' noop to suspend-devices defer resume-devices ' noop to resume-devices @@ -454,50 +529,60 @@ : l!++ ( adr l -- adr' ) over l! la1+ ; : w!++ ( adr w -- adr' ) over w! wa1+ ; -[ifdef] notyet -code rm-lidt ( -- ) smm-rmidt #) lidt c; -[then] - \ rm-setup fudges the saved SMM state so that, instead of returning \ to the context that invoked the SMI, the next exit from SMM returns \ to the address "eip" in real mode. This is an implementation \ factor of the "rm-run" mechanism. +: set-segment ( base limit access 'seg-save -- ) + >r ( base limit access ) + r@ 8 + smm! ( base limit ) \ Set access rights field + r@ smm! ( base ) \ Set limit field + r> 4 + smm! ( ) \ Set base field +; +: set-data-segment ( base 'seg-save -- ) + \ >r h# ffff h# 4093 r> set-segment + >r h# ffffffff h# 0092 r> set-segment +; + : rm-setup ( -- ) -[ifdef] notyet - rm-entry-adr >seg:off 2>r ( off seg ) + rm-regs >rm-eip @ >seg:off ( off seg ) + swap smm-eip smm! ( seg ) + dup smm-cs smm! ( seg ) + 4 lshift h# ffff h# 009a smm-cs-limit set-segment - smm-header h# 30 - ( adr ) - h# 38 l!++ ( adr' ) \ SMM_CTL - 0 l!++ ( adr' ) \ I/O DATA - 0 l!++ ( adr' ) \ I/O ADDRESS, I/O SIZE - h# 938009 l!++ ( adr' ) \ SS_FLAGS, SMM Flags - h# ffff l!++ ( adr' ) \ CS_LIMIT - r@ 4 lshift l!++ ( adr' ) \ CS_BASE + rm-regs >rm-ds w@ dup smm-ds-limit set-data-segment smm-ds smm! + rm-regs >rm-es w@ dup smm-es-limit set-data-segment smm-es smm! + rm-regs >rm-fs w@ dup smm-fs-limit set-data-segment smm-fs smm! + rm-regs >rm-gs w@ dup smm-gs-limit set-data-segment smm-gs smm! + rm-regs >rm-ss w@ dup smm-ss-limit set-data-segment smm-ss smm! - r> h# 9a wljoin l!++ ( adr' ) \ CS_FLAGS.CS_INDEX - r> l!++ ( adr' ) \ NEXT_IP - 0 l!++ ( adr' ) \ CURRENT_IP - h# 10 l!++ ( adr' ) \ CR0 - h# 2 l!++ ( adr' ) \ EFLAGS - h# 400 l!++ ( adr' ) \ DR7 - drop + 0 h# 3ff h# 82 smm-idtr-limit set-segment + 0 h# ffff h# 83 smm-tr-limit set-segment 0 smm-tr smm! + 0 0 h# 82 smm-ldtr-limit set-segment 0 smm-ldtr smm! - 0 smm-esp +smm l! + \ gdtr - leave alone, GDT shouldn't matter in real mode + \ cr3 - leave alone, PDE base shouldn't matter with paging disabled - smm-save-seg +smm - h# ffff l!++ h# 9300 l!++ 0 w!++ \ DS - h# ffff l!++ h# 9300 l!++ 0 w!++ \ ES - h# ffff l!++ h# 9300 l!++ 0 w!++ \ FS - h# ffff l!++ h# 9300 l!++ 0 w!++ \ GS - h# ffff l!++ h# 9300 l!++ 0 w!++ \ SS - drop + h# 10 smm-cr0 smm! \ Paging and Protected Mode off + h# 10 smm-cr4 smm! \ Page size extension on + h# ffff0ff0 smm-dr6 smm! \ Value after init (status register) + h# 400 smm-dr7 smm! \ Value after init - no breakpoints set - h# ffff smm-rmidt w! 0 smm-rmidt wa1+ l! \ Limit and base + 0 smm-tr smm! - \ Interrupts are off because we are in SMM - rm-lidt -[then] + 0 smm-io-restart smm! \ Clear IO-restart and HLT-restart + + rm-regs >rm-eflags @ 2 or smm-eflags smm! \ 2 bit is "Must Be One" + + rm-regs >rm-esp @ smm-esp smm! + rm-regs >rm-eax @ smm-eax smm! + rm-regs >rm-ebx @ smm-ebx smm! + rm-regs >rm-ecx @ smm-ecx smm! + rm-regs >rm-edx @ smm-edx smm! + rm-regs >rm-ebp @ smm-ebp smm! + rm-regs >rm-esi @ smm-esi smm! + rm-regs >rm-edi @ smm-edi smm! ; \ : rm-init-program ( eip -- ) rm-init-program rm-return ; @@ -509,12 +594,11 @@ smi-debug? if ." SOFT" cr then h# 2f acpi-b@ h# f0 = if rm-setup - -1 to rm-entry-adr exit then [ifdef] notyet - smm-pc smm-retaddr l! \ So .caller-regs will work + smm-pc smm-eip l! \ So .caller-regs will work sbpadr @ if sbpadr @ smm>physical smm-pc smm>physical <> if ." Not at SMI breakpoint!" cr @@ -633,6 +717,12 @@ 0 #smint \ Trigger SMI ; +: smi-access-fb ( -- ) + h# 383 config-b@ 2 or h# 383 config-b! \ Direct SMM mode data accesses to A/Bxxxx range to frame buffer +; +: smi-unaccess-fb ( -- ) + h# 383 config-b@ 2 invert and h# 383 config-b! \ Restore SMM mode data accesses to A/Bxxxx range to memory +; \ Call this to enable SMI support : setup-smi ( -- ) h# 383 config-b@ 1 or h# 383 config-b! \ Enable A/Bxxxx range as memory instead of frame buffer @@ -650,6 +740,7 @@ smm-sp0 smm-save-sp0 ! smm-rp0 smm-save-rp0 ! + smm-gdt-template smm-gdt /smm-gdt move smi-handler smm-base +smm-offset /smi-handler move \ Relocate the code field of the code word that is embedded in the sequence @@ -667,27 +758,3 @@ 4 4 acpi-w! \ Trigger BIOS Release ; [then] - -\ Layout of saved registers, used by biosints.fth - -: caller-regs ( -- adr ) smm-es +smm ; - -struct - 4 field >rm-es - 4 field >rm-cs - 4 field >rm-ss - 4 field >rm-ds - 4 field >rm-fs - 4 field >rm-gs - d# 16 + \ LDTR, TR, DR7, DR6 - 4 field >rm-eax - 4 field >rm-edx - 4 field >rm-ecx - 4 field >rm-ebx - 4 field >rm-exx - 4 field >rm-ebp - 4 field >rm-esi - 4 field >rm-edi - 4 field >rm-retaddr \ EIP - 4 field >rm-flags -drop

1 0

r1476 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Nov. 13, 2009

Nov. 13, 2009

Author: wmb Date: 2009-11-13 23:51:37 +0100 (Fri, 13 Nov 2009) New Revision: 1476 Modified: cpu/x86/pc/olpc/via/fw.bth Log: OLPC trac 9671 - Missed a file in the last checkin. Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-11-13 22:45:00 UTC (rev 1475) +++ cpu/x86/pc/olpc/via/fw.bth 2009-11-13 22:51:37 UTC (rev 1476) @@ -308,6 +308,8 @@ fload ${BP}/cpu/x86/pc/olpc/banner.fth fload ${BP}/ofw/gui/loadmenu.fth +patch merge-rect-565 merge-rect merge-cursor \ Hack since we do all our user-level graphics in 565 +patch merge-rect-565 merge-rect merge-cursor \ Hack since we do all our user-level graphics in 565 fload ${BP}/ofw/gui/insticon.fth fload ${BP}/cpu/x86/pc/olpc/via/cstate.fth \ C-state tests

1 0

r1475 - dev/via/unichrome dev/video/common ofw/termemu
by svn＠openfirmware.info Nov. 13, 2009

Nov. 13, 2009

Author: wmb Date: 2009-11-13 23:45:00 +0100 (Fri, 13 Nov 2009) New Revision: 1475 Modified: dev/via/unichrome/accel2d.fth dev/via/unichrome/vgamodes.fth dev/video/common/rectangle16.fth ofw/termemu/fb8.fth Log: OLPC trac 9671 - Switch display depth to 32bpp in coordination with the OS's change. Requires os40. Modified: dev/via/unichrome/accel2d.fth =================================================================== --- dev/via/unichrome/accel2d.fth 2009-11-13 22:43:30 UTC (rev 1474) +++ dev/via/unichrome/accel2d.fth 2009-11-13 22:45:00 UTC (rev 1475) @@ -1,8 +1,6 @@ \ See license at end of file purpose: Via Unichrome graphics acceleration -alias depth+ wa+ - : mmio@ ( offset -- l ) mmio-base + rl@ ; : mmio! ( l offset -- ) mmio-base + rl! ; @@ -11,7 +9,7 @@ 0 h# 14 mmio! \ Destination map base - beginning of frame buffer 0 h# 1c mmio! \ Source map base - beginning of frame buffer bytes/line 3 rshift dup wljoin 8 mmio! \ Dest and src pitch - depth case + effective-depth case 8 of 0 endof \ 8-bpp 3:3:2 d# 16 of h# 100 endof \ 16-bpp 5:6:5 d# 32 of h# 300 endof \ 32-bpp 8:8:8:8 Modified: dev/via/unichrome/vgamodes.fth =================================================================== --- dev/via/unichrome/vgamodes.fth 2009-11-13 22:43:30 UTC (rev 1474) +++ dev/via/unichrome/vgamodes.fth 2009-11-13 22:45:00 UTC (rev 1475) @@ -88,5 +88,6 @@ : 640x480x32 ( -- ) olpc-lcd-mode d# 640 d# 480 d# 32 change-resolution h# 112 note-mode ; \ VESA mode 112 : 800x600x32 ( -- ) olpc-lcd-mode d# 800 d# 600 d# 32 change-resolution h# 115 note-mode ; \ VESA mode 115 : 1024x768x32 ( -- ) olpc-lcd-mode d# 1024 d# 768 d# 32 change-resolution h# 118 note-mode ; \ VESA mode 118 -: 1200x900x16 ( -- ) olpc-lcd-mode d# 1024 d# 768 d# 16 change-resolution note-native-mode ; -: 1200x900x32 ( -- ) olpc-lcd-mode d# 1024 d# 768 d# 32 change-resolution native-mode# 1- note-mode ; +: 1200x900x16 ( -- ) olpc-lcd-mode d# 1024 d# 768 d# 16 change-resolution native-mode# 1- note-mode ; +: 1200x900x24 ( -- ) olpc-lcd-mode d# 1024 d# 768 d# 32 change-resolution note-native-mode ; +: 1200x900x32 ( -- ) olpc-lcd-mode d# 1024 d# 768 d# 32 change-resolution note-native-mode ; Modified: dev/video/common/rectangle16.fth =================================================================== --- dev/video/common/rectangle16.fth 2009-11-13 22:43:30 UTC (rev 1474) +++ dev/video/common/rectangle16.fth 2009-11-13 22:45:00 UTC (rev 1475) @@ -3,13 +3,73 @@ external +code 565>argb-pixel ( 565 -- argb ) + ax pop + ax bx mov d# 11 # bx shr d# 19 # bx shl \ Red + ax dx mov d# 27 # dx shl d# 24 # dx shr dx bx or \ Blue + d# 21 # ax shl d# 26 # ax shr d# 10 # ax shl bx ax or + h# ff070307 # ax or + ax push +c; +code 565>argb ( src dst #pixels -- ) + cx pop + di 0 [sp] xchg + si 4 [sp] xchg + + begin + ax ax xor + op: ax lods + ax bx mov d# 11 # bx shr d# 19 # bx shl \ Red + ax dx mov d# 27 # dx shl d# 24 # dx shr dx bx or \ Blue + d# 21 # ax shl d# 26 # ax shr d# 10 # ax shl bx ax or + h# ff070307 # ax or + ax stos + loopa + + di pop + si pop +c; +code argb>565-pixel ( argb -- 565 ) + ax pop + ax bx mov d# 19 # bx shr d# 11 # bx shl \ Red + ax dx mov d# 24 # dx shl d# 27 # dx shr dx bx or \ Blue + d# 16 # ax shl d# 26 # ax shr d# 5 # ax shl bx ax or \ Green + ax push +c; + +code argb>565 ( src dst #pixels -- ) + cx pop + di 0 [sp] xchg + si 4 [sp] xchg + + begin + ax lods + ax bx mov d# 19 # bx shr d# 11 # bx shl \ Red + ax dx mov d# 24 # dx shl d# 27 # dx shr dx bx or \ Blue + d# 16 # ax shl d# 26 # ax shr d# 5 # ax shl bx ax or \ Green + op: ax stos + loopa + + di pop + si pop +c; + : rectangle-setup ( x y w h -- wb fbadr h ) swap depth * 3 rshift swap ( x y wbytes h ) 2swap /scanline * frame-buffer-adr + ( wbytes h x line-adr ) swap depth * 3 rshift + ( wbytes h fbadr ) swap ( wbytes fbadr h ) ; +: 565-rectangle-setup ( x y w h -- w fbadr h ) + 2swap /scanline * frame-buffer-adr + ( w h x line-adr ) + swap depth * 3 rshift + ( w h fbadr ) + swap ( w fbadr h ) +; : fill-rectangle ( color x y w h -- ) + depth d# 32 = if ( color x y w h ) + 2>r 2>r 565>argb-pixel 2r> 2r> ( color' x y w h ) + then ( color x y w h ) + rot /scanline * frame-buffer-adr + ( color x w h fbadr ) -rot >r ( color x fbadr w r: h ) \ The loop is inside the case for speed @@ -24,32 +84,47 @@ ; : draw-rectangle ( adr x y w h -- ) - rectangle-setup 0 ?do ( adr wbytes fbadr ) - 3dup swap move ( adr wbytes fbadr ) - >r tuck + swap r> ( adr' wbytes fbadr ) - /scanline + ( adr' wbytes fbadr' ) - loop ( adr' wbytes fbadr' ) + 565-rectangle-setup 0 ?do ( adr w fbadr ) + 3dup swap ( adr w fbadr adr fbadr w ) + depth d# 32 = if ( adr w fbadr adr fbadr w ) + 565>argb ( adr w fbadr ) + else ( adr w fbadr adr fbadr w ) + /w* move ( adr w fbadr ) + then ( adr w fbadr ) + >r tuck wa+ swap r> ( adr' w fbadr ) + /scanline + ( adr' w fbadr' ) + loop ( adr' w fbadr' ) 3drop ; +defer pixel! ( color fbadr i -- ) +: 565-pixel! ( color fbadr i -- ) wa+ w! ; +: argb-pixel! ( color fbadr i -- ) rot 565>argb-pixel -rot la+ l! ; + : draw-transparent-rectangle ( adr x y w h -- ) - rectangle-setup ( adr wbytes fbadr h ) - >r rot r> ( wbytes fbadr adr h ) - 0 ?do ( wbytes fbadr adr ) - 2 pick 0 ?do ( wbytes fbadr adr ) - dup w@ >r wa1+ r> ( wbytes fbadr adr' color ) - dup h# ffff = if ( wbytes fbadr adr color ) - drop ( wbytes fbadr adr ) - else ( wbytes fbadr adr color ) - 2 pick i + w! ( wbytes fbadr adr ) - then ( wbytes fbadr adr ) - /w +loop ( wbytes fbadr adr ) - swap /scanline + swap ( wbytes fbadr' adr ) - loop ( wbytes fbadr' adr' ) + depth d# 32 = if + ['] argb-pixel! to pixel! + else + ['] 565-pixel! to pixel! + then + 565-rectangle-setup ( adr w fbadr h ) + >r rot r> ( w fbadr adr h ) + 0 ?do ( w fbadr adr ) + 2 pick 0 ?do ( w fbadr adr ) + dup i wa+ w@ ( w fbadr adr color ) + dup h# ffff = if ( w fbadr adr color ) + drop ( w fbadr adr ) + else ( w fbadr adr color ) + 2 pick i pixel! ( w fbadr adr ) + then ( w fbadr adr ) + loop ( w fbadr adr ) + swap /scanline + swap ( w fbadr' adr ) + third wa+ ( w fbadr adr' ) + loop ( w fbadr' adr' ) 3drop ; -: read-rectangle ( adr x y w h -- ) +: native-read-rectangle ( adr x y w h -- ) rectangle-setup 0 ?do ( adr wbytes fbadr ) 3dup -rot move ( adr wbytes fbadr ) >r tuck + swap r> ( adr' wbytes fbadr ) @@ -57,6 +132,19 @@ loop ( adr' wbytes fbadr' ) 3drop ; +: read-rectangle ( adr x y w h -- ) + 565-rectangle-setup 0 ?do ( adr w fbadr ) + 3dup -rot ( adr w fbadr fbadr adr w ) + depth d# 32 = if ( adr w fbadr fbadr adr w ) + argb>565 ( adr w fbadr ) + else ( adr w fbadr fbadr adr w ) + /w* move ( adr w fbadr ) + then ( adr w fbadr ) + >r tuck wa+ swap r> ( adr' w fbadr ) + /scanline + ( adr' w fbadr' ) + loop ( adr' w fbadr' ) + 3drop +; : dimensions ( -- width height ) width height ; : replace-color16 ( old new -- ) Modified: ofw/termemu/fb8.fth =================================================================== --- ofw/termemu/fb8.fth 2009-11-13 22:43:30 UTC (rev 1474) +++ ofw/termemu/fb8.fth 2009-11-13 22:45:00 UTC (rev 1475) @@ -281,6 +281,14 @@ loop 4drop ; +: merge-rect-565 ( color mask-adr dst-adr width height -- ) + 0 ?do ( color mask-adr rect-adr width ) + 2over @ 2over fb16-merge ( color mask-adr rect-adr width ) + rot na1+ -rot ( color mask-adr' rect-adr width ) + tuck wa+ swap ( color mask-adr rect-adr' width ) + loop + 4drop +; headers : fb8-insert-characters ( #chars -- )

1 0

r1474 - dev/mmc/sdhci
by svn＠openfirmware.info Nov. 13, 2009

Nov. 13, 2009

Author: wmb Date: 2009-11-13 23:43:30 +0100 (Fri, 13 Nov 2009) New Revision: 1474 Modified: dev/mmc/sdhci/sdhcixo.bth Log: Fixed a "stack depth changed" warning that only happens on B3 systems. We don't have any real B3s yet, but the ECO-ed B2 revealed the problem. Modified: dev/mmc/sdhci/sdhcixo.bth =================================================================== --- dev/mmc/sdhci/sdhcixo.bth 2009-11-13 22:41:11 UTC (rev 1473) +++ dev/mmc/sdhci/sdhcixo.bth 2009-11-13 22:43:30 UTC (rev 1474) @@ -48,6 +48,7 @@ " sdmmc" " $load-driver" eval drop " internal" " slot-name" string-property finish-device + exit then \ B1,B2

1 0

r1473 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Nov. 13, 2009

Nov. 13, 2009

Author: wmb Date: 2009-11-13 23:41:11 +0100 (Fri, 13 Nov 2009) New Revision: 1473 Modified: cpu/x86/pc/olpc/via/starthostctl.fth Log: Removed a compile-time message that was checked-in by accident. Modified: cpu/x86/pc/olpc/via/starthostctl.fth =================================================================== --- cpu/x86/pc/olpc/via/starthostctl.fth 2009-11-13 22:40:37 UTC (rev 1472) +++ cpu/x86/pc/olpc/via/starthostctl.fth 2009-11-13 22:41:11 UTC (rev 1473) @@ -56,7 +56,6 @@ 51 80 80 mreg \ Last step - enable DRDY timing [then] [ifdef] xo-board -.( HELLO) cr 60 ff 2a mreg \ DRDY Timing Control 1 for Read Line 61 ff 00 mreg \ DRDY Timing Control 2 for Read Line 62 ff 00 mreg \ Reserved, probably channel B

1 0

r1472 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Nov. 13, 2009

Nov. 13, 2009

Author: wmb Date: 2009-11-13 23:40:37 +0100 (Fri, 13 Nov 2009) New Revision: 1472 Modified: cpu/x86/pc/olpc/via/startgfxrestore.fth Log: OLPC trac 9671 - restore video state to 24bpp mode. Also fixed a bug that appeared only in brown-bag versions a15p-r, in which the system crashed on resume. Modified: cpu/x86/pc/olpc/via/startgfxrestore.fth =================================================================== --- cpu/x86/pc/olpc/via/startgfxrestore.fth 2009-11-13 20:47:00 UTC (rev 1471) +++ cpu/x86/pc/olpc/via/startgfxrestore.fth 2009-11-13 22:40:37 UTC (rev 1472) @@ -36,8 +36,6 @@ 80 17 crt-clr \ Assert reset while programming geometry crtc-table - 30 36 ireg \ Turn off primary DAC to save power - d7 50 ireg \ Htotal low af 51 ireg \ Hdisplay low af 52 ireg \ Hblank low @@ -45,8 +43,8 @@ 24 54 ireg \ Hblank, Hblankend overflow 44 55 ireg \ Htotal and hdisplay overflow \ b7 56 ireg \ Hsync low - b5 56 ireg \ Hsync low - bd 57 ireg \ Hsyncend low + b6 56 ireg \ Hsync low + be 57 ireg \ Hsyncend low 8f 58 ireg \ Vtotal low 83 59 ireg \ Vdisplay low 83 5a ireg \ Vblank low @@ -54,24 +52,50 @@ 9b 5c ireg \ Hsync,Hsyncend,Vblank,Vblankend overflow 1b 5d ireg \ Hblankend, Hsync, Vtotal, Vdisplay overflow 88 5e ireg \ Vsync low - 6a 5f ireg \ Vsyncend all and Vsync overflow + 6e 5f ireg \ Vsyncend all and Vsync overflow 00 62 ireg \ Starting address 00 63 ireg \ Starting address 00 64 ireg \ Starting address - 96 65 ireg \ Fetch count (67 overflow already set above) - 2c 66 ireg \ Offset (frame buffer pitch) low (67 overflow already set above) - 51 67 ireg \ Color depth - 16bpp ([7:6] = 10) - no interlace ([5] = 0), various overflow bits + 2c 65 ireg \ Fetch count (67 overflow already set above) + 58 66 ireg \ Offset (frame buffer pitch) low (67 overflow already set above) + d6 67 ireg \ Color depth - 32bpp ([7:6] = 11) - no interlace ([5] = 0), various overflow bits f0 68 ireg \ Display queue depth c8 6a ireg \ Enable secondary display 00 6b ireg \ Disable simultaneous display, IGA2 on, IGA2 screen enable not slaved to IGA1 00 6c ireg \ VCK source from PLL output clock, LCKCK PLL source from X1 pin - 00 71 ireg \ Offset overflow - 00 79 ireg \ LCD scaling off - + ff 6d ireg + 77 6e ireg + ef 6f ireg + 7f 70 ireg + + 7f 71 ireg \ Offset overflow + 2f 72 ireg + ef 73 ireg + e7 74 ireg + ee 75 ireg + 77 76 ireg + 00 77 ireg + 6f 78 ireg + 68 79 ireg \ LCD scaling off + 01 7a ireg \ LCD Scaling Parameter 1 + 02 7b ireg \ LCD Scaling Parameter 2 + 03 7c ireg \ LCD Scaling Parameter 3 + 04 7d ireg \ LCD Scaling Parameter 4 + 07 7e ireg \ LCD Scaling Parameter 5 + 0A 7f ireg \ LCD Scaling Parameter 6 + 0D 80 ireg \ LCD Scaling Parameter 7 + 13 81 ireg \ LCD Scaling Parameter 8 + 16 82 ireg \ LCD Scaling Parameter 9 + 19 83 ireg \ LCD Scaling Parameter 10 + 1C 84 ireg \ LCD Scaling Parameter 11 + 1D 85 ireg \ LCD Scaling Parameter 12 + 1E 86 ireg \ LCD Scaling Parameter 13 + 1F 87 ireg \ LCD Scaling Parameter 14 + 60 88 ireg \ LVDS sequential 01 8a ireg \ LCD adjust LP 08 94 ireg \ Expire number @@ -108,12 +132,12 @@ \ legacy-settings seq-table - 00 00 ireg \ Reset sequencer +\ 00 00 ireg \ Reset sequencer - don't touch this register, it makes the system reset in this context 01 01 ireg \ 8/9 timing 0f 02 ireg \ Enable map planes 00 03 ireg \ Character map select 06 04 ireg \ Extended memory present - 03 00 ireg \ Release reset bits +\ 03 00 ireg \ Release reset bits - don't touch this register, it makes the system reset in this context 00 0a ireg \ Cursor start 00 0b ireg \ Cursor end 00 0e ireg \ Cursor loc @@ -166,7 +190,7 @@ end-table crtc-table - 01 36 ireg \ Enable PCI power management control + 31 36 ireg \ Enable PCI power management control, primary DAC off 34 37 ireg \ DAC power savings end-table

1 0

r1471 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info Nov. 13, 2009

Nov. 13, 2009

Author: wmb Date: 2009-11-13 21:47:00 +0100 (Fri, 13 Nov 2009) New Revision: 1471 Modified: cpu/x86/pc/olpc/via/startgfxrestore.fth Log: Via - restore display FIFO registers and other tuning knobs in S3 resume. Modified: cpu/x86/pc/olpc/via/startgfxrestore.fth =================================================================== --- cpu/x86/pc/olpc/via/startgfxrestore.fth 2009-11-13 20:40:24 UTC (rev 1470) +++ cpu/x86/pc/olpc/via/startgfxrestore.fth 2009-11-13 20:47:00 UTC (rev 1471) @@ -31,78 +31,163 @@ \ olpc-lcd-mode -c0 1b seq-set \ Secondary engine clock (LCK) can be gated on or off +c0 1b seq-set \ Secondary engine clock (LCK) can be gated on or off -80 17 crt-clr \ Assert reset while programming geometry +80 17 crt-clr \ Assert reset while programming geometry crtc-table - 30 36 ireg \ Turn off primary DAC to save power + 30 36 ireg \ Turn off primary DAC to save power - d7 50 ireg \ Htotal low - af 51 ireg \ Hdisplay low - af 52 ireg \ Hblank low - d7 53 ireg \ Hblankend - 24 54 ireg \ Hblank, Hblankend overflow - 44 55 ireg \ Htotal and hdisplay overflow - \ b7 56 ireg \ Hsync low - b5 56 ireg \ Hsync low - bd 57 ireg \ Hsyncend low - 8f 58 ireg \ Vtotal low - 83 59 ireg \ Vdisplay low - 83 5a ireg \ Vblank low - 8f 5b ireg \ Vblankend low - 9b 5c ireg \ Hsync,Hsyncend,Vblank,Vblankend overflow - 1b 5d ireg \ Hblankend, Hsync, Vtotal, Vdisplay overflow - 88 5e ireg \ Vsync low - 6a 5f ireg \ Vsyncend all and Vsync overflow + d7 50 ireg \ Htotal low + af 51 ireg \ Hdisplay low + af 52 ireg \ Hblank low + d7 53 ireg \ Hblankend + 24 54 ireg \ Hblank, Hblankend overflow + 44 55 ireg \ Htotal and hdisplay overflow + \ b7 56 ireg \ Hsync low + b5 56 ireg \ Hsync low + bd 57 ireg \ Hsyncend low + 8f 58 ireg \ Vtotal low + 83 59 ireg \ Vdisplay low + 83 5a ireg \ Vblank low + 8f 5b ireg \ Vblankend low + 9b 5c ireg \ Hsync,Hsyncend,Vblank,Vblankend overflow + 1b 5d ireg \ Hblankend, Hsync, Vtotal, Vdisplay overflow + 88 5e ireg \ Vsync low + 6a 5f ireg \ Vsyncend all and Vsync overflow - 00 62 ireg \ Starting address - 00 63 ireg \ Starting address - 00 64 ireg \ Starting address + 00 62 ireg \ Starting address + 00 63 ireg \ Starting address + 00 64 ireg \ Starting address - 96 65 ireg \ Fetch count (67 overflow already set above) - 2c 66 ireg \ Offset (frame buffer pitch) low (67 overflow already set above) - 51 67 ireg \ Color depth - 16bpp ([7:6] = 10) - no interlace ([5] = 0), various overflow bits - f0 68 ireg \ Display queue depth - c8 6a ireg \ Enable secondary display - 00 6b ireg \ Disable simultaneous display, IGA2 on, IGA2 screen enable not slaved to IGA1 + 96 65 ireg \ Fetch count (67 overflow already set above) + 2c 66 ireg \ Offset (frame buffer pitch) low (67 overflow already set above) + 51 67 ireg \ Color depth - 16bpp ([7:6] = 10) - no interlace ([5] = 0), various overflow bits + f0 68 ireg \ Display queue depth + c8 6a ireg \ Enable secondary display + 00 6b ireg \ Disable simultaneous display, IGA2 on, IGA2 screen enable not slaved to IGA1 - 00 6c ireg \ VCK source from PLL output clock, LCKCK PLL source from X1 pin + 00 6c ireg \ VCK source from PLL output clock, LCKCK PLL source from X1 pin - 00 71 ireg \ Offset overflow - 00 79 ireg \ LCD scaling off + 00 71 ireg \ Offset overflow + 00 79 ireg \ LCD scaling off - 60 88 ireg \ LVDS sequential - 01 8a ireg \ LCD adjust LP - 08 94 ireg \ Expire number - 11 95 ireg \ extension bits - 10 97 ireg \ LVDS channel 2 - secondary display - 1b 9b ireg \ DVP mode - alpha:80, VSYNC:40, HSYNC:20, secondary:10, clk polarity:8, clk adjust:7 - 00 a3 ireg \ IGA2 frame buffer is system local memory, address bits [28:26] are 0 - 8b a7 ireg \ expected vertical display low - 01 a8 ireg \ expected vertical display high + 60 88 ireg \ LVDS sequential + 01 8a ireg \ LCD adjust LP + 08 94 ireg \ Expire number + 11 95 ireg \ extension bits + 10 97 ireg \ LVDS channel 2 - secondary display + 1b 9b ireg \ DVP mode - alpha:80, VSYNC:40, HSYNC:20, secondary:10, clk polarity:8, clk adjust:7 + 00 a3 ireg \ IGA2 frame buffer is system local memory, address bits [28:26] are 0 + 8b a7 ireg \ expected vertical display low + 01 a8 ireg \ expected vertical display high - 80 f3 ireg \ 18-bit TTL LCD - 0a f9 ireg \ V1 power mode exit delay - 0d fb ireg \ IGA2 Interlace VSYNC timing + 80 f3 ireg \ 18-bit TTL LCD + 0a f9 ireg \ V1 power mode exit delay + 0d fb ireg \ IGA2 Interlace VSYNC timing end-table +\ general-init +01 1e seq-set \ ROC ECK seq-table - 9f 4a ireg \ 2nd PLL value 0 - 0c 4b ireg \ 2nd PLL value 1 - 05 4c ireg \ 2nd PLL value 2 - 04 40 ireg \ Pulse LCDCK PLL reset - 00 40 ireg \ Release LCDCK PLL reset + 00 20 ireg \ max queuing number (but manual recommends 4) + 14 22 ireg \ (display queue request expire number) + 40 34 ireg \ not documented + 01 3b ireg \ not documented + 38 40 ireg \ ECK freq + 30 4d ireg \ preempt arbiter end-table -3cc port-rb 0c bitset 3c2 # dx mov al dx out \ use external clock (MISC register reads at 3cc, writes at 3c2) +crtc-table + 08 30 ireg \ DAC speed enhancement + 01 3b ireg \ Scratch 2 + 08 3c ireg \ Scratch 3 + c0 f7 ireg \ Spread spectrum + 01 32 ireg \ real time flipping (I think we can ignore this) +end-table -80 17 crt-set \ Release reset +\ legacy-settings +seq-table + 00 00 ireg \ Reset sequencer + 01 01 ireg \ 8/9 timing + 0f 02 ireg \ Enable map planes + 00 03 ireg \ Character map select + 06 04 ireg \ Extended memory present + 03 00 ireg \ Release reset bits + 00 0a ireg \ Cursor start + 00 0b ireg \ Cursor end + 00 0e ireg \ Cursor loc + 00 0f ireg \ Cursor loc +end-table -60 78 seq-set \ Inverse HSYNC and VSYNC on IGA2 for LVDS -30 1e seq-set \ Power up DVP1 pads -0c 2a seq-set \ Power up LVDS pads -30 1b seq-set \ Turn off primary engine clock to save power +crtc-table + 00 11 ireg \ Refreshes per line, disable vert intr + 23 17 ireg \ address wrap, sequential access, not CGA compat mode +end-table + +\ tune-fifos +seq-table + 60 16 ireg \ FIFO threshold + 1f 17 ireg \ FIFO depth (VX855 value) + 4e 18 ireg \ Display Arbiter (VX855 value) + + 18 21 ireg \ (typical request track FIFO number channel 0 + 1f 50 ireg \ FIFO + 81 51 ireg \ FIFO - 81 enable Northbridge FIFO + 00 57 ireg \ FIFO + 08 58 ireg \ Display FIFO low threshold select + 20 66 ireg \ request kill + 20 67 ireg \ request kill + 20 69 ireg \ request kill + 20 70 ireg \ request kill + 0f 72 ireg \ FIFO + 08 79 ireg \ request kill + 10 7a ireg \ request kill + c8 7c ireg \ request kill +end-table + +\ lower-power +seq-table + 7f 19 ireg \ clock gating + f0 1b ireg \ clock gating + ff 2d ireg \ Power control enables + ff 2e ireg \ clock gating + ff 3f ireg \ clock gating + 5f 4f ireg \ clock gating threshold + df 59 ireg \ clock gating + 00 a8 ireg \ leave on ROC ECK in C0 + 00 a9 ireg \ leave on ROC ECK in C1 + 80 aa ireg \ gate off ROC ECK in C4 + 80 ab ireg \ gate off ROC ECK in C3 + 00 ac ireg \ leave on ROC ECK in S3 + 00 ad ireg \ leave on ROC ECK in S1 Snapshot + 00 ae ireg \ leave on ROC ECK in C4P + 00 af ireg \ leave on ROC ECK in reserved state +end-table + +crtc-table + 01 36 ireg \ Enable PCI power management control + 34 37 ireg \ DAC power savings +end-table + +\ end of lower-power + +seq-table + 9f 4a ireg \ 2nd PLL value 0 + 0c 4b ireg \ 2nd PLL value 1 + 05 4c ireg \ 2nd PLL value 2 + 04 40 ireg \ Pulse LCDCK PLL reset + 00 40 ireg \ Release LCDCK PLL reset +end-table + +3cc port-rb 0c bitset 3c2 # dx mov al dx out \ use external clock (MISC register reads at 3cc, writes at 3c2) + +80 17 crt-set \ Release reset + +60 78 seq-set \ Inverse HSYNC and VSYNC on IGA2 for LVDS +30 1e seq-set \ Power up DVP1 pads +0c 2a seq-set \ Power up LVDS pads +30 1b seq-set \ Turn off primary engine clock to save power d# 32000 wait-us \ Wait for DCON_BLNK to be low @@ -113,7 +198,7 @@ 0<> while d# 1000 wait-us cx dec -0= until then \ "then" resolves "while" +0= until then \ "then" resolves "while" \ This is a cheesy way to set the DCON LOAD bit -- ff acpi-io-base 4d + port-wb \ B1 and B2 - DCON LOAD is the 0x04 bit (bit number 2) of PMIO+4d

1 0

r1470 - cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev/via/unichrome
by svn＠openfirmware.info Nov. 13, 2009

Nov. 13, 2009

Author: wmb Date: 2009-11-13 21:40:24 +0100 (Fri, 13 Nov 2009) New Revision: 1470 Added: cpu/x86/pc/olpc/DisplayEDID.raw Modified: cpu/x86/pc/olpc/via/olpc.bth dev/via/unichrome/unichrome.fth Log: Via - Added EDID data for the XO display to the display driver for use by Openchrome. Added: cpu/x86/pc/olpc/DisplayEDID.raw =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/DisplayEDID.raw ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: cpu/x86/pc/olpc/via/olpc.bth =================================================================== --- cpu/x86/pc/olpc/via/olpc.bth 2009-11-13 20:37:04 UTC (rev 1469) +++ cpu/x86/pc/olpc/via/olpc.bth 2009-11-13 20:40:24 UTC (rev 1470) @@ -140,6 +140,8 @@ " ${BP}/cpu/x86/pc/olpc/images/xo.565" " xo.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/sd.565" " sd.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/DisplayEDID.raw" " edid" $add-deflated-dropin + " ${BP}/ofw/termemu/15x30pc.psf" " font" $add-deflated-dropin [ifdef] use-ega " ${BP}/ofw/termemu/cp881-16.obf" " pcfont" $add-deflated-dropin Modified: dev/via/unichrome/unichrome.fth =================================================================== --- dev/via/unichrome/unichrome.fth 2009-11-13 20:37:04 UTC (rev 1469) +++ dev/via/unichrome/unichrome.fth 2009-11-13 20:40:24 UTC (rev 1470) @@ -23,12 +23,23 @@ : set-resolution ( width height depth -- ) to depth to height to width ; +: create-edid-property ( -- ) + " edid" get-my-property if ( ) + " edid" find-drop-in if ( adr len ) + 2dup encode-bytes " edid" property free-mem + then ( ) + else ( adr len ) + 2drop ( ) + then ( ) +; + : 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 /scanline encode-int " linebytes" property + create-edid-property else 2drop then @@ -247,12 +258,14 @@ \ : crt-clr ( mask reg# -- ) tuck crt@ swap invert and swap crt! ; : crt-clr crt-clear ; - +: effective-depth ( depth -- depth' ) + depth d# 24 = if d# 32 else depth then +; : bytes>chars ( bytes -- chars ) 3 >> ; : chars>bytes 3 << ; : pixels>bytes ( pixels -- bytes ) depth 4 = if 2/ exit then - depth d# 24 = if d# 32 else depth then * ( bits ) 3 >> ( bytes ) + effective-depth * ( bits ) 3 >> ( bytes ) ; : lower-power ( -- ) @@ -744,7 +757,7 @@ : scaling-off ( -- ) 07 79 crt-clr ; : olpc-lcd-mode ( -- ) - panel-resolution d# 16 set-resolution + panel-resolution d# 32 set-resolution c0 1b seq-set \ Secondary display clock on @@ -1195,7 +1208,7 @@ : set-terminal ( -- ) width height ( width height ) over char-width / over char-height / ( width height rows cols ) - /scanline depth fb-install gp-install ( ) + /scanline effective-depth fb-install gp-install ( ) ; : change-resolution ( new-width new-height new-depth -- )

1 0