openfirmware

openfirmware@openfirmware.info

3007 discussions

r1234 - cpu/x86/pc/olpc/via/build
by svn＠openfirmware.info 03 Jul '09

03 Jul '09

Author: wmb Date: 2009-07-03 06:14:51 +0200 (Fri, 03 Jul 2009) New Revision: 1234 Modified: cpu/x86/pc/olpc/via/build/ Log: svn ignore Property changes on: cpu/x86/pc/olpc/via/build ___________________________________________________________________ Modified: svn:ignore - *.txt *.public *.rom *.version tags sourceurl *.tag build builton.fth VIA.ROM *.bin memtest + *.txt *.public *.rom *.version tags sourceurl *.tag build builton.fth VIA.ROM *.bin memtest *.aml *.stamp

1 0

r1233 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 03 Jul '09

03 Jul '09

Author: wmb Date: 2009-07-03 06:07:29 +0200 (Fri, 03 Jul 2009) New Revision: 1233 Modified: cpu/x86/pc/olpc/via/acpi.fth cpu/x86/pc/olpc/via/romreset.bth Log: Via - another try at ACPI wakeup. Modified: cpu/x86/pc/olpc/via/acpi.fth =================================================================== --- cpu/x86/pc/olpc/via/acpi.fth 2009-07-03 04:06:23 UTC (rev 1232) +++ cpu/x86/pc/olpc/via/acpi.fth 2009-07-03 04:07:29 UTC (rev 1233) @@ -232,7 +232,9 @@ dup >acpi-table-len 9 fix-checksum ; -h# 28 constant rm-ds \ Must agree with GDT in rmstart.fth +h# 18 constant ds32 \ Must agree with GDT in rmstart.fth +h# 20 constant cs16 \ Must agree with GDT in rmstart.fth +h# 28 constant ds16 \ Must agree with GDT in rmstart.fth label do-acpi-wake \ This code must be copied to low memory @@ -251,22 +253,16 @@ h# 0f # ax and ax cx mov op: 4 # bx shr - \ The following might be unnecessary - ax ax xor rm-ds # al mov \ 16-bit data segment - ax ds mov ax es mov ax ss mov + \ Set data segment for storing offset and segment below + ax ax xor ds16 # al mov ax ds mov \ 16-bit data segment + cx wake-adr wa1+ #) mov \ Offset + bx wake-adr la1+ #) mov \ Segment - cx wake-adr la1+ #) mov \ Offset - bx wake-adr wa1+ #) mov \ Segment + cr0 ax mov h# fe # al and ax cr0 mov \ Enter real mode - op: cr0 ax mov h# fe # al and op: ax cr0 mov \ Enter real mode + here 5 + do-acpi-wake - wake-adr + lwsplit d# 12 lshift #) far jmp \ Jump to set cs - here 5 + do-acpi-wake - wake-adr + lwsplit #) far jmp \ Jump to set cs - - \ The following might be unnecessary - \ Now we are running in real mode; fix segments again - cs ax mov ax ds mov ax es mov - - wake-adr wa1+ s#) far jmp + cs: wake-adr wa1+ lwsplit drop s#) far jmp end-code here do-acpi-wake - constant /do-acpi-wake Modified: cpu/x86/pc/olpc/via/romreset.bth =================================================================== --- cpu/x86/pc/olpc/via/romreset.bth 2009-07-03 04:06:23 UTC (rev 1232) +++ cpu/x86/pc/olpc/via/romreset.bth 2009-07-03 04:07:29 UTC (rev 1233) @@ -13,7 +13,7 @@ \needs write-dropin fload ${BP}/forth/lib/mkdropin.fth \needs >seg:off fload ${BP}/cpu/x86/pc/rmtools.fth -h# 20 constant rm-cs \ Must agree with GDT in rmstart.fth +h# 20 constant cs16 \ Must agree with GDT in rmstart.fth fload ${BP}/cpu/x86/mmuparam.fth @@ -178,8 +178,7 @@ facs-adr h# c + #) ax mov ax ax or 0<> if \ Resume in real mode for ACPI operating systems \ Linear wakeup address is in EAX - sp sp xor \ Possibly unnecessary - wake-adr lwsplit drop rm-cs #) far jmp + wake-adr lwsplit drop cs16 #) far jmp else \ Resume in 32-bit protected mode for OFW resume-data # sp mov

1 0

r1232 - cpu/x86 forth/kernel
by svn＠openfirmware.info 03 Jul '09

03 Jul '09

Author: wmb Date: 2009-07-03 06:06:23 +0200 (Fri, 03 Jul 2009) New Revision: 1232 Modified: cpu/x86/kerncode.fth cpu/x86/syscall.fth cpu/x86/target.fth forth/kernel/kernel.fth forth/kernel/sysio.fth Log: Kernel - added omit-files configuration option for smaller kernel. Modified: cpu/x86/kerncode.fth =================================================================== --- cpu/x86/kerncode.fth 2009-07-01 00:25:47 UTC (rev 1231) +++ cpu/x86/kerncode.fth 2009-07-03 04:06:23 UTC (rev 1232) @@ -38,10 +38,17 @@ :-h /n* /n * ;-h +[ifdef] omit-files \ assembler macro to assemble next :-h next + meta-asm[ ax lods 0 [ax] jmp ]meta-asm +;-h +[else] +\ assembler macro to assemble next +:-h next meta-asm[ up jmp ]meta-asm ;-h +[then] :-h c; next end-code ;-h Modified: cpu/x86/syscall.fth =================================================================== --- cpu/x86/syscall.fth 2009-07-01 00:25:47 UTC (rev 1231) +++ cpu/x86/syscall.fth 2009-07-03 04:06:23 UTC (rev 1232) @@ -171,16 +171,19 @@ \ systems (e.g. CP/M) require this; others which don't require it \ usually run faster with alignment than without. +[ifndef] omit-files hex \ Aligns to a 512-byte boundary; this is okay for most systems. : _falign ( l.byte# fd -- l.aligned ) drop 1ff invert and ; : _dfalign ( d.byte# fd -- d.aligned ) drop swap 1ff invert and swap ; +[then] : sys-init-io ( -- ) init-relocation \ must be first, for [is] to work install-wrapper-io install-disk-io + \ Don't poll the keyboard under an OS; block waiting for a key ['] (key ['] key (is ; Modified: cpu/x86/target.fth =================================================================== --- cpu/x86/target.fth 2009-07-01 00:25:47 UTC (rev 1231) +++ cpu/x86/target.fth 2009-07-03 04:06:23 UTC (rev 1232) @@ -29,11 +29,15 @@ \t16-t /w-t constant /link-t \t32-t /l-t constant /link-t /token-t constant /defer-t +[ifdef] omit-files +/n-t th 100 * constant user-size-t +[else] [ifdef] big-endian-t \ reloc code uses 300 in both cases. should we????? /n-t th 600 * constant user-size-t [else] /n-t th c00 * constant user-size-t [then] +[then] /n-t th 100 * constant ps-size-t /n-t th 100 * constant rs-size-t \t16-t /w-t constant /user#-t Modified: forth/kernel/kernel.fth =================================================================== --- forth/kernel/kernel.fth 2009-07-01 00:25:47 UTC (rev 1231) +++ forth/kernel/kernel.fth 2009-07-03 04:06:23 UTC (rev 1232) @@ -1365,6 +1365,9 @@ nuser tag-file decimal +[ifdef] omit-files +: $tagout 2drop ; +[else] : $tag-field ( $ -- ) tag-file @ fputs ; : tag-char ( char -- ) tag-file @ fputc ; : $tagout ( name$ -- ) @@ -1375,6 +1378,7 @@ base @ decimal source-id file-line (.) $tag-field base ! newline-string $tag-field ; +[then] : $make-header ( adr len voc-acf -- ) -rot ( voc-acf adr,len ) @@ -1938,6 +1942,10 @@ [then] +\ A place to put the last word returned by blword +0 value 'word + +[ifndef] omit-files \ From filecomm.fth decimal @@ -2167,9 +2175,6 @@ ; : close-file ( fd -- ior ) fclose 0 ; -\ A place to put the last word returned by blword -0 value 'word - headerless \ File descriptor allocation @@ -2237,6 +2242,7 @@ file @ false ; +[then] headerless \ A version that knows about multi-segment dictionaries can be installed @@ -2247,9 +2253,7 @@ defer .error# : (.error#) ( error# -- ) - dup d# -38 = if - ." The file '" opened-filename 2@ type ." ' cannot be opened." - else ." Error " . then + dup d# -38 = if .file-open-error else ." Error " . then ; : .abort ( -- ) @@ -2328,6 +2332,10 @@ : warm (s -- ) single sp0 @ sp! quit ; [then] +[ifdef] omit-files +: read-line ( adr len fd -- actual not-eof? error? ) 3drop 0 true ; +: .file-open-error ( -- ) ; +[else] \ From disk.fth \ High level interface to disk files. @@ -2560,6 +2568,10 @@ 2 /n-t * ualloc-t user opened-filename headers +: .file-open-error ( -- ) + ." The file '" opened-filename 2@ type ." ' cannot be opened." +; + : open-file ( adr len mode -- fd ior ) file @ >r \ Guard against re-entrancy @@ -2722,6 +2734,7 @@ then ( ior ) ; \ Missing: file-status, create-file, delete-file, resize-file, rename-file +[then] \ From cstrings.fth @@ -2929,6 +2942,13 @@ throw ; +defer prompt ( -- ) ' (prompt) is prompt + +defer quit ' (quit) is quit + +[ifdef] omit-files +: process-command-line ( -- ) ; +[else] : include-file ( fid -- ) /tib 4 + allocate throw ( fid adr ) save-input 2>r 2>r 2>r ( fid adr ) @@ -3004,10 +3024,6 @@ : null-environment? ( c-addr u -- false | i*x true ) 2drop false ; ' null-environment? is environment? -defer prompt ( -- ) ' (prompt) is prompt - -defer quit ' (quit) is quit - : fload fl ; : $report-name ( name$ -- name$ ) @@ -3072,6 +3088,8 @@ repeat bye ; +[then] + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: forth/kernel/sysio.fth =================================================================== --- forth/kernel/sysio.fth 2009-07-01 00:25:47 UTC (rev 1231) +++ forth/kernel/sysio.fth 2009-07-03 04:06:23 UTC (rev 1232) @@ -1,6 +1,9 @@ \ See license at end of file purpose: System I/O interfaces +[ifdef] omit-files +: install-disk-io ; +[else] \ From sysdisk.fth \ File I/O interface using the C wrapper program @@ -111,6 +114,7 @@ create lf-pstr 1 c, linefeed c, \ Unix create cr-pstr 1 c, carret c, \ Macintosh, OS-9 create crlf-pstr 2 c, carret c, linefeed c, \ DOS +[then] \ From syskey.fth

1 0

r1231 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 01 Jul '09

01 Jul '09

Author: wmb Date: 2009-07-01 02:25:47 +0200 (Wed, 01 Jul 2009) New Revision: 1231 Modified: cpu/x86/pc/olpc/via/acpi.fth cpu/x86/pc/olpc/via/rmstart.fth cpu/x86/pc/olpc/via/romreset.bth Log: Via - fixes to ACPI wakeup support. Modified: cpu/x86/pc/olpc/via/acpi.fth =================================================================== --- cpu/x86/pc/olpc/via/acpi.fth 2009-06-30 19:53:14 UTC (rev 1230) +++ cpu/x86/pc/olpc/via/acpi.fth 2009-07-01 00:25:47 UTC (rev 1231) @@ -248,25 +248,25 @@ then op: ax bx mov - h# 0f # ax and + h# 0f # ax and ax cx mov op: 4 # bx shr - cs: ax wake-adr la1+ #) mov \ Offset - cs: bx wake-adr wa1+ #) mov \ Segment - \ The following might be unnecessary ax ax xor rm-ds # al mov \ 16-bit data segment ax ds mov ax es mov ax ss mov - cr0 ax mov h# fe # al and ax cr0 mov \ Enter real mode + cx wake-adr la1+ #) mov \ Offset + bx wake-adr wa1+ #) mov \ Segment - here 5 + do-acpi-wake - wake-adr + >seg:off #) far jmp \ Jump to set cs + op: cr0 ax mov h# fe # al and op: ax cr0 mov \ Enter real mode + here 5 + do-acpi-wake - wake-adr + lwsplit #) far jmp \ Jump to set cs + \ The following might be unnecessary \ Now we are running in real mode; fix segments again cs ax mov ax ds mov ax es mov - cs: wake-adr wa1+ s#) far jmp + wake-adr wa1+ s#) far jmp end-code here do-acpi-wake - constant /do-acpi-wake @@ -292,7 +292,7 @@ " dsdt" find-drop-in 0= abort" No DSDT " ( adr len ) 2dup dsdt-adr swap move free-mem - do-acpi-wake wake-adr 4 + /do-acpi-wake move + do-acpi-wake wake-adr /do-acpi-wake move [ifdef] notdef \ Copy in the SSDT Modified: cpu/x86/pc/olpc/via/rmstart.fth =================================================================== --- cpu/x86/pc/olpc/via/rmstart.fth 2009-06-30 19:53:14 UTC (rev 1230) +++ cpu/x86/pc/olpc/via/rmstart.fth 2009-07-01 00:25:47 UTC (rev 1231) @@ -83,7 +83,7 @@ \ ffff.fc00 GDT - 1f w, ffff.fc00 l, 0 w, \ 0 Pointer to GDT in first slot + 2f w, ffff.fc00 l, 0 w, \ 0 Pointer to GDT in first slot 0 w, 0 l, 0 w, \ * Null descriptor ffff w, 9b.000000 l, 00.c.f w, \ 10 Code, linear=physical, full 4Gbytes ffff w, 93.000000 l, 00.c.f w, \ 18 Data, linear=physical, full 4Gbytes Modified: cpu/x86/pc/olpc/via/romreset.bth =================================================================== --- cpu/x86/pc/olpc/via/romreset.bth 2009-06-30 19:53:14 UTC (rev 1230) +++ cpu/x86/pc/olpc/via/romreset.bth 2009-07-01 00:25:47 UTC (rev 1231) @@ -179,7 +179,7 @@ \ Resume in real mode for ACPI operating systems \ Linear wakeup address is in EAX sp sp xor \ Possibly unnecessary - wake-adr >seg:off drop rm-cs #) far jmp + wake-adr lwsplit drop rm-cs #) far jmp else \ Resume in 32-bit protected mode for OFW resume-data # sp mov

1 0

r1230 - cpu/x86/pc/olpc/via dev/olpc/dcon
by svn＠openfirmware.info 30 Jun '09

30 Jun '09

Author: wmb Date: 2009-06-30 21:53:14 +0200 (Tue, 30 Jun 2009) New Revision: 1230 Modified: cpu/x86/pc/olpc/via/acpi.fth cpu/x86/pc/olpc/via/addrs.fth cpu/x86/pc/olpc/via/dsdt.dsl cpu/x86/pc/olpc/via/fw.bth cpu/x86/pc/olpc/via/ioinit.fth cpu/x86/pc/olpc/via/rmstart.fth cpu/x86/pc/olpc/via/romreset.bth dev/olpc/dcon/viadcon.fth Log: Via - ACPI wakeup support. Modified: cpu/x86/pc/olpc/via/acpi.fth =================================================================== --- cpu/x86/pc/olpc/via/acpi.fth 2009-06-29 19:30:06 UTC (rev 1229) +++ cpu/x86/pc/olpc/via/acpi.fth 2009-06-30 19:53:14 UTC (rev 1230) @@ -232,6 +232,44 @@ dup >acpi-table-len 9 fix-checksum ; +h# 28 constant rm-ds \ Must agree with GDT in rmstart.fth + +label do-acpi-wake + \ This code must be copied to low memory + \ Jump to this code (in low memory) with the linear target address in EAX + \ Interrupts must be off. We don't have a stack. + \ We got here via a far jmp to a 16-bit code segment, so we are + \ using the 16-bit instruction set, but we're not yet in real mode + + 16-bit + + ahead + 0 w, 0 w, \ Room for the segment:offset pointer + then + + op: ax bx mov + h# 0f # ax and + op: 4 # bx shr + + cs: ax wake-adr la1+ #) mov \ Offset + cs: bx wake-adr wa1+ #) mov \ Segment + + \ The following might be unnecessary + ax ax xor rm-ds # al mov \ 16-bit data segment + ax ds mov ax es mov ax ss mov + + cr0 ax mov h# fe # al and ax cr0 mov \ Enter real mode + + here 5 + do-acpi-wake - wake-adr + >seg:off #) far jmp \ Jump to set cs + + \ The following might be unnecessary + \ Now we are running in real mode; fix segments again + cs ax mov ax ds mov ax es mov + + cs: wake-adr wa1+ s#) far jmp +end-code +here do-acpi-wake - constant /do-acpi-wake + : setup-acpi ( -- ) [ifdef] notdef \ This has to agree with the _SB's _INI method, which gets the memory size @@ -254,6 +292,8 @@ " dsdt" find-drop-in 0= abort" No DSDT " ( adr len ) 2dup dsdt-adr swap move free-mem + do-acpi-wake wake-adr 4 + /do-acpi-wake move + [ifdef] notdef \ Copy in the SSDT \ I suppose we could point to it in FLASH - if so don't compress it, Modified: cpu/x86/pc/olpc/via/addrs.fth =================================================================== --- cpu/x86/pc/olpc/via/addrs.fth 2009-06-29 19:30:06 UTC (rev 1229) +++ cpu/x86/pc/olpc/via/addrs.fth 2009-06-30 19:53:14 UTC (rev 1230) @@ -69,12 +69,13 @@ h# e0080 constant fadt-adr h# e0180 constant facs-adr h# e01c0 constant dbgp-adr -h# e0200 constant madt-adr \ MADT is 5a byts long +h# e0200 constant madt-adr \ MADT is 5a bytes long h# e0280 constant hpet-adr h# fc000 constant dsdt-adr h# fd000 constant ssdt-adr h# ffc00 constant smbios-adr +h# fff00 constant wake-adr h# 3e.0000 constant inflate-base h# 30.0000 constant workspace Modified: cpu/x86/pc/olpc/via/dsdt.dsl =================================================================== --- cpu/x86/pc/olpc/via/dsdt.dsl 2009-06-29 19:30:06 UTC (rev 1229) +++ cpu/x86/pc/olpc/via/dsdt.dsl 2009-06-30 19:53:14 UTC (rev 1230) @@ -22,6 +22,14 @@ { Processor(\_PR.CPU0,0x00,0x00000410,0x06) { + Name(_CST, Package() + { + 4, + Package(){ResourceTemplate(){Register(SystemIO, 8, 0, 0x414)}, 2, 2, 750}, + Package(){ResourceTemplate(){Register(SystemIO, 8, 0, 0x415)}, 3, 65, 500}, + Package(){ResourceTemplate(){Register(SystemIO, 8, 0, 0x416)}, 4, 100, 300}, + Package(){ResourceTemplate(){Register(SystemIO, 8, 0, 0x417)}, 5, 200, 200} + }) } } // System Sleep States Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-06-29 19:30:06 UTC (rev 1229) +++ cpu/x86/pc/olpc/via/fw.bth 2009-06-30 19:53:14 UTC (rev 1230) @@ -344,12 +344,12 @@ boot-getline to boot-file " rom:emacs" $boot ; +fload ${BP}/cpu/x86/pc/rmtools.fth fload ${BP}/cpu/x86/pc/olpc/via/acpi.fth fload ${BP}/cpu/x86/pc/olpc/via/smbios.fth [ifdef] Later -fload ${BP}/cpu/x86/pc/rmtools.fth fload ${BP}/dev/geode/smi.fth \ fload ${BP}/cpu/x86/pc/biosload/rmenter.fth fload ${BP}/cpu/x86/pc/biosints.fth Modified: cpu/x86/pc/olpc/via/ioinit.fth =================================================================== --- cpu/x86/pc/olpc/via/ioinit.fth 2009-06-29 19:30:06 UTC (rev 1229) +++ cpu/x86/pc/olpc/via/ioinit.fth 2009-06-30 19:53:14 UTC (rev 1230) @@ -199,7 +199,8 @@ 82 0f 0a mreg \ Direct SCI to IRQ 10 (0xa) 84 ff da mreg \ IRQs 7,6,4,3,1 are primary wakeups 85 ff 40 mreg \ IRQ 14 is primary wakeup - 8a 9f 1f mreg \ C-state auto switching with normal latencies +\ 8a 9f 1f mreg \ C-state auto switching with normal latencies + 8a 9f 9f mreg \ C-state auto switching with slow C4 recovery mode - for C4 support [ifdef] demo-board 8d 18 18 mreg \ fast clock as throttle timer tick, hold SMI# low until event status cleared (FIXME for OLPC) [then] Modified: cpu/x86/pc/olpc/via/rmstart.fth =================================================================== --- cpu/x86/pc/olpc/via/rmstart.fth 2009-06-29 19:30:06 UTC (rev 1229) +++ cpu/x86/pc/olpc/via/rmstart.fth 2009-06-30 19:53:14 UTC (rev 1230) @@ -39,9 +39,8 @@ \ Addresses where the following items will be located in the processor's \ physical address space: -\ ffff.fc00: GDT ( 3 entries ) + padding -\ ffff.fc20: GDT address + size ( 6 bytes ) plus padding -\ ffff.fc28: Startup code plus padding +\ ffff.fc00: GDT ( 4 active entries ) + padding +\ ffff.fc30: Startup code plus padding \ ffff.fff0: Reset entry point - jump to startup code plus padding to end \ Assembler macros for startup diagnostics @@ -88,10 +87,12 @@ 0 w, 0 l, 0 w, \ * Null descriptor ffff w, 9b.000000 l, 00.c.f w, \ 10 Code, linear=physical, full 4Gbytes ffff w, 93.000000 l, 00.c.f w, \ 18 Data, linear=physical, full 4Gbytes + ffff w, 9b.0f0000 l, 00.0.0 w, \ 20 Code16, base f.0000, 64K + ffff w, 93.0f0000 l, 00.0.0 w, \ 28 Data16, base f.0000, 64K \ ------->>>>> Startup code, reached by branch from main entry point below \ - \ ffff.fc20 + \ ffff.fc30 here \ Mark the beginning of this code so its size may be determined \ and so that a jump to it may be assembled later. @@ -170,8 +171,8 @@ here over - ( adr , size-of-preceding-code ) - \ ffff.fc20 is the location of the code that follows the GDT - ffff.fff0 ffff.fc20 - swap - ( address #bytes-to-pad ) + \ ffff.fc30 is the location of the code that follows the GDT + ffff.fff0 ffff.fc30 - swap - ( address #bytes-to-pad ) \ The code mustn't extend past ffff.ffc0, because that is where PC \ manufacturers put the 0x10-byte BIOS version string. @@ -187,7 +188,7 @@ 16-bit cli cld \ Turn off interrupts (does not affect NMI) - #) jmp \ Relative jump back to ffff.fc20 + #) jmp \ Relative jump back to ffff.fc30 0 w, 0 c, \ align "pad" to end of ROM loader-version# l, \ version# loader-format# w, \ "format" (>1 when crc present) Modified: cpu/x86/pc/olpc/via/romreset.bth =================================================================== --- cpu/x86/pc/olpc/via/romreset.bth 2009-06-29 19:30:06 UTC (rev 1229) +++ cpu/x86/pc/olpc/via/romreset.bth 2009-06-30 19:53:14 UTC (rev 1230) @@ -11,7 +11,10 @@ \needs start-assembling fload ${BP}/cpu/x86/asmtools.fth \needs write-dropin fload ${BP}/forth/lib/mkdropin.fth +\needs >seg:off fload ${BP}/cpu/x86/pc/rmtools.fth +h# 20 constant rm-cs \ Must agree with GDT in rmstart.fth + fload ${BP}/cpu/x86/mmuparam.fth \ startmacros.fth defines some assembler macros that make MSR and I/O port @@ -170,12 +173,21 @@ bx ax mov h# 1c00 invert # ax and acpi-io-base 4 + # dx mov op: ax dx out char r report - resume-data # sp mov - resume-entry # ax mov ax call \ This might return if checksumming fails + cli + + facs-adr h# c + #) ax mov ax ax or 0<> if + \ Resume in real mode for ACPI operating systems + \ Linear wakeup address is in EAX + sp sp xor \ Possibly unnecessary + wake-adr >seg:off drop rm-cs #) far jmp + else + \ Resume in 32-bit protected mode for OFW + resume-data # sp mov + resume-entry # ax mov ax call \ This might return if checksumming fails + then char x report then \ Not a wakeup from S3 - \ Cache is now setup normally, backed by memory h# 20.0000 # esp mov Modified: dev/olpc/dcon/viadcon.fth =================================================================== --- dev/olpc/dcon/viadcon.fth 2009-06-29 19:30:06 UTC (rev 1229) +++ dev/olpc/dcon/viadcon.fth 2009-06-30 19:53:14 UTC (rev 1230) @@ -83,7 +83,7 @@ d# 50 ms wait-output dcon-load \ Put the DCON in VGA-refreshed mode - d# 25 us + d# 25 ms \ Ensure that that DCON sees the DCONLOAD high \ display-on else dcon-unload \ Put the DCON in self-refresh mode

1 0

r1229 - cpu/x86/pc/olpc
by svn＠openfirmware.info 29 Jun '09

29 Jun '09

Author: wmb Date: 2009-06-29 21:30:06 +0200 (Mon, 29 Jun 2009) New Revision: 1229 Modified: cpu/x86/pc/olpc/dsdt.bth Log: dsdt.bth - added -p option to force the output filename in the face of a change to the way that some newer versions of iasl construct the output filename. Modified: cpu/x86/pc/olpc/dsdt.bth =================================================================== --- cpu/x86/pc/olpc/dsdt.bth 2009-06-29 12:17:35 UTC (rev 1228) +++ cpu/x86/pc/olpc/dsdt.bth 2009-06-29 19:30:06 UTC (rev 1229) @@ -3,7 +3,7 @@ command: &builder &this build-now -" iasl -vi -vr -vs ../dsdt.dsl" expand$ $sh +" iasl -p dsdt -vi -vr -vs ../dsdt.dsl" expand$ $sh \ " iasl -vi -vr -vs ../fadt.dsl" expand$ $sh \ " iasl -vi -vr -vs ../ssdt.dsl" expand$ $sh

1 0

r1228 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 29 Jun '09

29 Jun '09

Author: wmb Date: 2009-06-29 14:17:35 +0200 (Mon, 29 Jun 2009) New Revision: 1228 Modified: cpu/x86/pc/olpc/via/fw.bth cpu/x86/pc/olpc/via/smbios.fth Log: OLPC Via - moved setup-smbios to an effective place in the startup sequence. Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-06-28 01:14:50 UTC (rev 1227) +++ cpu/x86/pc/olpc/via/fw.bth 2009-06-29 12:17:35 UTC (rev 1228) @@ -675,6 +675,7 @@ ['] false to interrupt-auto-boot? probe-usb " probe+" do-drop-in + setup-smbios \ Must be done after build-date is defined via do-drop-in interpreter-init [ifdef] Later Modified: cpu/x86/pc/olpc/via/smbios.fth =================================================================== --- cpu/x86/pc/olpc/via/smbios.fth 2009-06-28 01:14:50 UTC (rev 1227) +++ cpu/x86/pc/olpc/via/smbios.fth 2009-06-29 12:17:35 UTC (rev 1228) @@ -479,7 +479,3 @@ smbios-adr h# 1f 4 fix-checksum \ Overall checksum smbios-adr h# 10 + h# 0f 5 fix-checksum \ Intermediate checksum ; - -stand-init: SMBIOS tables - setup-smbios -;

1 0

r1227 - cpu/x86/pc/olpc cpu/x86/pc/olpc/via dev/olpc/kb3700
by svn＠openfirmware.info 28 Jun '09

28 Jun '09

Author: rsmith Date: 2009-06-28 03:14:50 +0200 (Sun, 28 Jun 2009) New Revision: 1227 Modified: cpu/x86/pc/olpc/rtcwake.fth cpu/x86/pc/olpc/via/versions.fth dev/olpc/kb3700/battery.fth dev/olpc/kb3700/ecio.fth Log: - Add support for general purpose ec timer driven wakeups - Add some test code for testing ec timer driven wakeups - words for flipping of a LiFePO4 debug dump bit - autowack support code update - Make OFW pull EC version 1.9.4 Modified: cpu/x86/pc/olpc/rtcwake.fth =================================================================== --- cpu/x86/pc/olpc/rtcwake.fth 2009-06-26 18:19:51 UTC (rev 1226) +++ cpu/x86/pc/olpc/rtcwake.fth 2009-06-28 01:14:50 UTC (rev 1227) @@ -69,6 +69,21 @@ key drop ; +\ for testing wakeups from the EC +: wackup-test-ec ( ms -- ) + d# 3000 autowack-delay \ At small ms delays the host can miss the SCI so this + \ is the back up. + 0 begin ( ms count ) + autowack-on swap dup ( count ms ms ) + ec-wackup ( count ms ) + s + swap dup ( ms count count ) + space .d (cr 1+ key? ( ms count+1 ) + until + key drop 2drop + autowack-off +; + stand-init: Century h# 20 cmos-century cmos! \ The century is in BCD, hence h# ; Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2009-06-26 18:19:51 UTC (rev 1226) +++ cpu/x86/pc/olpc/via/versions.fth 2009-06-28 01:14:50 UTC (rev 1227) @@ -2,10 +2,10 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 04a +macro: FW_MINOR 04b \ The EC microcode -macro: EC_VERSION 1_9_1 +macro: EC_VERSION 1_9_4 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2009-06-26 18:19:51 UTC (rev 1226) +++ dev/olpc/kb3700/battery.fth 2009-06-28 01:14:50 UTC (rev 1227) @@ -134,10 +134,11 @@ : see-bstate 0 begin - next-bstate dup . - dup 4 = if + next-bstate + dup 0 = if cr - then key? + then + dup . key? until ; @@ -166,6 +167,13 @@ \ Turn off the trickle charger : bat-disable-trickle ( -- ) fc23 ec@ 1 invert and fc23 ec! ; +\ Turn on the EC lifepo4 dump +: bat-enable-ec-life-dump ( -- ) f915 ec@ 8 or f915 ec! ; + +\ Turn on the EC lifepo4 dump +: bat-disable-ec-life-dump ( -- ) f915 ec@ 8 invert and f915 ec! ; + + \ Access the 1-wire data line via the EC GPIO ports h# 383 constant dataport Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2009-06-26 18:19:51 UTC (rev 1226) +++ dev/olpc/kb3700/ecio.fth 2009-06-28 01:14:50 UTC (rev 1227) @@ -20,10 +20,6 @@ iobase 3 + pc! ; -: autowak! ( value -- ) f64f ec! ; -: autowak-on ( -- ) 1 autowak! ; -: autowak-off ( -- ) 0 autowak! ; -: autowak-delay ( delay -- ) wbsplit f650 ec! f651 ec! ; : kbc-debug-on ( -- ) 1 fbfe ec! ; : kbc-debug-off ( -- ) 0 fbfe ec! ; @@ -66,8 +62,10 @@ : ec-rw ( -- w ) ec-rb ec-rb swap bwjoin ; : ec-ww ( -- w ) wbsplit ec-wb ec-wb ; +: ec-wl ( -- l ) lbsplit ec-wb ec-wb ec-wb ec-wb ; : (ec-cmd-b!) ( b cmd -- ) ec-cmd-out ec-wb ; +: (ec-cmd-l!) ( l cmd -- ) ec-cmd-out ec-wl ; : (ec-cmd-b@) ( cmd -- b ) ec-cmd-out ec-rb ; : (ec-cmd-w@) ( cmd -- w ) ec-cmd-out ec-rw ; @@ -94,6 +92,17 @@ loop ( b cmd ) too-many-retries ; + +: ec-cmd-l! ( l cmd -- ) + #ec-retries 0 do ( b cmd ) + 2dup ['] (ec-cmd-l!) catch 0= if ( b cmd ) + 2drop unloop exit + then ( b cmd x x ) + 2drop ( b cmd ) + loop ( b cmd ) + too-many-retries +; + : ec-cmd-b@ ( cmd -- b ) #ec-retries 0 do ( cmd ) dup ['] (ec-cmd-b@) catch 0= if ( cmd b ) @@ -157,7 +166,7 @@ too-many-retries ; -: ec-wakeup! ( wakeup -- ) lbsplit h# 36 ec-cmd-out ec-wb ec-wb ec-wb ec-wb ; +: ec-wackup ( ms -- ) lbsplit h# 36 ec-cmd-out ec-wb ec-wb ec-wb ec-wb ; : ec-abnormal@ ( -- b ) h# 1f ec-cmd-b@ ; @@ -181,7 +190,10 @@ : sci-inhibit ( -- ) h# 32 ec-cmd ; : sci-uninhibit ( -- ) h# 34 ec-cmd ; -: sci-inhibit-delay ( delay -- ) wbsplit f64d ec! f64e ec! ; +: autowack-on ( -- ) 1 33 ec-cmd-b! ; +: autowack-off ( -- ) 0 33 ec-cmd-b! ; +: autowack-delay ( delay -- ) wbsplit f650 ec! f651 ec! ; + : ec-indexed-io-off ( -- ) h# fe95 ec@ h# 40 invert and h# fe95 ec! ; 0 [if]

1 0

r1226 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 26 Jun '09

26 Jun '09

Author: wmb Date: 2009-06-26 20:19:51 +0200 (Fri, 26 Jun 2009) New Revision: 1226 Modified: cpu/x86/pc/olpc/via/suspend.fth cpu/x86/pc/olpc/via/versions.fth Log: Via - Added sci-wakeup, lid-wakeup, ebook-wakeup, batlow-wakeup. Modified: cpu/x86/pc/olpc/via/suspend.fth =================================================================== --- cpu/x86/pc/olpc/via/suspend.fth 2009-06-26 16:10:47 UTC (rev 1225) +++ cpu/x86/pc/olpc/via/suspend.fth 2009-06-26 18:19:51 UTC (rev 1226) @@ -12,14 +12,11 @@ code ax-call ( ax-value dst -- ) bx pop ax pop bx call c; -.( XXX Implement lid-wakeup) cr -: lid-wakeup -; +: batlow-wakeup ( -- ) h# 22 acpi-w@ h# 1000 or h# 22 acpi-w! ; +: ebook-wakeup ( -- ) h# 22 acpi-w@ h# 0100 or h# 22 acpi-w! ; +: lid-wakeup ( -- ) h# 22 acpi-w@ h# 0800 or h# 22 acpi-w! ; +: sci-wakeup ( -- ) h# 22 acpi-w@ h# 0002 or h# 22 acpi-w! ; -.( XXX Implement sci-wakeup) cr -: sci-wakeup -; - : s3 \ Enable wakeup from power button, also clearing \ any status bits in the low half of the register. Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2009-06-26 16:10:47 UTC (rev 1225) +++ cpu/x86/pc/olpc/via/versions.fth 2009-06-26 18:19:51 UTC (rev 1226) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 04 +macro: FW_MINOR 04a \ The EC microcode macro: EC_VERSION 1_9_1

1 0

r1225 - cpu/x86 cpu/x86/pc cpu/x86/pc/olpc/via ofw/inet
by svn＠openfirmware.info 26 Jun '09

26 Jun '09

Author: wmb Date: 2009-06-26 18:10:47 +0200 (Fri, 26 Jun 2009) New Revision: 1225 Added: cpu/x86/pc/olpc/via/smbios.fth Modified: cpu/x86/apic.fth cpu/x86/pc/apic.fth cpu/x86/pc/olpc/via/acpi.fth cpu/x86/pc/olpc/via/addrs.fth cpu/x86/pc/olpc/via/config.fth cpu/x86/pc/olpc/via/dsdt.dsl cpu/x86/pc/olpc/via/fw.bth cpu/x86/pc/olpc/via/ioinit.fth cpu/x86/pc/olpc/via/versions.fth ofw/inet/ip.fth Log: OLPC q3a04 - ACPI and SMBIOS enabled, suspend/resume works from OFW. Modified: cpu/x86/apic.fth =================================================================== --- cpu/x86/apic.fth 2009-06-25 21:23:17 UTC (rev 1224) +++ cpu/x86/apic.fth 2009-06-26 16:10:47 UTC (rev 1225) @@ -44,9 +44,9 @@ : id! ( id -- ) d# 24 lshift d# 20 apic! ; : id@ ( -- id ) d# 20 apic@ d# 24 rshift ; : lvt0@ ( -- n ) h# 350 apic@ ; -: lvt0! ( n -- ) h# 350 apic@ ; +: lvt0! ( n -- ) h# 350 apic! ; : lvt1@ ( -- n ) h# 360 apic@ ; -: lvt1! ( n -- ) h# 360 apic@ ; +: lvt1! ( n -- ) h# 360 apic! ; : lvt0-disable-irq ( -- ) h# 10000 h# 350 apic-set ; \ Disable LINT0 : lvt0-enable-irq ( -- ) h# 10000 h# 350 apic-clr ; \ Enable LINT0 @@ -148,6 +148,8 @@ : open ( -- okay? ) io-apic-base 0= if io-apic-mmio-base h# 80 " map-in" $call-parent to io-apic-base + 1 d# 24 lshift 0 io-apic! \ I/O APIC ID + 1 3 io-apic! \ Front side bus message delivery then true ; Modified: cpu/x86/pc/apic.fth =================================================================== --- cpu/x86/pc/apic.fth 2009-06-25 21:23:17 UTC (rev 1224) +++ cpu/x86/pc/apic.fth 2009-06-26 16:10:47 UTC (rev 1225) @@ -123,10 +123,10 @@ 20 0 30 50014 -80 f0 +80 f0 (00) d0 0 e0 ffffffff -f0 10f +f0 10f (1ff) Spurious vector number 320 10000 Timer Masked off 340 10000 PCINT Masked off 350 700 LINT0 vector 0 mode ExtINT (111) Edge Trigger Active High @@ -164,7 +164,7 @@ indirect io apic regs 00 1000000 IOAPIC ID is 1 01 178003 (RO) version -02 1000000 Arb ID is 1 +02 1000000 (RO) Arb ID is 1 03 1 Front side bus message delivery 10,11 0100.0000 . 0001.0000 DD00 . 0000 . 000 ooom . tips MVV .. Modified: cpu/x86/pc/olpc/via/acpi.fth =================================================================== --- cpu/x86/pc/olpc/via/acpi.fth 2009-06-25 21:23:17 UTC (rev 1224) +++ cpu/x86/pc/olpc/via/acpi.fth 2009-06-26 16:10:47 UTC (rev 1225) @@ -2,9 +2,13 @@ h# 0. 2constant xsdt-adr +: set-acpi-table-length ( table-adr -- ) + here over - swap la1+ l! +; + create fadt ( 000 4 ) " FACP" $, \ Signature -( 004 4 ) h# 84 l, \ Table Length +( 004 4 ) h# 84 l, \ Length ( 008 1 ) h# 02 c, \ Revision (supports reset adr) ( 009 1 ) h# 00 c, \ Checksum ( 00A 6 ) " OLPC " $, \ Oem ID @@ -27,24 +31,22 @@ ( 037 1 ) h# 00 c, \ P-State Control ( 038 4 ) h# 400 l, \ PM1A Event Block Address ( 03C 4 ) h# 0 l, \ PM1B Event Block Address -\ ( 040 4 ) h# 9c28 l, \ PM1A Control Block Address ( 040 4 ) h# 404 l, \ PM1A Control Block Address ( 044 4 ) h# 0 l, \ PM1B Control Block Address -( 048 4 ) h# 0 l, \ PM2 Control Block Address (don't support) -\ ( 04C 4 ) h# 9c10 l, \ PM Timer Block Address +( 048 4 ) h# 22 l, \ PM2 Control Block Address ( 04C 4 ) h# 408 l, \ PM Timer Block Address ( 050 4 ) h# 420 l, \ GPE0 Block Address ( 054 4 ) h# 0 l, \ GPE1 Block Address ( 058 1 ) h# 4 c, \ PM1 Event Block Length ( 059 1 ) h# 2 c, \ PM1 Control Block Length -( 05A 1 ) h# 0 c, \ PM2 Control Block Length +( 05A 1 ) h# 1 c, \ PM2 Control Block Length ( 05B 1 ) h# 4 c, \ PM Timer Block Length ( 05C 1 ) h# 4 c, \ GPE0 Block Length ( 05D 1 ) h# 0 c, \ GPE1 Block Length ( 05E 1 ) h# 10 c, \ GPE1 Base Offset ( 05F 1 ) h# 85 c, \ _CST Support -( 060 2 ) h# 1 w, \ C2 Latency -( 062 2 ) h# 1 w, \ C3 Latency +( 060 2 ) d# 10 w, \ C2 Latency (guess) +( 062 2 ) d# 100 w, \ C3 Latency (guess) ( 064 2 ) h# 0 w, \ CPU Cache Size ( 066 2 ) h# 0 w, \ Cache Flush Stride ( 068 1 ) h# 0 c, \ Duty Cycle Offset @@ -59,37 +61,24 @@ ( 080 1 ) h# 1 c, \ Reset value ( 081 3 ) 0 c, 0 c, 0 c, \ Reserved -here fadt - constant /fadt +fadt set-acpi-table-length \ FADT Flags: \ WBINVD is operational : 1 \ WBINVD does not invalidate : 0 \ All CPUs support C1 : 1 \ C2 works on MP system : 0 -\ Power button is generic : 0 -\ Sleep button is generic : 1 +\ Power button is generic : 0 ?? +\ Sleep button is generic : 1 ?? \ RTC wakeup not fixed : 0 \ RTC wakeup/S4 not possible : 1 \ 32-bit PM Timer : 1 \ Docking Supported : 0 \ Reset Register Supported: 1 -create rsdp -( 00 8 ) " RSD PTR " $, \ Signature -( 08 1 ) 00 c, \ Checksum -( 09 6 ) " OLPC " $, \ Oem Id -( 0f 1 ) 2 c, \ ACPI revision (3.0b) -( 10 4 ) rsdt-adr l, \ RSDT Address - -( 14 4 ) d# 36 l, \ Length for extended version -( 18 8 ) xsdt-adr d, \ XSDT Address -( 20 1 ) 0 c, \ extended checksum -( 21 3 ) 0 c, 0 c, 0 c, \ reserved -here rsdp - constant /rsdp - create madt \ Multiple APIC Descriptor Table ( 000 4 ) " APIC" $, \ Signature -( 004 4 ) h# 5a l, \ Table Length +( 004 4 ) h# 5a l, \ Length ( 008 1 ) h# 01 c, \ Revision ( 009 1 ) h# 00 c, \ Checksum ( 00A 6 ) " OLPC " $, \ Oem ID @@ -106,7 +95,6 @@ ( 02f 1 ) 0 c, \ ACPI ID ( 030 4 ) 1 l, \ Flags - 1 means this processor is usable - ( 034 1 ) 1 c, \ I/O APIC ( 035 1 ) d# 12 c, \ length ( 036 1 ) 1 c, \ I/O APIC ID @@ -133,11 +121,11 @@ ( 053 1 ) 9 c, \ Bus-relative IRQ ( 054 4 ) 9 l, \ Interrupt # that this source will trigger ( 058 2 ) h# f w, \ Flags - active low, level triggered -here madt - constant /madt +madt set-acpi-table-length create hpet \ High Precision Event Timer table ( 000 4 ) " HPET" $, \ Signature -( 004 4 ) h# 38 l, \ Table Length +( 004 4 ) h# 38 l, \ Length ( 008 1 ) h# 01 c, \ Revision ( 009 1 ) h# 00 c, \ Checksum ( 00A 6 ) " OLPC " $, \ Oem ID @@ -155,13 +143,11 @@ ( 034 1 ) 0 c, \ Sequence ( 035 2 ) 0 w, \ Min tick ( 037 1 ) 0 c, \ flags -here hpet - constant /hpet +hpet set-acpi-table-length create rsdt ( 00 4 ) " RSDT" $, \ Signature ( 04 4 ) h# 34 l, \ Length -\ ( 04 4 ) h# 30 l, \ Length -\ ( 04 4 ) h# 2c l, \ Length ( 08 1 ) 1 c, \ Revision ( 09 1 ) 00 c, \ Checksum ( 0a 6 ) " OLPC " $, \ Oem Id @@ -176,7 +162,7 @@ \ ( 2c 4 ) dbgp-adr l, \ DBGP Address \ ( 30 4 ) ssdt-adr l, \ SSDT Address \ ( 30 4 ) prtn-adr l, \ PRTN Address -here rsdt - constant /rsdt +rsdt set-acpi-table-length 0 [if] create dbgp @@ -192,7 +178,7 @@ ( 24 1 ) 0 c, \ Full 16550 interface ( 25 3 ) 0 c, 0 c, 0 c, \ reserved ( 28 c ) 1 c, 8 c, 0 c, 1 c, h# 3f8 l, 0 l, \ Port base address (generic register descriptor) -here dbgp - constant /dbgp +dbgp set-acpi-table-length [then] create facs @@ -205,8 +191,21 @@ ( 18 8 ) 0. d, \ 64-bit waking vector ( 20 1 ) 1 c, \ Version ( 21 1f ) here d# 31 dup allot erase -here facs - constant /facs +facs set-acpi-table-length +create rsdp +( 00 8 ) " RSD PTR " $, \ Signature +( 08 1 ) 00 c, \ Checksum +( 09 6 ) " OLPC " $, \ Oem Id +( 0f 1 ) 2 c, \ ACPI revision (3.0b) +( 10 4 ) rsdt-adr l, \ RSDT Address + +( 14 4 ) d# 36 l, \ Length for extended version +( 18 8 ) xsdt-adr d, \ XSDT Address +( 20 1 ) 0 c, \ extended checksum +( 21 3 ) 0 c, 0 c, 0 c, \ reserved +here rsdp - constant /rsdp + : fix-checksum ( table /table checksum-offset -- ) >r over >r ( table /table r: cksum-offset table ) 0 -rot bounds ?do i c@ + loop ( sum ) @@ -227,6 +226,12 @@ h# 1000 - \ Safety page ; +: >acpi-table-len ( adr -- len ) la1+ l@ ; +: copy-acpi-table ( src dst -- ) + tuck over >acpi-table-len move ( dst ) + dup >acpi-table-len 9 fix-checksum +; + : setup-acpi ( -- ) [ifdef] notdef \ This has to agree with the _SB's _INI method, which gets the memory size @@ -234,14 +239,14 @@ memory-limit d# 10 rshift 'ebda h# 180 + l! [then] - \ Copy rsdt and fadt to low memory + \ Copy tables to low memory + fadt fadt-adr copy-acpi-table + madt madt-adr copy-acpi-table + hpet hpet-adr copy-acpi-table +\ dbgp dbgp-adr copy-acpi-table + facs facs-adr facs >acpi-table-len move + rsdt rsdt-adr copy-acpi-table rsdp rsdp-adr /rsdp move rsdp-adr h# 14 8 fix-checksum rsdp-adr /rsdp h# 20 fix-checksum - rsdt rsdt-adr /rsdt move rsdt-adr /rsdt 9 fix-checksum - fadt fadt-adr /fadt move fadt-adr /fadt 9 fix-checksum - madt madt-adr /madt move madt-adr /madt 9 fix-checksum - hpet hpet-adr /hpet move hpet-adr /hpet 9 fix-checksum -\ dbgp dbgp-adr /dbgp move dbgp-adr /dbgp 9 fix-checksum - facs facs-adr /facs move \ Copy in the DSDT \ I suppose we could point to it in FLASH - if so don't compress it, @@ -261,10 +266,8 @@ h# ffffffff h# 20 acpi-l! \ Ack all leftover events ; -.( Not setting up ACPI automatically) cr stand-init: ACPI tables -." Not setting up ACPI automatically" cr -\ setup-acpi + setup-acpi ; \ Geode h# 6000 constant xp-smbus-base Modified: cpu/x86/pc/olpc/via/addrs.fth =================================================================== --- cpu/x86/pc/olpc/via/addrs.fth 2009-06-25 21:23:17 UTC (rev 1224) +++ cpu/x86/pc/olpc/via/addrs.fth 2009-06-26 16:10:47 UTC (rev 1225) @@ -74,6 +74,8 @@ h# fc000 constant dsdt-adr h# fd000 constant ssdt-adr +h# ffc00 constant smbios-adr + h# 3e.0000 constant inflate-base h# 30.0000 constant workspace Modified: cpu/x86/pc/olpc/via/config.fth =================================================================== --- cpu/x86/pc/olpc/via/config.fth 2009-06-25 21:23:17 UTC (rev 1224) +++ cpu/x86/pc/olpc/via/config.fth 2009-06-26 16:10:47 UTC (rev 1225) @@ -9,6 +9,7 @@ [ifdef] xo-board create use-ec [then] +create use-apic \ --- The environment that "boots" us --- \ - Image Format - Example Media - previous stage bootloader Modified: cpu/x86/pc/olpc/via/dsdt.dsl =================================================================== --- cpu/x86/pc/olpc/via/dsdt.dsl 2009-06-25 21:23:17 UTC (rev 1224) +++ cpu/x86/pc/olpc/via/dsdt.dsl 2009-06-26 16:10:47 UTC (rev 1225) @@ -18,10 +18,12 @@ Store (Arg1, CMSD) } // Processor Objects - Scope(\_PR) { - Processor(\_PR.CPU0,0x00,0x00000410,0x06){} - } - +Scope(\_PR) +{ + Processor(\_PR.CPU0,0x00,0x00000410,0x06) + { + } +} // System Sleep States Name(\_S0,Package(){0,0,0,0}) Name(\_S1,Package(){4,4,4,4}) @@ -888,13 +890,13 @@ ECDX, 2 //USB3 PM capability status register } - Method(_STA,0) { //Status of the USB3 Device - If(LEqual(\_SB.PCI0.USB3.CMDR, 0x00)) { - Return(0x0D) - } Else { - Return(0x0F) - } + Method(_STA,0) { //Status of the USB3 Device + If(LEqual(\_SB.PCI0.USB3.CMDR, 0x00)) { + Return(0x0D) + } Else { + Return(0x0F) } + } } @@ -904,7 +906,7 @@ Name(_PRW, Package(2){0x0E,3}) Name(_S3D, 3) - + OperationRegion(U2F4,PCI_Config,0x00,0xC2) Field(U2F4,ByteAcc,NoLock,Preserve){ Offset(0x00), Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-06-25 21:23:17 UTC (rev 1224) +++ cpu/x86/pc/olpc/via/fw.bth 2009-06-26 16:10:47 UTC (rev 1225) @@ -346,10 +346,11 @@ fload ${BP}/cpu/x86/pc/olpc/via/acpi.fth +fload ${BP}/cpu/x86/pc/olpc/via/smbios.fth + [ifdef] Later fload ${BP}/cpu/x86/pc/rmtools.fth fload ${BP}/dev/geode/smi.fth -fload ${BP}/cpu/x86/pc/olpc/smbios.fth \ fload ${BP}/cpu/x86/pc/biosload/rmenter.fth fload ${BP}/cpu/x86/pc/biosints.fth fload ${BP}/cpu/x86/pc/olpc/biosresume.fth Modified: cpu/x86/pc/olpc/via/ioinit.fth =================================================================== --- cpu/x86/pc/olpc/via/ioinit.fth 2009-06-25 21:23:17 UTC (rev 1224) +++ cpu/x86/pc/olpc/via/ioinit.fth 2009-06-26 16:10:47 UTC (rev 1225) @@ -167,7 +167,7 @@ [then] .( Check RTC century byte mapping to cmos 32 - see d17f0 rx58) cr [ifdef] use-apic - 58 40 40 mreg \ Enable Internal APIC + 58 40 40 mreg \ Enable Internal IO-APIC [then] [ifdef] xo-board 59 ff 1c mreg \ Keyboard (ports 60,64) and ports 62,66 on LPC bus (EC) @@ -257,6 +257,9 @@ [ifdef] use-apic e7 80 80 mreg \ Enable APIC Cycle Reflect to ALL Bus Master Activity Effective Signal [then] +[ifdef] xo-board + ec 04 00 mreg \ C3 state setting +[then] fc 06 04 mreg \ DPSLP# to SLP# Latency Adjustment - 22.5 us end-table @@ -278,7 +281,7 @@ \ 74 d8 08 mreg \ Lock Cycle Issued by CPU Blocks P2C Cycles (04 bit is reserved) 74 dc 0c mreg \ Lock Cycle Issued by CPU Blocks P2C Cycles - 04 res be like Phx 75 ff 0f mreg \ Use New grant mechanism for PCI arbitration, PCI Master Bus Timeout is 7x16 PCI clock - 76 fd 50 mreg \ Enable PCI parking, Grant to CPU after 2 PC master grants + 76 fd d0 mreg \ Enable PCI parking, Grant to CPU after 2 PC master grants, support IO address 22 for C3 77 58 48 mreg \ PCI1 FIFO empty blocks CPU to PCI read, Read FIFO times out after 1 ms 80 07 07 mreg \ PCI1 and HDAC upstream read does not pass write, APCI blocks upstream write \ 82 3e 20 mreg \ Monitor CCA and SDIO2 @@ -316,4 +319,6 @@ \ 00 to run - Axxxxx hits VGA in normal mode, hits shadow DRAM in SMM \ 01 to access VGA when in SMM (data cycles only) +\ acpi-io-base h# 26 + port-rb h# 07 bitset al dx out \ Settings to support C4 state +acpi-io-base h# 26 + port-rb h# 06 bitset al dx out \ Settings to support C3 state acpi-io-base h# 4c + port-rl h# 400 bitset ax dx out \ Set USB power high Added: cpu/x86/pc/olpc/via/smbios.fth =================================================================== --- cpu/x86/pc/olpc/via/smbios.fth (rev 0) +++ cpu/x86/pc/olpc/via/smbios.fth 2009-06-26 16:10:47 UTC (rev 1225) @@ -0,0 +1,485 @@ +\ Make SMBIOS tables + + +0 [if] +h# ffbc0 constant 'pciirq +\ http://www.microsoft.com/whdc/archive/pciirq.mspx +\ create pciirq-header +\ h# 52495024 l, \ $PIR +\ h# 0100 w, \ version 1.0 +\ h# 0040 w, \ Total size +\ +\ 0 c, 0 c, \ Bus#, DevFunc# +\ 0 w, \ Exclusive IRQs +\ 0 l, \ Compatible router +\ 0 l, \ miniport data +\ 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, \ res +\ h# b0 c, \ checksum +\ \ Table data goes here + +: make-pciirq-table ( -- ) + 'pciirq h# 40 erase + h# 52495024 'pciirq l! \ $PIR + h# 0100 'pciirq la1+ w! \ version + h# 0040 'pciirq la1+ wa1+ w! \ total size + h# b0 'pciirq h# 1f + c! \ checksum + \ The rest of the table is 0 because the actual routing + \ is now done by ACPI +; +[then] + +: c$, $, 0 c, ; + +0 value #smbios-tables +: copy-smbios-table ( dst-adr table -- dst-adr' ) + #smbios-tables 1+ to #smbios-tables + 2dup 1+ c@ ( dst-adr table dst-adr len ) + dup >r move ( dst-adr r: len ) + r> + ( dst-adr' ) +; + +: smbios-c, ( dst-adr b -- dst-adr' ) over c! 1+ ; +: smbios-w, ( dst-adr w -- dst-adr' ) over le-w! wa1+ ; +: smbios-l, ( dst-adr l -- dst-adr' ) over le-l! la+ ; +: smbios-null ( dst-adr -- dst-adr' ) 0 smbios-c, ; +: end-smbios-table ( dst-adr -- dst-adr' ) smbios-null ; +: +smbios$ ( dst-adr adr len -- dst-adr' ) + 3dup rot swap move ( dst-adr adr len ) + nip + smbios-null +; + +0 value uuid-adr + +create smbios-entry +( 00 ) " _SM_" $, +( 04 ) 0 c, \ Byte checksum - structure must sum to 0 SETME +( 05 ) h# 1f c, \ Entry structure length +( 06 ) h# 02 c, \ Major version +( 07 ) h# 01 c, \ Minor version +( 08 ) h# 100 w, \ Maximum size of a structure +( 0a ) h# 00 c, \ Entry point revision +( 0b ) 0 c, 0 c, 0 c, 0 c, 0 c, \ Formatted area +( 10 ) " _DMI_" $, \ Intermediate anchor string +( 15 ) 0 c, \ Intermediate checksum SETME +( 16 ) 0 w, \ Structure table length SETME +( 18 ) 0 l, \ Structure table address SETME +\ ( 1c ) d# 11 w, \ Number of structures +( 1c ) d# 12 w, \ Number of structures +( 1e ) h# 21 c, \ BCD revision + +create bios-info +( 00 ) 0 c, \ BIOS info type code +( 01 ) h# 13 c, \ Length (one BIOS characteristic extension byte) +( 02 ) h# 0000 w, \ Handle +( 04 ) 1 c, \ Vendor string index +( 05 ) 2 c, \ Version string index +( 06 ) h# f000 w, \ BIOS starting address segment +( 08 ) 3 c, \ Release date index +( 09 ) h# 0f c, \ BIOS ROM size in 64K chunks, minus 1 +( 0a ) h# 99880 l, \ BIOS characteristics - PCI, Reflash, shadowing, CD boot, selectable boot, EDD +( 0e ) 0 l, \ Vendor and system specific BIOS characteristics +( 12 ) 1 c, \ ACPI is supported +\ " OLPC" c$, \ Vendor string +\ " Q2E00" c$, \ Version string +\ " 04/01/2008" c$, \ Release date string +\ 0 c, \ End + +create system-info +( 00 ) 1 c, \ System info type code +( 01 ) h# 19 c, \ Length (for v2.1) +( 02 ) h# 0100 w, \ Handle +( 04 ) 1 c, \ Manufacturer string index +( 05 ) 2 c, \ Product name string index +( 06 ) 3 c, \ Version string index +( 07 ) 4 c, \ Serial number string index +( 08 ) here to uuid-adr h# 10 allot \ SETME +( 18 ) 6 c, \ Wake up type +\ " OLPC" c$, \ 1: Manufacturer +\ " XO" c$, \ 2: Product Name +\ " 1" c$, \ 3: Version +\ " <sn>" c$, \ 4: Serial number +\ 0 c, + +create base-board-info +( 00 ) 2 c, \ System info type code +( 01 ) h# 8 c, \ Length (for v2.1) +( 02 ) h# 0200 w, \ Handle +( 04 ) 1 c, \ Manufacturer string index +( 05 ) 2 c, \ Product string index +( 06 ) 3 c, \ Version string index +( 07 ) 4 c, \ Serial number string index +\ " QUANTA" c$, \ 1: Manufacturer +\ " XO" c$, \ 2: Product Name +\ " 1" c$, \ 3: Version + + +create system-enclosure +( 00 ) 3 c, \ System enclosure type code +( 01 ) h# 0d c, \ Length (for v2.1) +( 02 ) h# 0300 w, \ Handle +( 04 ) 1 c, \ Manufacturer string index +( 05 ) 9 c, \ Type - laptop +( 06 ) 2 c, \ Version number string index +( 07 ) 0 c, \ Serial number string index +( 08 ) 0 c, \ Asset tag string index +( 09 ) 3 c, \ Boot-up state +( 0a ) 3 c, \ Power Supply State +( 0b ) 3 c, \ Thermal State +( 0c ) 5 c, \ Security Status - XXX set to 4 in secure mode +\ " OLPC" c$, \ 2: Manufacturer +\ " 1" c$, \ 3: Version +\ 0 c, + +create processor-info +( 00 ) 4 c, \ Processor info type code +( 01 ) h# 20 c, \ Length (for v2.1) +( 02 ) h# 0400 w, \ Handle +( 04 ) 0 c, \ Reference designator string index +( 05 ) 3 c, \ Type - CPU +( 06 ) 1 c, \ Family - other +( 07 ) 1 c, \ Manufacturer +( 08 ) h# 5a2 l, h# 88a93d l, \ CPUID results - Set dynamically later +( 10 ) 2 c, \ Processor version string index +( 11 ) h# 8c c, \ Processor voltage (h# 80 + 1.2V/10) +( 12 ) d# 33 w, \ External clock (main bus clock) +( 14 ) d# 433 w, \ Max speed +( 16 ) d# 433 w, \ Current speed +( 18 ) h# 41 c, \ CPU present and enabled +( 19 ) 6 c, \ Processor upgrade - None +( 1a ) h# 0701 w, \ L1 Cache Handle +( 1c ) h# 0703 w, \ L2 Cache Handle +( 1e ) h# ffff w, \ L3 Cache Handle +\ " AuthenticAMD" c$, \ 1: Manufacturer +\ 0 c, + +create l1-icache-info +( 00 ) 7 c, \ Cache info type code +( 01 ) h# 13 c, \ Length +( 02 ) h# 0701 w, \ Handle +( 04 ) 0 c, \ Socket string index +( 05 ) h# 180 w, \ Writeback, enabled, internal, not socketed, L1 +( 07 ) h# 8002 w, \ Max size - 128K +( 09 ) h# 8002 w, \ Installed size - 128K +( 0b ) 1 w, \ Supported SRAM type - unknown +( 0d ) 1 w, \ Installed SRAM type - unknown +( 0f ) 0 c, \ Speed (NS) +( 10 ) 1 c, \ ECC - other +( 11 ) 5 c, \ Type - Unified (actually it is split I and D but they are coherent) +( 12 ) 5 c, \ Associativity - 4-way set-associative +\ 0 w, + +0 [if] +create l1-dcache-info +( 00 ) 7 c, \ Cache info type code +( 01 ) h# 13 c, \ Length +( 02 ) h# 0702 w, \ Handle +( 04 ) 0 c, \ Socket string index +( 05 ) h# 180 w, \ Writeback, enabled, internal, not socketed, L1 +( 07 ) h# 8001 w, \ Max size - 64K +( 09 ) h# 8001 w, \ Installed size - 64K +( 0b ) 1 w, \ Supported SRAM type - unknown +( 0d ) 1 w, \ Installed SRAM type - unknown +( 0f ) 0 c, \ Speed (NS) +( 10 ) 3 c, \ ECC - none +( 11 ) 4 c, \ Type - Data +( 12 ) 8 c, \ Associativity - 16-way set-associative +\ 0 w, +[then] + +create l2-cache-info +( 00 ) 7 c, \ Cache info type code +( 01 ) h# 13 c, \ Length +( 02 ) h# 0703 w, \ Handle +( 04 ) 0 c, \ Socket string index +( 05 ) h# 181 w, \ Writeback, enabled, internal, not socketed, L2 +( 07 ) h# 8002 w, \ Max size - 128K +( 09 ) h# 8002 w, \ Installed size - 128K +( 0b ) 1 w, \ Supported SRAM type - unknown +( 0d ) 1 w, \ Installed SRAM type - unknown +( 0f ) 0 c, \ Speed (NS) +\ ( 10 ) 3 c, \ ECC - none +( 10 ) 1 c, \ ECC - other +( 11 ) 5 c, \ Type - Unified +( 12 ) h# a c, \ Associativity - 32-way set-associative +\ 0 w, + +0 value portinfo# +: make-smbios-port ( dst-adr connectortype porttype name$ -- dst-adr' ) + #smbios-tables 1+ to #smbios-tables + 2>r >r >r + 8 smbios-c, 9 smbios-c, + portinfo# h# 800 + smbios-w, portinfo# 1+ to portinfo# + 0 smbios-c, 0 smbios-c, \ Internal Refdes and Internal Connector Type + 1 smbios-c, \ String index + r> smbios-c, \ Connector type + r> smbios-c, \ Port type + 2r> +smbios$ \ Reference designator string + end-smbios-table +; + +create sd-slot-array +( 00 ) d# 9 c, \ physical-memory-array type code +( 01 ) h# 0d c, \ Length +( 02 ) h# d01 w, \ Handle +( 04 ) 1 c, \ Refdes +( 05 ) h# b c, \ Slot type - proprietary +( 06 ) 1 c, \ Bus width - other +( 07 ) 4 c, \ Usage - in use +( 08 ) 3 c, \ Length - short +( 09 ) h# 0000 w, \ ID - meaningless +( 0b ) 4 c, \ Characteristics 1 - 3.3V +( 0c ) 2 c, \ Characteristics 2 - hot plug + +create video-array +( 00 ) d# 10 c, \ onboard device type code +( 01 ) h# 06 c, \ Length +( 02 ) h# a01 w, \ Handle +( 04 ) h# 83 c, \ Enabled, type 3 (video) +( 05 ) 1 c, \ Description string + +create bios-lang-array +( 00 ) d# 13 c, \ BIOS language type code +( 01 ) h# 16 c, \ Length +( 02 ) h# d01 w, \ Handle +( 04 ) 1 c, \ Number of languages +( 05 ) 1 c, \ Flags - abbreviated format +( 06 ) 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, \ Res +( 15 ) 1 c, \ Currrent language string + +create main-memory-array +( 00 ) d# 16 c, \ physical-memory-array type code +( 01 ) h# 0f c, \ Length +( 02 ) h# 1001 w, \ Handle +( 04 ) 3 c, \ Location - onboard +( 05 ) 3 c, \ Use - system memory +( 06 ) 3 c, \ ECC - none +( 07 ) h# 100000 l, \ Maximum size - 1024K KiB (1 GiB) +( 0b ) h# fffe w, \ Memory Error Info Handle - not provided +( 0d ) 1 w, \ Number of devices +\ 0 w, + +create memory-device +( 00 ) d# 17 c, \ physical-memory-array type code +( 01 ) h# 15 c, \ Length +( 02 ) h# 1101 w, \ Handle +( 04 ) h# 1001 w, \ Handle of "parent" memory array +( 06 ) h# fffe w, \ Memory Error Info Handle - not provided +( 08 ) d# 64 w, \ Total width +( 0a ) d# 64 w, \ Data width +( 0c ) h# 400 w, \ Size - 1024 MB +( 0e ) h# 0b c, \ Form factor - row of chips +( 0f ) 0 c, \ Set - not part of a set +( 10 ) 1 c, \ Device Locator string index +( 11 ) 0 c, \ Bank Locator string index +( 12 ) h# 13 c, \ Memory type - DDR3 +( 13 ) h# 0080 w, \ Memory type detail - Synchronous +\ " Soldered" c$, +\ 0 w, + +create ma-mapped-address +( 00 ) d# 19 c, \ memory-array-mapped-address type code +( 01 ) h# 0f c, \ Length +( 02 ) h# 1301 w, \ Handle +( 04 ) 0 l, \ Starting address - first KiB +( 08 ) h# fffff l, \ Ending address - last KiB +( 0c ) h# 31 w, \ Handle of "parent" memory array +( 0e ) h# 1 c, \ Partition width +\ 0 w, + +create pointing-device +( 00 ) d# 21 c, \ system boot info type code +( 01 ) h# 07 c, \ Length +( 02 ) h# 1501 w, \ Handle +( 04 ) 7 c, \ Type - touchpad +( 05 ) 4 c, \ Interface - PS/2 +( 06 ) 2 c, \ #buttons - 2 + + +create system-boot-info +( 00 ) d# 32 c, \ system boot info type code +( 01 ) h# 0b c, \ Length +( 02 ) h# 2000 w, \ Handle +( 04 ) 0 l, 0 w, \ 6 reseved bytes +( 0a ) 0 c, \ Boot status - no errors +\ 0 w, + +create end-array +( 00 ) h# 7f c, \ End type code +( 01 ) h# 04 c, \ Length +( 02 ) h# 7f01 w, \ Handle + + +: test-name$ ( -- $ ) " IE8y2D ScD%g4r2bAIFA." ; +: test-version$ ( -- $ ) " OLPC Ver 1.50.01" ; +: fw-version$ ( -- $ ) + " /openprom" find-package if + " model" rot get-package-property 0= if + get-encoded-string ( adr len ) + dup d# 16 = if + \ We just want the "Q2E00" part + drop 6 + 5 exit + then + 2drop + then + then + " Unknown" +; +d# 10 buffer: fw-date-buf + +\ Convert build-date format "2008-04-14" to SMBIOS format "04/14/2008" +: fw-date$ ( -- $ ) + " xx/xx/xxxx" fw-date-buf swap move + " build-date" evaluate drop ( adr ) + dup fw-date-buf 6 + 4 move ( adr ) \ Year + dup 5 + fw-date-buf 2 move ( adr ) \ Month + 8 + fw-date-buf 3 + 2 move ( ) \ Day + fw-date-buf d# 10 +; +: get-tag$ ( tag$ -- value$ ) find-tag 0= if " Not Available" then ?-null ; + +: too-long? ( dst-adr -- dst-adr flag ) dup pad - h# 10 >= ; +: (uuid) ( -- true | adr len false ) + " U#" find-tag if ( adr len ) + ?-null ( adr len' ) + pad -rot ( dst-adr adr len ) + bounds ?do ( dst-adr ) + too-long? if drop true unloop exit then + i c@ h# 10 digit if ( dst-adr digith ) + i 1+ c@ h# 10 digit if ( dst-adr digith digitl ) + swap 4 lshift or ( dst-adr byte ) + over c! 1+ ( dst-adr' ) + 2 ( dst-adr advance ) + else ( dst-adr digith char ) + 3drop true unloop exit + then ( dst-adr ) + else ( dst-adr char ) + [char] - <> if drop true unloop exit then + 1 ( dst-adr advance ) + then ( dst-adr advance ) + +loop ( dst-adr ) + pad tuck - ( adr len ) + dup h# 10 = if ( adr len ) + false \ Good UUID ( adr len false ) + else ( adr len ) + 2drop true ( true ) + then ( true | adr len false ) + else ( ) + true ( true ) + then ( true | adr len false ) +; +: get-uuid ( -- uuid$ ) + (uuid) if " "(00 11 22 33 44 55 66 77 88 99 aa bb cc dd ee ff)" then +; + +code get-cpuid ( code -- eax ebx ecx edx ) + ax pop cpuid ax push bx push cx push dx push +c; +0 value ptr +: 0pad ( -- ) pad to ptr ; +: pad, ( n -- ) ptr ! ptr na1+ to ptr ; + +: cpu-family$ ( -- adr len ) + 0 get-cpuid 0pad rot pad, pad, pad, drop + pad d# 12 +; + +: 4scramble ( a b c d -- d c b a ) swap 2swap swap ; +: cpu-name, ( cpuid# -- ) get-cpuid 4scramble pad, pad, pad, pad, ; + +: cpu-name$ ( -- adr len ) + 0pad + h# 8000.0002 cpu-name, + h# 8000.0003 cpu-name, + h# 8000.0004 cpu-name, + pad h# 30 -leading -trailing +; + +: +OLPC ( adr -- adr' ) " OLPC" +smbios$ ; +: setup-smbios ( -- ) + 0 to #smbios-tables + 0 to portinfo# + + smbios-entry smbios-adr h# 1f move + smbios-adr h# 1f + ( adr ) + + bios-info copy-smbios-table ( adr ) + test-name$ +smbios$ + test-version$ +smbios$ +\ +OLPC +\ fw-version$ +smbios$ + fw-date$ +smbios$ + end-smbios-table + + dup >r ( adr r: adr ) + system-info copy-smbios-table ( adr r: adr ) + get-uuid r> 8 + swap move ( adr ) + +OLPC + " XO" +smbios$ + " 1" +smbios$ \ Version + " SN" get-tag$ +smbios$ + end-smbios-table + + base-board-info copy-smbios-table ( adr ) + " QUANTA" +smbios$ + " XO" +smbios$ + " 1.5" +smbios$ \ Version + " SN" get-tag$ +smbios$ + end-smbios-table + + \ XXX might need to amend the security status field + system-enclosure copy-smbios-table ( adr ) + +OLPC + " 1.5" +smbios$ \ Version + end-smbios-table + + dup >r ( adr r: adr ) + processor-info copy-smbios-table ( adr' r: adr ) + 1 get-cpuid nip nip ( adr' eax edx r: adr ) + r@ h# c + l! r> 8 + l! ( adr' ) + cpu-family$ +smbios$ + cpu-name$ +smbios$ + end-smbios-table + + l1-icache-info copy-smbios-table smbios-null end-smbios-table +\ l1-dcache-info copy-smbios-table smbios-null end-smbios-table + l2-cache-info copy-smbios-table smbios-null end-smbios-table + +[ifdef] notdef \ Why bother - XP doesn't collect these + h# 1f h# 1d " Microphone" make-smbios-port + h# 1f h# 1d " Headphone" make-smbios-port + h# 12 h# 10 " USB1" make-smbios-port + h# 12 h# 10 " USB2" make-smbios-port + h# 12 h# 10 " USB3" make-smbios-port + + sd-slot-array copy-smbios-table " SD Slot" +smbios$ end-smbios-table + bios-lang-array copy-smbios-table " enUS" +smbios$ end-smbios-table +[then] + video-array copy-smbios-table " CON" +smbios$ end-smbios-table + + main-memory-array copy-smbios-table smbios-null end-smbios-table + memory-device copy-smbios-table " Soldered" +smbios$ end-smbios-table + ma-mapped-address copy-smbios-table smbios-null end-smbios-table + +\ XP ignores it +\ pointing-device copy-smbios-table smbios-null end-smbios-table + + \ PORTABLE BATTERY (TYPE 22) + +\ XP ignores it +\ system-boot-info copy-smbios-table smbios-null end-smbios-table + + end-array copy-smbios-table smbios-null end-smbios-table ( adr' ) + + \ Fixup the entry structure + smbios-adr h# 1f + tuck - ( tables-adr tables-len ) + smbios-adr h# 16 + w! ( tables-adr ) + smbios-adr h# 18 + l! ( ) + #smbios-tables smbios-adr h# 1c + w! + + smbios-adr h# 1f 4 fix-checksum \ Overall checksum + smbios-adr h# 10 + h# 0f 5 fix-checksum \ Intermediate checksum +; + +stand-init: SMBIOS tables + setup-smbios +; Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2009-06-25 21:23:17 UTC (rev 1224) +++ cpu/x86/pc/olpc/via/versions.fth 2009-06-26 16:10:47 UTC (rev 1225) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 03t +macro: FW_MINOR 04 \ The EC microcode macro: EC_VERSION 1_9_1 Modified: ofw/inet/ip.fth =================================================================== --- ofw/inet/ip.fth 2009-06-25 21:23:17 UTC (rev 1224) +++ ofw/inet/ip.fth 2009-06-26 16:10:47 UTC (rev 1225) @@ -76,9 +76,11 @@ then ( 'netmask-c ) ; -\ either h# ffffffff or h# 0 is broadcast ip addr +\ Matches either h# ffffffff or h# 0 or subnet-specific broadcast addr : broadcast-ip-addr? ( adr-buf -- flag ) - dup broadcast-ip-addr ip= swap unknown-ip-addr? or + dup broadcast-ip-addr ip= + swap def-broadcast-ip ip= or + over unknown-ip-addr? or ; : netmask ( -- 'ip )

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware