openfirmware

openfirmware@openfirmware.info

3007 discussions

r1195 - in cpu/x86/pc: biosload olpc/via
by svn＠openfirmware.info 14 May '09

14 May '09

Author: wmb Date: 2009-05-14 10:16:14 +0200 (Thu, 14 May 2009) New Revision: 1195 Added: cpu/x86/pc/biosload/memtest.fth cpu/x86/pc/olpc/via/memtest.fth Log: Checked in some files related to memtest. Added: cpu/x86/pc/biosload/memtest.fth =================================================================== --- cpu/x86/pc/biosload/memtest.fth (rev 0) +++ cpu/x86/pc/biosload/memtest.fth 2009-05-14 08:16:14 UTC (rev 1195) @@ -0,0 +1,76 @@ +purpose: Interface to memtest86 + +h# 200 constant lb-table-address +0 value table-start +variable #lb-entries + +: ,memrange ( adr len type -- ) + rot l, 0 l, ( len type ) \ 64-bit address + swap l, 0 l, ( type ) \ 64-bit size + l, ( ) \ type +; +: make-lb-table ( -- ) + #lb-entries off + here to table-start + " LBIO" $, \ Signature + 6 /l* l, \ header_bytes + 0 l, \ header_checksum, set later + 0 l, \ table_bytes, set later + 0 l, \ table_checksum, set later + 1 l, \ table_entries - just a memory tag + + here ( mem-struct-adr ) + + 1 l, \ MEM tag + 0 l, \ size of memory struct, set later + + h# 100000 memory-limit over - 1 ,memrange + + here over - over la1+ ! ( mem-struct-adr ) \ Set size of memory struct + here over - table-start 3 la+ l! ( mem-struct-adr ) \ Set table_bytes + here over - 0 -rot ip-checksum table-start 4 la+ be-w! ( ) \ Set table checksum + 0 table-start 6 /l* ip-checksum table-start 2 la+ be-w! ( ) \ Set header checksum + + table-start lb-table-address here table-start - move +; + +: ?memtest-elf-map-in ( vaddr size -- ) + \ We recognize memtest by its virtual address of 0x10000 + \ It expects that virtual = physical; we depend on the fact + \ that we have low memory mapped V=P + over h# 10000 = if ( vaddr size ) +[ifdef] unfreeze unfreeze [then] +[ifdef] usb-quiet usb-quiet [then] + make-lb-table + then + + \ If it's not memtest, chain to the linux recognizer + ?linux-elf-map-in +; +' ?memtest-elf-map-in is elf-map-in + +: memtest ( -- ) " rom:memtest" $boot ; + +\ LICENSE_BEGIN +\ Copyright (c) 2009 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Added: cpu/x86/pc/olpc/via/memtest.fth =================================================================== --- cpu/x86/pc/olpc/via/memtest.fth (rev 0) +++ cpu/x86/pc/olpc/via/memtest.fth 2009-05-14 08:16:14 UTC (rev 1195) @@ -0,0 +1,87 @@ +purpose: Interface to memtest86 + + +h# 200 constant lb-table-address +0 value table-start +variable #lb-entries + +: ,memrange ( adr len type -- ) + rot l, 0 l, ( len type ) \ 64-bit address + swap l, 0 l, ( type ) \ 64-bit size + l, ( ) \ type +; +: make-lb-table ( -- ) + #lb-entries off + here to table-start + " LBIO" $, \ Signature + 6 /l* l, \ header_bytes + 0 l, \ header_checksum, set later + 0 l, \ table_bytes, set later + 0 l, \ table_checksum, set later + 1 l, \ table_entries - just a memory tag + + here ( mem-struct-adr ) + + 1 l, \ MEM tag + 0 l, \ size of memory struct, set later + + h# 100000 memory-limit over - 1 ,memrange + + here over - over la1+ ! ( mem-struct-adr ) \ Set size of memory struct + here over - table-start 3 la+ l! ( mem-struct-adr ) \ Set table_bytes + here over - 0 -rot ip-checksum table-start 4 la+ be-w! ( ) \ Set table checksum + 0 table-start 6 /l* ip-checksum table-start 2 la+ be-w! ( ) \ Set header checksum + + table-start lb-table-address here table-start - move +; + + +: ?memtest-elf-map-in ( vaddr size -- ) + \ We recognize memtest by its virtual address of 0x10000 + \ It expects that virtual = physical; we depend on the fact + \ that we have low memory mapped V=P + over h# 10000 = if ( vaddr size ) +[ifdef] notdef +[ifdef] virtual-mode + \ Map the frame buffer (virtual=physical) + h# 810 config-l@ dup 100.0000 -1 mmu-map +[then] +[else] + " text-mode3" stdout @ $call-method \ XXX should be screen-ih + stdout off + make-lb-table +[then] +[ifdef] unfreeze unfreeze [then] + usb-quiet + then + + \ If it's not memtest, chain to the linux recognizer + ?linux-elf-map-in +; +' ?memtest-elf-map-in is elf-map-in + +: memtest ( -- ) " rom:memtest" $boot ; + +\ LICENSE_BEGIN +\ Copyright (c) 2009 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0

r1194 - cpu/x86/pc/olpc/via
by svn＠openfirmware.info 14 May '09

14 May '09

Author: wmb Date: 2009-05-14 10:15:12 +0200 (Thu, 14 May 2009) New Revision: 1194 Added: cpu/x86/pc/olpc/via/dumpvia.fth Modified: cpu/x86/pc/olpc/via/devices.fth Log: Via version - added register dumping to build. Modified: cpu/x86/pc/olpc/via/devices.fth =================================================================== --- cpu/x86/pc/olpc/via/devices.fth 2009-05-14 08:13:38 UTC (rev 1193) +++ cpu/x86/pc/olpc/via/devices.fth 2009-05-14 08:15:12 UTC (rev 1194) @@ -20,6 +20,7 @@ fload ${BP}/cpu/x86/pc/olpc/via/smbus.fth \ SMBUS driver fload ${BP}/cpu/x86/apic.fth \ APIC driver +fload ${BP}/cpu/x86/pc/olpc/via/dumpvia.fth \ Dump a bunch of registers stand-init: CPU node d# 1,500,000,000 " VIA,C7" Added: cpu/x86/pc/olpc/via/dumpvia.fth =================================================================== --- cpu/x86/pc/olpc/via/dumpvia.fth (rev 0) +++ cpu/x86/pc/olpc/via/dumpvia.fth 2009-05-14 08:15:12 UTC (rev 1194) @@ -0,0 +1,794 @@ +\ VIA video register dump + +hex + +: reset-attr-addr ( -- ) h# 3da ( input-status1 ) pc@ drop ; + +: video-mode! ( b -- ) reset-attr-addr h# 03c0 pc! ; +: attr! ( b index -- ) reset-attr-addr h# 03c0 pc! h# 03c0 pc! ; +: attr@ ( index -- b ) + reset-attr-addr h# 03c0 pc! h# 03c1 pc@ reset-attr-addr +; +: seq@ ( index -- value ) h# 3c4 pc! h# 3c5 pc@ ; +: grf@ ( index -- value ) h# 3ce pc! h# 3cf pc@ ; +: crt@ ( index -- value ) h# 3d4 pc! h# 3d5 pc@ ; +: seq. ( adr len -- ) bounds ?do i c@ seq@ 3 u.r loop ; +: .regular + ." ATR " h# 15 0 do i attr@ 3 u.r loop cr + h# 20 video-mode! + ." SEQ " 5 0 do i seq@ 3 u.r loop cr + ." GRF " 9 0 do i grf@ 3 u.r loop cr +." 0 1 2 3 4 5 6 7 8 9 a b c d e f" cr + ." C00 " h# 10 0 do i crt@ 3 u.r loop cr + ." C10 " h# 19 h# 10 do i crt@ 3 u.r loop cr +; +: .sextended + ." S10 " h# 1f h# 10 do i seq@ 3 u.r loop cr + ." S20 " " "(20 21 22 26 2a 2b 2c 2d 2e)" seq. cr + ." S30 " " "(31 35 36 3c 3d 3e 3f)" seq. cr + ." S40 " h# 50 h# 40 do i seq@ 3 u.r loop cr + ." S50 " h# 60 h# 50 do i seq@ 3 u.r loop cr + ." S60 " h# 70 h# 60 do i seq@ 3 u.r loop cr + ." S70 " h# 80 h# 70 do i seq@ 3 u.r loop cr + ." SA8 " h# b0 h# a8 do i seq@ 3 u.r loop cr + ." G20 " h# 23 h# 20 do i grf@ 3 u.r loop cr +; +: .cextended + ." C30 " h# 40 h# 30 do i crt@ 3 u.r loop cr + ." C40 " h# 49 h# 40 do i crt@ 3 u.r loop cr + ." C50 " h# 60 h# 50 do i crt@ 3 u.r loop cr + ." C60 " h# 70 h# 60 do i crt@ 3 u.r loop cr + ." C70 " h# 80 h# 70 do i crt@ 3 u.r loop cr + ." C80 " h# 90 h# 80 do i crt@ 3 u.r loop cr + ." C90 " h# a0 h# 90 do i crt@ 3 u.r loop cr + ." CA0 " h# b0 h# a0 do i crt@ 3 u.r loop cr + ." CD0 " h# e0 h# d0 do i crt@ 3 u.r loop cr + ." CE0 " h# f0 h# e0 do i crt@ 3 u.r loop cr + ." CF0 " h# fd h# f0 do i crt@ 3 u.r loop cr +; +: .dpy .regular .cextended .sextended ; + +\ b0 8b0 config-b@ -> 1 ( VGA in S.L.) +\ b2 8b2 config-b@ -> 40 ( 256 MB memory base 0) + + +hex +0 value config-base +: cl. dup (.2) type ." : " config-base + config-l@ (.8) type cr ; +: cw. dup (.2) type ." : " config-base + config-w@ (.4) type cr ; +: cb. dup (.2) type ." : " config-base + config-b@ (.2) type cr ; +: ch. config-base h# 40 bounds do i config-l@ u. 4 +loop cr ; +: dump-d0f0 + 0 to config-base + ." == D0F0 Host Control ==" cr + ch. + 4f cb. cr + c0 cb. \ ." mem/io access ctl" + c6 cb. \ ." legacy access ctl" + c8 cl. \ ." GFX mem base 0 for S.L." + cc cl. \ ." GFX mem base 1 for MMIO" + d4 cb. \ ." MMIO/SL enable" + e0 cb. \ ." GFX power state" + fe cb. \ ." VGA no alias" + cr +; +: dump-d0f1 + h# 100 to config-base + ." == D0F1 Error Reporting ==" cr + cr +; + +0 [if] +D0F2 + + 50 51 52 53 54 55 56 57 59 5c 5d 5e 5f + 60 61 63 64 66 68 69 6a 6b 6c 6d 6e 6f + 70 71 72 73 76 7a + 90 92 93 96 97 98 99 + a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af + b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be + c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 + d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 +[then] + +: dump-d0f2 + h# 200 to config-base + ." == D0F2 Host Bus Control ==" cr + ch. + 50 cb. \ ." Request phase control" + 51 cb. \ ." CPU Interface Control - Basic Option" + 52 cb. \ ." CPU Interface Control - Advanced Option" + 53 cb. \ ." Arbitration" + 54 cb. \ ." Misc ctl 1" + 55 cb. \ ." Misc ctl 2" + 56 cb. \ ." Write policy 1" + 57 cb. \ ." Calibration" + 59 cb. \ ." CPU Misc Ctl 1" + 5c cb. \ ." CPU Misc Ctl 2" + 5d cb. \ ." Write policy 2" + 5e cb. \ ." Bandwidth Timers" + 5f cb. \ ." CPU Misc Ctl 3" + 60 cb. + 61 cb. + 63 cb. + 64 cb. + 66 cb. + 68 cb. + 69 cb. + 6a cb. + 6b cb. + 6c cb. + 6d cb. + 6e cb. + 6f cb. + 70 cb. + 71 cb. + 72 cb. + 73 cb. + 76 cb. + 7a cb. + 90 cb. + 92 cb. + 93 cb. + 96 cb. + 97 cb. + 98 cb. + 99 cb. + a0 cb. + a1 cb. + a2 cb. + a3 cb. + a4 cb. + a5 cb. + a6 cb. + a7 cb. + a8 cb. + a9 cb. + aa cb. + ab cb. + ac cb. + ad cb. + ae cb. + af cb. + b0 cb. + b1 cb. + b2 cb. + b3 cb. + b4 cb. + b5 cb. + b6 cb. + b7 cb. + b8 cb. + b9 cb. + ba cb. + bb cb. + bc cb. + bd cb. + be cb. + c0 cb. + c1 cb. + c2 cb. + c3 cb. + c4 cb. + c5 cb. + c6 cb. + c7 cb. + c8 cb. + c9 cb. + d0 cb. + d1 cb. + d2 cb. + d3 cb. + d4 cb. + d5 cb. + d6 cb. + d7 cb. + d8 cb. + d9 cb. + cr +; + +: dump-d0f3 + h# 300 to config-base + ." == D0F3 DRAM Bus Control ==" cr + ch. + 40 cb. + 41 cb. + 42 cb. + 43 cb. + 48 cb. + 49 cb. + 4a cb. + 4b cb. + 50 cw. + 52 cb. + 53 cb. + 55 cb. + 58 cb. + 59 cb. + 5a cb. + 5b cb. + 60 cb. + 61 cb. + 62 cb. + 63 cb. + 65 cb. + 66 cb. + 67 cb. + 68 cb. + 69 cb. + 6a cb. + 6b cb. + 6c cb. + 6d cb. + 6e cb. + 6f cb. + 70 cb. + 71 cb. + 74 cb. + 75 cb. + 76 cb. + 77 cb. + 78 cb. + 7b cb. + 7c cb. + 80 cb. + 81 cb. + 82 cb. + 83 cb. + 84 cb. + 85 cb. + 86 cb. + 88 cw. +\ 8a cb. \ RO + 8c cb. + 90 cb. + 91 cb. + 92 cb. + 93 cb. + 95 cb. + 96 cb. + 97 cb. + 98 cb. + 99 cb. + 9c cb. + 9e cb. + 9f cb. + a0 cw. + a2 cb. + a3 cb. + a4 cw. + a6 cb. + a7 cb. + b3 cb. + d0 cb. +\ d1 cb. \ RO +\ d2 cb. \ RO + d3 cb. + d4 cb. + d5 cb. + d6 cb. + d7 cb. + db cb. + dc cb. + dd cb. + de cb. + df cb. + e0 cb. + e1 cb. + e2 cb. + e3 cb. + e4 cb. + e5 cb. + e6 cb. + e7 cb. + e8 cb. + d9 cb. + ec cb. + ed cb. + ee cb. + ef cb. + f0 cl. + f8 cw. + fb cb. + fd cb. + fe cb. + ff cb. + cr +; + +: dump-d0f4 + h# 400 to config-base + ." == D0F4 Power Management" cr + ch. + 84 cb. + 85 cb. + 89 cb. + 8b cb. + 8d cb. + 8e cb. + 8f cb. + 90 cb. + 91 cb. + 92 cb. + + a0 cb. + a1 cb. + a2 cb. + a3 cb. + a8 cb. + cr +; + +: dump-d0f5 + h# 500 to config-base + ." == D0F5 APIC" cr + ch. + + 50 cl. + 54 cb. + 55 cb. + 58 cb. + 59 cb. + 5e cb. + 5f cb. + + 60 cb. + 61 cb. + 64 cb. + + 80 cb. + 82 cb. + 83 cb. + 84 cb. + 85 cb. + + a2 cb. + a3 cb. + cr +; + +\ d0f6 Scratch some scratch regs 80.l .. 9c.l shadowers + +: dump-d0f7 + h# 700 to config-base + ." == D0F7 North/South Module Control" cr + ch. + + 40 cb. + 71 cb. + 76 cb. + \ Channel B DRAM init: c0.d c8.d d0.d d8.d + cr +; + +: dump-d12f0 + h# 6000 to config-base + ." == D12F0 SDIO" cr + ch. + + 44 cb. + 84 cl. + 88 cl. + 8c cb. +\ 8d cb. \ RO + 8e cb. + 8f cb. + 98 cb. + 99 cb. + 9a cb. + cr +; + +\ D13F0 is card controller + +: dump-d15f0 + h# 7800 to config-base + ." == D15F0 EIDE" cr + ch. + + 40 cb. + 45 cb. + 4a cb. + 4b cb. + 4c cb. + 4f cb. + 52 cb. + 53 cb. + + b0 cw. + b2 cw. + b4 cw. + b9 cb. + ba cw. + bc cw. + be cw. + c1 cb. + c2 cb. + c3 cb. + c4 cb. + c6 cb. + d4 cb. + d5 cb. + + e0 cw. +\ f0 cb. \ RO + f1 cb. + f2 cb. + + cr +; + +: dump-d16f0 + h# 8000 to config-base + ." == D16F0 UHCI 0,1" cr + ch. + + 40 cb. + 41 cb. + 42 cb. + 43 cb. + 48 cb. + 49 cb. + 4a cb. + 4b cb. + 4c cb. + 84 cb. + c0 cw. + cr +; + +: dump-d16f1 + h# 8100 to config-base + ." == D16F1 UHCI 2,3" cr + ch. + + 40 cb. + 41 cb. + 42 cb. + 43 cb. + 48 cb. + 49 cb. + 4a cb. + 4b cb. + 4c cb. + 84 cb. + c0 cw. + cr +; + +: dump-d16f2 + h# 8200 to config-base + ." == D16F2 UHCI 4,5" cr + ch. + + 40 cb. + 41 cb. + 42 cb. + 43 cb. + 48 cb. + 49 cb. + 4a cb. + 4b cb. + 4c cb. + 84 cb. + c0 cw. + cr +; + +: dump-d16f4 + h# 8400 to config-base + ." == D16F4 EHCI" cr + ch. + + 40 cb. + 42 cb. + 43 cb. + 48 cb. + 49 cb. + 4a cb. + 4b cb. + 4c cb. + 4d cb. + 4e cb. + 4f cb. + 50 cb. + 51 cb. + 52 cb. + 53 cb. + 54 cb. + 55 cb. + 56 cb. + 57 cb. + 58 cb. + 59 cb. + 5a cw. + 5c cb. + 5d cb. + 5e cb. + 5f cb. + 61 cb. + + 62 cw. + 64 cb. + 68 cw. + 6c cw. +\ 6e cw. \ Status + + 84 cw. + cr +; + +: dump-d17f0 + h# 8800 to config-base + ." == D17F0 Bus Control and Power Management" cr + ch. + + 40 cb. + 41 cb. + 42 cb. + 43 cb. + 44 cb. + 45 cb. + 46 cb. + 47 cb. + 48 cb. + 49 cb. + 4a cb. + 4b cb. + 4c cb. + 4d cb. + 4e cb. + 4f cb. + + 50 cb. + 51 cb. + 52 cb. + 53 cb. + 54 cb. + 55 cb. + 56 cb. + 57 cb. + 58 cb. + 59 cb. + 5a cb. + 5b cb. + 5c cw. + 5e cw. + 60 cw. + 62 cw. + 64 cw. + 66 cb. + 67 cb. + 68 cb. + 69 cb. + 6a cb. + 6b cb. + 6c cb. + 6d cb. + 6e cb. + 6f cb. + 70 cw. + 72 cw. + 75 cb. + 76 cb. + 77 cb. + 7c cb. + 7d cb. + 7e cb. + 7f cb. + 80 cb. + 81 cb. + 82 cb. + 83 cb. + + 84 cw. + 86 cw. + 88 cw. + 8a cb. + 8c cb. + 8d cb. + 90 cl. + 94 cb. + 95 cb. + 96 cb. + 97 cb. + 98 cb. + 99 cb. + 9a cb. + 9b cb. + 9c cb. + 9d cb. + 9e cb. + 9f cb. + b0 cb. + b2 cb. + b4 cb. + b5 cb. + b7 cb. + b8 cb. + b9 cb. + ba cb. + bb cb. + bc cb. + bd cb. + be cb. + c4 cl. + d0 cw. + d2 cb. + d3 cb. + d4 cb. + d5 cb. + d6 cb. + e0 cb. + e1 cb. + e2 cb. + e3 cb. + e4 cb. + e5 cb. + e6 cb. + e7 cb. + + e8 cl. + ec cb. + fc cb. + cr +; + +: dump-d17f7 + h# 8f00 to config-base + ." == D17F7 South-North Module Interface Control" cr + ch. + + 4f cb. + 50 cb. + 51 cb. + 52 cb. + 53 cb. + 54 cb. + 55 cb. + 56 cb. + 60 cb. + 61 cb. + 62 cb. + 63 cb. + 64 cb. + 70 cb. + 71 cb. + 72 cb. + 73 cb. + 74 cb. + 75 cb. + 76 cb. + 77 cb. + 78 cb. + 79 cb. + 7a cb. + 7b cb. + 7c cb. + 80 cb. + 81 cb. + 82 cb. + 84 cb. + d1 cb. + e0 cb. + e2 cb. + e3 cb. + e4 cb. + e5 cb. + e6 cb. + fc cb. + + cr +; +: dump-d19f0 + h# 9800 to config-base + ." == D19F0 PCI-PCI bridge" cr + ch. + + + 40 cb. + cr +; +: dump-d20f0 + h# a000 to config-base + ." == D20F0 HD Audio" cr + ch. + + 40 cb. + 41 cb. + 44 cb. + 54 cw. + 64 cl. + 68 cl. + 6c cw. + 70 cw. + cr +; + +: dump-config-regs + dump-d0f0 + dump-d0f1 + dump-d0f2 + dump-d0f3 + dump-d0f4 + dump-d0f5 + dump-d0f7 + dump-d12f0 + dump-d15f0 + dump-d16f0 + dump-d16f1 + dump-d16f2 + dump-d16f4 + dump-d17f0 + dump-d17f7 + dump-d19f0 + dump-d20f0 +; + +[ifdef] apic-ih +: ap. ( index -- ) + dup (.4) type ." : " ( index ) + " apic@" apic-ih $call-method (.8) type cr +; +: dump-apic + ." == APIC Registers" cr + 20 ap. + 320 ap. + 340 ap. + 350 ap. + 360 ap. + 380 ap. + 390 ap. + cr +; +: ioap. ( index -- ) + dup (.2) type ." : " ( index ) + " io-apic@" io-apic-ih $call-method (.8) type cr +; + +: ioapd. ( index -- ) + dup (.2) type ." : " ( index ) + dup 1+ " io-apic@" io-apic-ih $call-method (.8) type space + " io-apic@" io-apic-ih $call-method (.8) type cr +; + +: dump-io-apic + ." == IO-APIC Indexed Registers" cr + 0 ioap. + 1 ioap. + 2 ioap. + 3 ioap. + 40 10 do i ioapd. 2 +loop + cr +; +[then] + +: udma. ( index -- ) + dup (.2) type ." : " ( index ) + 88b8 config-w@ + ( index port ) + pc@ (.2) type cr +; + +: dump-uart-dma + ." == UART DMA Indexed Registers" cr + 88b7 config-b@ 8 and 0= if ." <disabled>" cr exit then + + 0 udma. + 1 udma. + 2 udma. + 3 udma. + cr +; + +\ Omitting USB Device registers +\ Omitting Host Controller MMIO registers +\ Omitting SD Card Controller MMIO registers + +: dump-all + dump-config-regs +[ifdef] dump-apic + dump-apic + dump-io-apic +[then] +;

1 0

r1193 - cpu/x86/pc/biosload
by svn＠openfirmware.info 14 May '09

14 May '09

Author: wmb Date: 2009-05-14 10:13:38 +0200 (Thu, 14 May 2009) New Revision: 1193 Modified: cpu/x86/pc/biosload/devices.fth Log: Biosload version - added register dumping for Via board. Modified: cpu/x86/pc/biosload/devices.fth =================================================================== --- cpu/x86/pc/biosload/devices.fth 2009-05-14 07:52:00 UTC (rev 1192) +++ cpu/x86/pc/biosload/devices.fth 2009-05-14 08:13:38 UTC (rev 1193) @@ -82,6 +82,11 @@ fload ${BP}/dev/pc87317.fth \ National PC87317 superIO [then] +[ifdef] via-demo +fload ${BP}/cpu/x86/pc/olpc/via/smbus.fth \ SMBUS driver +fload ${BP}/cpu/x86/pc/olpc/via/dumpvia.fth \ Config register dumps +[then] + [ifdef] olpc \ Create the top-level device node to access the entire boot FLASH device 0 0 " fff00000" " /" begin-package

1 0

r1192 - clients/memtest86
by svn＠openfirmware.info 14 May '09

14 May '09

Author: wmb Date: 2009-05-14 09:52:00 +0200 (Thu, 14 May 2009) New Revision: 1192 Modified: clients/memtest86/main.c Log: memtest - removed unused local variables. Modified: clients/memtest86/main.c =================================================================== --- clients/memtest86/main.c 2009-05-14 07:48:27 UTC (rev 1191) +++ clients/memtest86/main.c 2009-05-14 07:52:00 UTC (rev 1192) @@ -428,8 +428,6 @@ void restart() { - int i, j; - /* clear variables */ firsttime = 0; v->test = 0;

1 0

r1191 - clients/memtest86 cpu/x86/pc/biosload cpu/x86/pc/olpc cpu/x86/pc/olpc/build cpu/x86/pc/olpc/via cpu/x86/pc/olpc/via/build
by svn＠openfirmware.info 14 May '09

14 May '09

Author: wmb Date: 2009-05-14 09:48:27 +0200 (Thu, 14 May 2009) New Revision: 1191 Added: clients/memtest86/olpcvia.c Modified: clients/memtest86/Makefile clients/memtest86/config.h clients/memtest86/memsize.c cpu/x86/pc/biosload/fw.bth cpu/x86/pc/biosload/ofw.bth cpu/x86/pc/olpc/build/Makefile cpu/x86/pc/olpc/olpc.bth cpu/x86/pc/olpc/via/build/Makefile cpu/x86/pc/olpc/via/fw.bth cpu/x86/pc/olpc/via/olpc.bth cpu/x86/pc/olpc/via/smbus.fth Log: memtest - Made memtest86 work on the Via demo board. Modified: clients/memtest86/Makefile =================================================================== --- clients/memtest86/Makefile 2009-05-14 07:45:40 UTC (rev 1190) +++ clients/memtest86/Makefile 2009-05-14 07:48:27 UTC (rev 1191) @@ -8,28 +8,51 @@ # FDISK=/dev/fd0 +DEFINES = + +# +# We tune the build for different platforms by passing arguments to make, e.g. +# make VARIANT=_VIA memtest +# +ifeq ($(VARIANT), OLPCVIA) + DEFINES += -DOLPC + DEFINES += -DSZ_MODE_EXT=SZ_MODE_BIOS +endif + +ifeq ($(VARIANT), OLPCGEODE) + DEFINES += -DOLPC + DEFINES += -DEMULATE_EGA + DEFINES += -DSZ_MODE_EXT=SZ_MODE_PROBE +endif + CC=gcc # # gcc compiler options, these settings should suffice # CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding CCFLAGS += -fno-stack-protector +CCFLAGS += $(DEFINES) + AS=as -32 COMMON_OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o config.o memsize.o random.o -PC_OBJS= $(COMMON_OBJS) linuxbios.o pci.o controller.o extra.o spd.o +OBJS_PC= $(COMMON_OBJS) linuxbios.o pci.o controller.o extra.o spd.o -OLPC_OBJS= $(COMMON_OBJS) lfbega.o olpc.o +OBJS_OLPCGEODE= $(COMMON_OBJS) olpc.o lfbega.o +OBJS_OLPCVIA = $(COMMON_OBJS) olpcvia.o linuxbios.o -OBJS= $(OLPC_OBJS) +OBJS= $(OBJS_$(VARIANT)) all: memtest.bin memtest olpc.o: olpc.c msr.h $(CC) -c $(CCFLAGS) -fPIC olpc.c +olpcvia.o: olpcvia.c + $(CC) -c $(CCFLAGS) -fPIC olpcvia.c + reloc.o: reloc.c $(CC) -c -m32 -fPIC -Wall -O -fno-strict-aliasing reloc.c @@ -82,7 +105,7 @@ $(CC) -S $(CCFLAGS) -fPIC controller.c head.s: head.S - $(CC) -E -m32 -traditional $< -o $@ + $(CC) $(DEFINES) -E -m32 -traditional $< -o $@ head.o: head.s $(AS) -o $@ $< Modified: clients/memtest86/config.h =================================================================== --- clients/memtest86/config.h 2009-05-14 07:45:40 UTC (rev 1190) +++ clients/memtest86/config.h 2009-05-14 07:48:27 UTC (rev 1191) @@ -13,7 +13,7 @@ /* SERIAL_CONSOLE_DEFAULT - The default state of the serial console. */ /* This is normally off since it slows down testing. Change to a 1 */ /* to enable. */ -#define SERIAL_CONSOLE_DEFAULT 0 +#define SERIAL_CONSOLE_DEFAULT 1 /* SERIAL_BAUD_RATE - Baud rate for the serial console * If this is not defined it is assumed a previous program has set the @@ -39,9 +39,9 @@ /* EMULATE_EGA - Enables EGA emulation instead of writing to EGA buffer directly */ /* Normally not enabled */ /* Enabled for OLPC */ -#define EMULATE_EGA +/* #define EMULATE_EGA */ /* OLPC - uses OLPC hardware instead of BIOS */ /* Normally not enabled */ /* Enabled for OLPC */ -#define OLPC +/* #define OLPC */ Modified: clients/memtest86/memsize.c =================================================================== --- clients/memtest86/memsize.c 2009-05-14 07:45:40 UTC (rev 1190) +++ clients/memtest86/memsize.c 2009-05-14 07:48:27 UTC (rev 1191) @@ -9,8 +9,8 @@ #include "config.h" short e820_nr; -short memsz_mode = SZ_MODE_PROBE; short firmware = FIRMWARE_UNKNOWN; +short memsz_mode = SZ_MODE_EXT; static ulong alt_mem_k; static ulong ext_mem_k; Added: clients/memtest86/olpcvia.c =================================================================== --- clients/memtest86/olpcvia.c (rev 0) +++ clients/memtest86/olpcvia.c 2009-05-14 07:48:27 UTC (rev 1191) @@ -0,0 +1,43 @@ +#include "io.h" + +#include "test.h" +#include "defs.h" +#include "config.h" + +void poll_errors(void) +{ +} +void set_ecc_polling(int val) +{ +} +void show_spd(void) +{ +} +void get_menu(void) +{ +} +void find_controller(void) +{ +} +int pci_init(void) +{ + return 0; +} +void warm_start() +{ + outb(0,0x92); + outb(1,0x92); +// wrmsr(0x51400017, 1, 0); +} +// int query_linuxbios(void) +// { +// return 1; +// } +int query_pcbios(void) +{ + return 0; +} +// int query_ofw(void) +// { +// return 1; +// } Modified: cpu/x86/pc/biosload/fw.bth =================================================================== --- cpu/x86/pc/biosload/fw.bth 2009-05-14 07:45:40 UTC (rev 1190) +++ cpu/x86/pc/biosload/fw.bth 2009-05-14 07:48:27 UTC (rev 1191) @@ -305,6 +305,10 @@ devalias net /wlan [then] +[ifdef] via-demo +fload ${BP}/cpu/x86/pc/biosload/memtest.fth +[then] + : probe-all ( -- ) " probe-" do-drop-in ." probe-pci" cr Modified: cpu/x86/pc/biosload/ofw.bth =================================================================== --- cpu/x86/pc/biosload/ofw.bth 2009-05-14 07:45:40 UTC (rev 1190) +++ cpu/x86/pc/biosload/ofw.bth 2009-05-14 07:48:27 UTC (rev 1191) @@ -99,6 +99,8 @@ " ${BP}/dev/mmc/sdhci/mv8686/build/mv8686.fc" " mv8686" $add-deflated-dropin " sd8686_helper.bin" " helper_sd.bin" $add-deflated-dropin " sd8686.bin" " sd8686.bin" $add-deflated-dropin + + " ../../olpc/via/build/memtest" " memtest" $add-deflated-dropin [else] " ${BP}/dev/mmc/sdhci/build/sdhci.fc" " class080501" $add-deflated-dropin " ${BP}/dev/mmc/sdhci/build/sdmmc.fc" " sdmmc" $add-deflated-dropin Modified: cpu/x86/pc/olpc/build/Makefile =================================================================== --- cpu/x86/pc/olpc/build/Makefile 2009-05-14 07:45:40 UTC (rev 1190) +++ cpu/x86/pc/olpc/build/Makefile 2009-05-14 07:48:27 UTC (rev 1191) @@ -3,7 +3,7 @@ BASEDIR= `(cd ../../../../..; pwd;)` TAGFILES= ../../../build/*.tag *.tag CLIENTDIR=../../../../../clients -CLIENTPROGS=${CLIENTDIR}/memtest86/memtest ${CLIENTDIR}/emacs/x86/emacs +CLIENTPROGS=memtest ${CLIENTDIR}/emacs/x86/emacs all: olpc.rom tags @@ -24,8 +24,10 @@ ../../../build/inflate.bin: @make -C ../../../build inflate.bin -${CLIENTDIR}/memtest86/memtest: - @make -C ${CLIENTDIR}/memtest86 memtest +memtest: + make -C ${CLIENTDIR}/memtest86 VARIANT=OLPCGEODE memtest + @mv ${CLIENTDIR}/memtest86/memtest . + @make -C ${CLIENTDIR}/memtest86 clean ${CLIENTDIR}/emacs/x86/emacs: @make -C ${CLIENTDIR}/emacs/x86 emacs Modified: cpu/x86/pc/olpc/olpc.bth =================================================================== --- cpu/x86/pc/olpc/olpc.bth 2009-05-14 07:45:40 UTC (rev 1190) +++ cpu/x86/pc/olpc/olpc.bth 2009-05-14 07:48:27 UTC (rev 1191) @@ -22,7 +22,7 @@ in: ${BP}/dev/usb2/device/wlan/build/usb8388.fc in: ${BP}/dev/olpc/cafenand/build/cafenand.fc in: ${BP}/dev/olpc/cafecamera/build/cafecamera.fc -in: ${BP}/clients/memtest86/memtest +in: memtest in: ${BP}/clients/emacs/x86/emacs in: ${BP}/cpu/x86/pc/olpc/build/verify.img in: ${BP}/cpu/x86/pc/olpc/build/usb8388.bin @@ -68,7 +68,7 @@ fload ${BP}/cpu/x86/pc/olpc/loaddropins.fth " sourceurl" " sourceurl" $add-dropin - " ${BP}/clients/memtest86/memtest" " memtest" $add-deflated-dropin + " memtest" " memtest" $add-deflated-dropin \ " ${BP}/cpu/x86/pc/olpc/images/olpc16EQima.wav" " splash" $add-deflated-dropin \ " ${BP}/cpu/x86/pc/olpc/images/Edge1-16k-EQ-Comp-Amp-ima.wav" " splash" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/Edge1-8k-EQ-Comp-Amp-Short.wav" " splash" $add-deflated-dropin Modified: cpu/x86/pc/olpc/via/build/Makefile =================================================================== --- cpu/x86/pc/olpc/via/build/Makefile 2009-05-14 07:45:40 UTC (rev 1190) +++ cpu/x86/pc/olpc/via/build/Makefile 2009-05-14 07:48:27 UTC (rev 1191) @@ -4,7 +4,7 @@ BASEDIR := $(shell cd ${CPUDIR}/../..; pwd;) TAGFILES= ${CPUDIR}/build/*.tag *.tag CLIENTDIR=${BASEDIR}/clients -CLIENTPROGS=${CLIENTDIR}/memtest86/memtest ${CLIENTDIR}/emacs/x86/emacs +CLIENTPROGS=memtest ${CLIENTDIR}/emacs/x86/emacs all: olpc.rom tags @@ -25,8 +25,10 @@ ${CPUDIR}/build/inflate.bin: @make -C ${CPUDIR}/build inflate.bin -${CLIENTDIR}/memtest86/memtest: - @make -C ${CLIENTDIR}/memtest86 memtest +memtest: + make -C ${CLIENTDIR}/memtest86 VARIANT=OLPCVIA memtest + @mv ${CLIENTDIR}/memtest86/memtest . + @make -C ${CLIENTDIR}/memtest86 clean ${CLIENTDIR}/emacs/x86/emacs: @make -C ${CLIENTDIR}/emacs/x86 emacs Modified: cpu/x86/pc/olpc/via/fw.bth =================================================================== --- cpu/x86/pc/olpc/via/fw.bth 2009-05-14 07:45:40 UTC (rev 1190) +++ cpu/x86/pc/olpc/via/fw.bth 2009-05-14 07:48:27 UTC (rev 1191) @@ -301,7 +301,6 @@ fload ${BP}/ofw/core/bailout.fth [ifdef] Later -[ifdef] olpc \ GUI false value gui-safeboot? @@ -312,13 +311,11 @@ true value user-mode? fload ${BP}/cpu/x86/pc/olpc/banner.fth -[then] fload ${BP}/ofw/gui/loadmenu.fth fload ${BP}/cpu/x86/pc/olpc/disptest.fth \ fload ${BP}/ofw/gui/insticon.fth -[ifdef] olpc : setup-for-linux ( -- ) [ ' linux-hook behavior compile, ] \ Chain to old behavior vpci-devices-on \ Do this after quieting USB @@ -339,14 +336,16 @@ \ fload ${BP}/cpu/x86/pc/olpc/carousel.fth \ Carouseled NAND writing fload ${BP}/cpu/x86/pc/olpc/crypto.fth \ Cryptographic image validation fload ${BP}/cpu/x86/pc/olpc/lzip.fth \ Access zip images from memory + fload ${BP}/cpu/x86/pc/olpc/gamekeys.fth -fload ${BP}/cpu/x86/pc/olpc/memtest.fth +[then] : emacs ( -- ) false to already-go? boot-getline to boot-file " rom:emacs" $boot ; +[ifdef] Later fload ${BP}/cpu/x86/pc/rmtools.fth fload ${BP}/dev/geode/smi.fth fload ${BP}/cpu/x86/pc/olpc/acpi.fth @@ -362,7 +361,7 @@ fload ${BP}/cpu/x86/pc/olpc/sound.fth [ifdef] wlan-wackup fload ${BP}/cpu/x86/pc/olpc/wlantest.fth -[then] + fload ${BP}/cpu/x86/pc/olpc/rtcwake.fth ' gx-power-off to power-off [then] @@ -469,6 +468,8 @@ fload ${BP}/ofw/inet/http.fth \ HTTP client end-support-package +fload ${BP}/cpu/x86/pc/olpc/via/memtest.fth + [ifdef] Later fload ${BP}/ofw/wifi/wifi-cfg.fth support-package: supplicant Modified: cpu/x86/pc/olpc/via/olpc.bth =================================================================== --- cpu/x86/pc/olpc/via/olpc.bth 2009-05-14 07:45:40 UTC (rev 1190) +++ cpu/x86/pc/olpc/via/olpc.bth 2009-05-14 07:48:27 UTC (rev 1191) @@ -29,7 +29,9 @@ \ in: ${BP}/cpu/x86/pc/olpc/via/build/dsdt.aml \ in: ${BP}/cpu/x86/pc/olpc/via/build/mcastnand.bin \ in: ${BP}/dev/hdaudio/build/hdaudio.fc +in: sd8686.bin + build-now fload ${BP}/cpu/x86/pc/olpc/via/versions.fth @@ -94,17 +96,20 @@ " ${BP}/dev/mmc/sdhci/build/sdhci2.fc" " class080501" $add-deflated-dropin " ${BP}/dev/mmc/sdhci/build/sdmmc.fc" " sdmmc" $add-deflated-dropin " ${BP}/dev/mmc/sdhci/mv8686/build/mv8686.fc" " mv8686" $add-deflated-dropin + " sd8686_helper.bin" " helper_sd.bin" $add-deflated-dropin + " sd8686.bin" " sd8686.bin" $add-deflated-dropin + " builton.fth" " probe-" $add-dropin " ${BP}/clients/emacs/x86/emacs" " emacs" $add-deflated-dropin " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin + " ${BP}/ofw/fcode/memtest.fth" " memtest.fth" $add-deflated-dropin + [ifdef] Later " ${BP}/dev/hdaudio/build/hdaudio.fc" " class040300" $add-deflated-dropin - " ${BP}/ofw/fcode/memtest.fth" " memtest.fth" $add-deflated-dropin - " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin \ " ${BP}/cpu/x86/pc/olpc/images/warnings.565" " warnings.565" $add-deflated-dropin @@ -135,6 +140,8 @@ " ${BP}/ofw/termemu/cp881-16.obf" " pcfont" $add-deflated-dropin [then] + " memtest" " memtest" $add-deflated-dropin + [ifdef] Later " verify.img" " verify" $add-deflated-dropin " os.public" " ospubkey" $add-dropin \ Incompressible @@ -145,7 +152,6 @@ " sourceurl" " sourceurl" $add-dropin - " ${BP}/clients/memtest86/memtest" " memtest" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/Edge1-8k-EQ-Comp-Amp-Short.wav" " splash" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/via/build/dsdt.aml" " dsdt" $add-deflated-dropin \ " ${BP}/cpu/x86/pc/olpc/via/build/ssdt.aml" " ssdt" $add-deflated-dropin Modified: cpu/x86/pc/olpc/via/smbus.fth =================================================================== --- cpu/x86/pc/olpc/via/smbus.fth 2009-05-14 07:45:40 UTC (rev 1190) +++ cpu/x86/pc/olpc/via/smbus.fth 2009-05-14 07:48:27 UTC (rev 1191) @@ -1,9 +1,11 @@ purpose: Driver for SMBUS controller in Via chipset \ See license at end of file -: smb-reg@ ( reg# -- value ) smbus-io-base + pc@ ; -: smb-reg! ( value reg# -- ) smbus-io-base + pc! ; +0 value smbus-port +: smb-reg@ ( reg# -- value ) smbus-port + pc@ ; +: smb-reg! ( value reg# -- ) smbus-port + pc! ; + 0 value smbus-target \ Register 1 is slave status; we don't use it @@ -33,12 +35,11 @@ smbus-wait ( ) smb-hoststat@ ( stat ) dup h# 9c and if ( stat ) - ." SMBUS error:" ( stat ) - dup h# 80 and if ." PEC" then - dup h# 10 and if ." FailedBusTransaction" then - dup h# 08 and if ." Collision" then - dup h# 04 and if ." DeviceError" then - cr ( stat ) + dup h# 80 and abort" SMBUS error: PEC" + dup h# 10 and abort" SMBUS error: FailedBusTransaction" + dup h# 08 and abort" SMBUS error: Collision" + dup h# 04 and abort" SMBUS error: DeviceError" + drop then ( stat ) drop ( ) h# 9e smb-hoststat! ( ) \ Clear all status bits @@ -95,6 +96,7 @@ smb-hostdata0! ( ) h# c smbus-cmd ( ) \ Word data command ; + : smbus-w@ ( offset -- word ) smbus-target 1 or smb-xmitadr! ( offset ) smb-hostcmd! ( ) @@ -107,7 +109,7 @@ : enable-smbus ( -- ) h# 8894 config-b@ h# 80 invert and h# 8894 config-b! \ Clock from 14 MHz divider - smbus-io-base 1 or h# 88d0 config-w! +\ smbus-io-base 1 or h# 88d0 config-w! \ Assume already set up 5 h# 88d2 config-b! \ Clock source (bit meaning is unclear), enable SMBUS HC 3 h# 8804 config-w! \ Enable in PCI command register smbus-release @@ -118,7 +120,33 @@ smbus-b@ smbus-release ; +: dump-dimm ( dimm# -- ) + h# 80 0 do + i 2 u.r ." : " + i 10 bounds do + i over get-spd-data 3 u.r + loop + cr + h# 10 +loop +; +: dump-dimms ( -- ) + 2 0 do + 0 i ['] get-spd-data catch if ( x x ) + 2drop + else ( byte ) + drop + ." DIMM# " i . cr + i dump-dimm + then + loop +; +stand-init: SMBUS + enable-smbus + h# 88d0 config-w@ h# fff0 and to smbus-port +; + + \ LICENSE_BEGIN \ Copyright (c) 2009 FirmWorks \

1 0

r1190 - clients/memtest86
by svn＠openfirmware.info 14 May '09

14 May '09

Author: wmb Date: 2009-05-14 09:45:40 +0200 (Thu, 14 May 2009) New Revision: 1190 Modified: clients/memtest86/main.c Log: memtest - removed screen clearing from the restart routine because the display hasn't been initialized yet. Modified: clients/memtest86/main.c =================================================================== --- clients/memtest86/main.c 2009-05-14 07:44:05 UTC (rev 1189) +++ clients/memtest86/main.c 2009-05-14 07:45:40 UTC (rev 1190) @@ -438,13 +438,6 @@ v->ecount = 0; v->ecc_ecount = 0; - /* Clear the screen */ - for (i=0; i<24; i++) { - for (j=0; j<80; j++) { - set_ega_char (i, j, ' '); - } - } - run_at(LOW_TEST_ADR); }

1 0

r1189 - clients/memtest86
by svn＠openfirmware.info 14 May '09

14 May '09

Author: wmb Date: 2009-05-14 09:44:05 +0200 (Thu, 14 May 2009) New Revision: 1189 Modified: clients/memtest86/init.c Log: memtest - added type detection for some more Via CPU types. Modified: clients/memtest86/init.c =================================================================== --- clients/memtest86/init.c 2009-05-14 06:22:53 UTC (rev 1188) +++ clients/memtest86/init.c 2009-05-14 07:44:05 UTC (rev 1189) @@ -15,6 +15,7 @@ #include "pci.h" #include "io.h" #include "ega.h" +#include "msr.h" extern short memsz_mode; extern short firmware; @@ -107,7 +108,7 @@ cprint(LINE_CPU+2, 0, "L2 Cache: Unknown "); cprint(LINE_CPU+3, 0, "Memory : "); aprint(LINE_CPU+3, 10, v->test_pages); - cprint(LINE_CPU+4, 0, "Chipset : "); +// cprint(LINE_CPU+4, 0, "Chipset : "); /* * Need to find out CPU type before seting up pci. This is @@ -788,12 +789,34 @@ off = 12; break; case 6: // VIA C3 - if (cpu_id.step < 8) { - cprint(LINE_CPU, 0, "VIA C3 Samuel2"); - off = 14; - } else { - cprint(LINE_CPU, 0, "Via C3 Eden"); - off = 11; + { + unsigned long vall, valh, code; + rdmsr(0x1153, vall, valh); + code = ((vall >> 20) & 3) ^ ((vall >> 18) & 3); + switch (code) { + case 0: + cprint(LINE_CPU, 0, "VIA C7-M"); + off = 8; + break; + case 1: + cprint(LINE_CPU, 0, "VIA C7"); + off = 6; + break; + case 2: + if (cpu_id.step < 8) { + cprint(LINE_CPU, 0, "VIA C3 Samuel2"); + off = 14; + } else { + cprint(LINE_CPU, 0, "Via C3 Eden"); + off = 11; + } + break; + case 3: + cprint(LINE_CPU, 0, "VIA C7-D"); + off = 8; + break; + + } } break; }

1 0

r1188 - cpu/x86/pc/biosload/build
by svn＠openfirmware.info 14 May '09

14 May '09

Author: wmb Date: 2009-05-14 08:22:53 +0200 (Thu, 14 May 2009) New Revision: 1188 Modified: cpu/x86/pc/biosload/build/ Log: svn ignore some artifact files. Property changes on: cpu/x86/pc/biosload/build ___________________________________________________________________ Modified: svn:ignore - build builton.fth ofw.c32 *.elf + build builton.fth ofw.c32 *.elf sd8686.bin *.version sd8686_helper.bin

1 0

r1187 - clients/memtest86
by svn＠openfirmware.info 14 May '09

14 May '09

Author: wmb Date: 2009-05-14 08:19:36 +0200 (Thu, 14 May 2009) New Revision: 1187 Modified: clients/memtest86/ega.h Log: memtest86 - Parameters to EGA_ADR must be parenthesized to prevent operator precedence problems. Modified: clients/memtest86/ega.h =================================================================== --- clients/memtest86/ega.h 2009-05-13 21:59:04 UTC (rev 1186) +++ clients/memtest86/ega.h 2009-05-14 06:19:36 UTC (rev 1187) @@ -14,7 +14,7 @@ #define SCREEN_ADR 0xb8000 #define SCREEN_END_ADR (SCREEN_ADR + 80*25*2) -#define EGA_ADR(y, x, offset) *(char *)(SCREEN_ADR + (y * 160) + (x * 2) + offset) +#define EGA_ADR(y, x, offset) *(char *)(SCREEN_ADR + ((y) * 160) + ((x) * 2) + offset) #define ega_init() do { } while(0) #define set_ega_char(y, x, ch) EGA_ADR(y, x, 0) = (ch)

1 0

r1186 - in cpu/x86/pc: biosload olpc/via
by svn＠openfirmware.info 13 May '09

13 May '09

Author: wmb Date: 2009-05-13 23:59:04 +0200 (Wed, 13 May 2009) New Revision: 1186 Added: cpu/x86/pc/olpc/via/sd8686.bth Modified: cpu/x86/pc/biosload/sd8686.bth cpu/x86/pc/olpc/via/versions.fth Log: OLPC VIA - added versioning support for the wireless firmware checkout. Modified: cpu/x86/pc/biosload/sd8686.bth =================================================================== --- cpu/x86/pc/biosload/sd8686.bth 2009-05-13 20:15:07 UTC (rev 1185) +++ cpu/x86/pc/biosload/sd8686.bth 2009-05-13 21:59:04 UTC (rev 1186) @@ -3,21 +3,4 @@ command: &builder &this build-now -\ fload ${BP}/cpu/x86/pc/biosload/versions.fth - -" rm -f sd8686.bin sd8686_helper.bin" expand$ $sh - -" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686.bin" expand$ $sh -" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686.bin.md5" expand$ $sh -" md5sum -b sd8686.bin | cmp - sd8686.bin.md5" expand$ $sh - -" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin" expand$ $sh -" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin.md5" expand$ $sh -" md5sum -b sd8686_helper.bin | cmp - sd8686_helper.bin.md5" expand$ $sh - -" rm sd8686.bin.md5 sd8686_helper.bin.md5" expand$ $sh - -\ This forces the creation of a .log file, so we don't re-fetch -writing sd8686.version -" ${WLAN_VERSION}"n" expand$ ofd @ fputs -ofd @ fclose +fload ${BP}/cpu/x86/pc/olpc/via/sd8686.bth Added: cpu/x86/pc/olpc/via/sd8686.bth =================================================================== --- cpu/x86/pc/olpc/via/sd8686.bth (rev 0) +++ cpu/x86/pc/olpc/via/sd8686.bth 2009-05-13 21:59:04 UTC (rev 1186) @@ -0,0 +1,25 @@ +purpose: Fetch the firmware for the Marvell 8686 wireless LAN module + +command: &builder &this +build-now + +fload ${BP}/cpu/x86/pc/olpc/via/versions.fth + +" rm -f sd8686.bin sd8686_helper.bin" expand$ $sh + +" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686-${WLAN_VERSION}.bin" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686-${WLAN_VERSION}.bin.md5" expand$ $sh +" md5sum -b sd8686-${WLAN_VERSION}.bin | cmp - sd8686-${WLAN_VERSION}.bin.md5" expand$ $sh + +" mv sd8686-${WLAN_VERSION}.bin sd8686.bin" expand$ $sh + +" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin.md5" expand$ $sh +" md5sum -b sd8686_helper.bin | cmp - sd8686_helper.bin.md5" expand$ $sh + +" rm sd8686-${WLAN_VERSION}.bin.md5 sd8686_helper.bin.md5" expand$ $sh + +\ This forces the creation of a .log file, so we don't re-fetch +writing sd8686.version +" ${WLAN_VERSION}"n" expand$ ofd @ fputs +ofd @ fclose Modified: cpu/x86/pc/olpc/via/versions.fth =================================================================== --- cpu/x86/pc/olpc/via/versions.fth 2009-05-13 20:15:07 UTC (rev 1185) +++ cpu/x86/pc/olpc/via/versions.fth 2009-05-13 21:59:04 UTC (rev 1186) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 02a +macro: FW_MINOR 02c \ The EC microcode macro: EC_VERSION e34 @@ -15,8 +15,7 @@ \ macro: KEYS testkeys \ The wireless LAN module firmware -macro: WLAN_RPM ${WLAN_VERSION}.olpc1 -macro: WLAN_VERSION 5.110.22.p23 +macro: WLAN_VERSION 9.70.7.p0 \ The bios_verify image macro: CRYPTO_VERSION 0.2

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware