- OpenBIOS - mail.coreboot.org

r781 - in cpu/x86/pc: . biosload
by svn＠openbios.org 18 Jan '08

18 Jan '08

Author: wmb Date: 2008-01-18 18:46:07 +0100 (Fri, 18 Jan 2008) New Revision: 781 Added: cpu/x86/pc/biosload/c32vesa.fth cpu/x86/pc/biosload/preofhdr.fth cpu/x86/pc/biosload/usb.fth Modified: cpu/x86/pc/biosload/addrs.fth cpu/x86/pc/biosload/callbios.fth cpu/x86/pc/biosload/config.fth cpu/x86/pc/biosload/devices.fth cpu/x86/pc/biosload/fw.bth cpu/x86/pc/biosload/mbootsec.fth cpu/x86/pc/biosload/ofw.bth cpu/x86/pc/biosload/pcinode.fth cpu/x86/pc/biosload/probemem.fth cpu/x86/pc/biosload/reset.bth cpu/x86/pc/biosload/rmenter.fth cpu/x86/pc/resetend.fth cpu/x86/pc/tsccal.fth Log: Generic PC version - omnibus checkin of a lot of new stuff relating to i945 and conventional BIOS support. Modified: cpu/x86/pc/biosload/addrs.fth =================================================================== --- cpu/x86/pc/biosload/addrs.fth 2008-01-18 17:38:46 UTC (rev 780) +++ cpu/x86/pc/biosload/addrs.fth 2008-01-18 17:46:07 UTC (rev 781) @@ -20,6 +20,12 @@ h# 08.0000 constant dropin-size [then] +[ifdef] preof-loaded +h# 2000.0000 constant ramsize +h# fff8.0020 constant dropin-base \ Location of payload in ROM +h# 08.0000 constant dropin-size +[then] + \needs dropin-base h# 198.0000 constant dropin-base \needs dropin-size h# 8.0000 constant dropin-size \needs ResetBase dropin-base h# 20 + constant ResetBase \ Location of "reset" dropin in ROM Added: cpu/x86/pc/biosload/c32vesa.fth =================================================================== --- cpu/x86/pc/biosload/c32vesa.fth (rev 0) +++ cpu/x86/pc/biosload/c32vesa.fth 2008-01-18 17:46:07 UTC (rev 781) @@ -0,0 +1,197 @@ +purpose: Call VESA BIOS functions via syslinux c32 callback + +[ifdef] notdef-get-com32-ptr +\ sp 0 #) mov \ Save COM32 stack pointer to get parameters +[then] +[ifdef] notdef-getvbe + \ There is an extra return address on the stack from the e9 call above + d# 16 [sp] bp mov \ COM32 intcall helper function + d# 20 [sp] dx mov \ bounce buffer address + + h# 4f00 # d# 36 [dx] mov \ AX + + dx ax mov + h# 200 # ax add + h# 32454256 # 0 [ax] mov \ VBE2 + + op: ax d# 08 [dx] mov \ DI - result pointer offset + d# 16 # ax shr \ Discard lower 16 bits + d# 12 # ax shl \ Shift segment into place + op: ax d# 04 [dx] mov \ ES - result pointer segment + + dx push dx push h# 10 # push bp call d# 12 # sp add + d# 36 [dx] ax mov ax 4 #) mov \ AX +[then] + +[ifdef] notdef-findmode + \ Registers: + \ edx: pointer to register array for calling the gateway function + \ ebp: address of gateway function + \ ecx: pointer to result array + \ esi: moving pointer to mode number array + \ eax: scratch + + \ There is an extra return address on the stack from the e9 call above + d# 16 [sp] bp mov \ COM32 intcall helper function + d# 20 [sp] dx mov \ bounce buffer address + + dx push dx push h# 10 # push + + h# 4f00 # d# 36 [dx] mov \ AX + + dx cx mov + h# 100 # cx add \ ecx: pointer to result buffer + + h# 32454256 # 0 [cx] mov \ 'VBE2' to signature field of result buffer - probably unnecessary (we don't need the OEM string) + + cx ax mov + op: ax d# 08 [dx] mov \ DI - result pointer offset + d# 16 # ax shr \ Discard lower 16 bits + d# 12 # ax shl \ Shift segment into place + op: ax d# 04 [dx] mov \ ES - result pointer segment + + bp call + + \ Extract the mode list pointer and convert it to a linear address + si si xor + op: h# 10 [cx] si mov \ Segment portion of mode list pointer + 4 # si shl \ Move into position + ax ax xor + op: h# 0e [cx] ax mov \ Offset portion of mode list pointer + ax si add \ esi: Linear address of mode list pointer + + \ Get a new result buffer so as not to overwrite the mode list + h# 100 # cx add + cx ax mov + op: ax d# 08 [dx] mov \ DI - result pointer offset + d# 16 # ax shr \ Discard lower 16 bits + d# 12 # ax shl \ Shift segment into place + op: ax d# 04 [dx] mov \ ES - result pointer segment + + h# 0 # ax mov ax 8 #) mov \ Clear the output value + + begin + op: ax lods \ Get mode number + op: h# ffff # ax cmp + <> while \ Exit if all modes have been tested + op: ax d# 32 [dx] mov \ CX - Mode number + op: ax bx mov + + h# 4f01 # d# 36 [dx] mov \ AX - GetMode function number + bp call + + op: 0 [cx] ax mov \ Mode attributes + 1 # al test 0<> if \ Is the mode supported? + h# 12 [cx] ax mov \ Yres.Xres + TARGET_RES # ax cmp = if + h# 19 [cx] al mov \ BPP + TARGET_BPP # al cmp = if + op: bx 8 #) mov \ Mode number + op: h# 10 [cx] ax mov + op: ax h# a #) mov \ Stride + then + then + then + repeat + d# 12 # sp add +[then] + +[ifndef] notdef-modemap + \ Registers: + \ edx: pointer to register array for calling the gateway function + \ ebp: address of gateway function + \ ecx: pointer to result array + \ esi: moving pointer to mode number array + \ eax: scratch + \ ebx: output pointer + + \ There is an extra return address on the stack from the e9 call above + d# 16 [sp] bp mov \ COM32 intcall helper function + d# 20 [sp] dx mov \ bounce buffer address + + dx push dx push h# 10 # push + + h# 4f00 # d# 36 [dx] mov \ AX + + dx cx mov + h# 100 # cx add \ ecx: pointer to result buffer + + h# 32454256 # 0 [cx] mov \ 'VBE2' to signature field of result buffer - probably unnecessary (we don't need the OEM string) + + cx ax mov + op: ax d# 08 [dx] mov \ DI - result pointer offset + d# 16 # ax shr \ Discard lower 16 bits + d# 12 # ax shl \ Shift segment into place + op: ax d# 04 [dx] mov \ ES - result pointer segment + + bp call + + \ Extract the mode list pointer and convert it to a linear address + si si xor + op: h# 10 [cx] si mov \ Segment portion of mode list pointer + 4 # si shl \ Move into position + ax ax xor + op: h# 0e [cx] ax mov \ Offset portion of mode list pointer + ax si add \ esi: Linear address of mode list pointer + + \ Get a new result buffer so as not to overwrite the mode list + h# 100 # cx add + cx ax mov + op: ax d# 08 [dx] mov \ DI - result pointer offset + d# 16 # ax shr \ Discard lower 16 bits + d# 12 # ax shl \ Shift segment into place + op: ax d# 04 [dx] mov \ ES - result pointer segment + + h# 40300 # bx mov + + begin + op: ax lods \ Get mode number + op: ax 0 [bx] mov + op: h# ffff # ax cmp + <> while \ Exit if all modes have been tested + op: ax d# 32 [dx] mov \ CX - Mode number + + h# 4f01 # d# 36 [dx] mov \ AX - GetMode function number + bp call + + h# 12 [cx] ax mov ax 2 [bx] mov \ Yres.Xres + ax ax xor + h# 19 [cx] al mov op: ax 6 [bx] mov \ BPP + op: h# 10 [cx] ax mov op: ax 8 [bx] mov \ Stride + ax ax xor + op: ax h# a [bx] mov ax h# c [bx] mov \ Clear trailing + h# 10 # bx add + repeat + d# 12 # sp add +[then] + +[ifdef] notdef-setmode + \ There is an extra return address on the stack from the e9 call above + d# 16 [sp] bp mov \ COM32 intcall helper function + d# 20 [sp] dx mov \ bounce buffer address + + dx push dx push h# 10 # push + + dx cx mov + h# 100 # cx add \ ecx: pointer to result buffer + + cx ax mov + op: ax d# 08 [dx] mov \ DI - result pointer offset + d# 16 # ax shr \ Discard lower 16 bits + d# 12 # ax shl \ Shift segment into place + op: ax d# 04 [dx] mov \ ES - result pointer segment + + h# 4f01 # d# 36 [dx] mov \ AX - GetMode function number + h# 0117 # d# 32 [dx] mov \ CX - Mode number + bp call + + h# 28 [cx] ax mov ax 0 #) mov \ Frame buffer address + ax ax xor op: h# 10 [cx] ax mov ax 4 #) mov \ Stride + + h# 4f02 # d# 36 [dx] mov \ AX + h# c117 # d# 24 [dx] mov \ BX 1024x768x16 linear + + bp call + + d# 12 # sp add +[then] Modified: cpu/x86/pc/biosload/callbios.fth =================================================================== --- cpu/x86/pc/biosload/callbios.fth 2008-01-18 17:38:46 UTC (rev 780) +++ cpu/x86/pc/biosload/callbios.fth 2008-01-18 17:46:07 UTC (rev 781) @@ -173,15 +173,15 @@ : bios-config-w! ( w adr -- ) lwsplit h# 1a { h# b10c ax bx rm-di ! rm-cx ! } ; : bios-config-l! ( l adr -- ) lwsplit h# 1a { h# b10d ax bx rm-di ! rm-cx ! } ; : disk-status ( -- stat ) h# 13 { h# 0100 ax } rm-ax @ ; -0 value sect/trk -0 value trk/head +0 value #sects +0 value #cyls 0 value #heads : get-drive-params ( -- ) h# 13 { 8 ah h# 80 dx } rm-flags @ 1 and if true exit then rm-cx @ wbsplit ( cl ch ) - over h# 3f and to sect/trk ( cl ch ) - swap 6 rshift bwjoin 1+ to trk/head ( ) + over h# 3f and to #sects ( cl ch ) + swap 6 rshift bwjoin 1+ to #cyls ( ) rm-dx @ 8 rshift 1+ to #heads ( ) ; : #drive-sectors ( -- n ) @@ -203,9 +203,10 @@ : write-sectors ( sector1 cyl0 head0 drive0 #sectors -- ) 3 do-rw ; : lbn>sch ( lbn -- sector cyl head ) - sect/trk /mod swap 1+ swap ( sector rem ) - trk/head /mod ( sector cyl head ) - dup #heads > abort" LBN out of range" + #sects /mod swap 1+ swap ( sector rem ) + #heads /mod ( sector head cyl ) + dup #cyls > abort" LBN out of range" + swap ( sector cyl head ) ; : lbn-read-sectors ( lbn drive #sectors -- ) 2>r lbn>sch 2r> read-sectors ; : lbn-write-sectors ( lbn drive #sectors -- ) 2>r lbn>sch 2r> write-sectors ; Modified: cpu/x86/pc/biosload/config.fth =================================================================== --- cpu/x86/pc/biosload/config.fth 2008-01-18 17:38:46 UTC (rev 780) +++ cpu/x86/pc/biosload/config.fth 2008-01-18 17:46:07 UTC (rev 781) @@ -1,9 +1,9 @@ \ See license at end of file purpose: Establish configuration definitions -create pc \ Demo version for generic PC +\ create pc \ Demo version for generic PC \ create pc-linux \ Demo version for generic PC and Linux -\ create pc-serial \ Demo version for generic PC +create pc-serial \ Demo version for generic PC \ --- The environment that "boots" OFW --- \ - Image Format - Example Media - previous stage bootloader @@ -24,11 +24,18 @@ \ Load and run in qemu \ create qemu-loaded +\ Load from ROM by preOF code from Intel +\ create preof-loaded + [ifdef] pc-serial create serial-console create pc [then] +[ifdef] qemu-loaded \ LinuxBIOS+OFW under QEMU currently doesn't do VGA right +create serial-console +[then] + [ifdef] etherboot-variant create debug-startup create serial-console @@ -67,6 +74,20 @@ create no-floppy-node [then] +[ifdef] preof-loaded +create serial-console +create use-timestamp-counter +create resident-packages +create addresses-assigned \ Don't reassign PCI addresses +\ create virtual-mode +create use-root-isa +create use-isa-ide +create use-elf +create use-watch-all +create use-null-nvram +create no-floppy-node +[then] + fload ${BP}/cpu/x86/pc/biosload/addrs.fth \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks Modified: cpu/x86/pc/biosload/devices.fth =================================================================== --- cpu/x86/pc/biosload/devices.fth 2008-01-18 17:38:46 UTC (rev 780) +++ cpu/x86/pc/biosload/devices.fth 2008-01-18 17:46:07 UTC (rev 781) @@ -32,6 +32,8 @@ " /pci" " init" execute-device-method drop ; +fload ${BP}/cpu/x86/pc/biosload/i945.fth \ Intel 945 hacks + fload ${BP}/dev/pciprobe.fth \ Generic PCI probing [ifdef] use-timestamp-counter @@ -52,7 +54,9 @@ end-package [then] +[ifndef] use-timestamp-counter fload ${BP}/cpu/x86/pc/getms.fth +[then] [ifdef] use-mediagx fload ${BP}/dev/mediagx/reg.fth \ MediaGX constants and access @@ -141,7 +145,7 @@ devalias mouse /isa/8042/mouse [ifdef] use-timestamp-counter -fload ${BP}/cpu/x86/pc/tsccal.fth +fload ${BP}/cpu/x86/pc/tsccal1.fth [then] [ifdef] use-ega @@ -176,10 +180,12 @@ fload ${BP}/cpu/x86/pc/cpunode.fth +[ifndef] serial-console fload ${BP}/ofw/core/bailout.fth stand-init: Keyboard overrides ?bailout ; +[then] fload ${BP}/ofw/core/countdwn.fth \ Startup countdown fload ${BP}/forth/lib/pattern.fth \ Text string pattern matching Modified: cpu/x86/pc/biosload/fw.bth =================================================================== --- cpu/x86/pc/biosload/fw.bth 2008-01-18 17:38:46 UTC (rev 780) +++ cpu/x86/pc/biosload/fw.bth 2008-01-18 17:46:07 UTC (rev 781) @@ -181,14 +181,36 @@ [then] devalias nfs net//obp-tftp:last//nfs +fload ${BP}/ofw/inet/loadtcp.fth +support-package: http + fload ${BP}/ofw/inet/http.fth \ HTTP client +end-support-package + +[ifndef] use-timestamp-counter fload ${BP}/cpu/x86/pc/mscal.fth +[then] fload ${BP}/cpu/x86/pc/boot.fth +hex +\ If there is a PCI ethernet adapter, use it as the default net device, +\ otherwise use any ethernet that can be found in the device tree. +: report-net ( -- ) + " /pci/ethernet" 2dup find-package if ( name$ phandle ) + drop ( name$ ) + else ( name$ ) + 2drop " /ethernet" ( name$' ) + then ( name$ ) + " net" 2swap $devalias ( ) +; + +fload ${BP}/cpu/x86/pc/biosload/usb.fth +\ fload ${BP}/cpu/x86/pc/biosload/callbios.fth +fload ${BP}/cpu/x86/pc/biosload/rmenter.fth + \ false to stand-init-debug? true to stand-init-debug? - hex stand-init-debug? [if] warning @ warning off @@ -198,7 +220,7 @@ standalone? if cr ." Type 'i' to interrupt stand-init sequence" cr - d# 500 ms + d# 2000 ms key? if key upc ascii I = if ." Interacting" cr hex interact then then @@ -210,26 +232,12 @@ warning ! [then] -fload ${BP}/cpu/x86/pc/biosload/mbootsec.fth - : (.firmware) ( -- ) ." Open Firmware " .built cr ." Copyright 1999 FirmWorks All Rights Reserved" cr ; ' (.firmware) to .firmware -hex -\ If there is a PCI ethernet adapter, use it as the default net device, -\ otherwise use any ethernet that can be found in the device tree. -: report-net ( -- ) - " /pci/ethernet" 2dup find-package if ( name$ phandle ) - drop ( name$ ) - else ( name$ ) - 2drop " /ethernet" ( name$' ) - then ( name$ ) - " net" 2swap $devalias ( ) -; - : linux-logo ( -- ) " penguin.txt" find-drop-in if page type then ; @@ -242,6 +250,7 @@ [ifdef] probe-isa-modem probe-isa-modem [then] + probe-usb report-disk report-net report-pci-fb @@ -257,10 +266,7 @@ auto-banner? if " Probing" ?type probe-all - \ install-console doesn't work with qemu, use -serial `tty` instead - [ifndef] qemu-loaded " Install console" ?type install-console - [then] banner then @@ -307,9 +313,11 @@ fload ${BP}/cpu/x86/pc/biosload/vmdoor.fth \ VMware interfaces +fload ${BP}/cpu/x86/pc/biosload/intelfb.fth \ Intel frame buffer setup + " dhcp" ' ip-address set-config-string-default -.( Saving fw.dic ...) +.( SAVING FW.dic ...) " fw.dic" $save-forth cr .( Saving fw.img ...) Modified: cpu/x86/pc/biosload/mbootsec.fth =================================================================== --- cpu/x86/pc/biosload/mbootsec.fth 2008-01-18 17:38:46 UTC (rev 780) +++ cpu/x86/pc/biosload/mbootsec.fth 2008-01-18 17:46:07 UTC (rev 781) @@ -5,8 +5,6 @@ \ create make-boot-sector-only -: $, ( adr len -- ) here over allot swap move ; - create ofw-boot-sectors here fload ${BP}/cpu/x86/pc/biosload/build/bootsec.hex @@ -77,6 +75,7 @@ ." Open Firmware bootable floppy image created." cr ." Please copy OFW.IMG to the floppy." cr ; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: cpu/x86/pc/biosload/ofw.bth =================================================================== --- cpu/x86/pc/biosload/ofw.bth 2008-01-18 17:38:46 UTC (rev 780) +++ cpu/x86/pc/biosload/ofw.bth 2008-01-18 17:46:07 UTC (rev 781) @@ -19,6 +19,7 @@ \ in: ${BP}/ofw/disklabel/build/disklabel.di \ in: ${BP}/ofw/inet/build/obptftp.di in: ${BP}/dev/pci/build/pcibridg.fc +in: ${BP}/dev/ide/build/leghier.fc in: ${BP}/cpu/x86/pc/biosload/linux.fth build-now @@ -67,6 +68,19 @@ bz-hdr /bz-hdr 0 " bz-header" write-dropin [then] +[ifdef] preof-loaded + : pad-file ( location -- ) + ofd @ fsize + 2dup u< abort" The ROM image is too large" + ?do h# ff ofd @ fputc loop + ; + + .( --- Saving as ofw.rom - Binary ROM image format for preOF) cr + fload ${BP}/cpu/x86/pc/biosload/preofhdr.fth + writing ofw.rom + preof-hdr /preof-hdr ofd @ fputs +[then] + [ifdef] real-mode-entry " biostart.img" $add-file [then] @@ -75,6 +89,7 @@ " ${BP}/cpu/x86/build/inflate.bin" " inflate" $add-dropin " fw.img" " firmware" $add-deflated-dropin " ${BP}/dev/pci/build/pcibridg.fc" " class060400" $add-deflated-dropin + " ${BP}/dev/ide/build/leghier.fc" " class01018a" $add-deflated-dropin " ${BP}/dev/usb2/hcd/uhci/build/uhci.fc" " class0c0300" $add-deflated-dropin " ${BP}/dev/usb2/hcd/ohci/build/ohci.fc" " class0c0310" $add-deflated-dropin @@ -107,6 +122,8 @@ [then] " ${BP}/ofw/fcode/memtest.fth" " memtest.fth" $add-deflated-dropin + " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin + " ${BP}/ofw/inet/httpdemo/index.htm" " index.htm" $add-dropin " ${BP}/ofw/inet/httpdemo/config.htm" " config.htm" $add-dropin \ " ${BP}/ofw/inet/httpdemo/post.htm" " post.htm" $add-dropin @@ -130,4 +147,10 @@ pad 4 ofd @ fputs \ Patch memory size [then] +[ifdef] preof-loaded + h# 60000 pad-file + " preof.img" $add-file + ofd @ fsize dropin-size <> if ." Size is wrong" cr then +[then] + ofd @ fclose Modified: cpu/x86/pc/biosload/pcinode.fth =================================================================== --- cpu/x86/pc/biosload/pcinode.fth 2008-01-18 17:38:46 UTC (rev 780) +++ cpu/x86/pc/biosload/pcinode.fth 2008-01-18 17:46:07 UTC (rev 781) @@ -106,10 +106,13 @@ \ The io-base handling really ought to be in the root node, but \ that would require more changes than I'm willing to do at present. +warning @ warning off : map-out ( vaddr size -- ) over io-base u>= if 2drop exit then ( vaddr size ) map-out ( ) ; +warning ! + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Added: cpu/x86/pc/biosload/preofhdr.fth =================================================================== --- cpu/x86/pc/biosload/preofhdr.fth (rev 0) +++ cpu/x86/pc/biosload/preofhdr.fth 2008-01-18 17:46:07 UTC (rev 781) @@ -0,0 +1,27 @@ +\ See license at end of file +purpose: Create header for starting Forth from preOF, 32-bit protected mode + +command: &builder &this +build-now + +\needs start-assembling fload ${BP}/cpu/x86/asmtools.fth + +hex + +start-assembling + +label preof-hdr + +\ This code begins execution in 32-bit mode. + +[ifdef] ramsize + ramsize # mem-info-pa 1 la+ #) mov + 0 # mem-info-pa 2 la+ #) mov +[then] + ResetBase # ax mov + ax jmp + h# 20 pad-to +end-code + +end-assembling +here preof-hdr - constant /preof-hdr Modified: cpu/x86/pc/biosload/probemem.fth =================================================================== --- cpu/x86/pc/biosload/probemem.fth 2008-01-18 17:38:46 UTC (rev 780) +++ cpu/x86/pc/biosload/probemem.fth 2008-01-18 17:46:07 UTC (rev 781) @@ -38,9 +38,12 @@ [else] fw-pa h# 10.0000 u> if h# 10.0000 fw-pa over - release + fw-pa /fw-ram + heap-base heap-size + umax /ram release then - dropin-base dropin-size + /ram over - release + dropin-base /ram u< if + dropin-base dropin-size + /ram over - release + then [then] ; Modified: cpu/x86/pc/biosload/reset.bth =================================================================== --- cpu/x86/pc/biosload/reset.bth 2008-01-18 17:38:46 UTC (rev 780) +++ cpu/x86/pc/biosload/reset.bth 2008-01-18 17:46:07 UTC (rev 781) @@ -16,6 +16,7 @@ hex fload ${BP}/cpu/x86/pc/finddi.fth \ find-dropin and other tools +fload ${BP}/cpu/x86/pc/port80.fth \ Port 80 output h# 3e.0000 constant inflate-base h# 30.0000 constant workspace @@ -32,14 +33,107 @@ [then] fload ${BP}/cpu/x86/pc/ramfind.fth \ find-dropin +\ uint16_t gs; /* Offset 0 */ +\ uint16_t fs; /* Offset 2 */ +\ uint16_t es; /* Offset 4 */ +\ uint16_t ds; /* Offset 6 */ +\ reg32_t edi; /* Offset 8 */ +\ reg32_t esi; /* Offset 12 */ +\ reg32_t ebp; /* Offset 16 */ +\ reg32_t _unused_esp; /* Offset 20 */ +\ reg32_t ebx; /* Offset 24 */ +\ reg32_t edx; /* Offset 28 */ +\ reg32_t ecx; /* Offset 32 */ +\ reg32_t eax; /* Offset 36 */ +\ +\ reg32_t eflags; /* Offset 40 */ + +\ VESA modes: +\ RESv BPP> 4 8 15 16 24 +\ 320x200 10d 10e 10f +\ 640x400 100 +\ 640x480 101 110 111 112 +\ 800x600 102 103 113 114 115 +\ 1024x768 104 105 116 117 118 +\ 1280x1024 106 107 119 11a 11b + +d# 1024 d# 768 wljoin constant TARGET_RES +d# 16 constant TARGET_BPP + label startup + h# 10 port80 cli cld +[ifdef] syslinux-loaded + fload ${BP}/cpu/x86/pc/biosload/c32vesa.fth +[then] + + h# 11 port80 80 70 isa-c! \ Disable NMI 71 # dx mov dx al in \ Why do we do this? [ifdef] debug-startup +h# 8000.f880 # ax mov h# cf8 # dx mov ax dx out +h# 140f.0010 # ax mov h# cfc # dx mov ax dx out \ Set LPC decoding + +h# 8000.f8f0 # ax mov h# cf8 # dx mov ax dx out +h# fed1.c001 # ax mov h# cfc # dx mov ax dx out \ Root complex BAR + +\ h# 0004.2210 # ax mov ax h# fed1f100 #) mov \ Int route dev31 SMIP:INTB SATA:INTB PATA:INTA (default) +\ h# 0000.2100 # ax mov ax h# fed1f104 #) mov \ Int route dev30 AMIP:INTB AAIP:INTA (default) +\ h# 1000.4321 # ax mov ax h# fed1f108 #) mov \ Int route dev29 EIP:INTA U3P:INTD U2P:INTC U1P:INTB U0P:INTA (def) +\ h# 0021.4321 # ax mov ax h# fed1f10c #) mov \ Int route dev28 P6IP:B P5IP:A P4IP:D P3IP:C P2IP:B P1IP:A (def) + +h# 0146.0132 # ax mov ax h# fed1f140 #) mov \ Int route dev30 D:PIRQA C:PIRQB B:PIRQE A:PIRQG + \ Int route dev31 D:PIRQA C:PIRQB B:PIRQD A:PIRQC +h# 3201.0237 # ax mov ax h# fed1f144 #) mov \ Int route dev28 D:PIRQD C:PIRQC B:PIRQA A:PIRQB + \ Int route dev29 D:PIRQA C:PIRQB B:PIRQD A:PIRQH +h# 0000.0146 # ax mov ax h# fed1f148 #) mov \ Int route dev27 D:PIRQA C:PIRQB B:PIRQE A:PIRQG + +h# 3 # al mov al h# fed1f1ff #) mov \ Enable APIC (Root complex other interrupt control register) + +h# 0000.0004 # ax mov ax h# fed1f400 #) mov \ Enable upper half of CMOS RAM +h# 0000.0080 # ax mov ax h# fed1f404 #) mov \ Enable High Precision Timer at fed0.0000 - fed0.03ff +h# 0032.0061 # ax mov ax h# fed1f418 #) mov \ Disable PCIe 6,5,2, AC97 modem, AC97 audio +h# 0000.0001 # ax mov ax h# fed1f41c #) mov \ Enable PCIe root port static clock gating + +h# 55 # al mov al h# 2e # out \ Superio Config mode + +\ h# 7 # al mov al h# 2e # out h# 1 # al mov al h# 2f # out \ Select LPT +\ h# 60 # al mov al h# 2e # out h# 3 # al mov al h# 2f # out \ High address +\ h# 61 # al mov al h# 2e # out h# 78 # al mov al h# 2f # out \ Low address +\ h# 70 # al mov al h# 2e # out h# 7 # al mov al h# 2f # out \ IRQ +\ h# 74 # al mov al h# 2e # out h# 4 # al mov al h# 2f # out \ DMA channel +\ h# f0 # al mov al h# 2e # out h# 3a # al mov al h# 2f # out \ PP Mode +\ h# f1 # al mov al h# 2e # out h# 0 # al mov al h# 2f # out \ PP Mode2 +\ h# f8 # al mov al h# 2e # out h# 4 # al mov al h# 2f # out \ PP Mapping +\ h# 30 # al mov al h# 2e # out h# 1 # al mov al h# 2f # out \ Enable + +h# 7 # al mov al h# 2e # out h# 3 # al mov al h# 2f # out \ Select COM1 +h# 60 # al mov al h# 2e # out h# 3 # al mov al h# 2f # out \ High address +h# 61 # al mov al h# 2e # out h# f8 # al mov al h# 2f # out \ Low address +h# 70 # al mov al h# 2e # out h# 4 # al mov al h# 2f # out \ IRQ +h# 30 # al mov al h# 2e # out h# 1 # al mov al h# 2f # out \ Enable + +\ h# 7 # al mov al h# 2e # out h# 4 # al mov al h# 2f # out \ Select Power control +\ h# 60 # al mov al h# 2e # out h# 6 # al mov al h# 2f # out \ High address +\ h# 61 # al mov al h# 2e # out h# c0 # al mov al h# 2f # out \ Low address +\ h# 30 # al mov al h# 2e # out h# 1 # al mov al h# 2f # out \ Enable + +\ h# 7 # al mov al h# 2e # out h# 5 # al mov al h# 2f # out \ Select mouse +\ h# 70 # al mov al h# 2e # out h# c # al mov al h# 2f # out \ IRQ +\ h# 30 # al mov al h# 2e # out h# 1 # al mov al h# 2f # out \ Enable + +h# 7 # al mov al h# 2e # out h# 6 # al mov al h# 2f # out \ Select keyboard +h# 70 # al mov al h# 2e # out h# 1 # al mov al h# 2f # out \ IRQ +h# 30 # al mov al h# 2e # out h# 1 # al mov al h# 2f # out \ Enable + +\ h# 7 # al mov al h# 2e # out h# 4 # al mov al h# 2f # out \ Select GPIO +\ h# 60 # al mov al h# 2e # out h# 6 # al mov al h# 2f # out \ High address +\ h# 61 # al mov al h# 2e # out h# 80 # al mov al h# 2f # out \ Low address +\ h# 30 # al mov al h# 2e # out h# 1 # al mov al h# 2f # out \ Enable + init-com1 carret report @@ -49,6 +143,7 @@ ascii r report [then] + h# 12 port80 " start" $find-dropin, \ Assemble call to find-dropin with literal arg \ What should we do it this fails? Perhaps call a default routine \ to try to initialize com1 and display a message? @@ -56,6 +151,7 @@ d# 32 # ax add \ Skip dropin header ax call \ Execute the dropin + h# 13 port80 fload ${BP}/cpu/x86/pc/resetend.fth end-code Modified: cpu/x86/pc/biosload/rmenter.fth =================================================================== --- cpu/x86/pc/biosload/rmenter.fth 2008-01-18 17:38:46 UTC (rev 780) +++ cpu/x86/pc/biosload/rmenter.fth 2008-01-18 17:46:07 UTC (rev 781) @@ -3,11 +3,27 @@ : seg:off> ( offset segment -- linear ) 4 lshift + ; : seg:off@ ( adr -- linear ) dup w@ swap wa1+ w@ seg:off> ; +[ifdef] syslinux-loaded h# 8 constant rm-cs h# 18 constant rm-ds h# 20 constant pm-cs h# 28 constant pm-ds +: fix-gdt ; +[then] +[ifdef] preof-loaded +h# 38 constant rm-cs +h# 30 constant rm-ds +h# 10 constant pm-cs +h# 18 constant pm-ds +: fix-gdt + gdtr@ gdt-pa swap 1+ move + h# ffff gdt-pa h# 38 + l! \ Limit ffff + h# 9a00 gdt-pa h# 3c + l! \ Base 00000, 16-bit code + gdt-pa gdtr@ nip h# 3f max 1+ gdtr! +; +[then] + h# 0.0000 constant rm-base : +rm ( offset -- adr ) rm-base + ; @@ -21,6 +37,7 @@ \ size is 2e h# f30 +rm constant 'rm-idt \ For loading RM IDT with LIDT +h# f36 +rm constant 'rm-int \ Incoming interrupt number h# f38 +rm constant 'rm-sp \ SS:SP For loading RM SP with LSS h# f3c +rm constant 'pm-sp \ Save/restore area for PM SP h# f40 +rm constant 'pm-gdt \ For loading PM GDT with LGDT @@ -54,6 +71,21 @@ : rm-al! caller-regs >rm-eax c! ; : rm-ax@ caller-regs >rm-eax w@ ; : rm-ax! caller-regs >rm-eax w! ; + +: rm-bh@ caller-regs >rm-ebx 1+ c@ ; +: rm-bh! caller-regs >rm-ebx 1+ c! ; +: rm-bl@ caller-regs >rm-ebx c@ ; +: rm-bl! caller-regs >rm-ebx c! ; +: rm-bx@ caller-regs >rm-ebx w@ ; +: rm-bx! caller-regs >rm-ebx w! ; + +: rm-ch@ caller-regs >rm-ecx 1+ c@ ; +: rm-ch! caller-regs >rm-ecx 1+ c! ; +: rm-cl@ caller-regs >rm-ecx c@ ; +: rm-cl! caller-regs >rm-ecx c! ; +: rm-cx@ caller-regs >rm-ecx w@ ; +: rm-cx! caller-regs >rm-ecx w! ; + : rm-dh@ caller-regs >rm-edx 1+ c@ ; : rm-dh! caller-regs >rm-edx 1+ c! ; : rm-dl@ caller-regs >rm-edx c@ ; @@ -61,9 +93,12 @@ : rm-dx@ caller-regs >rm-edx w@ ; : rm-dx! caller-regs >rm-edx w! ; -: rm-set-cf caller-regs >rm-flags dup w@ 1 or swap w! ; -: rm-clr-cf caller-regs >rm-flags dup w@ 1 or swap w! ; +: rm-flags@ caller-regs >rm-flags w@ ; +: rm-flags! caller-regs >rm-flags w! ; +: rm-set-cf rm-flags@ 1 or rm-flags! ; +: rm-clr-cf rm-flags@ 1 or rm-flags! ; + \ 80ff0 is the target address of the interrupt vector \ We use different segment:offset representations of that address in \ the vector table, so the handler code can determine the vector @@ -88,8 +123,10 @@ \ CS:IP return address (from INT) \ (low) EDI,ESI,EBP,ESP,EBX,EDX,ECX,EAX (high) \ (low) GS,FS,ES,DS (high) - \ CS for vector + \ CS from interrupt vector, which is the interrupt number + cs: 'rm-int #) pop \ Save interrupt vector CS, i.e. the int# + cli \ This is unnecessary since we got here from an INT cs push ds pop @@ -173,6 +210,7 @@ 0 value rm-prepped? : prep-rm ( -- ) rm-prepped? if exit then true to rm-prepped? + fix-gdt 0 saved-rm-vectors h# 400 move make-vector-table @@ -190,11 +228,245 @@ 'rm-regs 'rm-sp seg:off! \ Initial stack pointer below regs ; +: get-font ( -- ) + rm-al@ h# 30 = if + ." Int 10 get-font called - BH = " rm-bh@ . cr + else + ." Int 10 set-font called" cr + then +; + +: video-int ( -- ) + rm-ah@ case + h# 0 of ( rm-al@ set-video-mode ) endof \ Set mode - Should blank the screen + h# a of rm-al@ emit endof \ Write character + h# e of rm-al@ emit endof \ Write character + h# 11 of get-font endof \ get or set font + h# 12 of 0 rm-bx! endof \ Attribute for blanked lines while scrolling - Wrong, I think + h# 20 of endof + + ( default ) ." Unimplemented video int - AH = " dup . cr rm-set-cf + endcase +; +: sysinfo-int ( -- ) h# 26 rm-ax! ; + +0 value disk-ih +: disk-read-sectors ( adr sector# #sectors -- #read ) + " read-blocks" disk-ih $call-method +; + +0 [if] +h# 200 constant /sector +: disk-seek ( sector# -- error? ) + /sector um* ( adr len d.byte# ) + " seek" disk-ih $call-method dup if ( error? ) + rm-set-cf 4 rm-ah! ( error? ) + then ( error? ) +; +: disk-read ( adr #sectors -- #sectors-read ) + /sector * ( adr #bytes ) + " read" disk-ih $call-method ( #bytes-read ) + /sector / ( #sectors-read ) +; +[then] + +: check-drive ( -- error? ) + rm-dl@ h# 80 <> if rm-set-cf 7 rm-ah! true exit then + disk-ih if false exit then +\ " disk:0" open-dev to disk-ih + " /ide@0" open-dev to disk-ih + disk-ih dup 0= if rm-set-cf h# aa rm-ah! then +; +: read-sectors ( -- ) + check-drive if exit then + disk-ih 0= if rm-set-cf h# aa rm-ah! exit then + rm-ch@ rm-cl@ 6 rshift bwjoin ( cylinder# ) + h# ff * rm-dh@ + ( trk# ) \ 255 heads + h# 3f * rm-cl@ h# 3f and 1- + ( sector# ) \ 63 is max sector# + + rm-bx@ caller-regs >rm-es w@ seg:off> ( sector# adr ) + swap rm-al@ ( adr sector# #sectors ) + disk-read-sectors rm-al! + +\ disk-seek if exit then +\ rm-bx@ caller-regs >rm-es w@ seg:off> rm-al@ ( adr #sectors ) +\ disk-read rm-al! +; +: drive-params ( -- ) + check-drive if exit then +\ " size" disk-ih $call-method ( d.#bytes ) +\ /sector um/mod nip ( #sectors ) + " #blocks" disk-ih $call-method ( #sectors ) + h# 3f / ( #tracks ) + h# ff / 1- ( maxcyl ) \ Max 255 heads is traditional + wbsplit ( maxcyl.lo maxcyl.hi ) + 3 min 6 lshift h# 3f or rm-cl! ( maxcyl.lo ) \ High cyl, max sector + rm-ch! ( ) \ Low byte of max cylinder + h# fe rm-dh! ( ) \ Max head number + h# 01 rm-dl! ( ) \ Number of drives + rm-clr-cf +; + +: lba-read ( -- ) + check-drive if exit then + caller-regs >rm-esi w@ caller-regs >rm-ds w@ seg:off> ( packet-adr ) + >r r@ 4 + seg:off@ r@ 8 + l@ r@ 2+ w@ disk-read-sectors r> 2+ w! +\ dup 8 + l@ ( packet-adr sector# ) +\ disk-seek if drop exit then ( packet-adr ) +\ dup 4 + seg:off@ over 2+ w@ ( packet-adr adr #sectors ) +\ disk-read +\ swap 2+ w! +; + +: check-disk-extensions ( -- ) + check-drive if 0 rm-bx! exit then + rm-bx@ h# 55aa <> if exit then + h# aa55 rm-bx! + h# 20 rm-ah! 1 rm-cx! +; + +: disk-int ( -- ) \ INT 13 handler + rm-ah@ case + h# 02 of read-sectors endof + h# 08 of drive-params endof + h# 41 of check-disk-extensions endof + h# 42 of lba-read endof + ( default ) ." Unsupported disk INT 13 - AH = " dup . cr + endcase +; + +: memory-limit ( -- limit ) + " /memory" find-package 0= abort" No /memory node" ( phandle ) + " available" rot get-package-property abort" No available property" ( $ ) + -1 >r ( $ ) ( r: limit ) + begin dup 0> while ( $ ) + decode-int >r decode-int r> + ( $ piece-end ) + dup 1meg u<= if drop else ( $ piece-end ) + r> umin >r ( $ ) ( r: limit' ) + then ( $ ) + repeat ( $ ) + 2drop r> ( limit ) +; + +: /1k d# 10 rshift ; +: bigmem-16bit ( -- ) + memory-limit + dup h# 100.0000 min h# 10.0000 - 0 max /1k dup rm-ax! rm-cx! + h# 100.0000 - 0 max d# 16 rshift dup rm-bx! rm-dx! +; +: bigmem-int ( -- ) + rm-clr-cf + rm-al@ case + h# 01 of bigmem-16bit endof +\ h# 20 of system-memory-map endof +\ h# 81 of pm-system-memory-map endof + ( default ) rm-set-cf + ." Unsupported Bigmem int 15 AH=e8 AL=" dup . cr + endcase +; + +: apm ( -- ) + ." APM not supported yet" cr + rm-set-cf h# 86 rm-ah! +; + +create sysconf 8 w, h# fc c, 1 c, 0 c, h# 70 c, 0 c, 0 c, +: get-conf ( -- ) + sysconf 'rm-regs 8 move + 'rm-regs >seg:off 0 caller-regs >rm-es w! rm-bx! +; + +: system-int ( -- ) \ INT 15 handler + rm-ah@ case + h# 53 of apm endof + h# 86 of rm-dx@ rm-cx@ wljoin us endof \ Delay microseconds + h# 8a of memory-limit h# 400.0000 - 0 max /1k lwsplit rm-dx! rm-ax! endof + h# 88 of h# fffc rm-ax! endof \ Extended memory - at least 64 MB + h# c0 of get-conf endof + h# c1 of rm-set-cf h# 86 rm-ah! endof + h# e8 of bigmem-int endof + ( default ) rm-set-cf + ." Unsupported INT 15 AH=" dup . cr + endcase +; + +: poll-key ( -- ) + key? if + key rm-al! 0 rm-ah! \ ASCII in AL, scancode in AH + rm-flags@ h# 40 invert and rm-flags! + else + rm-flags@ h# 40 or rm-flags! + then +; + +: keyboard-int ( -- ) \ INT 15 handler + rm-ah@ case + 1 of poll-key endof + 2 of 0 rm-al! endof \ Claim that no shift keys are active + ( bit 7:sysrq 6:capslock 5:numlock 4:scrlock 3:ralt 2:rctrl 1:lalt 0:lctrl ) + ( default ) ." Keyboard INT called with AH = " dup . cr + endcase +; + +: cfgadr ( -- adr ) + caller-regs >rm-edi c@ rm-bx@ 8 lshift or +; +: pcibios-installed ( -- ) + h# 20494350 caller-regs >rm-edx ! \ "PCI " in little-endian + 1 rm-al! \ Config method 1 + h# 201 rm-bx! \ Version 2.1 + 1 rm-cl! \ Number of last PCI bus - XXX get this from PCI node +; +: pcibios ( -- ) + rm-clr-cf + rm-ah@ case + h# 01 of pcibios-installed endof +\ h# 02 of find-pci-device ( cx:devid dx:vendid si:index -> bh:bus# bl:devfn ) endof +\ h# 03 of find-pci-class-code ( ecx:0,classcode si:index -> bh:bus# bl:devfn ) endof +\ h# 06 of pci-special-cycle ( bh:bus# edx:special_cycle_data ) endof + h# 08 of cfgadr config-b@ rm-cl! endof + h# 09 of cfgadr config-w@ rm-cx! endof + h# 0a of cfgadr config-l@ caller-regs >rm-ecx l! endof + h# 0b of rm-cl@ cfgadr config-b! endof + h# 0c of rm-cx@ cfgadr config-w! endof + h# 0d of caller-regs >rm-ecx l@ cfgadr config-l! endof + \ h# 0e of pci-int-rout endof + \ h# 0f of set-pci-int endof + + ( default ) h# 81 rm-ah! rm-set-cf + ." Unimplemented PCI BIOS INT - AH = " dup . cr + endcase +; + +: get-timer-ticks ( -- ) + get-msecs d# 55 / lwsplit rm-cx! rm-dx! + 0 rm-al! \ Should be nonzero if midnight happened since last call +; + +: int-1a ( -- ) + rm-ah@ case + h# 0 of get-timer-ticks endof + h# b1 of pcibios endof + ( default ) ." Unimplemented INT 1a - AH = " dup . rm-set-cf + endcase +; + +: showint + ." INT " 'rm-int w@ . ." AH " rm-ah@ . ." AL " rm-al@ . cr +; + : handle-bios-call ( -- ) - 'rm-sp seg:off@ w@ h# ff and ( int# ) - 'rm-sp w@ 2+ 'rm-sp w! ( int# ) - ." Interrupt " . cr - interact + 'rm-int w@ case + h# 10 of video-int endof + h# 11 of sysinfo-int endof + h# 13 of disk-int endof +showint + h# 12 of h# a0000 /1k rm-ax! endof \ Low memory size + h# 15 of system-int endof + h# 16 of keyboard-int endof + h# 1a of int-1a endof + ( default ) ." Interrupt " dup . cr interact + endcase ; : rm-go ( -- ) \ Load boot image at 7c00 @@ -212,3 +484,14 @@ h# 7c00 h# 3f 1 " read-blocks" r@ $call-method . r> close-dev ; +: .lreg ( adr -- adr' ) 4 - dup l@ 9 u.r ; +: .wreg ( adr -- adr' ) 2 - dup w@ 5 u.r ; +: .caller-regs ( -- ) + ." AX CX BX DX SP BP SI DI" cr + caller-regs >rm-eax 4 + 8 0 do .lreg loop cr + cr + ." DS ES FS GS PC FLAGS" cr + 4 0 do .wreg loop + caller-regs >rm-retaddr seg:off@ 9 u.r 2 spaces + caller-regs >rm-flags w@ 5 u.r cr +; Added: cpu/x86/pc/biosload/usb.fth =================================================================== --- cpu/x86/pc/biosload/usb.fth (rev 0) +++ cpu/x86/pc/biosload/usb.fth 2008-01-18 17:46:07 UTC (rev 781) @@ -0,0 +1,90 @@ +purpose: USB elaborations for the BIOS loaded OFW +\ See license at end of file + +0 config-int usb-delay \ Milliseconds to wait before set-address + +devalias u /usb/disk + +\ Like $show-devs, but ignores pagination keystrokes +: $nopage-show-devs ( nodename$ -- ) + ['] exit? behavior >r ['] false to exit? + $show-devs + r> to exit? +; + +: probe-usb ( -- ) + ." USB2 devices:" cr + " /usb@1d,7" open-dev ?dup if close-dev then + " /usb" $nopage-show-devs + + ." USB1 devices:" cr + " /usb@1d,3" open-dev ?dup if close-dev then + " /usb@1d,3" $nopage-show-devs + " /usb@1d,2" open-dev ?dup if close-dev then + " /usb@1d,2" $nopage-show-devs + " /usb@1d,1" open-dev ?dup if close-dev then + " /usb@1d,1" $nopage-show-devs + " /usb@1d,0" open-dev ?dup if close-dev then + " /usb@1d,0" $nopage-show-devs +; +alias p2 probe-usb + +: ?usb-keyboard ( -- ) + " keyboard" expand-alias if ( devspec$ ) + drop " /usb" comp 0= if ( ) + red-letters ." Using USB keyboard." cr black-letters + " keyboard" input + then + then +; + +\ Unlink every node whose phys.hi component matches port +: port-match? ( port -- flag ) + get-unit if drop false exit then + get-encoded-int = +; +: rm-usb-children ( port -- ) + device-context? 0= if drop exit then + also ( port ) + 'child ( port prev ) + first-child begin while ( port prev ) + over port-match? if ( port prev ) + 'peer link@ over link! ( port prev ) \ Disconnect + else ( port prev ) + drop 'peer ( port prev' ) + then ( port prev ) + next-child repeat ( port prev ) + 2drop ( ) + previous definitions +; + +: usb-quiet ( -- ) + [ ' go-hook behavior compile, ] \ Chain to old behavior + " usb1" " reset-usb" execute-device-method drop + " usb2" " reset-usb" execute-device-method drop +; +' usb-quiet to go-hook + +\ LICENSE_BEGIN +\ Copyright (c) 2007 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 Modified: cpu/x86/pc/resetend.fth =================================================================== --- cpu/x86/pc/resetend.fth 2008-01-18 17:38:46 UTC (rev 780) +++ cpu/x86/pc/resetend.fth 2008-01-18 17:46:07 UTC (rev 781) @@ -5,6 +5,8 @@ \ memory. [ifndef] qemu-loaded +[ifndef] syslinux-loaded +[ifndef] preof-loaded \ Move GDT to low memory. We use the first location at gdt-pa as \ scratch memory for sgdt, and put the actual gdt at gdt-pa + 0x10 gdt-pa # ax mov @@ -42,7 +44,6 @@ ax fs mov ax gs mov ax ss mov -[then] h# 20 # al mov al h# 80 # out @@ -50,6 +51,9 @@ gdt-pa /page round-up # ax mov \ Current low-memory high water mark ax mem-info-pa 2 la+ #) mov \ Store in memory info area [then] +[then] +[then] +[then] cld Modified: cpu/x86/pc/tsccal.fth =================================================================== --- cpu/x86/pc/tsccal.fth 2008-01-18 17:38:46 UTC (rev 780) +++ cpu/x86/pc/tsccal.fth 2008-01-18 17:46:07 UTC (rev 781) @@ -58,7 +58,8 @@ ; stand-init: Calibrating millisecond timer calibrate-ms -;\ LICENSE_BEGIN +; +\ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ \ Permission is hereby granted, free of charge, to any person obtaining

1 0

r780 - in dev/olpc: kb3700 spiflash
by svn＠openbios.org 18 Jan '08

18 Jan '08

Author: wmb Date: 2008-01-18 18:38:46 +0100 (Fri, 18 Jan 2008) New Revision: 780 Modified: dev/olpc/kb3700/battery.fth dev/olpc/spiflash/spiui.fth Log: OLPC Selftest enhancements - display manufacturing data and battery info in selftest. Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2008-01-18 06:49:42 UTC (rev 779) +++ dev/olpc/kb3700/battery.fth 2008-01-18 17:38:46 UTC (rev 780) @@ -117,6 +117,15 @@ ; \ send questions to andrew at gold peak +dev / +new-device +" battery" device-name +: selftest ( -- error? ) + .bat + false +; +finish-device +device-end \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks Modified: dev/olpc/spiflash/spiui.fth =================================================================== --- dev/olpc/spiflash/spiui.fth 2008-01-18 06:49:42 UTC (rev 779) +++ dev/olpc/spiflash/spiui.fth 2008-01-18 17:38:46 UTC (rev 780) @@ -282,6 +282,7 @@ [ifdef] dev dev /flash : selftest ( -- error? ) + .mfg-data slow-flash-read

1 0

r779 - cpu/x86/pc/olpc
by svn＠openbios.org 18 Jan '08

18 Jan '08

Author: wmb Date: 2008-01-18 07:49:42 +0100 (Fri, 18 Jan 2008) New Revision: 779 Modified: cpu/x86/pc/olpc/mfgdata.fth Log: OLPC trac 6080 - Fixed bug in mfg data tag scanner that was causing the keyboard driver to crash with a stack underflow when looking for the KA tag in a mfg data area that had been corrupted with a malformed long-data tag. The bug was a "3drop" that should have been a "2drop". Modified: cpu/x86/pc/olpc/mfgdata.fth =================================================================== --- cpu/x86/pc/olpc/mfgdata.fth 2008-01-17 09:19:13 UTC (rev 778) +++ cpu/x86/pc/olpc/mfgdata.fth 2008-01-18 06:49:42 UTC (rev 779) @@ -13,7 +13,7 @@ dup 4 - c@ dup h# 80 and if drop true exit then ( adr low ) over 5 - c@ dup h# 80 and if 2drop true exit then ( adr low high ) 2dup xor h# ff xor ( adr low high check ) - 3 pick 3 - c@ <> if 3drop true exit then ( adr low high ) + 3 pick 3 - c@ <> if 2drop true exit then ( adr low high ) 7 << + ( adr length ) - 5 - ( data-adr ) else \ Short (4-byte tag) format

1 0

Upgrade for OpenFirmware on Umax S900?
by Harmon Seaver 18 Jan '08

18 Jan '08

Is there any firmware upgrade available for this machine? It's running OF 1.0.5 right now. -- Harmon Seaver

1 0

r778 - cpu/x86/pc/biosload
by svn＠openbios.org 17 Jan '08

17 Jan '08

Author: wmb Date: 2008-01-17 10:19:13 +0100 (Thu, 17 Jan 2008) New Revision: 778 Added: cpu/x86/pc/biosload/callbios.fth cpu/x86/pc/biosload/rmenter.fth Log: x86 real mode support - initial checkin Added: cpu/x86/pc/biosload/callbios.fth =================================================================== --- cpu/x86/pc/biosload/callbios.fth (rev 0) +++ cpu/x86/pc/biosload/callbios.fth 2008-01-17 09:19:13 UTC (rev 778) @@ -0,0 +1,211 @@ +purpose: Call real-mode BIOS interrupts from protected mode + +\ For now we assume the following descriptors: +\ 08 - 16-bit code 0..ffff +\ 10 - 16-bit data 0..ffffffff +\ 18 - 16-bit data 0..ffff +\ 20 - 32-bit code 0..ffffffff +\ 28 - 32-bit data 0..ffffffff + +\ We assume that we can use memory from h# 200 to h# 3ff + +\ Bounce buffer at h# 90000 + +h# 8 constant rm-code-desc +h# 18 constant rm-data-desc +h# 20 constant pm-code-desc +h# 28 constant pm-data-desc + +h# 002 constant rm-flagval \ Flags for IRET + +\ Low-memory addresses +h# 200 constant rm-go \ Real mode enter code +h# 280 constant rm-return \ Real mode return code +h# 300 constant rm-idt \ For loading RM IDT with LIDT +h# 308 constant rm-sp \ For loading RM SP with LSS +h# 30c constant pm-sp-save \ Save/restore area for PM SP +h# 310 constant pm-gdt-save \ For loading PM GDT with LGDT +h# 318 constant pm-idt-save \ For loading PM IDT with LIDT +h# 3c0 constant rm-regs \ Real-mode register buffer (in/out) +rm-regs constant rm-gs +rm-gs wa1+ constant rm-fs +rm-fs wa1+ constant rm-es +rm-es wa1+ constant rm-ds +rm-ds wa1+ constant rm-di +rm-di la1+ constant rm-si +rm-si la1+ constant rm-bp +rm-bp la1+ constant rm-xx \ Would be stack pointer +rm-xx la1+ constant rm-bx +rm-bx la1+ constant rm-dx +rm-dx la1+ constant rm-cx +rm-cx la1+ constant rm-ax +rm-ax la1+ constant rm-flags +rm-flags la1+ constant rm-target \ Full pointer for RM call target address +rm-target la1+ constant rm-retloc \ Full pointer to rm-return +rm-retloc la1+ constant rm-rflags \ Flags in case of return via IRET + +label rmint-enter + real-mode + \ This must be copied to low memory + + rm-data-desc # ax mov \ 16-bit data segment + ax ds mov ax es mov ax fs mov ax gs mov ax ss mov + + pm-gdt-save #) sgdt \ So we can get back + pm-idt-save #) sidt \ So we can get back + + rm-idt #) lidt + cr0 ax mov h# fe # al and ax cr0 mov \ Enter real mode + + here 5 + rmint-enter - rm-go + 0 #) far jmp \ Jump to set cs + + \ Now we are running in real mode; fix segments again + cs ax mov ax ds mov ax es mov ax fs mov ax gs mov + + rm-sp #) sp lss + + \ Load the 16-bit registers from the rm-regs area + gs pop fs pop es pop ds pop op: popa op: popf + + far ret \ Now we are running the real-mode target code +end-code +here rmint-enter - constant /rmint-enter + +label rmint-exit + rm-target # sp mov \ Set the stack pointer to the top of the rm reg area + + \ Copy the real-mode registers to the buffer + op: pushf op: pusha ds push es push fs push gs push + + cli + cs ax mov ax ds mov + + op: pm-gdt-save #) lgdt + cr0 ax mov 1 # al or ax cr0 mov + + here 5 + rmint-exit - rm-return + pm-code-desc #) far jmp + + protected-mode + + pm-data-desc # ax mov ax ds mov ax es mov ax gs mov ax gs mov ax ss mov + pm-idt-save #) lidt + + pm-sp-save #) sp mov + popf + popa +c; +here rmint-exit - constant /rmint-exit + +\ Must set up the registers area with register values and the target address +code rm-call ( -- ) + pusha + pushf + + sp pm-sp-save #) mov + cld + cli + sp sp xor + rm-go rm-code-desc #) far jmp +c; + +: >seg:off ( linear -- offset segment ) lwsplit d# 12 lshift ; +: seg:off! ( linear adr -- ) >r >seg:off r@ 2+ w! r> w! ; + +0 value bios-prepped? +: ?prep-bios-call ( -- ) + bios-prepped? if exit then true to bios-prepped? + rmint-enter rm-go /rmint-enter move + rmint-exit rm-return /rmint-exit move + h# ffff rm-idt w! + 0 rm-idt 2+ l! + rm-regs rm-sp seg:off! \ Setup real-mode full pointer for lss + rm-return rm-retloc seg:off! \ Setup return address full pointer + rm-flagval rm-retloc 4 + w! \ Flags for return +; + +: dr + ." ax: " rm-ax ? 2 spaces + ." bx: " rm-bx ? 2 spaces + ." cx: " rm-cx ? 2 spaces + ." dx: " rm-dx ? 2 spaces + ." bp: " rm-bp ? 2 spaces + ." si: " rm-si ? 2 spaces + ." di: " rm-di ? 2 spaces +; + +: { ( int# -- ) ?prep-bios-call rm-regs d# 44 erase 4 * @ rm-target ! ; +: } rm-call ; + +: ax rm-ax ! ; +: ah rm-ax 1+ c! ; +: al rm-ax c! ; +: bx rm-bx l! ; +: cx rm-cx l! ; +: dx rm-dx l! ; +: cf@ rm-flags @ 1 and ; +: es:di >seg:off rm-es w! rm-di l! ; +: video-mode ( mode# -- ) + d# 55 set-tick-limit h# 10 { 3 al bx } d# 10 set-tick-limit +; +: text-mode 3 video-mode ; +: 1024x768x8 h# 105 video-mode ; +: 1024x768x16 h# 116 video-mode ; +: apm-connect16 h# 15 { h# 5302 ax 0 bx } ; +: apm-power-off apm-connect16 h# 15 { h# 5307 ax 1 bx 3 cx } ; +: bios-memsize ( -- n ) + h# 15 { h# e801 ax } + rm-ax @ h# 400 * rm-bx @ h# 10000 * + h# 100000 + +; +: .bios-memory-map ( -- ) + 0 + begin ( continuation ) + h# 15 { bx h# e820 ax h# 10000 es:di d# 20 cx " PAMS" drop @ dx } + rm-flags @ 1 and abort" Not supported" + rm-cx @ + h# 10000 rm-cx @ bounds ?do i @ 9 u.r 4 +loop cr + rm-bx @ ( continuation' ) + ?dup 0= until +; +: bios-config-b@ ( adr -- b ) lwsplit h# 1a { h# b108 ax bx rm-di ! } rm-cx @ ; +: bios-config-w@ ( adr -- w ) lwsplit h# 1a { h# b109 ax bx rm-di ! } rm-cx @ ; +: bios-config-l@ ( adr -- l ) lwsplit h# 1a { h# b10a ax bx rm-di ! } rm-cx @ ; +: bios-config-b! ( b adr -- ) lwsplit h# 1a { h# b10b ax bx rm-di ! rm-cx ! } ; +: bios-config-w! ( w adr -- ) lwsplit h# 1a { h# b10c ax bx rm-di ! rm-cx ! } ; +: bios-config-l! ( l adr -- ) lwsplit h# 1a { h# b10d ax bx rm-di ! rm-cx ! } ; +: disk-status ( -- stat ) h# 13 { h# 0100 ax } rm-ax @ ; +0 value sect/trk +0 value trk/head +0 value #heads +: get-drive-params ( -- ) + h# 13 { 8 ah h# 80 dx } + rm-flags @ 1 and if true exit then + rm-cx @ wbsplit ( cl ch ) + over h# 3f and to sect/trk ( cl ch ) + swap 6 rshift bwjoin 1+ to trk/head ( ) + rm-dx @ 8 rshift 1+ to #heads ( ) +; +: #drive-sectors ( -- n ) + h# 13 { h# 15 ah h# 80 dx } + rm-dx @ rm-cx @ wljoin +; +: reset-disks ( -- ) h# 13 { 0 ah h# 80 dx } ; +: reset-hard-disks ( -- ) h# 13 { h# 0d ah h# 80 dx } ; +: do-rw ( sector1 cyl0 head0 drive0 #sectors ah-val -- ) + h# 13 { ah al ( sector1 cyl0 head0 drive0 ) + swap bwjoin dx ( sector1 cyl0 ) + wbsplit ( sector1 cyl.lo cyl.hi ) + 6 lshift rot or ( cyl.lo cyl.hi|sector ) + swap bwjoin cx + h# 10000 >seg:off rm-es w! bx + } +; +: read-sectors ( sector1 cyl0 head0 drive0 #sectors -- ) 2 do-rw ; +: write-sectors ( sector1 cyl0 head0 drive0 #sectors -- ) 3 do-rw ; + +: lbn>sch ( lbn -- sector cyl head ) + sect/trk /mod swap 1+ swap ( sector rem ) + trk/head /mod ( sector cyl head ) + dup #heads > abort" LBN out of range" +; +: lbn-read-sectors ( lbn drive #sectors -- ) 2>r lbn>sch 2r> read-sectors ; +: lbn-write-sectors ( lbn drive #sectors -- ) 2>r lbn>sch 2r> write-sectors ; Added: cpu/x86/pc/biosload/rmenter.fth =================================================================== --- cpu/x86/pc/biosload/rmenter.fth (rev 0) +++ cpu/x86/pc/biosload/rmenter.fth 2008-01-17 09:19:13 UTC (rev 778) @@ -0,0 +1,214 @@ +: >seg:off ( linear -- offset segment ) lwsplit d# 12 lshift ; +: seg:off! ( linear adr -- ) >r >seg:off r@ wa1+ w! r> w! ; +: seg:off> ( offset segment -- linear ) 4 lshift + ; +: seg:off@ ( adr -- linear ) dup w@ swap wa1+ w@ seg:off> ; + +h# 8 constant rm-cs +h# 18 constant rm-ds +h# 20 constant pm-cs +h# 28 constant pm-ds + +h# 0.0000 constant rm-base +: +rm ( offset -- adr ) rm-base + ; + +\ Place for the initial registers upon entry to real mode. +\ The real-mode stack pointer will start here +h# f00 +rm constant 'rm-regs +\ (00) 4 * 2: GS,FS,ES,DS +\ (08) 8 * 4: EDI,ESI,EBP,ESP,EBX,EDX,ECX,EAX +\ (28) 1 * 4: CS:IP of return address +\ (2c) 1 * 2: flags +\ size is 2e + +h# f30 +rm constant 'rm-idt \ For loading RM IDT with LIDT +h# f38 +rm constant 'rm-sp \ SS:SP For loading RM SP with LSS +h# f3c +rm constant 'pm-sp \ Save/restore area for PM SP +h# f40 +rm constant 'pm-gdt \ For loading PM GDT with LGDT +h# f48 +rm constant 'pm-idt \ For loading PM IDT with LGDT + +h# f50 +rm constant 'rm-to-pm +h# fa0 +rm constant 'pm-to-rm +h# ff0 +rm constant 'rm-enter + +: caller-regs 'rm-sp seg:off@ ; +struct + 2 field >rm-gs + 2 field >rm-fs + 2 field >rm-es + 2 field >rm-ds + 4 field >rm-edi + 4 field >rm-esi + 4 field >rm-ebp + 4 field >rm-exx + 4 field >rm-ebx + 4 field >rm-edx + 4 field >rm-ecx + 4 field >rm-eax + 4 field >rm-retaddr + 2 field >rm-flags +drop + +: rm-ah@ caller-regs >rm-eax 1+ c@ ; +: rm-ah! caller-regs >rm-eax 1+ c! ; +: rm-al@ caller-regs >rm-eax c@ ; +: rm-al! caller-regs >rm-eax c! ; +: rm-ax@ caller-regs >rm-eax w@ ; +: rm-ax! caller-regs >rm-eax w! ; +: rm-dh@ caller-regs >rm-edx 1+ c@ ; +: rm-dh! caller-regs >rm-edx 1+ c! ; +: rm-dl@ caller-regs >rm-edx c@ ; +: rm-dl! caller-regs >rm-edx c! ; +: rm-dx@ caller-regs >rm-edx w@ ; +: rm-dx! caller-regs >rm-edx w! ; + +: rm-set-cf caller-regs >rm-flags dup w@ 1 or swap w! ; +: rm-clr-cf caller-regs >rm-flags dup w@ 1 or swap w! ; + +\ 80ff0 is the target address of the interrupt vector +\ We use different segment:offset representations of that address in +\ the vector table, so the handler code can determine the vector +\ number by inspecting the code segment register value +\ 00: 8000:0ff0 +\ 01: 8001:0fe0 +\ ... +\ ff: 80ff:0000 + +: make-vector-table ( -- ) + h# 100 0 do + h# ff0 i 4 lshift - i /l* w! \ Set offset + rm-base 4 rshift i + i /l* wa1+ w! \ Set segment + loop +; + +label rm-to-pm + real-mode + + \ Stack: (high address) + \ flags (from INT) + \ CS:IP return address (from INT) + \ (low) EDI,ESI,EBP,ESP,EBX,EDX,ECX,EAX (high) + \ (low) GS,FS,ES,DS (high) + \ CS for vector + + cli \ This is unnecessary since we got here from an INT + cs push ds pop + + sp 'rm-sp #) mov + ss 'rm-sp 2+ #) mov + + op: 'pm-gdt #) lgdt + cr0 ax mov 1 # al or ax cr0 mov \ Enter protected mode + + here 5 + rm-to-pm - 'rm-to-pm + pm-cs #) far jmp + + protected-mode + + ax ax xor pm-ds # al mov ax ds mov ax es mov ax gs mov ax gs mov ax ss mov + 'rm-idt #) sidt + 'pm-idt #) lidt + 'pm-sp #) sp mov + + popa + popf +c; +here rm-to-pm - constant /rm-to-pm + +label pm-to-rm + \ Interrupts must be off. We don't have a stack at the moment. + \ 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 + \ The assembler uses "real-mode" to mean "16-bit code". + real-mode + + \ This must be copied to low memory + + ax ax xor rm-ds # al mov \ 16-bit data segment + ax ds mov ax es mov ax fs mov ax gs mov ax ss mov + + 'pm-gdt #) sgdt \ So we can get back + 'pm-idt #) sidt \ So we can get back + 'rm-idt #) lidt + cr0 ax mov h# fe # al and ax cr0 mov \ Enter real mode + + here 5 + pm-to-rm - 'pm-to-rm + >seg:off #) far jmp \ Jump to set cs + + \ Now we are running in real mode; fix segments again + cs ax mov ax ds mov ax es mov ax fs mov ax gs mov + + 'rm-sp #) sp lss \ Now we are back on the caller stack + + \ Load the 16-bit registers from the rm-regs area + gs pop fs pop es pop ds pop op: popa + + iret \ Now we are back to the caller +end-code +here pm-to-rm - constant /pm-to-rm + +code rm-return ( -- ) + protected-mode + pushf + pusha + sp 'pm-sp #) mov + + cli + sp sp xor + 'pm-to-rm rm-cs #) far jmp +end-code + +\ This is the common target of all the real-mode interrupt vectors. +\ It lives at 8.0ff0. Upon entry, the code segment register contains +\ 80xx where xx is the vector number, and the IP contains 0yy0 where +\ yy is ff - vector_number. +label rm-enter + real-mode + op: pusha ds push es push fs push gs push + cs push \ Save the Code Segment value + 'rm-to-pm >seg:off #) far jmp \ Normalize the CS value + protected-mode +end-code +here rm-enter - constant /rm-enter + +h# 400 buffer: saved-rm-vectors + +0 value rm-prepped? +: prep-rm ( -- ) + rm-prepped? if exit then true to rm-prepped? + 0 saved-rm-vectors h# 400 move + make-vector-table + + rm-enter 'rm-enter /rm-enter move + rm-to-pm 'rm-to-pm /rm-to-pm move + pm-to-rm 'pm-to-rm /pm-to-rm move + + h# ffff 'rm-idt w! 0 'rm-idt wa1+ l! \ Limit and base +; + +: rm-init-program ( pc -- ) + prep-rm + 'rm-regs h# 2e erase ( pc ) + 'rm-regs h# 28 + seg:off! ( ) + 'rm-regs 'rm-sp seg:off! \ Initial stack pointer below regs +; + +: handle-bios-call ( -- ) + 'rm-sp seg:off@ w@ h# ff and ( int# ) + 'rm-sp w@ 2+ 'rm-sp w! ( int# ) + ." Interrupt " . cr + interact +; +: rm-go ( -- ) + \ Load boot image at 7c00 + h# 7c00 rm-init-program + begin + rm-return + handle-bios-call + again +; +label xx h# 99 # al mov al h# 80 # out begin again end-code +here xx - constant /xx +: put-xx ( adr -- ) xx swap /xx move ; +: get-mbr + " /ide@0" open-dev >r + h# 7c00 h# 3f 1 " read-blocks" r@ $call-method . + r> close-dev +;

1 0

r777 - cpu/x86
by svn＠openbios.org 17 Jan '08

17 Jan '08

Author: wmb Date: 2008-01-17 10:17:08 +0100 (Thu, 17 Jan 2008) New Revision: 777 Modified: cpu/x86/assem.fth cpu/x86/disassem.fth Log: x86 assembler/disassembler - Fixed several bugs in 16-bit mode. Modified: cpu/x86/assem.fth =================================================================== --- cpu/x86/assem.fth 2008-01-12 17:22:24 UTC (rev 776) +++ cpu/x86/assem.fth 2008-01-17 09:17:08 UTC (rev 777) @@ -119,7 +119,7 @@ 10 2 32REGS [EAX] [ECX] [EDX] [EBX] [ESP] [EBP] [ESI] [EDI] 3 2 pmREGS [AX] [CX] [DX] - 2 4 pmreg [SP] + 2 4 32reg [SP] 6 3 REGS ES CS SS DS FS GS 3 4 REGS # #) S#) @@ -240,7 +240,7 @@ \ Assemble mod-r/m byte and s-i-b byte if necessary : SOP, ( mr rmid mod -- ) - protected? if + 16bit? 0= if 2 pick [SIB] = if ( [SIB] rmid mod ) [ESP] -rot mod-rm, ( [SIB] ) \ Scaled index mode drop ( ) @@ -263,11 +263,11 @@ \ (nonexistent) "<no-displacement> [EBP]" mode. OVER #) = IF - protected? if 5 else 6 then + 16bit? if 6 else 5 then swap 0 mod-rm, DROP ADR, EXIT THEN ( disp mr rmid ) - protected? if + 16bit? 0= if \ Special case for "0 [EBP]" ; use short 0 displacement \ instead of [EBP] (there is no [EBP] addressing mode \ because that encoding is used for 32-bit displacement.) @@ -329,6 +329,8 @@ \ 2MI define ascii adjust instructions. : 2MI CREATE C, DOES> C@ ASM8, 12 ASM8, normal ; +: prefix-0f h# 0f asm8, ; + \ 3MI define branch instructions, with one or two bytes of offset. : 3MI \ conditional branches ( op -- ) create c, @@ -337,7 +339,7 @@ dup small? if ( op disp8 ) swap asm8, asm8, else ( op disp ) - h# 0f asm8, swap h# 10 + asm8, + prefix-0f swap h# 10 + asm8, real? if 2 else 4 then - adr, then normal @@ -345,7 +347,7 @@ \ 4MI define LDS, LEA, LES instructions. : 4MI CREATE C, - DOES> C@ dup h# b2 h# b5 between if h# 0f asm8, then ASM8, MEM, + DOES> C@ dup h# b2 h# b5 between if prefix-0f then ASM8, MEM, normal ; @@ -455,7 +457,7 @@ ELSE ( dst apf ) 1+ OVER SEG? IF ( dst apf' ) \ Segment register OVER FS >= IF ( dst apf' ) \ FS or GS - H# 0F ASM8, 3 + C@ ( dst opcode ) + prefix-0f 3 + C@ ( dst opcode ) SWAP GS = IF 10 OR THEN ( opcode' ) ASM8, ( ) ELSE ( dst apf' ) \ CS, DS, ES, or SS @@ -528,7 +530,7 @@ 2 1 15mi lgdt 3 1 15mi lidt 2 0 15mi lldt 3 0 15mi ltr \ LSS, LFS, LGS -: 16MI CREATE C, DOES> C@ H# 0F ASM8, ASM8, MEM, normal ; +: 16MI CREATE C, DOES> C@ prefix-0f ASM8, MEM, normal ; \ TEST bits in dest : TEST (S source dest -- ) @@ -580,7 +582,7 @@ \ 0x22 for normal->special direction, 0x20 for special->normal direction \ or with 0 for CRx, 1 for DRx, 4 for TRx : special-mov ( s d -- ) - h# 0f asm8, + prefix-0f [ also forth ] dup spec? if h# 22 else swap h# 20 then ( norm-reg spec-reg opcode ) over o# 7000 and case @@ -634,6 +636,10 @@ ; : MOV (MOV) normal ; +\ Use "byte movsx" for the r8 form, "movsx" for the r16 form +: movsx ( r/m r -- ) prefix-0f h# be size, r/m, ; +: movzx ( r/m r -- ) prefix-0f h# b6 size, r/m, ; + \ Most instructions are defined here. Those mnemonics in \ parenthetic comments are defined earlier or not at all. @@ -681,12 +687,12 @@ 9B 1MI WAIT ( XCHG ) D7 1MI XLAT 30 13MI XOR C2 14MI +RET -: invd ( -- ) h# 0f asm8, h# 08 asm8, ; -: wbinvd ( -- ) h# 0f asm8, h# 09 asm8, ; -: wrmsr ( -- ) h# 0f asm8, h# 30 asm8, ; -: rdtsc ( -- ) h# 0f asm8, h# 31 asm8, ; -: rdmsr ( -- ) h# 0f asm8, h# 32 asm8, ; -: cpuid ( -- ) h# 0f asm8, h# a2 asm8, ; \ Arg in %eax, results in ax,bx,dx,cx +: invd ( -- ) prefix-0f h# 08 asm8, ; +: wbinvd ( -- ) prefix-0f h# 09 asm8, ; +: wrmsr ( -- ) prefix-0f h# 30 asm8, ; +: rdtsc ( -- ) prefix-0f h# 31 asm8, ; +: rdmsr ( -- ) prefix-0f h# 32 asm8, ; +: cpuid ( -- ) prefix-0f h# a2 asm8, ; \ Arg in %eax, results in ax,bx,dx,cx \ Structured Conditionals \ single pass forces fixed size. optimize for small, fast structures: @@ -720,7 +726,7 @@ drop here 2+ + ( addr ) #) jmp else - h# 0f asm8, h# 10 + asm8, ( offset ) + prefix-0f h# 10 + asm8, ( offset ) real? if 2 else 4 then - adr, then then @@ -739,7 +745,7 @@ dup h# eb = if drop h# e9 asm8, else - h# 0f asm8, h# 10 + asm8, + prefix-0f h# 10 + asm8, then real? if 0 asm16, else 0 asm32, then else Modified: cpu/x86/disassem.fth =================================================================== --- cpu/x86/disassem.fth 2008-01-12 17:22:24 UTC (rev 776) +++ cpu/x86/disassem.fth 2008-01-17 09:17:08 UTC (rev 777) @@ -28,7 +28,7 @@ true value op32? : opv@ ( -- l | w ) op32? if op32@ else op16@ then ; true value ad32? -: adv@ ( -- l | w ) ad32? if op32@ else op16@ wext then ; +: adv@ ( -- l | w ) ad32? if op32@ else op16@ then ; : dis16 ( -- ) false is op32? false is ad32? ; : dis32 ( -- ) true is op32? true is ad32? ; \ XXX We should also change the register names e.g. from "eax" to "ax" @@ -60,7 +60,7 @@ case 0 of " " exit endof 1 of op8@ bext dup 0>= if ?+ then endof - 2 of ?+ adv@ endof + 2 of ?+ adv@ wext endof endcase (u.) disp-buf pack count ; @@ -80,7 +80,7 @@ ," eax" ," ecx" ," edx" ," ebx" ," esp" ," ebp" ," esi" ," edi" end-string-array -: >reg ( -- adr len ) >regw count ; +: >reg ( -- adr len ) >regw count op32? 0= if 1 /string then ; : >greg ( -- adr len ) wbit if >reg else >reg8 count then ; @@ -101,8 +101,10 @@ >scale count $add-text ( ) then ( ) ; +: .[ " [" $add-text ; +: .] " ]" $add-text ; : add-disp ( sib? reg mod -- ) - " [" $add-text ( sib? reg mod ) + .[ ( sib? reg mod ) 2dup 0<> swap 5 <> or if ( sib? reg mod ) \ D32 swap >reg $add-text ( sib? mod ) else ( sib? reg mod ) @@ -110,9 +112,53 @@ then ( sib? mod ) swap if get-scaled then ( mod ) get-disp $add-text ( ) - " ]" $add-text ( ) + .] ( ) ; +: .ea32 ( reg mod -- ) + >r ( reg r: mod ) + dup 4 = if ( reg ) \ s-i-b + drop get-op true lowbits ( true reg ) + else ( reg ) \ displaced + false swap ( false reg ) + then ( sib? reg ) + r> add-disp +; + +string-array modes16 + ," [bx+si]" + ," [bx+di]" + ," [bp+si]" + ," [bp+di]" + ," [si]" + ," [di]" + ," [bp]" + ," [bx]" +end-string-array + +: add-disp16 ( disp -- ) + h# ffff and (u.) disp-buf pack count $add-text +; +: +disp16 ( disp -- ) + dup 0< if + " -" $add-text negate + else + " +" $add-text + then + add-disp16 +; + +: .ea16 ( reg mod -- ) + over 6 = over 0= and if ( reg mod ) + \ disp16 only, takes the place of the [bp] mode + 2drop op16@ .[ add-disp16 .] exit + then ( reg mod ) + swap modes16 count $add-text ( mod ) + case + 1 of op8@ +disp16 endof + 2 of op16@ +disp16 endof + endcase +; : .ea ( -- ) " " ea-text place lowbits hibits >r ( reg ) ( r: mod ) @@ -120,12 +166,7 @@ >greg $add-text ( ) r> drop ea-text ". exit then ( reg ) - dup 4 = if ( reg ) \ s-i-b - drop get-op true lowbits ( true reg ) - else ( reg ) \ displaced - false swap ( false reg ) - then ( sib? reg ) - r> add-disp + r> ad32? if .ea32 else .ea16 then ea-text ". ; : ,ea ( -- ) ., .ea ; @@ -133,7 +174,7 @@ \ Display formatting variable start-column -: op-col ( -- ) start-column @ d# 8 + #out @ - 0 max spaces ; +: op-col ( -- ) start-column @ d# 9 + #out @ - 1 max spaces ; string-array >segment ," es" ," cs" ," ss" ," ds" ," fs" ," gs" @@ -164,7 +205,7 @@ : iub ( -- ) op8@ (.) type ; : iw ( -- ) op16@ (.) type ; : iv ( -- ) opv@ (.) type ; -: iuv ( -- ) opv@ (u.) type ; +: iuv ( -- ) adv@ (u.) type ; : ,ib/v ( -- ) ., wbit if opv@ else op8@ then (u.) type ; : al/x ( -- ) wbit if ." eax" else ." al" then ; : ,al/x ( -- ) ., al/x ; @@ -186,8 +227,18 @@ ," s" ," ns" ," pe" ," po" ," l" ," ge" ," le" ," g" end-string-array -: jb ( -- ) op8@ bext pc @ + dup branch-target ! showaddr ; -: jv ( -- ) adv@ pc @ + dup branch-target ! showaddr ; +: showbranch ( offset -- ) + pc @ ad32? if ( offset pc ) + + ( pc' ) + else ( offset pc ) + lwsplit -rot ( pc.high offset pc.low ) + + h# ffff and ( pc.high pc.low' ) + swap wljoin ( pc' ) + then ( pc' ) + dup branch-target ! showaddr +; +: jb ( -- ) op8@ bext showbranch ; +: jv ( -- ) adv@ showbranch ; : .jcc ( -- ) ." j" low4bits >cond ". op-col jb ; : ea,g ( -- ) get-ea .ea ., gb/v ; @@ -404,7 +455,12 @@ endcase ; -: ap ( -- ) adv@ ." far " op16@ .x ." :" showaddr ; +: .4x ( n -- ) push-hex <# u# u# u# u# u#> type pop-base ; +: ap ( -- ) + adv@ ." far " + op16@ push-hex (.) type pop-base + ." :" ad32? if showaddr else .4x then +; string-array >8line-ops ," cwde" ," cdq" ," call" ," wait" ," pushfd" ," popfd" ," sahf" ," lahf"

1 0

r776 - clients/lib/x86
by svn＠openbios.org 12 Jan '08

12 Jan '08

Author: wmb Date: 2008-01-12 18:22:24 +0100 (Sat, 12 Jan 2008) New Revision: 776 Modified: clients/lib/x86/makefile Log: Client demo "hello" makefile - added cc flags to force 32 bit compilation. Modified: clients/lib/x86/makefile =================================================================== --- clients/lib/x86/makefile 2008-01-07 09:31:33 UTC (rev 775) +++ clients/lib/x86/makefile 2008-01-12 17:22:24 UTC (rev 776) @@ -3,7 +3,7 @@ # -fno-builtin has the effect of suppressing some warnings about # functions that conflict with gcc builtins CC=gcc -CFLAGS=-g -fno-builtin +CFLAGS=-g -m32 -fno-builtin -fno-stack-protector all: libobp.a hello hello.elf start.o @@ -56,13 +56,16 @@ # Hello is a demo program that uses the stdio library hello.elf: libobp.a start.o hello.o - ld -Bstatic -N -Ttext 0x100000 -o $@ start.o hello.o libobp.a -lc + ld -melf_i386 -Bstatic -N -Ttext 0x100000 -o $@ start.o hello.o libobp.a -lc cp hello.elf hello.syms strip hello.elf hello.o: ../../hello/hello.c ${CC} ${CFLAGS} -c ../../hello/hello.c +hello: hello.o + ${CC} -m32 $< -o $@ + # Binary to ELF converter program bintoelf: ../bintoelf.c

1 0

open BIOS for SM722 Graphics controller(Linux)
by mahendra varman 10 Jan '08

10 Jan '08

Hi I have a SM722 graphics controller based PMC card . At present Iam using the card with a base board which contains Powerpc processor. The card need to be mounted with a BIOS chip.. I have contacted Siliconmotion they have only Bios file of x86 based .. Is there any open bios available which supports SM722 basic bios setup and that supports powerpc processor for Linux? Help me on the above Thanks

2 2

r775 - cpu/x86/pc/olpc
by svn＠openbios.org 07 Jan '08

07 Jan '08

Author: wmb Date: 2008-01-07 10:31:33 +0100 (Mon, 07 Jan 2008) New Revision: 775 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2D08 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-01-07 09:10:33 UTC (rev 774) +++ cpu/x86/pc/olpc/versions.fth 2008-01-07 09:31:33 UTC (rev 775) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 07 +macro: FW_MINOR 08 \ The EC microcode macro: EC_VERSION test4e @@ -16,7 +16,7 @@ \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 -macro: WLAN_VERSION 5.110.20.p42 +macro: WLAN_VERSION 5.110.20.p49 \ The bios_verify image macro: CRYPTO_VERSION 0.2

1 0

r774 - cpu/x86/pc/olpc dev/olpc/cafenand ofw/core
by svn＠openbios.org 07 Jan '08

07 Jan '08

Author: wmb Date: 2008-01-07 10:10:33 +0100 (Mon, 07 Jan 2008) New Revision: 774 Modified: cpu/x86/pc/olpc/gamekeys.fth dev/olpc/cafenand/selftest.fth ofw/core/ofwcore.fth Log: OLPC trac 5853 - more improvements in selftest display: 1) Added the ability to pause the test-all progress by holding down the "rotate" game button 2) Noted in the nandflash test that a few bad blocks is normal Modified: cpu/x86/pc/olpc/gamekeys.fth =================================================================== --- cpu/x86/pc/olpc/gamekeys.fth 2008-01-05 23:48:04 UTC (rev 773) +++ cpu/x86/pc/olpc/gamekeys.fth 2008-01-07 09:10:33 UTC (rev 774) @@ -44,3 +44,20 @@ then ; : game-key? ( mask -- flag ) game-key-mask and 0<> ; + +: (hold-message) ( ms -- ) + d# 100 / ( decisecs ) + begin dup while ( decisecs ) + dup d# 10 /mod swap if drop else (cr .d then ( decisecs ) + d# 100 ms ( decisecs ) + 1- ( decisecs ) + button-rotate game-key@ and if ( decisecs ) + (cr ." Release the game button to continue" + begin button-rotate game-key@ and while d# 100 ms repeat + (cr kill-line + drop exit + then + repeat + drop (cr kill-line +; +' (hold-message) to hold-message Modified: dev/olpc/cafenand/selftest.fth =================================================================== --- dev/olpc/cafenand/selftest.fth 2008-01-05 23:48:04 UTC (rev 773) +++ dev/olpc/cafenand/selftest.fth 2008-01-07 09:10:33 UTC (rev 774) @@ -17,9 +17,10 @@ : #fixbbt++ ( -- ) #fixbbt 1+ to #fixbbt ; : .#fixbbt ( -- ) - (cr ." # bad blocks " - fixbbt? if ." marked" else ." found" then - ." = " #fixbbt .d cr + (cr + #fixbbt ?dup if .d else ." No " then + ." new bad blocks " + fixbbt? if ." marked" else ." found" then cr ; : record-err ( error? -- ) noop @@ -305,6 +306,7 @@ : selftest ( -- error? ) open 0= if true exit then get-msecs rn ! + ." Note: a few bad blocks is normal - these are already known:" cr show-bbt cr (selftest) close Modified: ofw/core/ofwcore.fth =================================================================== --- ofw/core/ofwcore.fth 2008-01-05 23:48:04 UTC (rev 773) +++ ofw/core/ofwcore.fth 2008-01-07 09:10:33 UTC (rev 774) @@ -3193,6 +3193,9 @@ ['] do-method? scan-subtree ; +defer hold-message +' ms to hold-message + : most-tests ( -- ) method-name 2@ current-device (search-wordlist) if ( xt ) @@ -3212,19 +3215,20 @@ execute-phandle-method if ( result ) ?dup if red-letters - ??cr ." Selftest failed. Return code = " .d cr cr - d# 10000 ms + ??cr ." Selftest failed. Return code = " .d cr black-letters + d# 10000 hold-message else green-letters - ." Okay" cr cr d# 3000 ms + ." Okay" cr black-letters + d# 2000 hold-message then else red-letters ." Selftest failed due to abort" cr - d# 10000 ms black-letters + d# 10000 hold-message then then ( ) ;

1 0

r773 - ofw/inet
by svn＠openbios.org 06 Jan '08

06 Jan '08

Author: wmb Date: 2008-01-06 00:48:04 +0100 (Sun, 06 Jan 2008) New Revision: 773 Modified: ofw/inet/pop3.fth Log: UI improvements in the POP3 demonstration code (not used by most builds). Modified: ofw/inet/pop3.fth =================================================================== --- ofw/inet/pop3.fth 2008-01-05 23:45:20 UTC (rev 772) +++ ofw/inet/pop3.fth 2008-01-05 23:48:04 UTC (rev 773) @@ -33,13 +33,24 @@ : send-one ( $ -- ok? ) >mail-buffer " +OK" send ( ok? ) ; : send-two ( $2 $1 -- ok? ) >mail-buffer mail-append " +OK" send ( ok? ) ; -: send-user-name ( -- ok? ) - " pop-user" $getenv drop ( adr len ) - " USER " send-two ( ok? ) +: get-password ( -- adr len ) + pad 0 + begin ( adr len ) + key case + carret of exit then + bs of 1- 0 max 2dup + 0 swap c! then + + \ default ( adr len char ) + over d# 32 >= abort" Password too long" ( adr len char ) + 3dup -rot + c! ( adr len char ) + swap 1+ swap ( adr len' char ) + endcase ( adr len ) + again ; : send-password ( -- ok? ) - " pop-password" $getenv drop ( adr len ) - " PASS " send-two ( ok? ) + ." Password: " get-password ( adr len ) + 2dup " PASS " send-two ( adr len ok? ) + -rot erase \ Don't leak password ( ok? ) ; : number? ( b -- ascii? ) @@ -73,12 +84,12 @@ while d# 10 * pop3-buf tbuf-ptr + c@ h# 0f and + - +pop3-buf + +tbuf repeat ( # ) ; : get-num ( -- ) - 0 to pop3-buf-ptr + 0 to tbuf-ptr begin begin key? until key dup emit ( key ) @@ -166,61 +177,36 @@ quit-mail drop ; -: rmail ( -- ) +: open-rmail-connection ( server$ -- ) + debug-mail? if ." Opening TCP stack..." cr then ( server$ ) - false + " tcp" open-dev to tcp-ih ( server$ ) + tcp-ih 0= abort" Failed to open tcp stack!" ( server$ ) - " pop-server" $getenv if - cr - ." Missing pop-server environment variable" cr - ." Use ""$setenv"" to set the pop-server name:" cr - ." "" <servername>"" "" pop-server"" $setenv" cr - drop true - else 2drop then - - " pop-user" $getenv if - cr - ." Missing pop-user environment variable" cr - ." Use ""$setenv"" to set the pop-user name:" cr - ." "" <username>"" "" pop-user"" $setenv" cr - drop true - else 2drop then - - " pop-password" $getenv if - cr - ." Missing pop-password environment variable" cr - ." Use ""$setenv"" to set the pop-password name:" cr - ." "" <password>"" "" pop-password"" $setenv" cr - drop true - else 2drop then - - if exit then - - debug-mail? if ." Opening TCP stack..." cr then - - " tcp" open-dev to tcp-ih - tcp-ih 0= if ." Failed to open tcp stack!" exit then - - allocate-mail-buffer + allocate-mail-buffer ( server$ ) - " pop-server" $getenv drop open-pop3-connection 0= if - close-pop3 exit + open-pop3-connection 0= if ( ) + ." Can't connect to POP3 server" + close-pop3 abort then debug-mail? if ." Connection established" cr then verify-pop3 0= if debug-mail? if ." Connection did not verify" cr then - close-pop3 exit + close-pop3 abort then +; +: authenticate-rmail ( user$ -- ) debug-mail? if ." Sending USER name..." cr then - send-user-name if + + " USER " send-two if debug-mail? if ." USER accepted" cr then else debug-mail? if ." Bad USER" cr then close-pop3 - exit + abort then debug-mail? if ." Sending password..." cr then @@ -229,9 +215,14 @@ else debug-mail? if ." Bad Password" cr then close-pop3 - exit + abort then +; +: (rmail) ( user$ server$ -- ) + open-rmail-connection ( user$ ) + authenticate-rmail ( ) + debug-mail? if ." Getting status..." cr then 0 to #messages get-status if @@ -247,17 +238,10 @@ close-pop3 ; -: (show-pop3) ( adr len -- ) - 2dup $getenv if missing-var else - 2swap type ." : " type cr - then +: rmail ( "server" "user" -- ) + safe-parse-word safe-parse-word 2swap (rmail) ; -: show-pop3 ( -- ) - " pop-server" (show-pop3) - " pop-user" (show-pop3) - " pop-password" (show-pop3) -; \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r772 - dev/usb2/device/wlan
by svn＠openbios.org 06 Jan '08

06 Jan '08

Author: wmb Date: 2008-01-06 00:45:20 +0100 (Sun, 06 Jan 2008) New Revision: 772 Modified: dev/usb2/device/wlan/usb8388.fth Log: OLPC wireless LAN driver - added some status report message text for previously-undefined message codes. Modified: dev/usb2/device/wlan/usb8388.fth =================================================================== --- dev/usb2/device/wlan/usb8388.fth 2008-01-05 23:43:26 UTC (rev 771) +++ dev/usb2/device/wlan/usb8388.fth 2008-01-05 23:45:20 UTC (rev 772) @@ -392,8 +392,12 @@ : process-ind ( adr len -- ) drop 4 + le-l@ case - h# 03 of " Link Loss" .event process-disconnect endof + h# 00 of " Tx PPA Free" .event endof \ n + h# 01 of " Tx DMA Done" .event endof \ n + h# 02 of " Link Loss with scan" .event process-disconnect endof + h# 03 of " Link Loss no scan" .event process-disconnect endof h# 04 of " Link Sensed" .event endof + h# 05 of " CMD Finished" .event endof h# 06 of " MIB Changed" .event endof h# 07 of " Init Done" .event endof h# 08 of " Deauthenticated" .event process-disconnect endof @@ -402,6 +406,7 @@ h# 0b of " Sleep" .event process-wakeup endof h# 0d of " Multicast MIC error" .event process-gmic-failure endof h# 0e of " Unicast MIC error" .event process-pmic-failure endof + h# 0e of " WM awake" .event endof \ n h# 11 of " HWAC - adhoc BCN lost" .event endof h# 19 of " RSSI low" .event endof h# 1a of " SNR low" .event endof @@ -410,6 +415,7 @@ h# 1d of " SNR high" .event endof h# 23 of endof \ Suppress this; the user doesn't need to see it \ h# 23 of ." Mesh auto-started" endof + h# 30 of " Firmware ready" .event endof ( default ) ." Unknown " dup u. endcase ; @@ -1057,7 +1063,7 @@ outbuf-bulk-out if false exit then wait-cmd-resp if false exit then - respbuf >fw-data 2 + le-w@ ?dup if + respbuf >fw-data 2 + le-w@ ?dup if \ This is the IEEE Status Code ." Failed to associate: " u. cr false else

1 0

r771 - cpu/x86/pc/olpc
by svn＠openbios.org 06 Jan '08

06 Jan '08

Author: wmb Date: 2008-01-06 00:43:26 +0100 (Sun, 06 Jan 2008) New Revision: 771 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC security - Guard some game-key functions against unexpected aborts, just in case. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-01-05 23:41:28 UTC (rev 770) +++ cpu/x86/pc/olpc/fw.bth 2008-01-05 23:43:26 UTC (rev 771) @@ -512,19 +512,26 @@ : ?games ( -- ) rocker-right game-key? if ec-indexed-io-off - time&date 5drop 1 and if pong else life-demo then + time&date 5drop 1 and if + ['] pong guarded + else + ['] life-demo guarded + then + power-off then ; : ?diags ( -- ) rocker-left game-key? if ec-indexed-io-off - text-on " test-all" eval + text-on " test-all" ['] eval guarded ." Tests complete - powering off" cr d# 5000 ms power-off then ; : ?scan-nand ( -- ) - rocker-up game-key? if ec-indexed-io-off text-on scan-nand then + rocker-up game-key? if + ec-indexed-io-off text-on ['] scan-nand guarded + then ; : ?fs-update ( -- ) button-check button-x or button-o or button-square or ( mask )

1 0

r770 - dev/olpc/cafenand
by svn＠openbios.org 06 Jan '08

06 Jan '08

Author: wmb Date: 2008-01-06 00:41:28 +0100 (Sun, 06 Jan 2008) New Revision: 770 Modified: dev/olpc/cafenand/cafenand.fth dev/olpc/cafenand/selftest.fth Log: OLPC trac 5868 - Preserve extra (non-ECC) out of band data when restoring tested blocks in the /nandflash selftest. Modified: dev/olpc/cafenand/cafenand.fth =================================================================== --- dev/olpc/cafenand/cafenand.fth 2008-01-05 23:37:48 UTC (rev 769) +++ dev/olpc/cafenand/cafenand.fth 2008-01-05 23:41:28 UTC (rev 770) @@ -260,14 +260,13 @@ ; [then] -: dma-write-raw ( adr len page# offset -- ) +: dma-write-raw ( adr len page# offset -- error? ) write-enable ( adr len page# offset ) set-page ( adr len ) dup false dma-setup ( ) write-cmd h# 110 cmd wait-cmd ( ) wait-write-done ( error? ) dma-release ( error? ) - drop ; : dma-write-page ( adr page# -- error? ) \ Size is fixed @@ -283,14 +282,15 @@ : write-bytes ( adr len page# offset -- error? ) pio-write-raw ; 3 value #erase-adr-bytes \ Chip dependent -: erase-block ( page# -- ) +: (erase-block) ( page# -- error? ) write-enable set-erase-page h# 20.0060 0 #erase-adr-bytes >cmd h# 1d0 cmd wait-write-done ( error? ) - drop ; +: erase-block ( page# -- ) (erase-block) drop ; + : read-id ( -- adr ) 8 0 0 h# c420.0090 0 generic-read ; : send-reset-cmd ( -- ) Modified: dev/olpc/cafenand/selftest.fth =================================================================== --- dev/olpc/cafenand/selftest.fth 2008-01-05 23:37:48 UTC (rev 769) +++ dev/olpc/cafenand/selftest.fth 2008-01-05 23:41:28 UTC (rev 770) @@ -13,6 +13,8 @@ false value fixbbt? \ Flag to determine whether to mark bad eblocks false value selftest-err? \ Selftest result +: /oobbuf ( -- n ) /oob pages/eblock * ; + : #fixbbt++ ( -- ) #fixbbt 1+ to #fixbbt ; : .#fixbbt ( -- ) (cr ." # bad blocks " @@ -32,11 +34,13 @@ then ; +0 value oobbuf \ Original content of OOB 0 value sbuf \ Original content of block 0 value obuf \ Block data written 0 value ibuf \ Block data read : alloc-test-bufs ( -- ) sbuf 0= if + /oobbuf alloc-mem to oobbuf erase-size alloc-mem to sbuf erase-size alloc-mem to obuf erase-size alloc-mem to ibuf @@ -44,6 +48,7 @@ ; : free-test-bufs ( -- ) sbuf if + oobbuf /oobbuf free-mem 0 to oobbuf sbuf erase-size free-mem 0 to sbuf obuf erase-size free-mem 0 to obuf ibuf erase-size free-mem 0 to ibuf @@ -54,10 +59,70 @@ dup if ." SAVE" cr then ; : write-eblock ( adr page# -- error? ) - dup erase-block - pages/eblock write-blocks pages/eblock <> - dup if ." RESTORE" cr then + dup (erase-block) if 2drop true exit then ( adr page# ) + over /eblock erased? if ( adr page# ) + 2drop false + else ( adr page# ) + pages/eblock write-blocks pages/eblock <> + dup if ." RESTORE" cr then + then ; + +: read-raw-eblock ( adr page# -- error? ) + pages/eblock bounds ?do ( adr ) + dup /dma-buf i 0 dma-write-raw if ( adr ) + drop true unloop exit + then + /dma-buf + + loop ( adr ) + drop false +; + +: save-eblock ( page# -- error? ) + sbuf over read-eblock dup record-err if ( page# ) + drop true exit + then ( page# ) + oobbuf swap ( adr page# ) + pages/eblock bounds ?do ( adr ) + dup /oob i /page pio-read ( adr ) + /oob + ( adr' ) + loop ( adr ) + drop false +; +: berased? ( adr len -- flag ) + bounds ?do + i c@ h# ff <> if false unloop exit then + loop + true +; +: restore-eblock ( page# -- ) + sbuf over write-eblock dup record-err if ( page# ) + drop exit ( page# ) + then ( page# ) + + oobbuf /ecc + swap ( adr page# ) + pages/eblock bounds ?do ( adr ) + dup /oob /ecc - berased? 0= if ( adr ) + dup /oob /ecc - i /page /ecc + ( adr adr len page# offset ) + pio-write-raw record-err ( adr ) + then ( adr ) + /oob + ( adr' ) + loop ( adr ) + drop ( ) +; + + + +: write-raw-eblock ( adr page# -- error? ) + dup (erase-block) if 2drop true exit then ( adr page# ) + pages/eblock bounds ?do ( adr ) + dup /dma-buf i 0 dma-write-raw if ( adr ) + drop true unloop exit + then + /dma-buf + + loop ( adr ) + drop false +; : test-eblock ( page# pattern -- error? ) obuf erase-size 2 pick fill ibuf erase-size rot invert fill @@ -98,20 +163,22 @@ 0 of 0 endof 1 of usable-page-limit 1- endof ( default ) random-page swap - endcase ( block# ) - pages/eblock 1- invert and ( block#' ) + endcase ( page# ) + pages/eblock 1- invert and ( page#' ) - dup block-bad? if ( block#' ) + dup block-bad? if ( page#' ) drop ( ) - else ( block#' ) - dup to cur-eblock - (cr dup . - sbuf over read-eblock dup record-err 0= if - dup h# 55 test-eblock record-err - dup h# aa test-eblock record-err - dup h# ff test-eblock record-err - then - sbuf swap write-eblock record-err + else ( page#' ) + dup to cur-eblock ( page#' ) + (cr dup . ( page#' ) + dup save-eblock if ( page# ) + drop ( ) + else ( page# ) + dup h# 55 test-eblock record-err ( page# ) + dup h# aa test-eblock record-err ( page# ) + dup h# ff test-eblock record-err ( page# ) + restore-eblock ( ) + then ( ) then loop @@ -146,18 +213,18 @@ parse-full-args ( #blk blk# ) 2dup .full-arg ( #blk blk# ) - pages/eblock * swap 1+ pages/eblock * ( page# #page ) - usable-page-limit rot ?do ( #blk+1 ) - i block-bad? not if - i to cur-eblock - (cr i . - sbuf i read-eblock dup record-err 0= if - i h# 55 test-eblock record-err - i h# aa test-eblock record-err - then - sbuf i write-eblock record-err - then - dup +loop drop + pages/eblock * swap 1+ pages/eblock * ( page# stride ) + usable-page-limit rot ?do ( stride ) + i block-bad? 0= if ( stride ) + i to cur-eblock ( stride ) + (cr i . ( stride ) + i save-eblock 0= if ( stride ) + i h# 55 test-eblock record-err ( stride ) + i h# aa test-eblock record-err ( stride ) + restore-eblock ( stride ) + then ( stride ) + then ( stride ) + dup +loop drop ( ) .#fixbbt ;

1 0

r769 - dev/olpc/cafenand
by svn＠openbios.org 06 Jan '08

06 Jan '08

Author: wmb Date: 2008-01-06 00:37:48 +0100 (Sun, 06 Jan 2008) New Revision: 769 Modified: dev/olpc/cafenand/badblock.fth dev/olpc/cafenand/redboot.fth Log: OLPC trac 5870 - More NAND error handling improvements. Modified: dev/olpc/cafenand/badblock.fth =================================================================== --- dev/olpc/cafenand/badblock.fth 2008-01-05 22:43:38 UTC (rev 768) +++ dev/olpc/cafenand/badblock.fth 2008-01-05 23:37:48 UTC (rev 769) @@ -27,6 +27,7 @@ \ Returns true if the block containing page# is bad : block-bad? ( page# -- flag ) + bbt 0= if drop false exit then >bbt ( adr mask ) tuck swap c@ and ( mask masked-byte ) <> @@ -184,6 +185,9 @@ bbt0 if bbt0 read-bbt-pages 0= if exit then then bbt1 if bbt1 read-bbt-pages 0= if exit then then + bbt0 bbt1 or if + ." Both bad block tables are unreadable" cr + then release-bbt ; @@ -234,7 +238,7 @@ \ Get the existing bad block table, or make a new one if necessary : get-bbt ( -- ) get-existing-bbt - bbt 0= if + bbt0 bbt1 or 0= if ." No bad block table; making one" cr make-bbt then @@ -306,7 +310,7 @@ : (wipe) ( 'show-bad 'show-erased 'show-bbt -- ) partition# 0= if get-existing-bbt - bbt 0= if + bbt0 bbt1 or 0= if \ If there is no existing bad block table, make one from factory info make-bbt then ( 'show-bad 'show-erased 'show-bbt ) Modified: dev/olpc/cafenand/redboot.fth =================================================================== --- dev/olpc/cafenand/redboot.fth 2008-01-05 22:43:38 UTC (rev 768) +++ dev/olpc/cafenand/redboot.fth 2008-01-05 23:37:48 UTC (rev 769) @@ -17,23 +17,12 @@ d# 256 constant /partition-entry d# 8 constant max#partitions -: partition-map-page# ( -- page# ) -[ifdef] notdef - bbt1 if - bbt1 bbt0 if bbt0 min then ( bbtn ) - else ( ) - bbt0 dup 0= abort" No Bad Block Table" ( bbt0 ) - then ( last-bbt-page# ) - begin pages/eblock - dup while ( part-page# ) - dup block-bad? 0= if exit then ( part-page# ) - repeat -[else] +: partition-map-page# ( -- true | page# false ) h# 10 pages/eblock * 0 do - i block-bad? 0= if i unloop exit then + i block-bad? 0= if i false unloop exit then pages/eblock +loop -[then] - - true abort" No place for partition map" + ." No place for partition map" + true ; : (#partitions) ( adr -- n ) @@ -55,11 +44,11 @@ 0 instance value #partitions : read-partmap ( -- ) - part-buf partition-map-page# + part-buf partition-map-page# if exit then partition-start >r 0 to partition-start read-page r> to partition-start - if true exit then + if exit then part-buf (#partitions) to #partitions ;

1 0

r768 - cpu/x86/pc/olpc dev/olpc/cafenand
by svn＠openbios.org 05 Jan '08

05 Jan '08

Author: wmb Date: 2008-01-05 23:43:38 +0100 (Sat, 05 Jan 2008) New Revision: 768 Modified: cpu/x86/pc/olpc/copynand.fth dev/olpc/cafenand/badblock.fth Log: OLPC trac 5870 - Improve error handling in NAND driver. Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2008-01-05 01:06:40 UTC (rev 767) +++ cpu/x86/pc/olpc/copynand.fth 2008-01-05 22:43:38 UTC (rev 768) @@ -269,7 +269,8 @@ #image-eblocks 0 ?do (cr i . read-image-block - load-base /nand-block + " read-next-block" $call-nand ( ) + load-base /nand-block + " read-next-block" $call-nand ( end? ) + " More image file blocks than NAND blocks" ?nand-abort ( ) load-base load-base /nand-block + /nand-block comp if ( ) cr ." Miscompare in block starting at page# " ( ) " scan-page#" $call-nand .x cr ( ) @@ -310,8 +311,8 @@ #crc-records 0 ?do (cr i . - load-base " read-next-block" $call-nand ( ) - + load-base " read-next-block" $call-nand ( end? ) + " More CRC records than NAND blocks" ?nand-abort ( ) load-base /nand-block $crc i >crc l@ ( actual-crc expected-crc ) 2dup <> if ( actual-crc expected-crc ) cr ." CRC miscompare - expected " . ." got " . ( ) Modified: dev/olpc/cafenand/badblock.fth =================================================================== --- dev/olpc/cafenand/badblock.fth 2008-01-05 01:06:40 UTC (rev 767) +++ dev/olpc/cafenand/badblock.fth 2008-01-05 22:43:38 UTC (rev 768) @@ -162,17 +162,17 @@ ; \ Read the bad block table from NAND to memory -: read-bbt-pages ( page# -- ) +: read-bbt-pages ( page# -- error? ) bbt swap /bbt /page / ( adr page# #pages ) \ Can't use read-blocks because of block-bad? dependency bounds ?do ( adr ) dup i read-page if ( adr ) ." BBT has uncorrectable errors" cr - abort + drop true unloop exit then ( adr ) /page + ( adr' ) loop ( adr ) - drop + drop false ; \ Find a bad block table @@ -181,8 +181,8 @@ alloc-bbt find-existing-bbt - bbt0 if bbt0 read-bbt-pages exit then - bbt1 if bbt1 read-bbt-pages exit then + bbt0 if bbt0 read-bbt-pages 0= if exit then then + bbt1 if bbt1 read-bbt-pages 0= if exit then then release-bbt ; @@ -348,7 +348,7 @@ headers -: (next-page#) ( -- true | page# false ) +: next-page# ( -- true | page# false ) partition-size scan-page# pages/eblock + ?do i block-bad? 0= if i to scan-page# @@ -357,9 +357,6 @@ pages/eblock +loop true ; -: next-page# ( -- page# ) - (next-page#) if ." No more good NAND blocks" cr abort then -; 0 value test-page @@ -397,7 +394,7 @@ ; : copy-block ( adr -- page# error? ) - begin (next-page#) 0= while ( adr page# ) + begin next-page# 0= while ( adr page# ) 2dup copy&check if nip partition-start + false exit then ( adr page# ) \ Error; retry once dup erase-block ( adr page# ) @@ -417,21 +414,22 @@ r> drop ; : put-cleanmarkers ( show-xt -- ) - begin (next-page#) 0= while ( show-xt page# ) + begin next-page# 0= while ( show-xt page# ) dup put-cleanmarker ( show-xt page# ) partition-start + pages/eblock / over execute ( show-xt ) repeat ( show-xt ) drop ; -: read-next-block ( adr -- ) - next-page# pages/eblock bounds ?do ( adr ) +: read-next-block ( adr -- no-more? ) + next-page# if drop true exit then ( adr page# ) + pages/eblock bounds ?do ( adr ) dup i read-page if ( adr ) ." Uncorrectable error in page 0x" i .x cr then /page + ( adr' ) loop ( adr ) - drop ( ) + drop false ( flag ) ; \ : start-verify ( -- )

1 0

r767 - cpu/x86/pc/olpc
by svn＠openbios.org 05 Jan '08

05 Jan '08

Author: wmb Date: 2008-01-05 02:06:40 +0100 (Sat, 05 Jan 2008) New Revision: 767 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC - Disable EC indexed I/O before some game-key functions just in case. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-01-05 00:43:59 UTC (rev 766) +++ cpu/x86/pc/olpc/fw.bth 2008-01-05 01:06:40 UTC (rev 767) @@ -511,24 +511,24 @@ : ?games ( -- ) rocker-right game-key? if + ec-indexed-io-off time&date 5drop 1 and if pong else life-demo then then ; : ?diags ( -- ) rocker-left game-key? if + ec-indexed-io-off text-on " test-all" eval ." Tests complete - powering off" cr d# 5000 ms power-off then ; : ?scan-nand ( -- ) - rocker-up game-key? if text-on scan-nand then + rocker-up game-key? if ec-indexed-io-off text-on scan-nand then ; : ?fs-update ( -- ) button-check button-x or button-o or button-square or ( mask ) - game-key-mask = if - try-fs-update - then + game-key-mask = if ec-indexed-io-off try-fs-update then ; : open-keyboard ( -- ) " keyboard" open-dev ?dup if set-stdin then

1 0

r766 - dev/mmc/sdhci ofw/core
by svn＠openbios.org 05 Jan '08

05 Jan '08

Author: wmb Date: 2008-01-05 01:43:59 +0100 (Sat, 05 Jan 2008) New Revision: 766 Modified: dev/mmc/sdhci/selftest.fth ofw/core/ofwcore.fth Log: OLPC trac 5853 - Improved messages from test-all diagnostics. Modified: dev/mmc/sdhci/selftest.fth =================================================================== --- dev/mmc/sdhci/selftest.fth 2008-01-05 00:39:52 UTC (rev 765) +++ dev/mmc/sdhci/selftest.fth 2008-01-05 00:43:59 UTC (rev 766) @@ -26,15 +26,18 @@ ibuf obuf /block comp ; +: (selftest) ( -- error? ) + sbuf 0 read-block if true exit then + 0 h# 5a test-block if true exit then + 0 h# a5 test-block if true exit then + sbuf 0 write-block \ Restore original content +; external : selftest ( -- error? ) open 0= if ." Open /sd failed" cr true exit then attach-card 0= if ." No card inserted" cr close false exit then alloc-test-bufs - sbuf 0 read-block if free-test-bufs close true exit then - 0 h# 5a test-block if free-test-bufs close true exit then - 0 h# a5 test-block if free-test-bufs close true exit then - sbuf 0 write-block \ Restore original content + ['] (selftest) catch if true then free-test-bufs close ; Modified: ofw/core/ofwcore.fth =================================================================== --- ofw/core/ofwcore.fth 2008-01-05 00:39:52 UTC (rev 765) +++ ofw/core/ofwcore.fth 2008-01-05 00:43:59 UTC (rev 766) @@ -3209,15 +3209,23 @@ ??cr ." Testing " pwd method-name 2@ current-device ( method-adr,len phandle ) - execute-phandle-method drop ( result ) - - ?dup if + execute-phandle-method if ( result ) + ?dup if + red-letters + ??cr ." Selftest failed. Return code = " .d cr cr + d# 10000 ms + black-letters + else + green-letters + ." Okay" cr cr d# 3000 ms + black-letters + then + else red-letters - ??cr ." Selftest failed. Return code = " .d cr + ." Selftest failed due to abort" cr d# 10000 ms black-letters then - then ( ) ;

1 0

r765 - cpu/x86/pc/olpc
by svn＠openbios.org 05 Jan '08

05 Jan '08

Author: wmb Date: 2008-01-05 01:39:52 +0100 (Sat, 05 Jan 2008) New Revision: 765 Modified: cpu/x86/pc/olpc/gamekeys.fth Log: OLPC trac 5585 - Stack cleanup for game key status display. Modified: cpu/x86/pc/olpc/gamekeys.fth =================================================================== --- cpu/x86/pc/olpc/gamekeys.fth 2008-01-04 00:31:23 UTC (rev 764) +++ cpu/x86/pc/olpc/gamekeys.fth 2008-01-05 00:39:52 UTC (rev 765) @@ -27,6 +27,7 @@ button-square 7 3 show-key button-check d# 11 3 show-key button-x 9 4 show-key + drop ; : read-game-keys ( -- )

1 0

r764 - cpu/x86/pc/olpc
by svn＠openbios.org 04 Jan '08

04 Jan '08

Author: wmb Date: 2008-01-04 01:31:23 +0100 (Fri, 04 Jan 2008) New Revision: 764 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC trac 5692 - Elaborated the "EC problem - remove all power" message. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-01-02 23:30:27 UTC (rev 763) +++ cpu/x86/pc/olpc/fw.bth 2008-01-04 00:31:23 UTC (rev 764) @@ -555,7 +555,8 @@ ?resume-botch board-revision 0= if - ." EC problem - remove all power and restart" cr + ." EC problem - disconnect the battery and AC adapter," cr + ." reconnect them, and restart." cr begin again then

1 0

r763 - forth/wrapper
by svn＠openbios.org 03 Jan '08

03 Jan '08

Author: wmb Date: 2008-01-03 00:30:27 +0100 (Thu, 03 Jan 2008) New Revision: 763 Modified: forth/wrapper/logger.c forth/wrapper/wrapper.c Log: This goes with svn 761 - I missed a couple of files in the checkin list. Modified: forth/wrapper/logger.c =================================================================== --- forth/wrapper/logger.c 2008-01-02 23:29:23 UTC (rev 762) +++ forth/wrapper/logger.c 2008-01-02 23:30:27 UTC (rev 763) @@ -227,7 +227,7 @@ #endif char cwdbuf[MAXPATHLEN*2]; -#ifdef UNIX +#ifdef __unix__ #ifdef MAJC char *hostname = "some_MAJC_machine"; #else @@ -235,17 +235,21 @@ (void) gethostname(hostname, 64); #endif #endif + #ifdef DOS char *hostname = "some_NT_machine"; #endif + #ifdef WIN32 char hostname[MAX_COMPUTERNAME_LENGTH+1]; long hostnamelen = MAX_COMPUTERNAME_LENGTH+1; (void) GetComputerName(hostname, &hostnamelen); #endif + #ifdef MACOS char *hostname = "some_Macintosh"; #endif + #ifdef USE_STDIO char *hostname = "some_machine"; #endif Modified: forth/wrapper/wrapper.c =================================================================== --- forth/wrapper/wrapper.c 2008-01-02 23:29:23 UTC (rev 762) +++ forth/wrapper/wrapper.c 2008-01-02 23:30:27 UTC (rev 763) @@ -55,29 +55,11 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#ifdef UNIX -#include <sys/mman.h> -#include <sys/mman.h> -#include <limits.h> /* for PAGESIZE */ -#ifndef PAGESIZE -#define PAGESIZE 4096 + +#ifdef __linux__ +char *host_os = "Linux"; +#define SYS5 1 #endif -#ifdef MAJC -#include <sys/unistd.h> -#else -#define HAVE_PSIGNAL -#include <unistd.h> -#endif -#include <sys/param.h> -#endif -#ifdef MACOS -#include <events.h> -#include <files.h> -#include <console.h> -#endif -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> #ifdef WIN32 #define ENV_DELIM ';' @@ -153,21 +135,12 @@ #define HOST_LITTLE_ENDIAN #endif -#ifdef __linux__ -char *host_os = "Linux"; -#define SYS5 1 #ifdef HOSTPOWERPC -#define LinuxPOWERPC char *host_cpu = "powerpc"; -#else -# ifdef __i386__ -# ifndef CKERNEL -# define LinuxX86 -# define HOST_LITTLE_ENDIAN -# endif +# ifdef __linux__ +# define LinuxPOWERPC # endif #endif -#endif #ifdef NT char *host_os = "nt"; @@ -202,8 +175,14 @@ #define START_OFFSET 4 #endif -#ifdef X86 +#ifdef __i386__ char *host_cpu = "x86"; +# ifndef CKERNEL +# define HOST_LITTLE_ENDIAN +# endif +#endif + +#ifdef TARGET_X86 char *target_cpu = "x86"; #define CPU_MAGIC 0x4d503400 #define START_OFFSET 0 @@ -220,95 +199,121 @@ #include <errno.h> +#ifdef __unix__ +# include <sys/mman.h> +# include <sys/mman.h> +# include <limits.h> /* for PAGESIZE */ +# ifndef PAGESIZE +# define PAGESIZE 4096 +# endif +# ifdef MAJC +# include <sys/unistd.h> +# else +# define HAVE_PSIGNAL +# include <unistd.h> +# endif +# include <sys/param.h> +#endif + +#ifdef MACOS +# include <events.h> +# include <files.h> +# include <console.h> +#endif + +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> + typedef long quadlet; #ifdef WIN32 -#include <windows.h> +# include <windows.h> #endif #ifdef BSD -#include <sys/time.h> -#include <sys/ioctl.h> /* For FIONREAD */ +# include <sys/time.h> +# include <sys/ioctl.h> /* For FIONREAD */ #endif #ifdef SYS5 -#define USE_TERMIOS +# define USE_TERMIOS #endif #ifdef BSD -#define USE_TERMIOS +# define USE_TERMIOS #endif #ifdef DEMON -#define USE_STDIO +# define USE_STDIO #endif #ifdef USE_STDIO -#include <stdio.h> +# include <stdio.h> #endif /* fcntl.h will define this if the system needs it; otherwise we use 0 */ #ifndef _O_BINARY -#ifdef O_BINARY -#define _O_BINARY O_BINARY -#else -#define _O_BINARY 0 +# ifdef O_BINARY +# define _O_BINARY O_BINARY +# else +# define _O_BINARY 0 +# endif #endif -#endif #ifndef MAXPATHLEN -#define MAXPATHLEN 256 +# define MAXPATHLEN 256 #endif #include <signal.h> #ifdef TARGET_POWERPC -#ifdef LinuxPOWERPC -#define NOGLUE -#else -extern void glue(); +# ifdef LinuxPOWERPC +# define NOGLUE +# else + extern void glue(); +# endif #endif -#endif #ifdef AIX -extern void _sync_cache_range(char *, long); + extern void _sync_cache_range(char *, long); #endif -#ifdef UNIX -INTERNAL void exit_handler(); +#ifdef __unix__ + INTERNAL void exit_handler(); # ifdef BSD -INTERNAL void cont_handler(); -INTERNAL void stop_handler(); + INTERNAL void cont_handler(); + INTERNAL void stop_handler(); # endif #endif #ifdef WIN32 -#define isatty _isatty -#define kbhit _kbhit -#define getch _getch -#define open _open -#define close _close -#define read _read -#define write _write -#define lseek _lseek -#define unlink _unlink -#define access _access -#define stat _stat -#define getcwd _getcwd -#define chdir _chdir +# define isatty _isatty +# define kbhit _kbhit +# define getch _getch +# define open _open +# define close _close +# define read _read +# define write _write +# define lseek _lseek +# define unlink _unlink +# define access _access +# define stat _stat +# define getcwd _getcwd +# define chdir _chdir -INTERNAL int getnum(char *); -INTERNAL void error(char *, char*); + INTERNAL int getnum(char *); + INTERNAL void error(char *, char*); #else -INTERNAL void error(); + INTERNAL void error(); #endif extern char *rootname(); extern char *basename(); #ifndef LinuxPOWERPC -extern int read(), write(); + extern int read(), write(); #endif INTERNAL char * substr(); @@ -322,13 +327,14 @@ INTERNAL long f_ioctl(); INTERNAL long f_lseek(); INTERNAL long f_crstr(); + #ifdef PPCSIM -/* These are not INTERNAL because the PowerPC simulator uses then */ + /* These are not INTERNAL because the PowerPC simulator uses then */ long c_key(); long s_bye(); #else -INTERNAL long c_key(); -INTERNAL long s_bye(); + INTERNAL long c_key(); + INTERNAL long s_bye(); #endif INTERNAL long c_emit(); @@ -378,15 +384,16 @@ #ifdef JTAG #include "jtag.h" #endif + #if defined (BSD) || defined (__linux__) INTERNAL long s_timeofday(); #endif + #if defined(USE_TERMIOS) INTERNAL long c_setraw(), c_setbaud(), c_setparity(), c_setattr(); INTERNAL long c_getattr(), c_drain(); #endif - long nop() { @@ -442,7 +449,7 @@ pathname, /* 156 */ -#ifdef UNIX +#ifdef __unix__ m_sbrk, #else nop, @@ -470,6 +477,7 @@ f_mkdir, f_rmdir, /* 200 */ s_getwd0, + #ifdef WIN32 #include "win32fun.c" #include "jtagfun.c" @@ -477,18 +485,21 @@ /* Windows socket stuff 204 .. 264 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, #endif + #ifdef JTAG #include "jtagfun.c" #else /* 268 .. 344 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, #endif + #if defined(BSD) || defined(__linux__) /* 348 */ s_timeofday, #else 0, #endif + #if defined(USE_TERMIOS) /* 352 356 360 364 368 372*/ c_setraw, c_setbaud, c_setparity, c_getattr, c_setattr, c_drain, @@ -536,7 +547,7 @@ * failed system call. */ -#ifdef X86 +#ifdef TARGET_X86 void fsyscall(long callno, long *args) { @@ -611,7 +622,7 @@ } #endif -#ifdef X86 +#ifdef TARGET_X86 int bittest(char *table, int index) { int quot, remain ; @@ -774,7 +785,7 @@ int extrak; char * dictfile; char *targv[10]; -#ifdef X86 +#ifdef TARGET_X86 char *reloc_table ; int delta_org, old_org, code_size ; int code_wsize, cold_code, i ; @@ -860,7 +871,7 @@ exit(1); } -#ifdef X86 +#ifdef TARGET_X86 /* * XXX we should do an additional test to verify that it's * really a Forthmacs dictionary file and not just some other @@ -988,7 +999,7 @@ keymode(); -#ifdef UNIX +#ifdef __unix__ signal(SIGHUP,exit_handler); signal(SIGINT,exit_handler); signal(SIGILL,exit_handler); @@ -1018,7 +1029,7 @@ argc, argv, 1 /* 0=POWER, 1=PowerPC */); #else s_flushcache(loadaddr, dictsize); /* We're about to execute data! */ -# ifdef X86 +# ifdef TARGET_X86 { int (*codep)(); /* There is a pointer to the startup code at offset 0x18 */ @@ -1146,7 +1157,7 @@ s_bye(0L); } else { restoremode(); -#ifdef UNIX +#ifdef __unix__ kill(0,SIGQUIT); #endif } @@ -1173,13 +1184,13 @@ } #endif -#ifdef LinuxX86 +#if defined(__linux__) && defined(__i386__) #include <sys/io.h> #endif INTERNAL long s_ioperm(unsigned long from, unsigned long num, unsigned long on) { -#ifdef LinuxX86 +#if defined(__linux__) && defined(__i386__) return (long)ioperm(from, num, (int)on); #else return -1L; @@ -1205,7 +1216,7 @@ int nchars = 0; fflush(stdout); -# ifdef UNIX +# ifdef __unix__ # ifdef SYS5 # ifdef __linux__ no_waitchar (0); @@ -1703,7 +1714,7 @@ INTERNAL long syserror() { -#ifndef UNIX +#ifndef __unix__ extern int errno; #endif @@ -1716,7 +1727,7 @@ pr_error(errnum) long errnum; { -#ifndef UNIX +#ifndef __unix__ extern int errno; #endif @@ -1792,7 +1803,7 @@ output_fd = result; } #else -#ifdef UNIX +#ifdef __unix__ result = open(expand_name(name), O_RDWR|O_CREAT|O_TRUNC, (int)mode); #else result = open(expand_name(name), _O_BINARY|O_RDWR|O_CREAT|O_TRUNC, (int)mode); @@ -1905,7 +1916,7 @@ long fd, code; char *buf; { -#ifdef UNIX +#ifdef __unix__ return((long)ioctl((int)fd, (int)code, buf)); #else return((long)-1); @@ -2160,7 +2171,7 @@ return((long)mem); } -#ifdef UNIX +#ifdef __unix__ INTERNAL long m_sbrk(size) long size;

1 0

r762 - cpu/x86/pc/olpc
by svn＠openbios.org 03 Jan '08

03 Jan '08

Author: wmb Date: 2008-01-03 00:29:23 +0100 (Thu, 03 Jan 2008) New Revision: 762 Modified: cpu/x86/pc/olpc/gamekeys.fth Log: OLPC game key display - changed "o" to "." for non-pressed keys, thus making it clearer which keys are down. Modified: cpu/x86/pc/olpc/gamekeys.fth =================================================================== --- cpu/x86/pc/olpc/gamekeys.fth 2008-01-02 23:28:13 UTC (rev 761) +++ cpu/x86/pc/olpc/gamekeys.fth 2008-01-02 23:29:23 UTC (rev 762) @@ -13,7 +13,7 @@ 0 value game-key-mask : show-key ( mask x y -- ) - at-xy game-key-mask and if ." *" else ." o" then + at-xy game-key-mask and if ." *" else ." ." then ; : update-game-keys ( mask -- ) dup game-key-mask or to game-key-mask

1 0

r761 - in cpu: ppc/Linux ppc/build x86/Linux
by svn＠openbios.org 03 Jan '08

03 Jan '08

Author: wmb Date: 2008-01-03 00:28:13 +0100 (Thu, 03 Jan 2008) New Revision: 761 Added: cpu/ppc/build/Makefile cpu/x86/Linux/Makefile.ppcforth Modified: cpu/ppc/Linux/Makefile cpu/ppc/build/Makefile.cross cpu/x86/Linux/Makefile Log: Improvements to the wrapper #define structure and the wrapper build scripts. Modified: cpu/ppc/Linux/Makefile =================================================================== --- cpu/ppc/Linux/Makefile 2008-01-02 21:41:48 UTC (rev 760) +++ cpu/ppc/Linux/Makefile 2008-01-02 23:28:13 UTC (rev 761) @@ -1,57 +1,36 @@ -# Flags for the simulator version -WRAPPER = pforth +# Makefile for native PowerPC wrapper to run under Linux + OPT = -O # OPT = BP=../../.. -CFLAGS = -DUNIX -DPPCSIM -DTARGET_POWERPC +CFLAGS = -D__linux__ -DHOSTPOWERPC -DTARGET_POWERPC CC = gcc WRDIR = ${BP}/forth/wrapper ZIPDIR = ${WRDIR}/zip -SIMDIR = ../ppcsim ZIPOBJS = zipmem.o deflate.o trees.o bits.o util.o inflate.o -OBJS = wrapsim.o ppcsim.o logger.o ${ZIPOBJS} -TRACEOBJS = wrapsim.o ppcsim.trace.o logger.o ${ZIPOBJS} -SIMROMOBJS = simrom.o ppcsim.simrom.o +OBJS = wrapper.o logger.o ${ZIPOBJS} -all: ppcforth ppcforth.trace +all: ppcforth -ppcforth: $(OBJS) +ppcforth: forth + ln -sf $< $@ + +forth: $(OBJS) $(CC) $(LFLAGS) $(OBJS) -o $@ -ppcforth.trace: $(TRACEOBJS) - $(CC) $(LFLAGS) $(TRACEOBJS) -o $@ - -simrom: $(SIMROMOBJS) - $(CC) $(LFLAGS) $(SIMROMOBJS) -o $@ - -wrapsim.o: ${WRDIR}/wrapper.c - ${CC} -c ${CFLAGS} $< -o $@ - %.o: ${WRDIR}/%.c ${CC} -c ${CFLAGS} $< -o $@ %.o: ${ZIPDIR}/%.c ${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@ -ppcsim.o: $(SIMDIR)/ppcsim.c - $(CC) $(OPT) $(CFLAGS) -DARGREGS -DSIMNEXT -c $< -o $@ - -ppcsim.trace.o: $(SIMDIR)/ppcsim.c - $(CC) $(OPT) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE -c $< -o $@ - -ppcsim.simrom.o: $(SIMDIR)/ppcsim.c - $(CC) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE -DSIMROM -c $< -o $@ - -simrom.o: $(SIMDIR)/simrom.c - $(CC) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE -DSIMROM -c $< -o $@ - clean: - @rm -f *.o ppcforth ppcforth.trace + @rm -f *.o forth ppcforth FRC: Added: cpu/ppc/build/Makefile =================================================================== --- cpu/ppc/build/Makefile (rev 0) +++ cpu/ppc/build/Makefile 2008-01-02 23:28:13 UTC (rev 761) @@ -0,0 +1,27 @@ +OS := $(shell uname) + +all: basefw.dic + +.PHONY: FORCE all clean + +.PRECIOUS: builder.dic + +../${OS}/forth: + @make -C ../${OS} forth + +build: ../${OS}/forth + @ln -sf ../${OS}/forth $@ + +%.dic: FORCE build + ./build $@ + +builder.dic: FORCE build + -[ ! -f builder.sav ] && cp builder.dic builder.sav + ./build builder.dic + +inflate.bin: + make -C ../${OS} ../build/inflate.bin + +# Don't use *.dic so as not to remove builder.dic +clean: + rm -f tools.dic kernel.dic basefw.dic *.log headers *~ inflate.bin build Modified: cpu/ppc/build/Makefile.cross =================================================================== --- cpu/ppc/build/Makefile.cross 2008-01-02 21:41:48 UTC (rev 760) +++ cpu/ppc/build/Makefile.cross 2008-01-02 23:28:13 UTC (rev 761) @@ -1,8 +1,36 @@ # This setting of HOSTDIR is for cross-building on an x86 Linux system # For it to work, you first need to build the simulator version of ppcforth -# in cpu/ppc/Linux and then copy the ppcforth file to cpu/x86/Linux -HOSTDIR:=$(shell pwd)/../../../cpu/x86/Linux/ +# in cpu/x86/Linux with "make -f Makefile.ppcforth" +OS := $(shell uname) -builder.dic: - HOSTDIR=${HOSTDIR} build $@ +HOSTCPU:=x86 +HOSTDIR:=../../${HOSTCPU}/${OS} +all: basefw.dic + +.PHONY: FORCE all clean + +.PRECIOUS: builder.dic + +${HOSTDIR}/forth: + @make -C ${HOSTDIR} forth + +${HOSTDIR}/ppcforth: + @make -C ${HOSTDIR} -f Makefile.ppcforth ppcforth + +build: ${HOSTDIR}/forth + @ln -sf $< $@ + +%.dic: FORCE build ${HOSTDIR}/ppcforth + ./build $@ + +builder.dic: FORCE build + -[ ! -f builder.sav ] && cp builder.dic builder.sav + ./build builder.dic + +inflate.bin: + make -C ../${OS} ../build/inflate.bin + +# Don't use *.dic so as not to remove builder.dic +clean: + rm -f tools.dic kernel.dic basefw.dic *.log headers *~ inflate.bin build Modified: cpu/x86/Linux/Makefile =================================================================== --- cpu/x86/Linux/Makefile 2008-01-02 21:41:48 UTC (rev 760) +++ cpu/x86/Linux/Makefile 2008-01-02 23:28:13 UTC (rev 761) @@ -1,11 +1,9 @@ # Wrapper makefile for x86 Unix: FreeBSD, Linux, etc. # Copyright 1997 FirmWorks. All rights reserved. # -OS := $(shell uname) - BP=../../.. -CFLAGS = -O -g -m32 -DUNIX -D${OS} -DX86 +CFLAGS = -O -g -m32 -DTARGET_X86 # CFLAGS += -DUSE_XCB WRTAIL = forth/wrapper Added: cpu/x86/Linux/Makefile.ppcforth =================================================================== --- cpu/x86/Linux/Makefile.ppcforth (rev 0) +++ cpu/x86/Linux/Makefile.ppcforth 2008-01-02 23:28:13 UTC (rev 761) @@ -0,0 +1,56 @@ +# Flags for the simulator version +OPT = -O +# OPT = + +BP=../../.. + +CFLAGS = -DPPCSIM -DTARGET_POWERPC + +CC = gcc + +WRDIR = ${BP}/forth/wrapper +ZIPDIR = ${WRDIR}/zip +SIMDIR = ${BP}/cpu/ppc/ppcsim + +ZIPOBJS = zipmem.o deflate.o trees.o bits.o util.o inflate.o + +OBJS = wrapsim.o ppcsim.o logger.o ${ZIPOBJS} +TRACEOBJS = wrapsim.o ppcsim.trace.o logger.o ${ZIPOBJS} +SIMROMOBJS = simrom.o ppcsim.simrom.o + +all: ppcforth ppcforth.trace + +ppcforth: $(OBJS) + $(CC) $(LFLAGS) $(OBJS) -o $@ + +ppcforth.trace: $(TRACEOBJS) + $(CC) $(LFLAGS) $(TRACEOBJS) -o $@ + +simrom: $(SIMROMOBJS) + $(CC) $(LFLAGS) $(SIMROMOBJS) -o $@ + +wrapsim.o: ${WRDIR}/wrapper.c + ${CC} -c ${CFLAGS} $< -o $@ + +%.o: ${WRDIR}/%.c + ${CC} -c ${CFLAGS} $< -o $@ + +%.o: ${ZIPDIR}/%.c + ${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@ + +ppcsim.o: $(SIMDIR)/ppcsim.c + $(CC) $(OPT) $(CFLAGS) -DARGREGS -DSIMNEXT -c $< -o $@ + +ppcsim.trace.o: $(SIMDIR)/ppcsim.c + $(CC) $(OPT) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE -c $< -o $@ + +ppcsim.simrom.o: $(SIMDIR)/ppcsim.c + $(CC) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE -DSIMROM -c $< -o $@ + +simrom.o: $(SIMDIR)/simrom.c + $(CC) $(CFLAGS) -DARGREGS -DSIMNEXT -DTRACE -DSIMROM -c $< -o $@ + +clean: + @rm -f *.o ppcforth ppcforth.trace + +FRC:

1 0

r760 - in cpu/ppc: . build
by svn＠openbios.org 02 Jan '08

02 Jan '08

Author: wmb Date: 2008-01-02 22:41:48 +0100 (Wed, 02 Jan 2008) New Revision: 760 Added: cpu/ppc/build/Makefile.cross Modified: cpu/ppc/build/builder.dic cpu/ppc/kernel.bth cpu/ppc/savemeta.fth Log: PowerPC build - some minor improvements to the PowerPC build scripts, which still need work. Added: cpu/ppc/build/Makefile.cross =================================================================== --- cpu/ppc/build/Makefile.cross (rev 0) +++ cpu/ppc/build/Makefile.cross 2008-01-02 21:41:48 UTC (rev 760) @@ -0,0 +1,8 @@ +# This setting of HOSTDIR is for cross-building on an x86 Linux system +# For it to work, you first need to build the simulator version of ppcforth +# in cpu/ppc/Linux and then copy the ppcforth file to cpu/x86/Linux +HOSTDIR:=$(shell pwd)/../../../cpu/x86/Linux/ + +builder.dic: + HOSTDIR=${HOSTDIR} build $@ + Modified: cpu/ppc/kernel.bth =================================================================== --- cpu/ppc/kernel.bth 2008-01-02 19:08:27 UTC (rev 759) +++ cpu/ppc/kernel.bth 2008-01-02 21:41:48 UTC (rev 760) @@ -79,7 +79,7 @@ fload ${BP}/cpu/ppc/savemeta.fth -.( --- Saving kernel.dic ---) "" kernel.dic save-meta +.( --- Saving kernel.dic ---) " kernel.dic" $save-meta cr \ LICENSE_BEGIN Modified: cpu/ppc/savemeta.fth =================================================================== --- cpu/ppc/savemeta.fth 2008-01-02 19:08:27 UTC (rev 759) +++ cpu/ppc/savemeta.fth 2008-01-02 21:41:48 UTC (rev 760) @@ -28,14 +28,14 @@ : swap-size ( -- n ) here-t >swap-map-size-t ; : user-base ( -- adr ) userarea-t ; : user-size ( -- n ) user-size-t doubleword-align ; -: save-meta ( str -- ) +: $save-meta ( str -- ) \ Doubleword alignment is required so that the user area image will \ not be in the same doubleword as the end of the dictionary, thus \ causing the copy loop to get the wrong value the first time. begin here-t 7 and while 0 c,-t repeat - new-file + $new-file \ Set the text and data sizes in the program header h# 4800.0020 header h# 0 + l-t! \ Branch past the header

1 0

r759 - cpu/ppc/build
by svn＠openbios.org 02 Jan '08

02 Jan '08

Author: wmb Date: 2008-01-02 20:08:27 +0100 (Wed, 02 Jan 2008) New Revision: 759 Added: cpu/ppc/build/builder.dic Log: Initial checkin Property changes on: cpu/ppc/build/builder.dic ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream

1 0

Which hardware are supported?
by Paul Csanyi 01 Jan '08

01 Jan '08

Hello! Happy New Year's! I search on yours web page the supported hardware, but can't find it. How can I know which hardware are supported by openbios? I have ASUS S775 P5N-E SLI NVIDIA motherboard. Can I use openbios on this hardware? Any advices will be appreciated! -- Regards, Paul Csanyi http://www.freewebs.com/csanyi-pal/index.htm

2 1

new CPU
by Jose Vasconcellos 01 Jan '08

01 Jan '08

I'm interested in an implementation of openfirmware on an arm9 cpu. I see that there are several implementations available. Where's the best place to start? SmartFirmware seems to be the closest as there's support for an arm7 board (edb7312) but it looks a little out of date. Any suggestions? Regards, Jose

2 1

r758 - cpu/x86/pc/olpc
by svn＠openbios.org 31 Dec '07

31 Dec '07

Author: wmb Date: 2007-12-31 01:01:13 +0100 (Mon, 31 Dec 2007) New Revision: 758 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC Trac 5778 - Display the firmware banner when enabling text output from secure mode, thus making it possible to determine the firmware version. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-12-27 09:24:22 UTC (rev 757) +++ cpu/x86/pc/olpc/security.fth 2007-12-31 00:01:13 UTC (rev 758) @@ -8,7 +8,7 @@ : visible dcon-unfreeze text-on ; : ?unfreeze ( -- ) - game-key@ button-check and if visible unfreeze then + game-key@ button-check and if visible banner unfreeze then ; 0 0 2value base-xy @@ -39,7 +39,7 @@ 0 value security-off? : security-failure ( -- ) - visible + visible banner security-off? if ." Stopping" cr quit then button-check game-key? if @@ -773,7 +773,7 @@ secure? 0= if unfreeze visible exit then button-check game-key? if - unfreeze visible + unfreeze visible banner else freeze dcon-freeze then @@ -785,6 +785,7 @@ date-bad? if \ This is not fatal, because we don't want a brick if the RTC battery fails visible red-letters ." Invalid system date" black-letters cr show-sad + banner then load-crypto if " Crytpo load failed" .security-failure then ( )

1 0

r183 - openbios-devel/arch/sparc32
by svn＠openbios.org 29 Dec '07

29 Dec '07

Author: blueswirl Date: 2007-12-29 19:38:16 +0100 (Sat, 29 Dec 2007) New Revision: 183 Modified: openbios-devel/arch/sparc32/entry.S Log: Print a message and halt if Sun4c or Sun4d Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2007-12-25 08:26:21 UTC (rev 182) +++ openbios-devel/arch/sparc32/entry.S 2007-12-29 18:38:16 UTC (rev 183) @@ -19,6 +19,14 @@ #define PHYS_SS10_EEPROM 0xf1200000 #define PHYS_SS10_INTR0 0xf1400000 +#define PHYS_SS2_EEPROM 0xf2000000 +#define PHYS_SS2_INTR0 0xf5000000 +#define SER_ADDR2 0xf1000004 + +#define PHYS_SS1000_EEPROM 0x00280000 +#define PHYS_SS1000_SBI 0x02800000 +#define SER_ADDR1000 0x00200004 + #define WRITE_PAUSE nop; nop; nop; /* Have to do this after %wim/%psr chg */ .globl entry, _entry @@ -95,27 +103,23 @@ jmp %g2 ! jump to kernel sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu -bad_nvram: - ! Unknown machine, freeze - b bad_nvram - nop ss10: set PHYS_SS10_EEPROM, %g1 lduba [%g1] ASI_M_CTL, %g2 cmp %g2, 'Q' - bne bad_nvram + bne ss2 inc %g1 lduba [%g1] ASI_M_CTL, %g2 cmp %g2, 'E' - bne bad_nvram + bne ss2 inc %g1 lduba [%g1] ASI_M_CTL, %g2 cmp %g2, 'M' - bne bad_nvram + bne ss2 inc %g1 lduba [%g1] ASI_M_CTL, %g2 cmp %g2, 'U' - bne bad_nvram + bne ss2 ! Ok, this is SS-10 or SS-600MP set PHYS_SS10_EEPROM + SPARC_MACHINE_ID, %g1 @@ -159,6 +163,52 @@ jmp %g2 ! jump to kernel sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu +ss2: + set PHYS_SS2_EEPROM, %g1 + lduba [%g1] ASI_M_BYPASS, %g2 + cmp %g2, 'Q' + bne ss1000 + inc %g1 + lduba [%g1] ASI_M_BYPASS, %g2 + cmp %g2, 'E' + bne ss1000 + inc %g1 + lduba [%g1] ASI_M_BYPASS, %g2 + cmp %g2, 'M' + bne ss1000 + inc %g1 + lduba [%g1] ASI_M_BYPASS, %g2 + cmp %g2, 'U' + bne ss1000 + + ! Ok, this is SS-2 + set ss2_error, %o2 + b ss2_ss1000_halt + nop + +ss1000: + set PHYS_SS1000_EEPROM, %g1 + lduba [%g1] ASI_M_CTL, %g2 + cmp %g2, 'Q' + bne bad_nvram + inc %g1 + lduba [%g1] ASI_M_CTL, %g2 + cmp %g2, 'E' + bne bad_nvram + inc %g1 + lduba [%g1] ASI_M_CTL, %g2 + cmp %g2, 'M' + bne bad_nvram + inc %g1 + lduba [%g1] ASI_M_CTL, %g2 + cmp %g2, 'U' + bne bad_nvram + + ! Ok, this is SS-1000 or SS-2000 + set ss1000_error, %o2 + b ss2_ss1000_halt + nop + first_cpu: /* Create temporary page tables and map the ROM area to end of RAM. This will be done properly in iommu.c later. */ @@ -338,3 +388,32 @@ ret nop +ss2_ss1000_halt: + set SER_ADDR2, %o0 + set SER_ADDR1000, %o1 + mov 0x05, %o3 /* Reg 5, TXCTRL2 */ + stba %o3, [%o0] ASI_M_BYPASS + stba %o3, [%o1] ASI_M_CTL + mov 0x68, %o3 /* 8 bits, Tx enabled */ + stba %o3, [%o0] ASI_M_BYPASS + stba %o3, [%o1] ASI_M_CTL + add %o0, 2, %o0 + add %o1, 2, %o1 + +1: lduba [%o2] ASI_M_KERNELTXT, %o3 + cmp %o3, 0 + be 2f + nop + stba %o3, [%o0] ASI_M_BYPASS + stba %o3, [%o1] ASI_M_CTL + b 1b + inc %o2 +bad_nvram: +2: b 2b + nop + + .section .rodata +ss2_error: + .string "Sun4c machines are not supported by OpenBIOS yet, freezing\r\n" +ss1000_error: + .string "Sun4d machines are not supported by OpenBIOS yet, freezing\r\n"

1 0

r757 - ofw/fs/jffs2
by svn＠openbios.org 27 Dec '07

27 Dec '07

Author: wmb Date: 2007-12-27 10:24:22 +0100 (Thu, 27 Dec 2007) New Revision: 757 Modified: ofw/fs/jffs2/jffs2.fth Log: OLPC Trac 5719 - Added the ability to delete files on a JFFS2 volume as a weak workaround for problems where the presence of a file prevents the OS from booting. Example use: ok rm n:\home\olpc\.olpc-configured Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-12-27 09:18:48 UTC (rev 756) +++ ofw/fs/jffs2/jffs2.fth 2007-12-27 09:24:22 UTC (rev 757) @@ -1160,8 +1160,10 @@ ; 0 instance value my-vers \ Highest version number - local to $find-name +0 0 2value tail-name$ : ?update-dirent ( offset name$ -- ) + 2dup to tail-name$ rot get-node >r ( name$ r: rdirent ) r@ rdname$ $= if ( r: rdirent ) wd-inum r@ rdpino@ = if ( r: rdirent ) @@ -1297,7 +1299,6 @@ 2drop false ( false ) ; -\ Leaves the-wd set to the containing directory \ : $chdir ( path$ -- error? ) \ \ XXX should save wf-* and restore them on failure \ $resolve-path if true exit then ( dirent ) @@ -1367,7 +1368,7 @@ \ End of "tdirent" section -false [if] +true [if] \ "delete file" section \ For now, just 0 the modify time, since we only support deleting @@ -1382,6 +1383,7 @@ r@ 5 j! \ dirino ( pino version name$ r: len adr ) dup r@ 7 la+ c! \ nsize ( pino version name$ r: len adr ) 2dup crc r@ 9 j! \ name_crc ( pino version name$ r: len adr ) + dup d# 10 la+ r@ 1 j! \ node-len ( pino version name$ r: len adr ) r@ d# 10 la+ swap move \ name ( pino version r: len adr ) \ Null terminate? r@ 4 j! \ version ( pino r: len adr ) @@ -1401,36 +1403,62 @@ ; : find-empty-page ( -- true | page# false ) pages/chip 0 ?do - i 1 read-pages 0= if + \ If the last page in the eblock is readable and erased ... + i pages/eblock + 1- 1 read-pages 0= if block-buf /page erased? if - i false unloop exit + \ Find the first readable and erased page in that eblock + i pages/eblock bounds do + i 1 read-pages 0= if + block-buf /page erased? if + i false unloop unloop exit + then + then + loop then then pages/eblock +loop true ; : put-node ( adr len page# -- ) + true to first-time? + -1 to have-eblock# ( adr len page# ) >r ( adr len r: page# ) - 2dup block-buf move ( adr len r: page# ) + 2dup block-buf swap move ( adr len r: page# ) tuck free-mem ( len r: page# ) block-buf /page rot /string ( pad-adr pad-len r: page# ) 2dup erase ( pad-adr pad-len r: page# ) over 1 j! \ totlen ( pad-adr r: page# ) jffs2-magic over w! \ magic ( pad-adr r: page# ) - padding-type swap wa1+ w! \ nodetype ( r: page# ) + padding-type over wa1+ w! \ nodetype ( pad-adr r: page# ) + dup 8 crc swap 2 j! \ crc ( r: page# ) block-buf r> 1 " write-blocks" $call-parent ( ) - 1 <> if ." JFFS2: write failed" then ( ) + 1 <> dup if ." JFFS2: write failed" then ( error? ) ; -\ the-wd is the parent dirent : $delete ( adr len -- error? ) - $resolve-path if true exit then ( dirent' ) - >r r@ xxpino@ r@ xxversion@ 1+ r> xxfname$ ( parent-ino new-version name$ ) + $resolve-path if true exit then ( ) + wf-type 4 = if true exit then ( ) \ Don't delete directories + wd-inum ( parent-ino ) + my-vers 1+ ( parent-ino new-version ) + tail-name$ ( parent-ino new-version name$ ) 0 0 make-raw-dirent ( adr len ) - find-empty-page ( adr len page# ) + find-empty-page if 2drop true exit then ( adr len page# ) put-node ; +\ XXX check for empty first +: $rmdir ( adr len -- error? ) + $resolve-path if true exit then ( ) + wf-type 4 <> if true exit then ( ) \ Must be a directory + wf-inum >parent if true exit then ( parent-ino ) + my-vers 1+ ( parent-ino new-version ) + tail-name$ ( parent-ino new-version name$ ) + 0 0 make-raw-dirent ( adr len ) + find-empty-page if 2drop true exit then ( adr len page# ) + put-node +; + + \ End of "delete file" section [then]

1 0

r756 - cpu/x86/pc/olpc
by svn＠openbios.org 27 Dec '07

27 Dec '07

Author: wmb Date: 2007-12-27 10:18:48 +0100 (Thu, 27 Dec 2007) New Revision: 756 Modified: cpu/x86/pc/olpc/setwp.fth Log: OLPC Trac 5727 - Added error check so that enable-security will abort unless both the SN and U# mfg tags are present. Modified: cpu/x86/pc/olpc/setwp.fth =================================================================== --- cpu/x86/pc/olpc/setwp.fth 2007-12-27 09:13:03 UTC (rev 755) +++ cpu/x86/pc/olpc/setwp.fth 2007-12-27 09:18:48 UTC (rev 756) @@ -9,6 +9,8 @@ : set-wp ( -- ) h# fffefffe 2 " wp" $= if ." wp is already set" cr exit then + " SN" find-tag 0= abort" No serial number (SN tag); enabling security would brick me." 2drop + " U#" find-tag 0= abort" No U# tag; enabling security would brick me." 2drop h# fffefffe 2 " ww" $= 0= abort" No ww tag" spi-start spi-identify " wp" h# efffe write-spi-flash

1 0

r755 - cpu/x86/pc/olpc
by svn＠openbios.org 27 Dec '07

27 Dec '07

Author: wmb Date: 2007-12-27 10:13:03 +0100 (Thu, 27 Dec 2007) New Revision: 755 Modified: cpu/x86/pc/olpc/gamekeys.fth Log: OLPC Trac 5585 - Show game key status during "release the game key to continue". Modified: cpu/x86/pc/olpc/gamekeys.fth =================================================================== --- cpu/x86/pc/olpc/gamekeys.fth 2007-12-27 01:33:11 UTC (rev 754) +++ cpu/x86/pc/olpc/gamekeys.fth 2007-12-27 09:13:03 UTC (rev 755) @@ -12,6 +12,23 @@ 0 value game-key-mask +: show-key ( mask x y -- ) + at-xy game-key-mask and if ." *" else ." o" then +; +: update-game-keys ( mask -- ) + dup game-key-mask or to game-key-mask + rocker-up 2 2 show-key + rocker-left 0 3 show-key + rocker-right 4 3 show-key + rocker-down 2 4 show-key + button-rotate 2 6 show-key + + button-o 9 2 show-key + button-square 7 3 show-key + button-check d# 11 3 show-key + button-x 9 4 show-key +; + : read-game-keys ( -- ) [ifdef] lx-devel false exit [then] board-revision h# b18 < if @@ -20,8 +37,9 @@ then game-key@ dup to game-key-mask if - ." Release the game key to continue" cr - begin d# 100 ms game-key@ 0= until + ." Release the game keys to continue" cr + begin d# 100 ms game-key@ dup update-game-keys 0= until + 0 7 at-xy then ; : game-key? ( mask -- flag ) game-key-mask and 0<> ;

1 0

r754 - dev/mmc/sdhci
by svn＠openbios.org 27 Dec '07

27 Dec '07

Author: wmb Date: 2007-12-27 02:33:11 +0100 (Thu, 27 Dec 2007) New Revision: 754 Modified: dev/mmc/sdhci/sdhci.fth Log: OLPC Trac 5717 - added 1 ms delay after reset-card for the benefit of cards (e.g. Kingston 4 GB SDHC) that fail to power up without a delay. Modified: dev/mmc/sdhci/sdhci.fth =================================================================== --- dev/mmc/sdhci/sdhci.fth 2007-12-07 09:14:42 UTC (rev 753) +++ dev/mmc/sdhci/sdhci.fth 2007-12-27 01:33:11 UTC (rev 754) @@ -314,7 +314,7 @@ d# 16 instance buffer: csd headers -: reset-card ( -- ) 0 0 0 cmd 0 to rca ; \ 0 - +: reset-card ( -- ) 0 0 0 cmd 0 to rca 1 ms ; \ 0 - : send-op-cond ( voltage-range -- ocr ) h# 0102 0 cmd response ; \ R3

1 0

r182 - in openbios-devel: arch/sparc32 drivers
by svn＠openbios.org 25 Dec '07

25 Dec '07

Author: blueswirl Date: 2007-12-25 09:26:21 +0100 (Tue, 25 Dec 2007) New Revision: 182 Modified: openbios-devel/arch/sparc32/vectors.S openbios-devel/drivers/obio.c Log: Add handlers for timer interrupts Modified: openbios-devel/arch/sparc32/vectors.S =================================================================== --- openbios-devel/arch/sparc32/vectors.S 2007-12-10 20:06:58 UTC (rev 181) +++ openbios-devel/arch/sparc32/vectors.S 2007-12-25 08:26:21 UTC (rev 182) @@ -43,6 +43,12 @@ #define BTRAP(lvl) ba bug; mov lvl, %g1; nop; nop; #define BTRAPS(x) BTRAP(x) BTRAP(x+1) BTRAP(x+2) BTRAP(x+3) BTRAP(x+4) BTRAP(x+5) BTRAP(x+6) BTRAP(x+7) +#define TRAP_ENTRY_INTERRUPT(int_level) \ + sethi %hi(irq_entry ## int_level), %l7; \ + or %l7, %lo(irq_entry ## int_level), %l7; \ + jmp %l7; \ + nop + t_zero: b entry; nop; nop; nop; BTRAP(0x1) BTRAP(0x2) BTRAP(0x3) BTRAP(0x4) t_wovf: WINDOW_SPILL /* Window Overflow */ @@ -67,7 +73,12 @@ t_irq14: TRAP_ENTRY_INTERRUPT(14) /* IRQ Timer #2 */ t_nmi: BAD_TRAP(0x1f) /* Level 15 (NMI) */ #else - BTRAPS(0x10) BTRAPS(0x18) + BTRAPS(0x10) + BTRAP(0x18) BTRAP(0x19) +t_irq10: TRAP_ENTRY_INTERRUPT(10) /* IRQ Timer #1 (one we use) */ + BTRAP(0x1b) BTRAP(0x1c) BTRAP(0x1d) +t_irq14: TRAP_ENTRY_INTERRUPT(14) /* IRQ Timer #2 */ + BTRAP(0x1f) #endif BTRAPS(0x20) BTRAPS(0x28) BTRAPS(0x30) BTRAPS(0x38) @@ -174,6 +185,21 @@ b _forever ; nop +irq_entry10: + sethi %hi(counter_regs), %l7 + ld [%l7 + %lo(counter_regs)], %l7 + sethi 0x10000, %l6 + ld [%l7 + %l6], %g0 + jmp %l1 + rett %l2 + +irq_entry14: + sethi %hi(counter_regs), %l7 + ld [%l7 + %lo(counter_regs)], %l7 + ld [%l7], %g0 + jmp %l1 + rett %l2 + /* Register window handlers */ #include "wof.S" #include "wuf.S" Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-12-10 20:06:58 UTC (rev 181) +++ openbios-devel/drivers/obio.c 2007-12-25 08:26:21 UTC (rev 182) @@ -1067,10 +1067,11 @@ fword("finish-device"); } +volatile struct sun4m_timer_regs *counter_regs; + static void ob_counter_init(uint64_t base, unsigned long offset) { - volatile struct sun4m_timer_regs *regs; int i; ob_new_obio_device("counter", NULL); @@ -1101,17 +1102,19 @@ fword("property"); - regs = map_io(base + (uint64_t)offset, sizeof(*regs)); - regs->l10_timer_limit = (((1000000/100) + 1) << 10); - regs->cpu_timers[0].l14_timer_limit = 0; + counter_regs = map_io(base + (uint64_t)offset, sizeof(*counter_regs)); + counter_regs->cfg = 0xffffffff; + counter_regs->l10_timer_limit = (((1000000/100) + 1) << 10); + counter_regs->cpu_timers[0].l14_timer_limit = 0; + counter_regs->cpu_timers[0].cntrl = 1; for (i = 0; i < SUN4M_NCPU; i++) { - PUSH((unsigned long)&regs->cpu_timers[i]); + PUSH((unsigned long)&counter_regs->cpu_timers[i]); fword("encode-int"); if (i != 0) fword("encode+"); } - PUSH((unsigned long)&regs->l10_timer_limit); + PUSH((unsigned long)&counter_regs->l10_timer_limit); fword("encode-int"); fword("encode+"); push_str("address");

1 0

r181 - openbios-devel/drivers
by svn＠openbios.org 10 Dec '07

10 Dec '07

Author: blueswirl Date: 2007-12-10 21:06:58 +0100 (Mon, 10 Dec 2007) New Revision: 181 Modified: openbios-devel/drivers/obio.c Log: Add support for SPARCstation 20 machine type Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-12-09 17:04:51 UTC (rev 180) +++ openbios-devel/drivers/obio.c 2007-12-10 20:06:58 UTC (rev 181) @@ -296,7 +296,7 @@ } } -static void +static uint32_t ob_eccmemctl_init(void) { uint32_t version, *regs; @@ -335,6 +335,8 @@ fword("property"); fword("finish-device"); + + return version; } static unsigned char *nvram; @@ -803,19 +805,37 @@ ob_eccmemctl_init(); break; case 0x72: - push_str("SPARCstation 10 (1 X 390Z55)"); - fword("encode-string"); - push_str("banner-name"); - fword("property"); - push_str("SUNW,S10,501-2365"); - fword("encode-string"); - push_str("model"); - fword("property"); - push_str("SUNW,SPARCstation-10"); - fword("encode-string"); - push_str("name"); - fword("property"); - ob_eccmemctl_init(); + switch (ob_eccmemctl_init()) { + default: + case 0x10000000: + push_str("SPARCstation 10 (1 X 390Z55)"); + fword("encode-string"); + push_str("banner-name"); + fword("property"); + push_str("SUNW,S10,501-2365"); + fword("encode-string"); + push_str("model"); + fword("property"); + push_str("SUNW,SPARCstation-10"); + fword("encode-string"); + push_str("name"); + fword("property"); + break; + case 0x20000000: + push_str("SPARCstation 20 (1 X 390Z55)"); + fword("encode-string"); + push_str("banner-name"); + fword("property"); + push_str("SUNW,S20,501-2324"); + fword("encode-string"); + push_str("model"); + fword("property"); + push_str("SUNW,SPARCstation-20"); + fword("encode-string"); + push_str("name"); + fword("property"); + break; + } break; case 0x80: push_str("SPARCstation 5");

1 0

r180 - openbios-devel/drivers
by svn＠openbios.org 09 Dec '07

09 Dec '07

Author: blueswirl Date: 2007-12-09 18:04:51 +0100 (Sun, 09 Dec 2007) New Revision: 180 Modified: openbios-devel/drivers/obio.c openbios-devel/drivers/obio.h Log: Add support for eccmemctl Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-11-19 19:11:38 UTC (rev 179) +++ openbios-devel/drivers/obio.c 2007-12-09 17:04:51 UTC (rev 180) @@ -72,9 +72,10 @@ } static unsigned long -ob_reg(uint64_t base, uint64_t offset, unsigned long size, int map) +map_reg(uint64_t base, uint64_t offset, unsigned long size, int map, + int phys_hi) { - PUSH(0); + PUSH(phys_hi); fword("encode-int"); PUSH(offset); fword("encode-int"); @@ -102,6 +103,12 @@ return 0; } +static unsigned long +ob_reg(uint64_t base, uint64_t offset, unsigned long size, int map) +{ + return map_reg(base, offset, size, map, 0); +} + static void ob_intr(int intr) { @@ -289,6 +296,47 @@ } } +static void +ob_eccmemctl_init(void) +{ + uint32_t version, *regs; + const char *mc_type; + + push_str("/"); + fword("find-device"); + fword("new-device"); + + push_str("eccmemctl"); + fword("device-name"); + + PUSH(0x20); + fword("encode-int"); + push_str("width"); + fword("property"); + + regs = map_reg(ECC_BASE, 0, ECC_SIZE, 1, ECC_BASE >> 32); + + version = regs[0]; + switch (version) { + case 0x00000000: + mc_type = "MCC"; + break; + case 0x10000000: + mc_type = "EMC"; + break; + default: + case 0x20000000: + mc_type = "SMC"; + break; + } + push_str(mc_type); + fword("encode-string"); + push_str("mc-type"); + fword("property"); + + fword("finish-device"); +} + static unsigned char *nvram; ohwcfg_v3_t nv_info; @@ -752,6 +800,7 @@ fword("encode-string"); push_str("name"); fword("property"); + ob_eccmemctl_init(); break; case 0x72: push_str("SPARCstation 10 (1 X 390Z55)"); @@ -766,6 +815,7 @@ fword("encode-string"); push_str("name"); fword("property"); + ob_eccmemctl_init(); break; case 0x80: push_str("SPARCstation 5"); Modified: openbios-devel/drivers/obio.h =================================================================== --- openbios-devel/drivers/obio.h 2007-11-19 19:11:38 UTC (rev 179) +++ openbios-devel/drivers/obio.h 2007-12-09 17:04:51 UTC (rev 180) @@ -32,6 +32,9 @@ #define SLAVIO_RESET 0x00f00000ULL #define RESET_REGS 1 +#define ECC_BASE 0xf00000000ULL +#define ECC_SIZE 0x20 + #define SLAVIO_SIZE 0x01000000 #define SUN4M_NCPUS 16

1 0

r753 - cpu/x86/pc/olpc
by svn＠openbios.org 07 Dec '07

07 Dec '07

Author: wmb Date: 2007-12-07 10:14:42 +0100 (Fri, 07 Dec 2007) New Revision: 753 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2D07 - svn 741, plus cherry-picked 749 750 752 753 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-12-07 09:03:55 UTC (rev 752) +++ cpu/x86/pc/olpc/versions.fth 2007-12-07 09:14:42 UTC (rev 753) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 06 +macro: FW_MINOR 07 \ The EC microcode macro: EC_VERSION test4e

1 0

r752 - ofw/fs
by svn＠openbios.org 07 Dec '07

07 Dec '07

Author: wmb Date: 2007-12-07 10:03:55 +0100 (Fri, 07 Dec 2007) New Revision: 752 Modified: ofw/fs/unixtime.fth Log: OLPC trac 5391 - Don't crash if >unix-seconds is presented with an invalid month. Modified: ofw/fs/unixtime.fth =================================================================== --- ofw/fs/unixtime.fth 2007-12-05 23:12:36 UTC (rev 751) +++ ofw/fs/unixtime.fth 2007-12-07 09:03:55 UTC (rev 752) @@ -31,7 +31,8 @@ : >unix-seconds ( s m h d m y -- seconds ) \ since 1970 d# 1970 - 4 /mod [ d# 365 4 * 1+ ] literal * ( s m h d m yrs days ) swap d# 365 * + ( s m h d m days ) - swap 1- 0 ?do i days/month + c@ + loop ( s m h d days ) + swap 1 max d# 12 min ( s m h d days m' ) + 1- 0 ?do i days/month + c@ + loop ( s m h d days ) + 1- ( s m h days ) d# 24 * + d# 60 * + d# 60 * + ;

1 0

r751 - dev/usb2/device/storage
by svn＠openbios.org 06 Dec '07

06 Dec '07

Author: wmb Date: 2007-12-06 00:12:36 +0100 (Thu, 06 Dec 2007) New Revision: 751 Modified: dev/usb2/device/storage/scsidisk.fth Log: OLPC trac 5354 - retry read-capacity command for USB mass storage devices that need extra startup time. Modified: dev/usb2/device/storage/scsidisk.fth =================================================================== --- dev/usb2/device/storage/scsidisk.fth 2007-12-05 03:44:34 UTC (rev 750) +++ dev/usb2/device/storage/scsidisk.fth 2007-12-05 23:12:36 UTC (rev 751) @@ -67,11 +67,18 @@ \ The SCSI-2 standard requires disk devices to implement \ the "read capacity" command. - 8 read-capacity-cmd 0a short-data-command if ( ) - true - else ( adr ) - dup 4 + 4c@ swap 4c@ 1+ false - then + \ Retry it a few times just in case that helps + d# 20 0 do + 8 read-capacity-cmd 0a short-data-command 0= if ( ) + dup 4 + 4c@ swap 4c@ 1+ false + unloop exit + then + d# 200 ms + loop + + \ If it fails, we just guess. Some devices violate the spec and + \ fail to implement read_capacity + d# 512 h# ffffffff false ; external

1 0

r750 - cpu/x86/pc/olpc
by svn＠openbios.org 05 Dec '07

05 Dec '07

Author: wmb Date: 2007-12-05 04:44:34 +0100 (Wed, 05 Dec 2007) New Revision: 750 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2D06 - build from svn 741 + 749 + 750 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-12-05 01:57:25 UTC (rev 749) +++ cpu/x86/pc/olpc/versions.fth 2007-12-05 03:44:34 UTC (rev 750) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 05 +macro: FW_MINOR 06 \ The EC microcode macro: EC_VERSION test4e @@ -16,7 +16,7 @@ \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 -macro: WLAN_VERSION 5.110.20.p1 +macro: WLAN_VERSION 5.110.20.p42 \ The bios_verify image macro: CRYPTO_VERSION 0.2

1 0

r749 - ofw/fs/jffs2
by svn＠openbios.org 05 Dec '07

05 Dec '07

Author: wmb Date: 2007-12-05 02:57:25 +0100 (Wed, 05 Dec 2007) New Revision: 749 Modified: ofw/fs/jffs2/jffs2.fth Log: OLPC trac 5322 - If the first dirent in block n+1 had the same name and pino as the last dirent in block n, but has an earlier version, it incorrectly superseded the last dirent. This was a side effect of an earlier optimization to eliminate the storing of junk dirents. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-12-03 05:27:55 UTC (rev 748) +++ ofw/fs/jffs2/jffs2.fth 2007-12-05 01:57:25 UTC (rev 749) @@ -836,6 +836,7 @@ inodes 'next-inode ! pages/chip 0 do i page>eblock to the-eblock# + 0 prev-name c! i h# 3fff and 0= if scan-callout then i no-summary? if i possible-nodes? if i scan-raw-nodes then

1 0

r748 - ofw/inet
by svn＠openbios.org 03 Dec '07

03 Dec '07

Author: wmb Date: 2007-12-03 06:27:55 +0100 (Mon, 03 Dec 2007) New Revision: 748 Modified: ofw/inet/telnetd.fth Log: Telnetd - fixed incompatibility with the Windows telnet client - looping on option negotiation and doubling carriage returns. Modified: ofw/inet/telnetd.fth =================================================================== --- ofw/inet/telnetd.fth 2007-12-02 10:35:56 UTC (rev 747) +++ ofw/inet/telnetd.fth 2007-12-03 05:27:55 UTC (rev 748) @@ -55,7 +55,9 @@ : will ( rem$ -- rem$' ) next-cmd-byte " WILL" .got dup case - 0 of send-do endof +\ Since we have already sent "do binary", there is no need to re-ack it +\ 0 of send-do endof + 0 of drop endof \ Suppress go-ahead \ Since we have already sent "do suppressGA", there is no need to re-ack it \ 3 of send-do endof \ Suppress go-ahead @@ -125,16 +127,26 @@ endcase ; +\ Remove the linefeed in a cr-lf pair. +\ The Windows telnet client sends CR-LF per the Telnet NVT spec. +\ The Linux telnet client just sends CR. +0 value last-was-cr? + +: do-lf ( adr len -- adr' len' ) + last-was-cr? if swallow else 1 /string then +; + : process-escapes ( adr len -- len' ) - over swap ( adr rem$ ) - begin dup while ( adr rem$ ) - over c@ #iac = if ( adr rem$ ) - do-command ( adr rem$' ) - else ( adr rem$ ) - 1 /string ( adr rem$' ) - then ( adr rem$ ) - repeat ( adr end-adr 0 ) - drop swap - ( len' ) + over swap ( adr rem$ ) + begin dup while ( adr rem$ ) + over c@ dup >r case ( adr rem$ r: char ) + #iac of do-command endof ( adr rem$' r: char ) + linefeed of do-lf endof ( adr rem$' r: char ) + ( adr rem$ char ) >r 1 /string r> ( adr rem$' r: char ) + endcase ( adr rem$ r: char ) + r> carret = to last-was-cr? ( adr rem$ ) + repeat ( adr end-adr 0 ) + drop swap - ( len' ) ; : read ( adr len -- actual ) over swap (read) ( adr actual ) @@ -174,13 +186,22 @@ begin get-msecs over d# 300 + - 0< while - the-byte 1 (read) case ( msecs [byte] ) - 1 of drop get-msecs the-byte 1 process-escapes drop endof - -1 of drop false exit endof - endcase + the-byte h# 10 (read) dup 0< if ( msecs count ) + \ Bail out if the connection closed + -1 = if drop false exit then + + \ The other alternative is -2, meaning no bytes available. + \ In that case, we'll eventually time out. + else ( msecs count ) + \ Keep advancing the timeout while bytes are still coming in + the-byte swap process-escapes drop ( msecs ) + drop get-msecs + then repeat drop + false to last-was-cr? + true ; : close ( -- ) ;

1 0

r747 - dev/usb2/device/keyboard
by svn＠openbios.org 02 Dec '07

02 Dec '07

Author: wmb Date: 2007-12-02 11:35:56 +0100 (Sun, 02 Dec 2007) New Revision: 747 Modified: dev/usb2/device/keyboard/request.fth Log: USB keyboard driver - Use control-set instead of control-set-nostat because keyboard devices appear to generate a status phase. Modified: dev/usb2/device/keyboard/request.fth =================================================================== --- dev/usb2/device/keyboard/request.fth 2007-12-02 10:31:17 UTC (rev 746) +++ dev/usb2/device/keyboard/request.fth 2007-12-02 10:35:56 UTC (rev 747) @@ -38,12 +38,12 @@ : set-boot-protocol ( -- error? ) 0 0 my-address ( interface ) 0 DR_HIDD DR_OUT or SET_PROTOCOL - control-set-nostat + control-set ; : set-idle ( ms -- error? ) >r 0 0 my-address ( interface ) r> 4 / 8 << ( 4ms ) DR_HIDD DR_OUT or SET_IDLE - control-set-nostat + control-set ; \ Key modifiers @@ -63,7 +63,7 @@ : (set-leds) ( led -- ) led-buf c! led-buf /led-buf my-address ( interface ) REPORT_OUT DR_HIDD DR_OUT or SET_REPORT - control-set-nostat drop + control-set drop ; : set-leds ( led-mask -- ) dup to led-state (set-leds) ; : toggle-leds ( led-mask -- ) led-state xor set-leds ;

1 0

r746 - in cpu/x86/pc: biosload olpc
by svn＠openbios.org 02 Dec '07

02 Dec '07

Author: wmb Date: 2007-12-02 11:31:17 +0100 (Sun, 02 Dec 2007) New Revision: 746 Modified: cpu/x86/pc/biosload/ofw.bth cpu/x86/pc/olpc/loaddropins.fth Log: USB - Load the usbkbd driver only for the keyboard subclass; don't load it for the generic hid subclass. Modified: cpu/x86/pc/biosload/ofw.bth =================================================================== --- cpu/x86/pc/biosload/ofw.bth 2007-12-02 10:27:07 UTC (rev 745) +++ cpu/x86/pc/biosload/ofw.bth 2007-12-02 10:31:17 UTC (rev 746) @@ -80,9 +80,9 @@ " ${BP}/dev/usb2/hcd/ohci/build/ohci.fc" " class0c0310" $add-deflated-dropin " ${BP}/dev/usb2/hcd/ehci/build/ehci.fc" " class0c0320" $add-deflated-dropin - " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-dropin - " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3" $add-dropin -\ " ${BP}/dev/usb2/device/net/build/usbnet.fc" " usbnet" $add-deflated-dropin + " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-dropin + " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1" $add-dropin + " ${BP}/dev/usb2/device/net/build/usbnet.fc" " usbnet" $add-deflated-dropin " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial" $add-deflated-dropin " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage" $add-deflated-dropin Modified: cpu/x86/pc/olpc/loaddropins.fth =================================================================== --- cpu/x86/pc/olpc/loaddropins.fth 2007-12-02 10:27:07 UTC (rev 745) +++ cpu/x86/pc/olpc/loaddropins.fth 2007-12-02 10:31:17 UTC (rev 746) @@ -8,7 +8,7 @@ " ${BP}/dev/usb2/hcd/ehci/build/ehci.fc" " class0c0320" $add-deflated-dropin " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-dropin " ${BP}/dev/usb2/device/net/build/usbnet.fc" " usbnet" $add-deflated-dropin - " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3" $add-dropin + " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1" $add-dropin " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial" $add-deflated-dropin " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage" $add-deflated-dropin " ${BP}/dev/usb2/device/wlan/build/usb8388.fc" " usb1286,2001" $add-deflated-dropin

1 0

r745 - in dev/usb2/hcd: . ehci uhci
by svn＠openbios.org 02 Dec '07

02 Dec '07

Author: wmb Date: 2007-12-02 11:27:07 +0100 (Sun, 02 Dec 2007) New Revision: 745 Modified: dev/usb2/hcd/ehci/probe.fth dev/usb2/hcd/hcd.fth dev/usb2/hcd/uhci/bulk.fth dev/usb2/hcd/uhci/probe.fth dev/usb2/hcd/uhci/uhci.fth Log: USB UHCI driver - Several fixes for the UHCI (USB 1.1) driver for compatibility with Intel ICH7 and some full-speed devices. Modified: dev/usb2/hcd/ehci/probe.fth =================================================================== --- dev/usb2/hcd/ehci/probe.fth 2007-12-02 02:43:57 UTC (rev 744) +++ dev/usb2/hcd/ehci/probe.fth 2007-12-02 10:27:07 UTC (rev 745) @@ -40,6 +40,29 @@ then drop ; +: grab-controller ( -- error? ) + hccparams@ 8 rshift h# ff and dup if ( config-adr ) + dup my-l@ h# 10001 = if ( config-adr ) + h# 100.0000 over my-l! ( config-adr ) \ Ask for it + true ( config-adr error? ) + d# 100 0 do ( config-adr error? ) + over my-l@ h# 101.0000 and h# 100.0000 = if + \ Turn off SMIs in Legacy Support Extended CSR + h# e000.0000 h# 6c my-l! ( config-adr error? ) + 0 my-l@ h# 27cc8086 = if + h# ffff.0000 h# 70 my-l! \ Clear EHCI Intel special SMIs + then + 0= leave ( config-adr error?' ) + then ( config-adr error? ) + d# 10 ms ( config-adr error? ) + loop ( config-adr error? ) + nip exit + then ( config-adr ) + then ( config-adr ) + drop ( ) + false +; + external : power-usb-ports ( -- ) ; @@ -64,8 +87,14 @@ parse-my-args open-count 0= if map-regs + alloc-dma-buf first-open? if false to first-open? + grab-controller if + ." Can't take control of EHCI from underlying BIOS" cr + free-dma-buf unmap-regs + false exit + then 0 ehci-reg@ h# ff and to op-reg-offset reset-usb init-ehci-regs @@ -74,8 +103,6 @@ init-struct init-extra then - alloc-dma-buf - probe-root-hub then open-count 1+ to open-count Modified: dev/usb2/hcd/hcd.fth =================================================================== --- dev/usb2/hcd/hcd.fth 2007-12-02 02:43:57 UTC (rev 744) +++ dev/usb2/hcd/hcd.fth 2007-12-02 10:27:07 UTC (rev 745) @@ -60,6 +60,9 @@ : my-w@ ( offset -- w ) my-space + " config-w@" $call-parent ; : my-w! ( w offset -- ) my-space + " config-w!" $call-parent ; +: my-l@ ( offset -- l ) my-space + " config-l@" $call-parent ; +: my-l! ( l offset -- ) my-space + " config-l!" $call-parent ; + : map-in ( phys.lo,md,hi len -- vaddr ) " map-in" $call-parent ; : map-out ( vaddr size -- ) " map-out" $call-parent ; Modified: dev/usb2/hcd/uhci/bulk.fth =================================================================== --- dev/usb2/hcd/uhci/bulk.fth 2007-12-02 02:43:57 UTC (rev 744) +++ dev/usb2/hcd/uhci/bulk.fth 2007-12-02 10:27:07 UTC (rev 745) @@ -103,21 +103,24 @@ bulk-in-qh my-speed insert-bulk-qh ; +: bulk-in-actual ( -- actual usberr ) + bulk-in-td bulk-in-qh >qh-#tds l@ get-actual ( actual ) + usb-error ( actual usberr ) + bulk-in-td bulk-in-qh >qh-#tds l@ fixup-bulk-in-data +; + : bulk-in? ( -- actual usberr ) bulk-in-qh 0= if 0 USB_ERR_INV_OP exit then clear-usb-error process-hc-status - bulk-in-qh dup sync-qhtds - qh-done? if - bulk-in-td bulk-in-qh >qh-#tds l@ get-actual ( actual ) - usb-error ( actual usberr ) - bulk-in-td bulk-in-qh >qh-#tds l@ fixup-bulk-in-data - else + bulk-in-qh dup sync-qhtds ( bulk-in-qh ) + qh-done? if ( ) + bulk-in-actual ( actual usberr ) + else ( ) bulk-in-qh dup >hcqh-elem le-l@ ( qh elem ) 1 ms over sync-qhtds ( qh elem ) swap >hcqh-elem le-l@ = if \ No movement in the past ms - bulk-in-td bulk-in-qh >qh-#tds l@ get-actual ( actual ) - usb-error ( actual usberr ) + bulk-in-actual ( actual usberr ) bulk-in-td bulk-in-qh >qh-#tds l@ fixup-bulk-in-data else \ It may not be done yet 0 usb-error ( actual usberr ) @@ -130,14 +133,16 @@ headers : restart-bulk-in-td ( td -- ) - begin ?dup while - dup >hctd-token dup le-l@ TD_TOKEN_DATA1 invert and - bulk-in-data@ toggle-bulk-in-data or swap le-l! - dup >hctd-stat dup le-l@ - TD_STAT_ANY_ERROR TD_ACTUAL_MASK or invert and - TD_STAT_ACTIVE or swap le-l! - >td-next l@ - repeat + begin ?dup while ( td ) + toggle-bulk-in-data ( td ) + dup >hctd-token ( td &token ) + dup le-l@ TD_TOKEN_DATA1 invert and ( td &token value ) + bulk-in-data@ or swap le-l! ( td ) + dup >hctd-stat dup le-l@ ( td &stat value ) + TD_STAT_ANY_ERROR TD_ACTUAL_MASK or invert and ( td &stat value' ) + TD_STAT_ACTIVE or swap le-l! ( td ) + >td-next l@ ( td' ) + repeat ( ) ; external Modified: dev/usb2/hcd/uhci/probe.fth =================================================================== --- dev/usb2/hcd/uhci/probe.fth 2007-12-02 02:43:57 UTC (rev 744) +++ dev/usb2/hcd/uhci/probe.fth 2007-12-02 10:27:07 UTC (rev 745) @@ -4,17 +4,20 @@ hex headers +\ We mustn't wait more than 3 ms between releasing the reset and enabling +\ the port to begin the SOF stream, otherwise some devices (e.g. pl2303) +\ will go into suspend state and then not respond to set-address. : reset-root-hub-port ( port -- ) - dup >r portsc@ fff5 and 200 or r@ portsc! \ Reset port - 10 ms - r@ portsc@ fff5 and 200 invert and r@ portsc! - 10 ms - r@ portsc@ fff5 and 4 or r@ portsc! \ Enable port - 20 ms - r@ portsc@ a or r> portsc! \ Clear status + dup >r portsc@ h# 20e invert and ( value r: port ) \ Clear reset, enable, status + dup h# 200 or r@ portsc! ( value r: port ) \ Reset port + d# 30 ms ( value r: port ) \ > 10 ms - reset time + dup r@ portsc! ( value r: port ) \ Release reset + 1 ms ( value r: port ) \ > 5.3 uS - reconnect time + h# e or r> portsc! ( ) \ Enable port and clear status ; : probe-root-hub-port ( port -- ) + dup reset-root-hub-port dup portsc@ 1 and 0= if drop exit then \ No device-connected ok-to-add-device? 0= if drop exit then \ Can't add another device @@ -39,7 +42,6 @@ 2 0 do i portsc@ h# a and if i rm-obsolete-children \ Remove obsolete device nodes - i reset-root-hub-port i ['] probe-root-hub-port catch if drop ." Failed to probe root port " i .d cr then @@ -57,6 +59,7 @@ map-regs first-open? if false to first-open? + ?disable-smis reset-usb init-struct init-lists @@ -73,7 +76,7 @@ : close ( -- ) open-count 1- to open-count end-extra - open-count 0= if free-dma-buf unmap-regs then + open-count 0= if free-dma-buf then \ Don't unmap ; \ LICENSE_BEGIN Modified: dev/usb2/hcd/uhci/uhci.fth =================================================================== --- dev/usb2/hcd/uhci/uhci.fth 2007-12-02 02:43:57 UTC (rev 744) +++ dev/usb2/hcd/uhci/uhci.fth 2007-12-02 10:27:07 UTC (rev 745) @@ -52,6 +52,10 @@ : portsc@ ( port -- data ) 2* 10 + uhci-w@ ; : portsc! ( data port -- ) 2* 10 + uhci-w! ; +: ?disable-smis ( -- ) + 0 my-l@ h# 27c88086 = if h# af00 h# 80 my-w! then +; + : reset-usb ( -- ) uhci-reg dup 0= if map-regs then 4 usbcmd! \ Global reset

1 0

r744 - dev/usb2/hcd/ehci
by svn＠openbios.org 02 Dec '07

02 Dec '07

Author: wmb Date: 2007-12-02 03:43:57 +0100 (Sun, 02 Dec 2007) New Revision: 744 Modified: dev/usb2/hcd/ehci/ehci.fth Log: USB EHCI driver - extended a setting time delay from 1 ms to 3 ms because 1 ms is empirically too short for some devices on systems that don't have individual port power controls. Modified: dev/usb2/hcd/ehci/ehci.fth =================================================================== --- dev/usb2/hcd/ehci/ehci.fth 2007-12-02 02:41:50 UTC (rev 743) +++ dev/usb2/hcd/ehci/ehci.fth 2007-12-02 02:43:57 UTC (rev 744) @@ -154,7 +154,7 @@ : claim-ownership ( -- ) 1 cfgflag! \ Claim ownership to all ports - 1 ms + 3 ms \ Give devices time to settle \ Power on ports if necessary hcsparams@ h# 10 and if

1 0

r743 - dev/usb2/device/serial
by svn＠openbios.org 02 Dec '07

02 Dec '07

Author: wmb Date: 2007-12-02 03:41:50 +0100 (Sun, 02 Dec 2007) New Revision: 743 Modified: dev/usb2/device/serial/belkin.fth dev/usb2/device/serial/mct_u232.fth dev/usb2/device/serial/pl2303.fth Log: USB serial drivers - Changed the default baud rate to 115200 because nobody uses 9600 anymore. Modified: dev/usb2/device/serial/belkin.fth =================================================================== --- dev/usb2/device/serial/belkin.fth 2007-11-30 19:38:32 UTC (rev 742) +++ dev/usb2/device/serial/belkin.fth 2007-12-02 02:41:50 UTC (rev 743) @@ -20,7 +20,7 @@ : belkin-set-baud ( -- ) belkin-rts-dtr-on - d# 00 ( SET_BAUDRATE_REQUEST ) d# 230400 d# 9600 / belkin-cmd + d# 00 ( SET_BAUDRATE_REQUEST ) d# 230400 d# 115200 / belkin-cmd d# 03 ( SET_PARITY_REQUEST ) 0 ( PARITY_NONE ) belkin-cmd d# 02 ( SET_DATA_BITS_REQUEST ) 8 5 - belkin-cmd d# 01 ( SET_STOP_BITS_REQUEST ) 1 1 - belkin-cmd Modified: dev/usb2/device/serial/mct_u232.fth =================================================================== --- dev/usb2/device/serial/mct_u232.fth 2007-11-30 19:38:32 UTC (rev 742) +++ dev/usb2/device/serial/mct_u232.fth 2007-12-02 02:41:50 UTC (rev 743) @@ -15,7 +15,8 @@ 1 0 0 DR_OUT DR_VENDOR or d# 10 ( SET_MODEM_CTRL_REQUEST ) control-set drop ; : mct-set-baud ( -- ) - mct-buf 8 over le-l! \ 9600 baud rate + \ 300:1 600:2 1200:3 2400:4 4800:6 9600:8 19200:9 38400:a 57600:b 115200:c + mct-buf h# c over le-l! \ 115200 baud rate 4 0 0 DR_OUT DR_VENDOR or 5 ( SET_BAUD_RATE_REQUEST ) control-set drop ; : mct-rts-dtr-off ( -- ) 8 mct-set-modem-ctrl ; Modified: dev/usb2/device/serial/pl2303.fth =================================================================== --- dev/usb2/device/serial/pl2303.fth 2007-11-30 19:38:32 UTC (rev 742) +++ dev/usb2/device/serial/pl2303.fth 2007-12-02 02:41:50 UTC (rev 743) @@ -33,7 +33,7 @@ 0 0 1 0 pl2303-vendor-write - d# 9600 pl2303-buf le-l! \ Baud rate = 9600 + d# 115200 pl2303-buf le-l! \ Baud rate = 115200 0 pl2303-buf 4 ca+ c! \ # stop bits = 1 (0=1, 1=1.5, 2=2) 0 pl2303-buf 5 ca+ c! \ parity = none \ (0=none, 1=odd, 2=even, 3=mark, 4=space)

1 0

r742 - cpu/x86/pc/olpc
by svn＠openbios.org 30 Nov '07

30 Nov '07

Author: wmb Date: 2007-11-30 20:38:32 +0100 (Fri, 30 Nov 2007) New Revision: 742 Modified: cpu/x86/pc/olpc/usb8388.bth Log: OLPC build process - check Libertas MD5 sum from individual checksum file instead of from MD5SUMS, which is less prone to accidental corruption of the checksum. Modified: cpu/x86/pc/olpc/usb8388.bth =================================================================== --- cpu/x86/pc/olpc/usb8388.bth 2007-11-28 03:21:05 UTC (rev 741) +++ cpu/x86/pc/olpc/usb8388.bth 2007-11-30 19:38:32 UTC (rev 742) @@ -9,11 +9,12 @@ " wget -q http://dev.laptop.org/pub/firmware/libertas/usb8388-${WLAN_VERSION}.bin" expand$ $sh -" wget -q -O - http://dev.laptop.org/pub/firmware/libertas/MD5SUMS | grep ${WLAN_VERSION} >usb8388.md5" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/libertas/usb8388-${WLAN_VERSION}.bin.md5" expand$ $sh -" md5sum usb8388-${WLAN_VERSION}.bin | cmp - usb8388.md5" expand$ $sh +" md5sum -b usb8388-${WLAN_VERSION}.bin | cmp - usb8388-${WLAN_VERSION}.bin.md5" expand$ $sh " mv usb8388-${WLAN_VERSION}.bin usb8388.bin" expand$ $sh +" rm usb8388-${WLAN_VERSION}.bin.md5" expand$ $sh \ This forces the creation of a .log file, so we don't re-fetch writing usb8388.version

1 0

r741 - cpu/x86/pc/olpc
by svn＠openbios.org 28 Nov '07

28 Nov '07

Author: wmb Date: 2007-11-28 04:21:05 +0100 (Wed, 28 Nov 2007) New Revision: 741 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2D05 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-11-28 00:08:05 UTC (rev 740) +++ cpu/x86/pc/olpc/versions.fth 2007-11-28 03:21:05 UTC (rev 741) @@ -2,10 +2,10 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 04n +macro: FW_MINOR 05 \ The EC microcode -macro: EC_VERSION test4c +macro: EC_VERSION test4e \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary @@ -16,7 +16,7 @@ \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 -macro: WLAN_VERSION 5.110.20.p4 +macro: WLAN_VERSION 5.110.20.p1 \ The bios_verify image macro: CRYPTO_VERSION 0.2

1 0

r740 - cpu/x86/pc/olpc
by svn＠openbios.org 28 Nov '07

28 Nov '07

Author: wmb Date: 2007-11-28 01:08:05 +0100 (Wed, 28 Nov 2007) New Revision: 740 Modified: cpu/x86/pc/olpc/versions.fth Log: Changed EC and Libertas firmware versions for testing. Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-11-27 00:23:05 UTC (rev 739) +++ cpu/x86/pc/olpc/versions.fth 2007-11-28 00:08:05 UTC (rev 740) @@ -2,21 +2,21 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 04 +macro: FW_MINOR 04n \ The EC microcode -macro: EC_VERSION d02 +macro: EC_VERSION test4c \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary -\ macro: GET_EC wget http://dev.laptop.org/~rsmith/shiny6.bin -O ec.img +\ macro: GET_EC cp shiny4c.bin ec.img macro: KEYS mpkeys \ macro: KEYS testkeys \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 -macro: WLAN_VERSION 5.110.20.p0 +macro: WLAN_VERSION 5.110.20.p4 \ The bios_verify image macro: CRYPTO_VERSION 0.2

1 0

Determining whether BARs point to (non)relocatable memory/io space.
by Asif Haswarey 27 Nov '07

27 Nov '07

Hi everyone! I've run into what seems to be a contradiction with reference to the "relocatability" of a BAR's mem/io space. In the following example the spec. of the device says that BARs 0x10, 0x14 and 0x30 are relocatable. assigned-addresses 81001810 00000000 00000300 00000000 00000100 82001814 00000000 00100000 00000000 00002000 82001830 00000000 00180000 00000000 00080000 reg 00001800 00000000 00000000 00000000 00000000 01001810 00000000 00000000 00000000 00000100 02001814 00000000 00000000 00000000 00002000 02001830 00000000 00000000 00000000 00080000 So when I create and assign values to the reg property, I set the "n" bit to 0. Example BAR 0x10: 01001810 As defined in the OpenFirmware IEEE-1275 PCI Bus Binding 2.1, the "n" bit indicates (non)relocatability of the corresponding BAR's mem/io address space. The assigned-addresses property, however, is created by the system OpenFirmware (Sun SPARC Blade 1500 in this example). And as you can see the "n" bit in the phy-hi values is set for all the BARs (0x10, 0x14, 0x30), indicating that the corresponding BAR's space is non-relocatable. Example BAR 0x10: 81001810 I know, I'm being lazy! I can look for the piece of code in Sun's OBP source. But I'm trying to understand the rule for setting this "n" bit as far as the PCI spec. is concerned. I could not find anything indicating the attribute of relocatibility in the PCI spec. (including the PCI Architecture 2.1 book from Mindshare.) The only place I was able to make any sense of relocatability was the type bit field in the BAR[2:1]: For BAR[0] = 0, this BAR is associated with a memory address space: Type field BAR[2:1] = 00 (locate anywhere in lower 4GB) 01 (locate below 1MB (reserved in PCI 2.2 spec)) 10 (locate anywhere over 4GB (implies that register is 64-bits wide)) 11 (reserved) For BAR[0] = 1, this BAR is associated with a IO address space. There is no type field in this case. All this leads me to conclude: - all memory-address-space BARs are relocatable; - all io-address-space BARs are non-relocatable. Is this conclusion correct? _____________ Äsif Haswaréy QLogic Corporation FCode Driver Development Phone: 949.389.7607 Fax: 949.389.6308 asif.haswarey(a)qlogic.com

1 0

r739 - cpu/x86/pc/olpc
by svn＠openbios.org 27 Nov '07

27 Nov '07

Author: wmb Date: 2007-11-27 01:23:05 +0100 (Tue, 27 Nov 2007) New Revision: 739 Modified: cpu/x86/pc/olpc/gxmsrs.fth cpu/x86/pc/olpc/lxmsrs.fth cpu/x86/pc/olpc/rtcwake.fth Log: OLPC Trac 5128 - Set RTC alarm day, alarm month, and century offset MSRs, and set century byte to 20. Modified: cpu/x86/pc/olpc/gxmsrs.fth =================================================================== --- cpu/x86/pc/olpc/gxmsrs.fth 2007-11-20 07:40:33 UTC (rev 738) +++ cpu/x86/pc/olpc/gxmsrs.fth 2007-11-27 00:23:05 UTC (rev 739) @@ -291,6 +291,9 @@ \ msr: 5140.004e 00000000.ef2500c0. \ LPC_SIRQ \ msr: 5140.004e 00000000.effd0080. \ LPC_SIRQ msr: 5140.004e 00000000.effd00c0. \ LPC_SIRQ - Active high bit 12 (mouse) and 2 (kbd), Enable, Quiet, 17 frames +msr: 5140.0055 00000000.0000003d. \ RTC alarm day (offset into CMOS RAM) +msr: 5140.0056 00000000.0000003e. \ RTC alarm month (offset into CMOS RAM) +msr: 5140.0057 00000000.00000032. \ RTC century (offset into CMOS RAM) \ USB host controller msr: 5120.0001 0000000b.00000000. \ USB_GLD_MSR_CONFIG - 5536 page 262 Modified: cpu/x86/pc/olpc/lxmsrs.fth =================================================================== --- cpu/x86/pc/olpc/lxmsrs.fth 2007-11-20 07:40:33 UTC (rev 738) +++ cpu/x86/pc/olpc/lxmsrs.fth 2007-11-27 00:23:05 UTC (rev 739) @@ -241,6 +241,9 @@ \ msr: 5140.004e 00000000.ef2500c0. \ LPC_SIRQ \ msr: 5140.004e 00000000.effd0080. \ LPC_SIRQ msr: 5140.004e 00000000.effd00c0. \ LPC_SIRQ - Active high bit 12 (mouse) and 2 (kbd), Enable, Quiet, 17 frames + msr: 5140.0055 00000000.0000003d. \ RTC alarm day (offset into CMOS RAM) + msr: 5140.0056 00000000.0000003e. \ RTC alarm month (offset into CMOS RAM) + msr: 5140.0057 00000000.00000032. \ RTC century (offset into CMOS RAM) \ USB host controller msr: 5120.0001 0000000b.00000000. \ USB_GLD_MSR_CONFIG - 5536 page 262 Modified: cpu/x86/pc/olpc/rtcwake.fth =================================================================== --- cpu/x86/pc/olpc/rtcwake.fth 2007-11-20 07:40:33 UTC (rev 738) +++ cpu/x86/pc/olpc/rtcwake.fth 2007-11-27 00:23:05 UTC (rev 739) @@ -4,17 +4,17 @@ : enable-rtc-irq ( -- ) h# a1 pc@ h# fe and h# a1 pc! ; : disable-rtc-irq ( -- ) h# a1 pc@ 1 or h# a1 pc! ; -0 value cmos-alarm-day \ Offset of day alarm in CMOS -0 value cmos-alarm-month \ Offset of month alarm in CMOS +\ Must agree with lxmsrs.fth +h# 3d constant cmos-alarm-day \ Offset of day alarm in CMOS +h# 3e constant cmos-alarm-month \ Offset of month alarm in CMOS +h# 32 constant cmos-century \ Offset of century byte in CMOS -: set-alarm-offsets ( -- ) - h# 10. h# 5140.0055 wrmsr - h# 11. h# 5140.0056 wrmsr +dev /rtc + cmos-alarm-day " alarm_day" integer-property + cmos-alarm-month " alarm_month" integer-property + cmos-century " century" integer-property +dend - h# 5140.0055 rdmsr drop to cmos-alarm-day - h# 5140.0056 rdmsr drop to cmos-alarm-month -; - false value enable-rtc-irq? : rtc-handler ( -- ) h# c cmos@ drop ." R" ; \ Clear RTC interrupt flags @@ -51,12 +51,15 @@ 0 0 acpi-l! \ Disable RTC SCI ; : rtc-wackup - set-alarm-offsets 0 begin pm-sleep-rtc space dup . (cr 1+ key? until key drop ; +stand-init: Century + d# 20 cmos-century cmos! +; + \ LICENSE_BEGIN \ Copyright (c) 2007 FirmWorks \

1 0

Strange request when attempting to build the latest release
by Gregg Levine 26 Nov '07

26 Nov '07

Hello! It seems that with the later releases of OpenBIOS from the SVN place I get a strange request: root@jimkirk:/usr/src/openbios/openbios-devel# make Please install the OpenBIOS fcode utilities. Download with : $ svn co svn://openbios.org/openbios/fcode-utils make: *** [requirements] Error 1 root@jimkirk:/usr/src/openbios/openbios-devel# Well I did that. I then repeated the make command, it said the same thing. Any suggestions for configuring the fcode-utils, and where they should be placed? I stuck my copy inside the same tree as the OpenBIOS SVN release. -- Gregg C Levine gregg.drwho8(a)gmail.com "This signature was once found posting rude messages in English in the Moscow subway."

2 1

r738 - ofw/fs/fatfs
by svn＠openbios.org 20 Nov '07

20 Nov '07

Author: wmb Date: 2007-11-20 08:40:33 +0100 (Tue, 20 Nov 2007) New Revision: 738 Modified: ofw/fs/fatfs/write.fth Log: OLPC trac 5029 - Fixed a problem that caused files written from OFW to be 0x400 bytes too short in certain cases. Modified: ofw/fs/fatfs/write.fth =================================================================== --- ofw/fs/fatfs/write.fth 2007-11-19 23:48:42 UTC (rev 737) +++ ofw/fs/fatfs/write.fth 2007-11-20 07:40:33 UTC (rev 738) @@ -80,7 +80,7 @@ \ If we need more cluster(s) and \ we're at or beyond the end of the file, add new cluster(s) dup 0> - current-position fh_length l@ > last-cluster? or and if + current-position fh_length l@ > last-cluster? or and if extend-file ?dup if ?flush-fat-cache nip exit then extended? on else \ same cluster? @@ -94,17 +94,19 @@ ?flush-fat-cache true exit then - \ If this is a partial cluster without extension, - \ then adjust the length field - remaining @ /cluster < extended? @ invert and if + \ Adjust the length field unless extend-file already did it + extended? @ 0= if current-position remaining @ + fh_length l! then \ Continue with the rest of the transfer #cont-cls @ /cluster * dup bufadr +! negate remaining +! - next-cl# @ ?dup if 1st-cl# ! 1 #cont-cls ! next-cl# off - else 1st-cl# off #cont-cls off then + next-cl# @ ?dup if + 1st-cl# ! 1 #cont-cls ! next-cl# off + else + 1st-cl# off #cont-cls off + then last-cluster? 0= if to-next-cluster then repeat drop ( )

1 0

r737 - ofw/fs/fatfs
by svn＠openbios.org 20 Nov '07

20 Nov '07

Author: wmb Date: 2007-11-20 00:48:42 +0100 (Tue, 20 Nov 2007) New Revision: 737 Modified: ofw/fs/fatfs/device.fth Log: OLPC trac 5022 - Fixed FAT size determination code in the face of crazy media type values, using Microsoft's recommended algorithm for determining whether to use FAT-12, FAT-16, or FAT-32. Modified: ofw/fs/fatfs/device.fth =================================================================== --- ofw/fs/fatfs/device.fth 2007-11-18 03:54:48 UTC (rev 736) +++ ofw/fs/fatfs/device.fth 2007-11-19 23:48:42 UTC (rev 737) @@ -121,6 +121,9 @@ then ; +\ This version of read-bpb implements Microsoft's recommended +\ method for determining whether a filesystem is FAT-16 or FAT-32. +variable nsects : ?read-bpb ( -- ) /sector 0= if \ Read bpb if necessary init-sector-size @@ -132,25 +135,14 @@ then bp_bps lew@ bps w! bp_spc c@ spc c! - bp_spf lew@ ?dup if - media c@ h# f8 = if - dup d# 12 < if fat12 else fat16 then - else - fat12 - then 0 0 - 0 fsinfo ! 0 fssector ! false fsinfos-dirty c! - else - bp_bspf lel@ fat32 - bp_rdirclus lel@ - bp_fsinfos lew@ dup read-fsinfo - then - fsinfos w! - rdirclus l! - fat-type c! - spf l! + bp_spf lew@ ?dup 0= if bp_bspf lel@ then spf l! + bp_nsects lew@ ?dup 0= if bp_xnsects lel@ then nsects l! - init-fat-cache + bp_ndirs lew@ /dirent * /sector 1- + /sector / #dir-sectors w! + \ nsects is TotSec + \ #dir-sectors is RootDirSectors + \ Sector number where the FAT starts. \ bp_nhid is the number of sectors before the BPB sector. \ bp_res is the number of sectors from the BPT sector to the @@ -158,17 +150,24 @@ \ If the underlying disk driver handles partition offsets, \ we don't need to handle bp_nhid here. - bp_res lew@ ( bp_nhid lel@ + ) fat-sector0 w! + bp_res lew@ ( bp_nhid lel@ + ) + dup fat-sector0 w! ( #resv-sectors ) + spf l@ bp_nfats c@ * + ( #early-sectors ) + dup dir-sector0 w! ( #early-sectors ) + #dir-sectors w@ + cl-sector0 l! ( ) - rdirclus @ ?dup if - dv_cwd-cl l! + \ cl-sector0 is FirstDataSector + + nsects l@ #dir-sectors w@ - spc c@ / ( #clusters ) + dup d# 65525 >= if ( #clusters ) + drop fat32 fat-type c! 0 dir-sector0 w! - 0 #dir-sectors w! - spf l@ bp_nfats c@ * fat-sector0 w@ + cl-sector0 l! + bp_rdirclus lel@ rdirclus l! + bp_fsinfos lew@ dup read-fsinfo fsinfos w! else - spf l@ bp_nfats c@ * fat-sector0 w@ + dir-sector0 w! - bp_ndirs lew@ /dirent * /sector / #dir-sectors w! - dir-sector0 w@ #dir-sectors w@ + cl-sector0 l! + d# 4085 >= if fat16 else fat12 then fat-type c! + 0 fsinfo ! 0 fssector ! false fsinfos-dirty c! + 0 fsinfos w! 0 rdirclus l! then \ The number of clusters is limited both by space for clusters numbers @@ -180,16 +179,22 @@ spf l@ /sector * bytes>cl-entries ( #clusters ) \ Compare it with the number of clusters for which there is disk space - bp_nsects lew@ ?dup 0= if bp_xnsects lel@ then + nsects l@ cl-sector0 l@ - spc c@ / 2 + min 1- max-cl# l! free-bpb + + \ Start with the root directory as the current working directory + rdirclus @ dv_cwd-cl l! + + init-fat-cache then ; : set-device ( device# -- ) (set-device) ?read-bpb ; \ : stand-init ( -- ) stand-init clear-device-records ; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r179 - openbios-devel/drivers
by svn＠openbios.org 19 Nov '07

19 Nov '07

Author: blueswirl Date: 2007-11-19 20:11:38 +0100 (Mon, 19 Nov 2007) New Revision: 179 Modified: openbios-devel/drivers/obio.c Log: Improved Module ID generation Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-11-17 19:00:58 UTC (rev 178) +++ openbios-devel/drivers/obio.c 2007-11-19 19:11:38 UTC (rev 179) @@ -891,7 +891,15 @@ push_str("cache-coherence?"); fword("property"); - PUSH(i); + switch (machine_id) { + case 0x71: + case 0x72: + PUSH(i + 8); + break; + case 0x80: + PUSH(i); + break; + } fword("encode-int"); push_str("mid"); fword("property"); @@ -1110,6 +1118,7 @@ sparc_header->smp_ctx = context; sparc_header->valid = 1; + cpu &= 7; intregs->cpu_intregs[cpu].set = SUN4M_SOFT_INT(14); return 0;

1 0

r736 - cpu/x86/pc/olpc
by svn＠openbios.org 18 Nov '07

18 Nov '07

Author: wmb Date: 2007-11-18 04:54:48 +0100 (Sun, 18 Nov 2007) New Revision: 736 Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/loaddropins.fth cpu/x86/pc/olpc/security.fth Log: OLPC - Cosmetic improvements in secure boot error messages and some stuff to help the factory repair systems after FQA. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-11-16 22:29:19 UTC (rev 735) +++ cpu/x86/pc/olpc/fw.bth 2007-11-18 03:54:48 UTC (rev 736) @@ -332,9 +332,9 @@ 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/linux.fth +fload ${BP}/cpu/x86/pc/olpc/setwp.fth fload ${BP}/cpu/x86/pc/olpc/security.fth fload ${BP}/cpu/x86/pc/olpc/fsupdate.fth -fload ${BP}/cpu/x86/pc/olpc/setwp.fth fload ${BP}/ofw/gui/ofpong.fth fload ${BP}/cpu/x86/pc/olpc/life.fth fload ${BP}/cpu/x86/pc/olpc/sound.fth @@ -520,12 +520,13 @@ ." Tests complete - powering off" cr d# 5000 ms power-off then ; + : ?scan-nand ( -- ) rocker-up game-key? if text-on scan-nand then ; : ?fs-update ( -- ) button-check button-x or button-o or button-square or ( mask ) - game-key-mask over and = if + game-key-mask = if try-fs-update then ; @@ -547,6 +548,8 @@ no-page + ?factory-mode + console-start ?resume-botch Modified: cpu/x86/pc/olpc/loaddropins.fth =================================================================== --- cpu/x86/pc/olpc/loaddropins.fth 2007-11-16 22:29:19 UTC (rev 735) +++ cpu/x86/pc/olpc/loaddropins.fth 2007-11-18 03:54:48 UTC (rev 736) @@ -27,7 +27,7 @@ " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/warnings.565" " warnings.565" $add-deflated-dropin +\ " ${BP}/cpu/x86/pc/olpc/images/warnings.565" " warnings.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/lightdot.565" " lightdot.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/yellowdot.565" " yellowdot.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/darkdot.565" " darkdot.565" $add-deflated-dropin Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-11-16 22:29:19 UTC (rev 735) +++ cpu/x86/pc/olpc/security.fth 2007-11-18 03:54:48 UTC (rev 736) @@ -13,8 +13,8 @@ 0 0 2value base-xy 0 0 2value next-xy -d# 410 d# 540 2constant progress-xy -d# 557 d# 283 2constant sad-xy +d# 463 d# 540 2constant progress-xy +d# 552 d# 283 2constant sad-xy true value debug-security? : ?lease-debug ( msg$ -- ) @@ -23,6 +23,9 @@ : ?lease-debug-cr ( msg$2 -- ) debug-security? if type cr else 2drop then ; +: ?lease-error-cr ( msg$2 -- ) + debug-security? if red-letters type black-letters cr else 2drop then +; : fail-load ( -- ) text-on @@ -31,15 +34,21 @@ begin again ; +code halt hlt c; \ To save power + 0 value security-off? : security-failure ( -- ) visible - ." Stopping" cr - security-off? if quit then + security-off? if ." Stopping" cr quit then - d# 10000 ms - power-off + button-check game-key? if + ." Use power button to power off" cr + begin halt again + else + ." Powering off in 10 seconds" cr + d# 10000 ms power-off + then ; : +icon-xy ( delta-x,y -- ) icon-xy d+ to icon-xy ; @@ -56,6 +65,12 @@ sad-xy to icon-xy " sad" show-icon to icon-xy ; +: .security-failure ( error$ -- ) + visible red-letters type black-letters cr + show-sad + security-failure +; + : show-lock ( -- ) " lock" show-icon ; : show-unlock ( -- ) " unlock" show-icon ; : show-child ( -- ) @@ -63,14 +78,16 @@ d# 552 d# 383 to icon-xy " rom:xogray.565" $show-opaque progress-xy to icon-xy \ For boot progress reports ; + +0 [if] : show-warnings ( -- ) " erase-screen" $call-screen d# 48 d# 32 to icon-xy " rom:warnings.565" $show-opaque dcon-freeze ; +[then] - h# 20 buffer: cn-buf \ filename prefix - either "act" or "run" h# 20 buffer: fn-buf \ filename tail - either "os" or "rd" h# 100 buffer: pn-buf \ pathname - either "\boot" or "\boot-alt" @@ -211,7 +228,7 @@ pubkey$ 2swap signature-bad? ( error? ) dup if - " Signature invalid" ?lease-debug-cr + " Signature invalid" ?lease-error-cr else " Signature valid" ?lease-debug-cr then @@ -233,7 +250,7 @@ 2dup our-pubkey? if false exit then ( rem$ line$ ) 2drop ( rem$ ) repeat ( rem$ ) - " No signature for our key" ?lease-debug-cr + " No signature for our key" ?lease-error-cr 2drop true ; @@ -266,94 +283,64 @@ over r@ - r> ( tail$ head$ ) ; -0. 2value exp-seconds \ Accumulator for parsing data/time strings - \ numfield is a factor used for parsing 2-digit fields from date/time strings. -\ Radix is the number to scale the result by, i.e. one more than the maximum -\ value of the field. Adjust is 0 for fields whose first valid value is 0 -\ (hours, minutes, seconds) or 1 for fields that start at 1 (month,day). - -: numfield ( exp$ adjust radix -- exp$' ) - >r >r ( exp$ r: radix adjust ) - 2 break$ $number throw ( exp$' num r: radix adjust ) - r> - ( exp$ num' r: radix ) - dup r@ u>= throw ( exp$ num r: radix ) - - \ No need to multiply the top half because it can only become nonzero - \ on the last call to scale-time - exp-seconds drop r> um* ( exp$ num d.seconds ) - rot 0 d+ to exp-seconds ( exp$ ) +: numfield ( exp$ min max -- exp$' ) + >r >r ( exp$ r: max min ) + 2 break$ $number throw ( exp$' num r: max min ) + dup r> < throw ( exp$ num r: max ) + dup r> > throw ( exp$ num ) ; \ expiration-to-seconds parses an expiration date string like \ "20070820T130401Z", converting it to (double precision) seconds \ according to the simplified calculation described above for "get-date" -: (expiration-to-seconds) ( expiration$ -- true | d.seconds false ) - 4 break$ $number throw ( exp$' year ) - dup d# 2999 u> throw ( exp$' year ) - 0 to exp-seconds ( exp$' ) - - 1 d# 12 numfield ( exp$' ) \ Month - 1 d# 31 numfield ( exp$' ) \ Day - - 1 break$ " T" $= 0= throw ( exp$' ) - - 0 d# 24 numfield ( exp$' ) \ Hour - 0 d# 60 numfield ( exp$' ) \ Minute - 0 d# 60 numfield ( exp$' ) \ Second - - " Z" $= 0= throw ( ) - exp-seconds +: (expiration-to-seconds) ( expiration$ -- d.seconds ) + 4 break$ $number throw >r ( exp$' r: y ) + 1 d# 12 numfield >r ( exp$' r: y m ) + 1 d# 31 numfield >r ( exp$' r: y m d ) + 1 break$ " T" $= 0= throw ( exp$' r: y m d ) + 0 d# 23 numfield >r ( exp$' r: y m d h ) + 0 d# 59 numfield >r ( exp$' r: y m d h m ) + 0 d# 59 numfield >r ( exp$' r: y m d h m s ) + " Z" $= 0= throw ( r: y m d h m s ) + r> r> r> r> r> r> ( s m h m d y ) + >unix-seconds ; -: expiration-to-seconds ( expiration$ -- true | d.seconds false ) +: expiration-to-seconds ( expiration$ -- true | seconds false ) push-decimal - ['] (expiration-to-seconds) catch ( x x true | d.seconds false ) + ['] (expiration-to-seconds) catch ( x x true | seconds false ) pop-base dup if nip nip then ; -\ earliest is the earliest acceptable date value (in seconds). -\ It is the date that the first test version of this code was -\ deployed. If a laptop has any earlier date that than, that -\ date is presumed bogus. +0 value current-seconds -" 20070101T000000Z" expiration-to-seconds drop 2constant earliest +: date-bad? ( -- flag ) + current-seconds 0= if + time&date >unix-seconds to current-seconds + then -0. 2value current-seconds + \ earliest is the earliest acceptable date value (in seconds). + \ It is the date that the first test version of this code was + \ deployed. If a laptop has any earlier date that than, that + \ date is presumed bogus. -\ get-date reads the date and time from the real time clock -\ and converts it to seconds. - -\ The seconds conversion uses a simplified approach that ignores -\ leap years and the like - it assumes that all months are 31 days. -\ This is sufficient for comparison purposes so long as we use the -\ same calculation in all cases. It is not good for doing -\ arithmetic on dates. -: get-date ( -- ) - time&date ( s m h d m y ) - d# 12 * swap 1- + ( s m h d m' ) \ Months start at 1 - d# 31 * swap 1- + ( s m h d' ) \ Days start at 1 - d# 24 * + ( s m h' ) - d# 60 * + ( s m' ) \ Can't overflow so far - d# 60 um* ( s d.s' ) - swap 0 d+ to current-seconds + current-seconds [ " 20070101T000000Z" expiration-to-seconds drop ] literal - 0< ; + \ expired? determines whether or not the expiration time string is \ earlier than this machine's current time (from the real time clock). : expired? ( expiration$ -- bad? ) - expiration-to-seconds if true exit then ( d.seconds ) + expiration-to-seconds if true exit then ( seconds ) - current-seconds 0. d= if ( d.seconds ) - then - \ If the date is bad, leases are deemed to have expired - current-seconds earliest d< if 2drop true exit then + date-bad? if drop true exit then ( seconds ) - current-seconds d< + current-seconds - 0< ; d# 1024 constant /sec-line-max @@ -380,11 +367,11 @@ : get-my-sn ( -- error? ) " SN" find-tag 0= if - " No serial number in mfg data" ?lease-debug-cr + " No serial number in mfg data" ?lease-error-cr true exit then ( adr len ) ?-null dup d# 11 <> if - " Invalid serial number" ?lease-debug-cr + " Invalid serial number" ?lease-error-cr 2drop true exit then ( adr len ) machine-id-buf swap move @@ -392,11 +379,11 @@ [char] : machine-id-buf d# 11 + c! " U#" find-tag 0= if - " No UUID in mfg data" ?lease-debug-cr + " No UUID in mfg data" ?lease-error-cr true exit then ( adr len ) ?-null dup d# 36 <> if - " Invalid UUID" ?lease-debug-cr + " Invalid UUID" ?lease-error-cr 2drop true exit then ( adr len ) machine-id-buf d# 12 + swap move @@ -419,12 +406,12 @@ 2dup " 00000000T000000Z" $= if 0 exit then dup d# 16 <> if ( expiration$ ) - " has bad expiration format" ?lease-debug-cr + " has bad expiration format" ?lease-error-cr -1 exit then ( expiration$ ) 2dup expired? if - " expired" ?lease-debug-cr + " expired" ?lease-error-cr -1 exit then ( expiration$ ) 0 @@ -454,7 +441,10 @@ my-sn$ $= 0= if 2drop 0 exit then ( rem$ ) \ Disposition code - bl left-parse-string 1 <> if 3drop -1 exit then ( rem$ disp-adr ) + bl left-parse-string 1 <> if + " No disposition code" ?lease-error-cr + 3drop -1 exit + then ( rem$ disp-adr ) set-disposition ( rem$ ) bl left-parse-string check-expiry if 4drop -1 exit then ( sig$ exp$ ) @@ -470,7 +460,7 @@ : check-lease ( act01-lease$ -- -1|0|1 ) bl left-parse-string " act01:" $= 0= if - " Not act01:" ?lease-debug-cr + " Not act01:" ?lease-error-cr 2drop -1 exit then ( rem$ ) check-timed-signature ( -1|0|1 ) @@ -498,7 +488,7 @@ -1 of r> close-file drop " lock" show-icon false exit endof endcase repeat - " No matching records" ?lease-debug-cr + " No matching records" ?lease-error-cr r> close-file drop false ; @@ -575,6 +565,7 @@ ; false value secure? +false value in-factory? stand-init: wp " wp" find-tag if 2drop true to secure? then @@ -612,7 +603,7 @@ -1 of r> close-file drop false exit endof endcase repeat - " No matching records" ?lease-debug-cr + " No matching records" ?lease-error-cr r> close-file drop false ; @@ -625,13 +616,13 @@ base @ >r d# 36 base ! fw#buf 5 $number if show-x - visible ." Invalid firmware version number" security-failure + " Invalid firmware version number" .security-failure then pop-base ; : firmware-up-to-date? ( img$ -- ) - /flash <> if show-x visible ." Invalid Firmware image" security-failure then ( adr ) + /flash <> if show-x " Invalid Firmware image" .security-failure then ( adr ) (fw-version) ( file-version# ) rom-pa (fw-version) ( file-version# rom-version# ) u<= @@ -680,7 +671,7 @@ ['] ?enough-power catch ?dup if visible - .error + red-letters .error black-letters security-failure then @@ -689,9 +680,7 @@ reflash \ Should power-off and reboot show-x - visible - ." Reflash returned, unexpectedly" cr - security-failure + " Reflash returned, unexpectedly" .security-failure then show-lock then @@ -757,7 +746,6 @@ next-xy to icon-xy ( list$ ) repeat ( list$ ) - " sad" show-icon ( list$ ) 2drop false ( ) ; @@ -765,15 +753,19 @@ : all-devices$ ( -- list$ ) " disk: sd: nand:" ; +: secure-startup ( -- ) + in-factory? if + button-check button-x or button-o or button-square or button-rotate or ( mask ) + game-key-mask = if exit then + then -: secure-startup ( -- ) ['] noop to ?show-device ['] noop to load-done ['] noop to load-started set-alternate - button-rotate game-key? if show-warnings then +\ button-rotate game-key? if show-warnings then show-child ?force-secure @@ -788,18 +780,58 @@ persistent-devkey? if true to security-off? visible exit then - get-my-sn if visible ." No serial number" cr show-sad security-failure then + get-my-sn if " No serial number" .security-failure then - get-date current-seconds earliest d< if + date-bad? if \ This is not fatal, because we don't want a brick if the RTC battery fails - visible ." Invalid system date" cr show-sad + visible red-letters ." Invalid system date" black-letters cr show-sad then - load-crypto if visible ." Crytpo load failed" cr show-sad security-failure then ( ) + load-crypto if " Crytpo load failed" .security-failure then ( ) alternate? if " \boot-alt" else " \boot" then pn-buf place all-devices$ load-from-list if exit then \ Returns only if no images found - visible ." Boot failed" cr show-sad security-failure + " Boot failed" .security-failure ; + +: efface-md ( -- ) + " md" find-tag 0= if exit then ( data$ ) + + 2 + flash-base - ( flash-offset ) + spi-start spi-identify ( flash-offset ) + " MD" rot write-spi-flash ( ) + spi-reprogrammed ( ) +; + +: days>seconds ( n -- seconds ) [ d# 60 d# 60 * d# 24 * ] literal * ; +: ?factory-mode ( -- ) + date-bad? if efface-md exit then + " md" find-tag if ( data$ ) + 0 left-parse-string 2nip ( time$ ) + \ Erase the tag if it is invalid + expiration-to-seconds if efface-md exit then ( begin-seconds ) + dup 3 days>seconds + ( begin-seconds end-seconds ) + \ Erase the tag if its time is up + current-seconds -rot within 0= if efface-md exit then ( ) + true to in-factory? + then +; + +\ iso8601 date construction for activation key +: .2digits ( .. roll# -- .. ) roll u# u# drop ; +: >iso8601$ ( s m h d m y -- adr len ) + push-decimal + <# + [char] Z hold 5 .2digits 4 .2digits 3 .2digits + [char] T hold 2 .2digits 1 .2digits u# u# u# u# + u#> + pop-base +; + +: factory-mode ( -- ) + " md" find-tag if ." md tag already exists" cr 2drop exit then + " MD" find-tag if ." MD tag already exists" cr 2drop exit then + date-bad? if ." The RTC is not set correctly" cr exit then + time&date >iso8601$ " md" $add-tag +;

1 0

r178 - openbios-devel/drivers
by svn＠openbios.org 17 Nov '07

17 Nov '07

Author: blueswirl Date: 2007-11-17 20:00:58 +0100 (Sat, 17 Nov 2007) New Revision: 178 Modified: openbios-devel/drivers/obio.c Log: Remove unused variable Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-11-17 18:56:43 UTC (rev 177) +++ openbios-devel/drivers/obio.c 2007-11-17 19:00:58 UTC (rev 178) @@ -687,7 +687,6 @@ unsigned int machine_id; struct cpudef *cpu; ohwcfg_v3_t *header; - uint16_t crc; ob_new_obio_device("eeprom", NULL);

1 0

r177 - in openbios-devel: arch/sparc32 drivers
by svn＠openbios.org 17 Nov '07

17 Nov '07

Author: blueswirl Date: 2007-11-17 19:56:43 +0100 (Sat, 17 Nov 2007) New Revision: 177 Modified: openbios-devel/arch/sparc32/entry.S openbios-devel/drivers/obio.c Log: Reset fixes: * recalculate CRC to avoid error message and halt after reset * fix bug that crashed SS10/SMP when reset Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2007-11-14 19:25:43 UTC (rev 176) +++ openbios-devel/arch/sparc32/entry.S 2007-11-17 18:56:43 UTC (rev 177) @@ -129,7 +129,7 @@ ! Check if this not the first SMP CPU, if so, bypass PROM entirely add %g3, SPARC_SMP_VALID, %g1 lduba [%g1] ASI_M_CTL, %g2 - stba %g0, [%g2] ASI_M_CTL + stba %g0, [%g1] ASI_M_CTL set PHYS_SS10_EEPROM + OHW_RAM_SIZE, %g1 ldda [%g1] ASI_M_CTL, %g0 tst %g2 Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-11-14 19:25:43 UTC (rev 176) +++ openbios-devel/drivers/obio.c 2007-11-17 18:56:43 UTC (rev 177) @@ -687,6 +687,7 @@ unsigned int machine_id; struct cpudef *cpu; ohwcfg_v3_t *header; + uint16_t crc; ob_new_obio_device("eeprom", NULL); @@ -721,6 +722,7 @@ header->kernel_image = 0; header->kernel_size = 0; header->cmdline_size = 0; + header->crc = OHW_compute_crc(header, 0x00, 0xF8); boot_device = nv_info.boot_devices[0]; nographic = nv_info.graphic_flags & OHW_GF_NOGRAPHICS;

1 0

r735 - dev/olpc/cafenand ofw/fs/jffs2
by svn＠openbios.org 16 Nov '07

16 Nov '07

Author: wmb Date: 2007-11-16 23:29:19 +0100 (Fri, 16 Nov 2007) New Revision: 735 Modified: dev/olpc/cafenand/cafenand.fth ofw/fs/jffs2/jffs2.fth Log: OLPC trac #4982 - Discard cached JFFS2 scan info if the data changes on the NAND FLASH, so JFFS2 operations work correctly after copy-nand. Also added a couple of JFFS2 debugging tools - .dirinum and .finum ; nothing calls them. They display the nodes for a given inum. Modified: dev/olpc/cafenand/cafenand.fth =================================================================== --- dev/olpc/cafenand/cafenand.fth 2007-11-16 22:02:01 UTC (rev 734) +++ dev/olpc/cafenand/cafenand.fth 2007-11-16 22:29:19 UTC (rev 735) @@ -129,6 +129,7 @@ \ : read-id ( -- ) 0 0 set-page read-id-cmd 0 cmd wait-cmd h# 30 cl@ ; : dma-off ( -- ) 0 h# 40 cl! ; +0 value #writes : wait-write-done ( -- error? ) 0 ( status ) begin ( status ) @@ -139,6 +140,7 @@ \ If the value is completely 0 I think it means write protect 1 and 0<> ( error? ) write-disable + #writes 1+ to #writes ; \ Assumes that the range doesn't straddle a page boundary Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-11-16 22:02:01 UTC (rev 734) +++ ofw/fs/jffs2/jffs2.fth 2007-11-16 22:29:19 UTC (rev 735) @@ -86,6 +86,7 @@ true value first-time? -1 value partition# +-1 value #writes \ This is a run-time cache of the parent inums for the directory inums we \ have seen, used for resolving "..". @@ -512,28 +513,26 @@ dirent-offset ! ( ) ; -: c@+ ( adr -- c adr' ) dup c@ swap ca1+ ; -: w@+ ( adr -- w adr' ) dup w@ swap wa1+ ; -: l@+ ( adr -- l adr' ) dup l@ swap la1+ ; +: w@+ ( adr -- w adr' ) dup wa1+ swap w@ ; +: l@+ ( adr -- adr' l ) dup la1+ swap l@ ; -: decode-dirent ( adr -- false | adr' offset pino true ) +: decode-dirent ( adr -- false | adr' offset true ) dup next-dirent >= if drop false exit then dup c@ dup 1 and if ( adr c ) \ 1-byte form 2/ /l* dirent-offset +! ( adr ) ca1+ ( adr' ) dirent-offset @ ( adr offset ) - cur-pino @ ( adr offset pino ) else ( adr c ) \ Longer form + drop ( adr ) w@+ ?dup if ( adr' w ) \ 2-byte form /w* dirent-offset +! ( adr ) dirent-offset @ ( adr offset ) - cur-pino @ ( adr offset pino ) else ( adr ) \ Long form - l@+ over cur-pino ! ( pino adr' ) - l@+ over dirent-offset ! ( pino offset adr' ) - swap rot ( adr offset pino ) - then ( adr offset pino ) - then ( adr offset pino ) + l@+ cur-pino ! ( adr' ) + l@+ dirent-offset ! ( adr' ) + dirent-offset @ ( adr offset ) + then ( adr offset ) + then ( adr offset ) true ; @@ -618,7 +617,7 @@ 4 # sp add \ clean stack ax ax xor 0 # 0 [sp] mov \ return false c; -: next-pino-match ( adr -- false | pino adr' offset true ) +: next-pino-match ( adr -- false | adr' offset true ) next-dirent wd-inum cur-pino dirent-offset (next-pino-match) ; [then] @@ -650,11 +649,11 @@ dup c@ dup 1 and if ( adr b ) 2/ /l* dirent-offset +! ( adr ) ca1+ ( adr' ) - w@+ swap ?dup if ( adr' w ) + w@+ ?dup if ( adr' w ) /w* dirent-offset +! ( adr' ) else ( adr' ) - l@+ swap cur-pino ! ( adr' ) - l@+ swap dirent-offset ! ( adr' ) + l@+ cur-pino ! ( adr' ) + l@+ dirent-offset ! ( adr' ) wd-inum cur-pino @ = if ( adr' ) dirent-offset @ ( adr' offset ) true ( adr' offset true ) @@ -827,7 +826,11 @@ ; : scan-occupied ( -- ) - " partition#" $call-parent partition# = first-time? 0= and if exit then + " partition#" $call-parent partition# = + first-time? 0= and + " #writes" $call-parent #writes = and + if exit then + init-curvars dirents 'next-dirent ! inodes 'next-inode ! @@ -838,6 +841,9 @@ i possible-nodes? if i scan-raw-nodes then then pages/eblock +loop + + " partition#" $call-parent to partition# + " #writes" $call-parent to #writes ; 0 [if] @@ -1195,7 +1201,37 @@ to wd-inum false ; +: .finum ( inum -- ) + init-curvars + inodes begin next-inode curinum amatch-inode while ( inum inode' offset version ) + drop get-node ( inum inode' adr ) + ." Vers: " dup riversion@ . ( inum inode' len adr ) + ." Floc: " dup rioffset@ . ( inum inode' len adr ) + ." Dlen: " dup ridsize@ . ( inum inode' len adr ) + ." Mode: " dup rimode@ . ( inum inode' len adr ) + drop cr ( inum inode' len ) + repeat ( inum ) + drop +; +: .dirinum ( inum -- ) + >r + dirents begin decode-dirent while ( adr' offset pino r: ) + get-node dup rdinode@ ( adr' node-adr this-inum r: inum ) + r@ = if + dup rdname$ type + ." Vers: " dup rdversion@ . + ." Pino: " dup rdpino@ . +\ Inum is known since we searched for it, and type is always "directory" +\ since we searched the dirent list. +\ ." Inum: " dup rdinode@ . + cr + then ( adr' node-adr r: inum ) + drop ( adr' r: inum ) + repeat ( r: inum ) + r> drop +; + : $find-name ( name$ -- error? ) -1 to my-vers ( name$ ) @@ -1469,7 +1505,6 @@ scan-occupied ( ) - " partition#" $call-parent to partition# false to first-time? my-args " <NoFile>" $= if true exit then

1 0

r734 - cpu/x86/pc/olpc/sdtools
by svn＠openbios.org 16 Nov '07

16 Nov '07

Author: wmb Date: 2007-11-16 23:02:01 +0100 (Fri, 16 Nov 2007) New Revision: 734 Modified: cpu/x86/pc/olpc/sdtools/sd.fth Log: sdkit - added some stub definitions to fix a problem that crept in when some other files changed. Modified: cpu/x86/pc/olpc/sdtools/sd.fth =================================================================== --- cpu/x86/pc/olpc/sdtools/sd.fth 2007-11-16 21:57:42 UTC (rev 733) +++ cpu/x86/pc/olpc/sdtools/sd.fth 2007-11-16 22:02:01 UTC (rev 734) @@ -59,6 +59,7 @@ : spicmd! unimp ; : spi-cmd-wait unimp ; : power-off unimp ; defer spi-start defer spi@ defer spi! defer spi-out defer spi-reprogrammed 1 value spi-us +: disable-interrupts ; : ignore-power-button ; \needs ec@ fload ecio.fth \needs ec-range fload ecdump.fth

1 0

r733 - cpu/x86/pc/olpc
by svn＠openbios.org 16 Nov '07

16 Nov '07

Author: wmb Date: 2007-11-16 22:57:42 +0100 (Fri, 16 Nov 2007) New Revision: 733 Modified: cpu/x86/pc/olpc/resume.bth Log: OLPC trac 4981 - don't hang indefinitely if the suspend sequence fails to power down the CPU. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-11-16 21:48:09 UTC (rev 732) +++ cpu/x86/pc/olpc/resume.bth 2007-11-16 21:57:42 UTC (rev 733) @@ -315,8 +315,16 @@ wrmsr \ Write GLD_MSR_PM to self-refresh memory di dx mov bx ax mov ax dx out \ Write PM1_CNT to initial suspend - begin again \ Spin in this cache line while going down + h# fff # cx mov begin nop loopa \ Spin in this cache line while going down + \ If the processor didn't really go down, perhaps because a wakeup event was + \ already pending, restart the memory clocks and proceed as with a wakeup + h# 0. h# 2000.2004 set-msr \ GLD_MSR_PM MSR number + h# 2000.0018 rmsr h# 5000 bitset h# 2000.0018 wmsr \ Set refresh interval + + \ Increment the CMOS byte at offset 3f + h# 3f # al mov al h# 70 # out h# 71 # al in al inc al h# 71 # out + \ Resume code here resume-entry put-branch

1 0

r732 - cpu/x86/pc/olpc
by svn＠openbios.org 16 Nov '07

16 Nov '07

Author: wmb Date: 2007-11-16 22:48:09 +0100 (Fri, 16 Nov 2007) New Revision: 732 Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/nandstat.fth Log: OLPC trac 4980 - fixed scan-nand display formatting glitches, and added rocker-up to invoke scan-nand in secure mode. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-11-15 02:48:56 UTC (rev 731) +++ cpu/x86/pc/olpc/fw.bth 2007-11-16 21:48:09 UTC (rev 732) @@ -520,6 +520,9 @@ ." Tests complete - powering off" cr d# 5000 ms power-off then ; +: ?scan-nand ( -- ) + rocker-up game-key? if text-on scan-nand then +; : ?fs-update ( -- ) button-check button-x or button-o or button-square or ( mask ) game-key-mask over and = if @@ -562,6 +565,7 @@ ['] false to interrupt-auto-boot? probe-usb interpreter-init + ?scan-nand ?diags ?fs-update secure-startup Modified: cpu/x86/pc/olpc/nandstat.fth =================================================================== --- cpu/x86/pc/olpc/nandstat.fth 2007-11-15 02:48:56 UTC (rev 731) +++ cpu/x86/pc/olpc/nandstat.fth 2007-11-16 21:48:09 UTC (rev 732) @@ -197,7 +197,7 @@ 3dup 0 1 xy+ 1 grid-h do-fill ( color x y ) 1 grid-h xy+ grid-w 1 do-fill ; -: lowlight ( block# -- ) h# ffff cell-border ; +: lowlight ( block# -- ) h# c0 h# c0 h# c0 rgb>565 cell-border ; : highlight ( block# -- ) 0 cell-border ; : +block ( offset -- ) current-block + nand-block-limit mod ( new-block ) @@ -223,7 +223,7 @@ ; : examine-nand ( -- ) - 0 status-line 1+ at-xy ." Arrows, fn Arrows to move, Esc to exit" cr + 0 status-line 1- at-xy red-letters ." Arrows, fn Arrows to move, Esc to exit" black-letters cr 0 to current-block current-block highlight false to examine-done? @@ -231,7 +231,6 @@ current-block lowlight ; - : scan-nand ( -- ) open-nand nand-map 0= if

1 0

r731 - cpu/x86/pc/olpc
by svn＠openbios.org 15 Nov '07

15 Nov '07

Author: wmb Date: 2007-11-15 03:48:56 +0100 (Thu, 15 Nov 2007) New Revision: 731 Modified: cpu/x86/pc/olpc/parsekbd.py Log: OLPC - Improved parsekbd.py to handle slight variations in the overall wiki page layout. Modified: cpu/x86/pc/olpc/parsekbd.py =================================================================== --- cpu/x86/pc/olpc/parsekbd.py 2007-11-14 09:53:14 UTC (rev 730) +++ cpu/x86/pc/olpc/parsekbd.py 2007-11-15 02:48:56 UTC (rev 731) @@ -20,7 +20,8 @@ from urllib import * from HTMLParser import HTMLParser -state = 0 +indent = 0 +hidseen = False keys = 128*[0] modifiers = 128*[0] column = 0 @@ -110,22 +111,9 @@ keys[ascii] = keyid modifiers[ascii] = modifier -class MyHTMLParser(HTMLParser): - def handle_starttag(self, tag, attrs): - global state, column, keyid - if tag == 'table': - state = state + 1 - elif tag == 'tr': - column = 0 - keyid = 0 - elif tag == 'td': - column = column + 1; - - def handle_data(self, data): - global state, column, keyid - if state != 1: - return - s = data.strip() +def do_key(): + global column, keyid + s = lastdata.strip() if column == 1: # XKB key pass elif column == 2: # HID @@ -149,7 +137,45 @@ elif column == 10: # comment pass +class MyHTMLParser(HTMLParser): + def handle_starttag(self, tag, attrs): + global column, keyid, indent + #for i in range(indent): + # print "", + #print "<", tag + #indent = indent+2 + if tag == 'tr': + column = 0 + keyid = 0 + elif tag == 'td': + column = column + 1; + + def handle_endtag(self, tag): + global hidseen, column, keyid, indent + #for i in range(indent): + # print "", + #print tag,">" + #indent = indent - 2 + #if indent < 0: + # indent = 0 + if tag == 'table': + hidseen = False + elif ((tag == 'th') & (lastdata == "HID")): + hidseen = True + elif (tag == 'td') & hidseen: + do_key() + + def handle_data(self, data): + global lastdata, indent + #for i in range(indent): + # print "", + #print "{", data, "}" + lastdata = data.strip() + if lastdata.startswith("There is currently no text"): + print "No such Wiki page" + raise + # This table converts from the IBM physical keystation number to # the corresponding scancode value in scan set 1. @@ -208,12 +234,16 @@ if len(argv) != 2: print "Usage: python parsekbd.py PageName" else: - infile = urlopen('http://wiki.laptop.org/go/' + argv[1]) - myparser=MyHTMLParser() - myparser.feed(infile.read()) - myparser.close() - infile.close() - - outfile = open(argv[1] + '.ka', 'w') - put_ka_format(outfile) - outfile.close() + try: + print "Getting",'http://wiki.laptop.org/go/' + argv[1] + infile = urlopen('http://wiki.laptop.org/go/' + argv[1]) + myparser=MyHTMLParser() + myparser.feed(infile.read()) + myparser.close() + infile.close() + outfile = open(argv[1] + '.ka', 'w') + put_ka_format(outfile) + outfile.close() + print "Output at",argv[1] + '.ka' + except: + print "Failed"

1 0

r176 - in openbios-devel: arch/sparc32 arch/sparc64 drivers include/openbios
by svn＠openbios.org 14 Nov '07

14 Nov '07

Author: blueswirl Date: 2007-11-14 20:25:43 +0100 (Wed, 14 Nov 2007) New Revision: 176 Added: openbios-devel/include/openbios/firmware_abi.h Modified: openbios-devel/arch/sparc32/entry.S openbios-devel/arch/sparc64/boot.c openbios-devel/arch/sparc64/boot.h openbios-devel/arch/sparc64/entry.S openbios-devel/arch/sparc64/openbios.c openbios-devel/arch/sparc64/sys_info.c openbios-devel/drivers/obio.c openbios-devel/drivers/obio.h Log: Update OHW interface to version 3. Use common ABI description file with Qemu for both Sparc32 and Sparc64. Remove private definitions and magic constants. Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2007-11-11 18:02:11 UTC (rev 175) +++ openbios-devel/arch/sparc32/entry.S 2007-11-14 19:25:43 UTC (rev 176) @@ -10,6 +10,8 @@ #include "psr.h" #include "asi.h" #include "asm/crs.h" +#define __ASSEMBLY__ +#include "openbios/firmware_abi.h" #define PHYS_JJ_EEPROM 0x71200000 /* [2000] MK48T08 */ #define PHYS_JJ_INTR0 0x71E00000 /* CPU0 interrupt control registers */ @@ -17,8 +19,6 @@ #define PHYS_SS10_EEPROM 0xf1200000 #define PHYS_SS10_INTR0 0xf1400000 -#define SUN_MACHINE_ID 0x1fd9 - #define WRITE_PAUSE nop; nop; nop; /* Have to do this after %wim/%psr chg */ .globl entry, _entry @@ -56,12 +56,17 @@ ! Ok, this is SS-5 mov 0x80, %y + ! Find architecture specific part + set PHYS_JJ_EEPROM + OHW_ARCH_PTR, %g1 + lduha [%g1] ASI_M_BYPASS, %g2 + set PHYS_JJ_EEPROM, %g1 + add %g1, %g2, %g3 ! Check if this not the first SMP CPU, if so, bypass PROM entirely - set PHYS_JJ_EEPROM + 0x2E, %g1 + add %g3, SPARC_SMP_VALID, %g1 lduba [%g1] ASI_M_BYPASS, %g2 stba %g0, [%g1] ASI_M_BYPASS - set PHYS_JJ_EEPROM + 0x30, %g1 - lda [%g1] ASI_M_BYPASS, %g1 + set PHYS_JJ_EEPROM + OHW_RAM_SIZE, %g1 + ldda [%g1] ASI_M_BYPASS, %g0 tst %g2 bz first_cpu nop @@ -73,17 +78,17 @@ sta %g1, [%g2] ASI_M_BYPASS ! clear softints add %g2, 4, %g2 sta %g0, [%g2] ASI_M_BYPASS ! clear softints - set PHYS_JJ_EEPROM + 0x3C, %g1 + add %g3, SPARC_SMP_CTXTBL, %g1 lda [%g1] ASI_M_BYPASS, %g2 sta %g0, [%g1] ASI_M_BYPASS set AC_M_CTPR, %g1 sta %g2, [%g1] ASI_M_MMUREGS ! set ctx table ptr - set PHYS_JJ_EEPROM + 0x40, %g1 + add %g3, SPARC_SMP_CTX, %g1 lda [%g1] ASI_M_BYPASS, %g2 sta %g0, [%g1] ASI_M_BYPASS set AC_M_CXR, %g1 sta %g2, [%g1] ASI_M_MMUREGS ! set context - set PHYS_JJ_EEPROM + 0x38, %g1 + add %g3, SPARC_SMP_ENTRY, %g1 lda [%g1] ASI_M_BYPASS, %g2 sta %g0, [%g1] ASI_M_BYPASS set 1, %g1 @@ -113,15 +118,20 @@ bne bad_nvram ! Ok, this is SS-10 or SS-600MP - ! Check if this not the first SMP CPU, if so, bypass PROM entirely - set PHYS_SS10_EEPROM + SUN_MACHINE_ID, %g1 + set PHYS_SS10_EEPROM + SPARC_MACHINE_ID, %g1 lduba [%g1] ASI_M_CTL, %g2 mov %g2, %y - set PHYS_SS10_EEPROM + 0x2E, %g1 + ! Find architecture specific part + set PHYS_SS10_EEPROM + OHW_ARCH_PTR, %g1 + lduha [%g1] ASI_M_CTL, %g2 + set PHYS_SS10_EEPROM, %g1 + add %g1, %g2, %g3 + ! Check if this not the first SMP CPU, if so, bypass PROM entirely + add %g3, SPARC_SMP_VALID, %g1 lduba [%g1] ASI_M_CTL, %g2 stba %g0, [%g2] ASI_M_CTL - set PHYS_SS10_EEPROM + 0x30, %g1 - lda [%g1] ASI_M_CTL, %g1 + set PHYS_SS10_EEPROM + OHW_RAM_SIZE, %g1 + ldda [%g1] ASI_M_CTL, %g0 tst %g2 bz first_cpu nop @@ -132,17 +142,17 @@ sta %g1, [%g2] ASI_M_CTL ! clear softints add %g2, 4, %g2 sta %g0, [%g2] ASI_M_CTL ! clear softints - set PHYS_SS10_EEPROM + 0x3C, %g1 + add %g3, SPARC_SMP_CTXTBL, %g1 lda [%g1] ASI_M_CTL, %g2 sta %g0, [%g1] ASI_M_CTL set AC_M_CTPR, %g1 sta %g2, [%g1] ASI_M_MMUREGS ! set ctx table ptr - set PHYS_JJ_EEPROM + 0x40, %g1 + add %g3, SPARC_SMP_CTX, %g1 lda [%g1] ASI_M_CTL, %g2 sta %g0, [%g1] ASI_M_CTL set AC_M_CXR, %g1 sta %g2, [%g1] ASI_M_MMUREGS ! set context - set PHYS_SS10_EEPROM + 0x38, %g1 + add %g3, SPARC_SMP_ENTRY, %g1 lda [%g1] ASI_M_CTL, %g2 sta %g0, [%g1] ASI_M_CTL set 1, %g1 Modified: openbios-devel/arch/sparc64/boot.c =================================================================== --- openbios-devel/arch/sparc64/boot.c 2007-11-11 18:02:11 UTC (rev 175) +++ openbios-devel/arch/sparc64/boot.c 2007-11-14 19:25:43 UTC (rev 176) @@ -16,10 +16,10 @@ void boot(void); struct sys_info sys_info; -uint32_t kernel_image; -uint32_t kernel_size; -uint32_t cmdline; -uint32_t cmdline_size; +uint64_t kernel_image; +uint64_t kernel_size; +uint64_t cmdline; +uint64_t cmdline_size; char boot_device; void boot(void) Modified: openbios-devel/arch/sparc64/boot.h =================================================================== --- openbios-devel/arch/sparc64/boot.h 2007-11-11 18:02:11 UTC (rev 175) +++ openbios-devel/arch/sparc64/boot.h 2007-11-14 19:25:43 UTC (rev 176) @@ -12,3 +12,9 @@ unsigned int start_elf(unsigned long entry_point, unsigned long param); +extern uint64_t kernel_image; +extern uint64_t kernel_size; +extern uint64_t cmdline; +extern uint64_t cmdline_size; +extern char boot_device; +extern struct sys_info sys_info; Modified: openbios-devel/arch/sparc64/entry.S =================================================================== --- openbios-devel/arch/sparc64/entry.S 2007-11-11 18:02:11 UTC (rev 175) +++ openbios-devel/arch/sparc64/entry.S 2007-11-14 19:25:43 UTC (rev 176) @@ -11,6 +11,8 @@ #include "asi.h" #include "pstate.h" #include "lsu.h" +#define __ASSEMBLY__ +#include "openbios/firmware_abi.h" #define PROM_ADDR 0x1fff0000000 @@ -49,7 +51,7 @@ ! Get memory size from NVRAM setx 0x1fe02000074, %g2, %g5 - mov 0x30, %g2 + mov OHW_RAM_SIZE, %g2 stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E add %g5, 1, %g1 stba %g0, [%g1] ASI_PHYS_BYPASS_EC_E @@ -72,6 +74,30 @@ inc %g2 stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3 + or %g3, %g4, %g4 + + sll %g4, 8, %g4 + inc %g2 + stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E + lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3 + or %g3, %g4, %g4 + + sll %g4, 8, %g4 + inc %g2 + stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E + lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3 + or %g3, %g4, %g4 + + sll %g4, 8, %g4 + inc %g2 + stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E + lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3 + or %g3, %g4, %g4 + + sll %g4, 8, %g4 + inc %g2 + stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E + lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3 or %g3, %g4, %g1 ! %g1 contains end of memory Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2007-11-11 18:02:11 UTC (rev 175) +++ openbios-devel/arch/sparc64/openbios.c 2007-11-14 19:25:43 UTC (rev 176) @@ -15,6 +15,8 @@ #include "openbios/stack.h" #include "sys_info.h" #include "openbios.h" +#include "openbios/firmware_abi.h" +#include "boot.h" void boot(void); @@ -23,35 +25,10 @@ // XXX #define NVRAM_SIZE 0x2000 #define NVRAM_IDPROM 0x1fd0 -#define NVRAM_OB_OFFSET 256 -#define NVRAM_OB_SIZE ((NVRAM_IDPROM - NVRAM_OB_OFFSET) & ~15) +#define NVRAM_OB_START (sizeof(ohwcfg_v3_t) + sizeof(struct sparc_arch_cfg)) +#define NVRAM_OB_SIZE ((NVRAM_IDPROM - NVRAM_OB_START) & ~15) -static struct qemu_nvram_v1 { - char id_string[16]; - uint32_t version; - uint32_t nvram_size; // not used in Sun4m - char unused1[8]; - char arch[12]; - char curr_cpu; - char smp_cpus; - char unused2; - char nographic; - uint32_t ram_size; - char boot_device; - char unused3[3]; - uint32_t kernel_image; - uint32_t kernel_size; - uint32_t cmdline; - uint32_t cmdline_size; - uint32_t initrd_image; - uint32_t initrd_size; - uint32_t nvram_image; - uint16_t width; - uint16_t height; - uint16_t depth; - char unused4[158]; - uint16_t crc; -} nv_info; +ohwcfg_v3_t nv_info; #define OBIO_CMDLINE_MAX 256 static char obio_cmdline[OBIO_CMDLINE_MAX]; @@ -148,38 +125,44 @@ unsigned char *nvptr = &nv_info; uint32_t size; struct cpudef *cpu; - extern uint32_t kernel_image; - extern uint32_t kernel_size; - extern uint32_t cmdline; - extern uint32_t cmdline_size; - extern char boot_device; - for (i = 0; i < sizeof(struct qemu_nvram_v1); i++) { + for (i = 0; i < sizeof(ohwcfg_v3_t); i++) { outb(i & 0xff, 0x74); outb(i >> 8, 0x75); *nvptr++ = inb(0x77); } + printk("Nvram id %s, version %d\n", nv_info.struct_ident, + nv_info.struct_version); + if (strcmp(nv_info.struct_ident, "QEMU_BIOS") || + nv_info.struct_version != 3 || + OHW_compute_crc(&nv_info, 0x00, 0xF8) != nv_info.crc) { + printk("Unknown nvram, freezing!\n"); + for (;;); + } + kernel_image = nv_info.kernel_image; kernel_size = nv_info.kernel_size; size = nv_info.cmdline_size; if (size > OBIO_CMDLINE_MAX - 1) size = OBIO_CMDLINE_MAX - 1; - memcpy(obio_cmdline, nv_info.cmdline, size); + memcpy(obio_cmdline, (void *)nv_info.cmdline, size); obio_cmdline[size] = '\0'; cmdline = obio_cmdline; cmdline_size = size; + boot_device = nv_info.boot_devices[0]; + printk("kernel addr %x size %x\n", kernel_image, kernel_size); if (size) printk("kernel cmdline %s\n", obio_cmdline); for (i = 0; i < NVRAM_OB_SIZE; i++) { - outb((i + NVRAM_OB_OFFSET) & 0xff, 0x74); - outb((i + NVRAM_OB_OFFSET) >> 8, 0x75); + outb((i + NVRAM_OB_START) & 0xff, 0x74); + outb((i + NVRAM_OB_START) >> 8, 0x75); data[i] = inb(0x77); } - printk("CPUs: %x", nv_info.smp_cpus); + printk("CPUs: %x", nv_info.nb_cpus); cpu = id_cpu(); printk(" x %s\n", cpu->name); } @@ -189,8 +172,8 @@ unsigned short i; for (i = 0; i < NVRAM_OB_SIZE; i++) { - outb((i + NVRAM_OB_OFFSET) & 0xff, 0x74); - outb((i + NVRAM_OB_OFFSET) >> 8, 0x75); + outb((i + NVRAM_OB_START) & 0xff, 0x74); + outb((i + NVRAM_OB_START) >> 8, 0x75); outb(data[i], 0x77); } } @@ -250,8 +233,6 @@ int openbios(void) { - extern struct sys_info sys_info; - #ifdef CONFIG_DEBUG_CONSOLE #ifdef CONFIG_DEBUG_CONSOLE_SERIAL uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED); Modified: openbios-devel/arch/sparc64/sys_info.c =================================================================== --- openbios-devel/arch/sparc64/sys_info.c 2007-11-11 18:02:11 UTC (rev 175) +++ openbios-devel/arch/sparc64/sys_info.c 2007-11-14 19:25:43 UTC (rev 176) @@ -11,8 +11,8 @@ #define debug(x...) #endif -unsigned long qemu_mem_size; -unsigned long va_shift; +uint64_t qemu_mem_size; +uint64_t va_shift; void collect_multiboot_info(struct sys_info *); Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-11-11 18:02:11 UTC (rev 175) +++ openbios-devel/drivers/obio.c 2007-11-14 19:25:43 UTC (rev 176) @@ -19,6 +19,7 @@ #include "openbios/drivers.h" #include "openbios/nvram.h" #include "obio.h" +#include "openbios/firmware_abi.h" #define REGISTER_NAMED_NODE( name, path ) do { \ bind_new_node( name##_flags_, name##_size_, \ @@ -289,26 +290,27 @@ } static unsigned char *nvram; -struct qemu_nvram_v1 nv_info; +ohwcfg_v3_t nv_info; +#define NVRAM_OB_START (sizeof(ohwcfg_v3_t) + sizeof(struct sparc_arch_cfg)) +#define NVRAM_OB_SIZE ((NVRAM_IDPROM - NVRAM_OB_START) & ~15) + void arch_nvram_get(char *data) { - memcpy(data, &nvram[sizeof(struct qemu_nvram_v1)], - NVRAM_IDPROM - sizeof(struct qemu_nvram_v1)); + memcpy(data, &nvram[NVRAM_OB_START], NVRAM_OB_SIZE); } void arch_nvram_put(char *data) { - memcpy(&nvram[sizeof(struct qemu_nvram_v1)], data, - NVRAM_IDPROM - sizeof(struct qemu_nvram_v1)); + memcpy(&nvram[NVRAM_OB_START], data, NVRAM_OB_SIZE); } int arch_nvram_size(void) { - return (NVRAM_IDPROM - sizeof(struct qemu_nvram_v1)) & ~15; + return NVRAM_OB_SIZE; } static void mb86904_init(void) @@ -684,6 +686,7 @@ uint32_t size; unsigned int machine_id; struct cpudef *cpu; + ohwcfg_v3_t *header; ob_new_obio_device("eeprom", NULL); @@ -696,9 +699,11 @@ memcpy(&nv_info, nvram, sizeof(nv_info)); machine_id = (unsigned int)nvram[0x1fd9] & 0xff; - printk("Nvram id %s, version %d, machine id 0x%2.2x\n", nv_info.id_string, - nv_info.version, machine_id); - if (strcmp(nv_info.id_string, "QEMU_BIOS") || nv_info.version != 1) { + printk("Nvram id %s, version %d, machine id 0x%2.2x\n", + nv_info.struct_ident, nv_info.struct_version, machine_id); + if (strcmp(nv_info.struct_ident, "QEMU_BIOS") || + nv_info.struct_version != 3 || + OHW_compute_crc(&nv_info, 0x00, 0xF8) != nv_info.crc) { printk("Unknown nvram, freezing!\n"); for (;;); } @@ -712,12 +717,13 @@ obio_cmdline[size] = '\0'; cmdline = obio_cmdline; cmdline_size = size; - ((struct qemu_nvram_v1 *)nvram)->kernel_image = 0; - ((struct qemu_nvram_v1 *)nvram)->kernel_size = 0; - ((struct qemu_nvram_v1 *)nvram)->cmdline_size = 0; + header = (ohwcfg_v3_t *)nvram; + header->kernel_image = 0; + header->kernel_size = 0; + header->cmdline_size = 0; - boot_device = nv_info.boot_device; - nographic = nv_info.nographic; + boot_device = nv_info.boot_devices[0]; + nographic = nv_info.graphic_flags & OHW_GF_NOGRAPHICS; graphic_depth = nv_info.depth; push_str("mk48t08"); @@ -779,10 +785,10 @@ for (;;); } // Add cpus - printk("CPUs: %x", nv_info.smp_cpus); + printk("CPUs: %x", nv_info.nb_cpus); cpu = id_cpu(); printk(" x %s\n", cpu->name); - for (i = 0; i < (unsigned int)nv_info.smp_cpus; i++) { + for (i = 0; i < (unsigned int)nv_info.nb_cpus; i++) { push_str("/"); fword("find-device"); @@ -1091,13 +1097,17 @@ int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, int cpu) { + ohwcfg_v3_t *header = (ohwcfg_v3_t *)nvram; + struct sparc_arch_cfg *sparc_header; + if (!cpu) return -1; - *(uint32_t *)&nvram[0x38] = pc; - *(uint32_t *)&nvram[0x3c] = context_ptr; - *(uint32_t *)&nvram[0x40] = context; - nvram[0x2e] = cpu & 0xff; + sparc_header = &nvram[header->nvram_arch_ptr]; + sparc_header->smp_entry = pc; + sparc_header->smp_ctxtbl = context_ptr; + sparc_header->smp_ctx = context; + sparc_header->valid = 1; intregs->cpu_intregs[cpu].set = SUN4M_SOFT_INT(14); Modified: openbios-devel/drivers/obio.h =================================================================== --- openbios-devel/drivers/obio.h 2007-11-11 18:02:11 UTC (rev 175) +++ openbios-devel/drivers/obio.h 2007-11-14 19:25:43 UTC (rev 176) @@ -34,33 +34,6 @@ #define SLAVIO_SIZE 0x01000000 -struct qemu_nvram_v1 { - char id_string[16]; - uint32_t version; - uint32_t nvram_size; // not used in Sun4m - char unused1[8]; - char arch[12]; - char curr_cpu; - char smp_cpus; - char unused2; - char nographic; - uint32_t ram_size; - char boot_device; - char unused3[3]; - uint32_t kernel_image; - uint32_t kernel_size; - uint32_t cmdline; - uint32_t cmdline_size; - uint32_t initrd_image; - uint32_t initrd_size; - uint32_t nvram_image; - uint16_t width; - uint16_t height; - uint16_t depth; - char unused4[158]; - uint16_t crc; -}; - #define SUN4M_NCPUS 16 #define PAGE_SIZE 4096 Added: openbios-devel/include/openbios/firmware_abi.h =================================================================== --- openbios-devel/include/openbios/firmware_abi.h (rev 0) +++ openbios-devel/include/openbios/firmware_abi.h 2007-11-14 19:25:43 UTC (rev 176) @@ -0,0 +1,198 @@ +#ifndef FIRMWARE_ABI_H +#define FIRMWARE_ABI_H + +#ifndef __ASSEMBLY__ +/* Open Hack'Ware NVRAM configuration structure */ + +/* Version 3 */ +typedef struct ohwcfg_v3_t ohwcfg_v3_t; +struct ohwcfg_v3_t { + /* 0x00: structure identifier */ + uint8_t struct_ident[0x10]; + /* 0x10: structure version and NVRAM description */ + uint32_t struct_version; + uint16_t nvram_size; + uint16_t pad0; + uint16_t nvram_arch_ptr; + uint16_t nvram_arch_size; + uint16_t nvram_arch_crc; + uint8_t pad1[0x02]; + /* 0x20: host architecture */ + uint8_t arch[0x10]; + /* 0x30: RAM/ROM description */ + uint64_t RAM0_base; + uint64_t RAM0_size; + uint64_t RAM1_base; + uint64_t RAM1_size; + uint64_t RAM2_base; + uint64_t RAM2_size; + uint64_t RAM3_base; + uint64_t RAM3_size; + uint64_t ROM_base; + uint64_t ROM_size; + /* 0x80: Kernel description */ + uint64_t kernel_image; + uint64_t kernel_size; + /* 0x90: Kernel command line */ + uint64_t cmdline; + uint64_t cmdline_size; + /* 0xA0: Kernel boot image */ + uint64_t initrd_image; + uint64_t initrd_size; + /* 0xB0: NVRAM image */ + uint64_t NVRAM_image; + uint8_t pad2[8]; + /* 0xC0: graphic configuration */ + uint16_t width; + uint16_t height; + uint16_t depth; + uint16_t graphic_flags; + /* 0xC8: CPUs description */ + uint8_t nb_cpus; + uint8_t boot_cpu; + uint8_t nboot_devices; + uint8_t pad3[5]; + /* 0xD0: boot devices */ + uint8_t boot_devices[0x10]; + /* 0xE0 */ + uint8_t pad4[0x1C]; /* 28 */ + /* 0xFC: checksum */ + uint16_t crc; + uint8_t pad5[0x02]; +} __attribute__ (( packed )); + +#define OHW_GF_NOGRAPHICS 0x0001 + +static inline uint16_t +OHW_crc_update (uint16_t prev, uint16_t value) +{ + uint16_t tmp; + uint16_t pd, pd1, pd2; + + tmp = prev >> 8; + pd = prev ^ value; + pd1 = pd & 0x000F; + pd2 = ((pd >> 4) & 0x000F) ^ pd1; + tmp ^= (pd1 << 3) | (pd1 << 8); + tmp ^= pd2 | (pd2 << 7) | (pd2 << 12); + + return tmp; +} + +static inline uint16_t +OHW_compute_crc (ohwcfg_v3_t *header, uint32_t start, uint32_t count) +{ + uint32_t i; + uint16_t crc = 0xFFFF; + uint8_t *ptr = (uint8_t *)header; + int odd; + + odd = count & 1; + count &= ~1; + for (i = 0; i != count; i++) { + crc = OHW_crc_update(crc, (ptr[start + i] << 8) | ptr[start + i + 1]); + } + if (odd) { + crc = OHW_crc_update(crc, ptr[start + i] << 8); + } + + return crc; +} + +/* Sparc32 runtime NVRAM structure for SMP CPU boot */ +struct sparc_arch_cfg { + uint32_t smp_ctx; + uint32_t smp_ctxtbl; + uint32_t smp_entry; + uint8_t valid; + uint8_t unused[51]; +}; + +/* OpenBIOS NVRAM partition */ +struct OpenBIOS_nvpart_v1 { + uint8_t signature; + uint8_t checksum; + uint16_t len; // BE, length divided by 16 + char name[12]; +}; + +#define OPENBIOS_PART_SYSTEM 0x70 +#define OPENBIOS_PART_FREE 0x7f + +static inline void +OpenBIOS_finish_partition(struct OpenBIOS_nvpart_v1 *header, uint32_t size) +{ + unsigned int i, sum; + uint8_t *tmpptr; + + // Length divided by 16 + header->len = cpu_to_be16(size >> 4); + + // Checksum + tmpptr = (uint8_t *)header; + sum = *tmpptr; + for (i = 0; i < 14; i++) { + sum += tmpptr[2 + i]; + sum = (sum + ((sum & 0xff00) >> 8)) & 0xff; + } + header->checksum = sum & 0xff; +} + +static inline uint32_t +OpenBIOS_set_var(uint8_t *nvram, uint32_t addr, const unsigned char *str) +{ + uint32_t len; + + len = strlen(str) + 1; + memcpy(&nvram[addr], str, len); + + return addr + len; +} + +/* Sun IDPROM structure at the end of NVRAM */ +struct Sun_nvram { + uint8_t type; + uint8_t machine_id; + uint8_t macaddr[6]; + uint8_t unused[7]; + uint8_t checksum; +}; + +static inline void +Sun_init_header(struct Sun_nvram *header, const uint8_t *macaddr, int machine_id) +{ + uint8_t tmp, *tmpptr; + unsigned int i; + + header->type = 1; + header->machine_id = machine_id & 0xff; + memcpy(&header->macaddr, macaddr, 6); + /* Calculate checksum */ + tmp = 0; + tmpptr = (uint8_t *)header; + for (i = 0; i < 15; i++) + tmp ^= tmpptr[i]; + + header->checksum = tmp; +} + +#else /* __ASSEMBLY__ */ + +/* Structure offsets for asm use */ + +/* Open Hack'Ware NVRAM configuration structure */ +#define OHW_ARCH_PTR 0x18 +#define OHW_RAM_SIZE 0x38 +#define OHW_BOOT_CPU 0xC9 + +/* Sparc32 runtime NVRAM structure for SMP CPU boot */ +#define SPARC_SMP_CTX 0x0 +#define SPARC_SMP_CTXTBL 0x4 +#define SPARC_SMP_ENTRY 0x8 +#define SPARC_SMP_VALID 0xc + +/* Sun IDPROM structure at the end of NVRAM */ +#define SPARC_MACHINE_ID 0x1fd9 + +#endif /* __ASSEMBLY__ */ +#endif /* FIRMWARE_ABI_H */ Property changes on: openbios-devel/include/openbios/firmware_abi.h ___________________________________________________________________ Name: svn:executable + *

1 0

r730 - ofw/fs/jffs2
by svn＠openbios.org 14 Nov '07

14 Nov '07

Author: wmb Date: 2007-11-14 10:53:14 +0100 (Wed, 14 Nov 2007) New Revision: 730 Modified: ofw/fs/jffs2/jffs2.fth Log: OLPC trac 4898 - fixed handling of deleted files. The problem occured when a deletion entry occurred at a lower NAND block number than a non-deletion entry, with a lower version number, for the same file . The scanning code was too aggressive in discarding RAM record for deleted files, so the file reappeared when the lower-version-number entry was later scanned. The fix is to keep such entries, so the highest version number record is kept regardless of the order in which the nodes are encountered. Deletions are then noticed at a later time, when you search for a file or enumerate a directory. I also added the $readlink method so that "dir" will display the referent of symlinks. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-11-14 07:58:39 UTC (rev 729) +++ ofw/fs/jffs2/jffs2.fth 2007-11-14 09:53:14 UTC (rev 730) @@ -781,12 +781,8 @@ : scan-node ( adr -- adr' ) dup wa1+ w@ case ( adr nodetype ) dirent-type of ( adr ) - dup rdinode@ if ( adr ) \ Ignore deleted entries - debug-scan? if ." d" then - scan-raw-dirent ( adr ) - else - debug-scan? if ." D" then - then ( adr ) + debug-scan? if ." d" then + scan-raw-dirent ( adr ) \ false to cleanmark? ( adr ) endof ( adr nodetype ) @@ -1214,7 +1210,8 @@ 2over ?update-dirent ( name$ adr ) repeat ( name$ ) 2drop ( ) - my-vers 0< if true exit then ( ) + my-vers 0< if true exit then ( ) \ Name not found + wf-inum 0= if true exit then ( ) \ Name was deleted wf-type 4 = if wd-inum wf-inum remember-parent wf-inum to wd-inum @@ -1222,7 +1219,6 @@ false ; - \ The work file is a symlink. Resolve it to a new dirent : dir-link ( -- error? ) delimiter >r [char] / to delimiter @@ -1315,17 +1311,13 @@ next-minode minodes ?do ( rdirent ) dup rdname$ i tdname$ $= if ( rdirent ) \ Same name dup rdversion@ i tdversion@ > if ( rdirent ) \ New version - dup rdinode@ if ( rdirent ) - dup i replace-tdirent ( rdirent ) \ Not unlinked - else ( rdirent ) - i remove-tdirent ( rdirent ) \ Unlinked - then ( rdirent ) + dup i replace-tdirent ( rdirent ) then ( rdirent ) drop unloop exit then ( rdirent ) i tdlen ( rdirent ) +loop ( rdirent ) - dup rdinode@ if place-tdirent else drop then ( ) + place-tdirent ; : prep-dirents ( -- ) @@ -1509,16 +1501,33 @@ file-size ; +0 instance value last-tdirent +0 instance value last-rinode +: $readlink ( name$ -- true | expansion$ false ) + last-tdirent tdname$ $= 0= if true exit then ( ) + last-rinode >ridata last-rinode ridsize@ false ( expansion$ false ) +; + : next-file-info ( id -- false | id' s m h d m y len attributes name$ true ) dup 0= if drop prep-dirents minodes then ( tdirent ) - dup next-minode = if drop false exit then ( tdirent ) - dup >r dup tdlen + ( id' r: tdirent ) - r@ tdinum@ latest-node if ( id' r: tdirent ) -." Can't find data node" cr + + \ Skip deleted nodes + begin + dup next-minode = if drop false exit then ( tdirent ) + dup tdinum@ 0= ( tdirent deleted? ) + while ( tdirent ) + dup tdlen + ( tdirent' ) + repeat ( tdirent ) + + dup to last-tdirent ( tdirent ) + dup >r dup tdlen + ( id' r: tdirent ) + r@ tdinum@ latest-node if ( id' r: tdirent ) + ." Can't find data node" cr 0 0 0 0 0 0 ( id' s m h d m y r: tdirent ) 0 ( ... len r: tdirent ) 0 ( ... attributes r: tdirent ) else ( id' rinode r: tdirent ) + dup to last-rinode >r ( id' r: tdirent rinode ) r@ rimtime@ unix-seconds> ( id' s m h d m y r: tdirent rinode ) r@ riisize@ ( id' s m h d m y len r: tdirent rinode )

1 0

r729 - cpu/x86/pc/olpc
by svn＠openbios.org 14 Nov '07

14 Nov '07

Author: wmb Date: 2007-11-14 08:58:39 +0100 (Wed, 14 Nov 2007) New Revision: 729 Modified: cpu/x86/pc/olpc/resume.bth Log: Really fixed the problem introduced by svn 726 - a misplaced progress report killed a register. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-11-14 07:37:37 UTC (rev 728) +++ cpu/x86/pc/olpc/resume.bth 2007-11-14 07:58:39 UTC (rev 729) @@ -64,8 +64,6 @@ gs push ss push dx pop \ SS in dx - h# f0 resume-progress - here 5 + dup #) call di pop \ Virtual address of EIP in DI ( here ) asm-base - # di sub \ Virtual address of suspend-base in DI

1 0

r728 - cpu/x86/pc/olpc
by svn＠openbios.org 14 Nov '07

14 Nov '07

Author: wmb Date: 2007-11-14 08:37:37 +0100 (Wed, 14 Nov 2007) New Revision: 728 Modified: cpu/x86/pc/olpc/resume.bth Log: Fixed a problem introduced by svn 726 - a misplaced progress report killed a register. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-11-14 07:12:55 UTC (rev 727) +++ cpu/x86/pc/olpc/resume.bth 2007-11-14 07:37:37 UTC (rev 728) @@ -85,8 +85,6 @@ \ Physical addresses from now on - h# f1 resume-progress - \ suspend-physical \ here suspend-entry put-branch resume-data # bp mov

1 0

r727 - ofw/fs/jffs2
by svn＠openbios.org 14 Nov '07

14 Nov '07

Author: wmb Date: 2007-11-14 08:12:55 +0100 (Wed, 14 Nov 2007) New Revision: 727 Modified: ofw/fs/jffs2/jffs2.fth Log: OLPC Trac 4898 - support . and .. in pathnames on JFFS2. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-11-14 07:11:25 UTC (rev 726) +++ ofw/fs/jffs2/jffs2.fth 2007-11-14 07:12:55 UTC (rev 727) @@ -87,6 +87,12 @@ true value first-time? -1 value partition# +\ This is a run-time cache of the parent inums for the directory inums we +\ have seen, used for resolving "..". +d# 256 2* /n* constant /parent-buf +/parent-buf buffer: parents +0 value next-parent + : allocate-buffers ( -- ) /eblock dma-alloc to block-buf /page d# 1024 max /eblock min to /empty-scan @@ -99,6 +105,7 @@ \ /page d# 100 / pages/chip * to alloc-len \ alloc-len dma-alloc to inodes \ alloc-len dma-alloc to dirents + parents to next-parent ; : release-buffers ( -- ) @@ -1165,16 +1172,53 @@ r> drop ( ) ; +: >parent ( ino -- true | pino false ) + dup 1 = if false exit then ( ino ) \ Root is special + parents begin dup next-parent <> while ( ino adr ) + 2dup @ = if nip na1+ @ false exit then ( ino adr ) + 2 na+ ( ino adr' ) + repeat ( ino adr ) + 2drop true +; + +: remember-parent ( pino ino -- ) + dup >parent if ( pino ino ) + next-parent parents - /parent-buf >= if + ." Parent directory cache overflow" cr + 2drop exit + then + next-parent ! next-parent na1+ ! + next-parent 2 na+ to next-parent + else ( pino ino existing-pino ) + 3drop + then +; + +: select-parent ( -- error? ) + wd-inum >parent if true exit then ( pino ) + to wd-inum + false +; + : $find-name ( name$ -- error? ) -1 to my-vers ( name$ ) + 2dup " ." $= if 2drop false exit then ( name$ ) \ Change nothing... + 2dup " .." $= if ( name$ ) + 2drop ( ) + select-parent exit + then ( name$ ) + 0 dirent-offset ! dirents begin next-pino-match while ( name$ adr' offset ) 2over ?update-dirent ( name$ adr ) repeat ( name$ ) 2drop ( ) my-vers 0< if true exit then ( ) - wf-type 4 = if wf-inum to wd-inum then + wf-type 4 = if + wd-inum wf-inum remember-parent + wf-inum to wd-inum + then false ;

1 0

r726 - cpu/x86/pc/olpc
by svn＠openbios.org 14 Nov '07

14 Nov '07

Author: wmb Date: 2007-11-14 08:11:25 +0100 (Wed, 14 Nov 2007) New Revision: 726 Modified: cpu/x86/pc/olpc/draminit.fth cpu/x86/pc/olpc/resume.bth cpu/x86/pc/olpc/rmstart.fth cpu/x86/pc/olpc/romreset.bth Log: OLPC - added CMOS RAM writes to suspend/resume sequence to record the progress in case of failures. Modified: cpu/x86/pc/olpc/draminit.fth =================================================================== --- cpu/x86/pc/olpc/draminit.fth 2007-11-08 21:59:58 UTC (rev 725) +++ cpu/x86/pc/olpc/draminit.fth 2007-11-14 07:11:25 UTC (rev 726) @@ -1,4 +1,8 @@ h# 18 # al mov al h# 80 # out + h# 1430 # dx mov dx ax in h# 9999 # ax cmp = if + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 18 # al mov al h# 71 # out \ Write value 01 + then \ Enable DLL, load Extended Mode Register by set and clear PROG_DRAM 20000018 rmsr @@ -40,6 +44,10 @@ ax h# ffff0 #) mov h# 19 # al mov al h# 80 # out + h# 1430 # dx mov dx ax in h# 9999 # ax cmp = if + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 19 # al mov al h# 71 # out \ Write value 01 + then \ Turn on the cache cr0 ax mov @@ -48,6 +56,11 @@ invd h# 1a # al mov al h# 80 # out + h# 1430 # dx mov dx ax in h# 9999 # ax cmp = if + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 1a # al mov al h# 71 # out \ Write value 01 + then + 0000f001.00001400. 5140000f set-msr \ PMS BAR \ It is tempting to test bit 0 of PM register 5c, but a 5536 erratum @@ -58,6 +71,9 @@ 1430 port-rl h# 9999 # ax cmp = if \ Wakeup event flag 0 1430 port-wl h# 1b # al mov al h# 80 # out + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 1b # al mov al h# 71 # out \ Write value 01 + char r 3f8 port-wb begin 3fd port-rb 40 bitand 0<> until resume-data # sp mov Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-11-08 21:59:58 UTC (rev 725) +++ cpu/x86/pc/olpc/resume.bth 2007-11-14 07:11:25 UTC (rev 726) @@ -33,6 +33,10 @@ h# efc0.0000 constant uoc-pa h# 1000 constant gpio-port +: resume-progress ( byte -- ) + " h# 34 # al mov al h# 70 # out ( byte ) # al mov al h# 71 # out" eval +; + start-assembling \ Turn on the target assembler protected-mode @@ -60,6 +64,8 @@ gs push ss push dx pop \ SS in dx + h# f0 resume-progress + here 5 + dup #) call di pop \ Virtual address of EIP in DI ( here ) asm-base - # di sub \ Virtual address of suspend-base in DI @@ -79,6 +85,8 @@ \ Physical addresses from now on + h# f1 resume-progress + \ suspend-physical \ here suspend-entry put-branch resume-data # bp mov @@ -287,6 +295,8 @@ \ h# 0100.ffff h# 1840 port-wl \ Enable Power button wakeup, clear status bits h# ffff.ffff h# 1858 port-wl \ Clear all status bits + h# fe resume-progress + wbinvd \ Flush the cache h# 00ff.ff00 h# 2000.0018 bitclr-msr \ Set refresh to 0, disabling GX refresh @@ -325,6 +335,8 @@ cld + h# 20 resume-progress + \ MSR init h# 30 [bp] si mov \ MSR table start address si bx mov @@ -338,6 +350,8 @@ si bx cmp = until + h# 21 resume-progress + [ifdef] checksum-test \ Checksum memory from 1M to top (excluding framebuffer) bx bx xor @@ -356,6 +370,8 @@ ax lods ax dx xchg ax lods ax dx xchg h# c000.2001 wmsr \ Video output format ax lods ax dx xchg ax lods ax dx xchg h# c000.2011 wmsr \ TFTP pad select + h# 22 resume-progress + [ifdef] reset-smbus-bitbang \ GPIO15 is SMB_DATA \ GPIO14 is SMB_CLOCK @@ -389,6 +405,8 @@ begin rdtsc bx ax sub 0>= until [then] + h# 23 resume-progress + h# 1038 # dx mov \ Low bank - first contiguous GPIO register h# 3c /l / # cx mov \ Register count (stop at lock register) begin @@ -424,6 +442,8 @@ ax lods h# 10c4 # dx mov ax dx out \ Neg edge enable ax lods h# 10bc # dx mov ax dx out \ High bank lock + h# 24 resume-progress + [ifdef] save-display \ \ h# 3c 0 do l@+ i gp! 4 +loop l@+ h# 4c gp! @@ -482,6 +502,8 @@ h# 500.0000 # vp-pa h# 410 + #) mov [then] + h# 25 resume-progress + \ 0 h# 1842 pw! \ Disable power button during early startup \ Restore Interrupt controller setup @@ -507,6 +529,8 @@ al lods h# 4d0 # dx mov al dx out \ Edge/level low al lods h# 4d1 # dx mov al dx out \ Edge/level high + h# 26 resume-progress + \ Restore PIT (timer) h# 30 # al mov al h# 43 # out \ Load LSB,MSB for counter 0 al lods al h# 40 out @@ -524,6 +548,8 @@ al lods al h# 61 # out al lods h# 5140.0037 wmsr \ PIT Count Enable MSR - high bits irrelevant + h# 27 resume-progress + \ SMBUS controller h# 18b3 # dx mov \ SMBUS base port al lods al dx out \ Reg 3 @@ -571,6 +597,8 @@ \ End of DCON SMbus reset dance [then] + h# 28 resume-progress + \ MFGPTs 0-5. MFGPT 6 and 7 are in the standby domain, live during suspend h# 1800 # dx mov \ MFGPT base port h# 18 # cx mov @@ -579,6 +607,8 @@ dx inc dx inc loopa + h# 29 resume-progress + \ AC97 \ Codec @@ -595,6 +625,8 @@ h# 100 # h# 58 [bx] mov \ HcRhPortStatus[2] register - Power on [then] + h# 2a resume-progress + \ Restore CaFe configuration h# 6010 config-setup ax lods ax dx out \ NAND BAR @@ -629,6 +661,8 @@ h# 100 # h# 60 [bx] mov \ HcRhPortStatus[4] register - Power on [then] + h# 2b resume-progress + \ Display stuff h# 4758 # h# fe00.4000 #) mov \ Unlock display controller registers @@ -648,6 +682,8 @@ \ DCON fiddling \ USB + h# 2c resume-progress + h# 2c [bp] di mov \ VA of suspend-base in di h# 28 [bp] si mov \ PDIR VA h# 24 [bp] cx mov \ PDIR entry 0 @@ -667,6 +703,8 @@ \ Force the paging enable to take place h# eb asm8, 0 asm8, \ jmp to next location to enable paging + h# 2d resume-progress + \ Now jump back to the virtual execution address here asm-base - 8 + # di add \ The add instruction is 6 bytes, the jmp is 2 di jmp Modified: cpu/x86/pc/olpc/rmstart.fth =================================================================== --- cpu/x86/pc/olpc/rmstart.fth 2007-11-08 21:59:58 UTC (rev 725) +++ cpu/x86/pc/olpc/rmstart.fth 2007-11-14 07:11:25 UTC (rev 726) @@ -156,9 +156,20 @@ op: h# 510100e1 # cx mov \ IOD Base Mask 1 MSR wrmsr + op: h# 0000f001 # dx mov \ Maps I/O space at 0x1400 to the + op: h# 00001400 # ax mov \ power management registers + op: h# 5140000f # cx mov \ PMS BAR + wrmsr + \ Writes 4 to CODEC register 0x76 to turn off VBIAS (VREFOUT) op: h# 7601.0004 # ax mov op: h# 148c # dx mov op: ax dx out + op: h# 1430 # dx mov op: dx ax in op: h# 9999 # ax cmp = if + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 01 # al mov al h# 71 # out \ Write value 01 + then + + \ End of MIC LED code. \ This code is highly optimized because it runs when the CPU is in @@ -176,12 +187,12 @@ al al test 0= if rdmsr \ Get base MSR value with divisors op: h# 04de.0000 # ax or \ Set the startup time (de) and breadcrumb (4) - op: h# 0000.04d9 # dx mov \ PLL value for 133 MB clk, 433 CPU + op: h# 0000.04d9 # dx mov \ PLL value for 333 MB clk, 433 CPU else al dec al h# 71 # out \ Decrement safety counter rdmsr \ Get base MSR value with divisors op: h# 04de.0000 # ax or \ Set the startup time (de) and breadcrumb (4) - op: h# 0000.04d9 # dx mov \ PLL value for 167 MB clk, 433 CPU + op: h# 0000.04d3 # dx mov \ PLL value for 333 MB clk, 333 CPU then wrmsr \ Put in the base value op: h# 0000.1800 invert # ax and \ Turn off the BYPASS bits @@ -208,6 +219,12 @@ \ Return to here after the reset h# 02 # al mov al h# 80 # out + op: h# 1430 # dx mov op: dx ax in op: h# 9999 # ax cmp = if + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 02 # al mov al h# 71 # out \ Write value 01 + then + + [ifdef] init-com1 init-com1 [then] [ifdef] debug-reset @@ -235,6 +252,12 @@ h# 03 # al mov al h# 80 # out + op: h# 1430 # dx mov op: dx ax in op: h# 9999 # ax cmp = if + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 01 # al mov al h# 71 # out \ Write value 01 + then + + \ We are in protected mode, but we are still executing from old \ 16-bit code segment, and will continue to do so until the far jump \ below @@ -263,6 +286,12 @@ [then] h# 0f # al mov al h# 80 # out + + op: h# 1430 # dx mov op: dx ax in op: h# 9999 # ax cmp = if + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 0f # al mov al h# 71 # out \ Write value 01 + then + op: ad: ResetBase h# 10 #) far jmp \ Jump to Forth startup real-mode Modified: cpu/x86/pc/olpc/romreset.bth =================================================================== --- cpu/x86/pc/olpc/romreset.bth 2007-11-08 21:59:58 UTC (rev 725) +++ cpu/x86/pc/olpc/romreset.bth 2007-11-14 07:11:25 UTC (rev 726) @@ -52,6 +52,11 @@ label startup h# 10 # al mov al h# 80 # out + h# 1430 # dx mov dx ax in h# 9999 # ax cmp = if + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 10 # al mov al h# 71 # out \ Write value 01 + then + long-offsets on h# 4c000017 rmsr h# 10 bitand 0<> if \ LX branch @@ -118,6 +123,11 @@ [then] \ lx-devel h# 11 # al mov al h# 80 # out + h# 1430 # dx mov dx ax in h# 9999 # ax cmp = if + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 11 # al mov al h# 71 # out \ Write value 01 + then + \ Init memory controller \ sdram_initialize,generic_sdram.c @@ -263,6 +273,11 @@ [then] h# 11 # al mov al h# 80 # out + h# 1430 # dx mov dx ax in h# 9999 # ax cmp = if + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 10 # al mov al h# 71 # out \ Write value 01 + then + \ Init memory controller \ sdram_initialize,generic_sdram.c @@ -322,6 +337,10 @@ \ char b 3f8 port-wb begin 3fd port-rb 40 bitand 0<> until h# 12 # al mov al h# 80 # out + h# 1430 # dx mov dx ax in h# 9999 # ax cmp = if + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 12 # al mov al h# 71 # out \ Write value 01 + then fload ${BP}/cpu/x86/pc/olpc/draminit.fth @@ -337,6 +356,11 @@ \ Now we can use the stack and do conventional subroutine calls h# 1f # al mov al h# 80 # out + h# 1430 # dx mov dx ax in h# 9999 # ax cmp = if + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 1f # al mov al h# 71 # out \ Write value 01 + then + fload ${BP}/cpu/x86/pc/resetend.fth end-code

1 0

Re: [OpenBIOS] r719 - in ofw/fs: . ext2fs jffs2
by Torsten Duwe 12 Nov '07

12 Nov '07

This requires at least --- tmp/openfirmware/cpu/x86/pc/biosload/fw.bth.orig 2007-11-12 00:01:00.000000000 +0100 +++ tmp/openfirmware/cpu/x86/pc/biosload/fw.bth 2007-11-12 00:14:04.000000000 +0100 @@ -119,6 +119,7 @@ [then] [ifdef] linux-support +\needs unix-seconds> fload ${BP}/ofw/fs/unixtime.fth \ Unix time calculation support-package: ext2-file-system fload ${BP}/ofw/fs/ext2fs/ext2fs.fth \ Linux file system end-support-package for me :-( Signed-off-by: Torsten Duwe <duwe(a)lst.de>

1 0

r175 - in openbios-devel: arch/sparc32 drivers include/openbios
by svn＠openbios.org 11 Nov '07

11 Nov '07

Author: blueswirl Date: 2007-11-11 19:02:11 +0100 (Sun, 11 Nov 2007) New Revision: 175 Modified: openbios-devel/arch/sparc32/entry.S openbios-devel/arch/sparc32/openbios.c openbios-devel/drivers/esp.c openbios-devel/drivers/obio.c openbios-devel/drivers/sbus.c openbios-devel/include/openbios/drivers.h Log: Add SPARCserver 600MP emulation Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2007-11-10 09:33:13 UTC (rev 174) +++ openbios-devel/arch/sparc32/entry.S 2007-11-11 18:02:11 UTC (rev 175) @@ -17,6 +17,8 @@ #define PHYS_SS10_EEPROM 0xf1200000 #define PHYS_SS10_INTR0 0xf1400000 +#define SUN_MACHINE_ID 0x1fd9 + #define WRITE_PAUSE nop; nop; nop; /* Have to do this after %wim/%psr chg */ .globl entry, _entry @@ -110,9 +112,11 @@ cmp %g2, 'U' bne bad_nvram - ! Ok, this is SS-10 - mov 0x72, %y + ! Ok, this is SS-10 or SS-600MP ! Check if this not the first SMP CPU, if so, bypass PROM entirely + set PHYS_SS10_EEPROM + SUN_MACHINE_ID, %g1 + lduba [%g1] ASI_M_CTL, %g2 + mov %g2, %y set PHYS_SS10_EEPROM + 0x2E, %g1 lduba [%g1] ASI_M_CTL, %g2 stba %g0, [%g2] ASI_M_CTL Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2007-11-10 09:33:13 UTC (rev 174) +++ openbios-devel/arch/sparc32/openbios.c 2007-11-11 18:02:11 UTC (rev 175) @@ -65,6 +65,22 @@ .le_base = 0xef0c00000ULL, .machine_id = 0x72, }, + /* SS-600MP */ + { + .iommu_base = 0xfe0000000ULL, + .tcx_base = 0xe20000000ULL, + .slavio_base = 0xff1000000ULL, + .ms_kb_base = 0xff1000000ULL, + .serial_base = 0xff1100000ULL, + .nvram_base = 0xff1200000ULL, + .fd_offset = -1, + .counter_offset = 0x00300000, // 0xff1300000ULL, + .intr_offset = 0x00400000, // 0xff1400000ULL, + .dma_base = 0xef0081000ULL, + .esp_base = 0xef0080000ULL, + .le_base = 0xef0060000ULL, + .machine_id = 0x71, + }, }; static const struct hwdef *hwdef; Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2007-11-10 09:33:13 UTC (rev 174) +++ openbios-devel/drivers/esp.c 2007-11-11 18:02:11 UTC (rev 175) @@ -25,9 +25,6 @@ #include "asm/dma.h" #include "esp.h" -#define MACIO_ESPDMA 0x00400000ULL /* ESP DMA controller */ -#define MACIO_ESP 0x00800000ULL /* ESP SCSI */ - #define BUFSIZE 4096 #define REGISTER_NAMED_NODE( name, path ) do { \ @@ -318,7 +315,7 @@ espdma_init(unsigned int slot, uint64_t base, unsigned long offset, struct esp_dma *espdma) { - espdma->regs = (void *)map_io(base + (uint64_t)offset + MACIO_ESPDMA, 0x10); + espdma->regs = (void *)map_io(base + (uint64_t)offset, 0x10); if (espdma->regs == 0) { DPRINTF("espdma_init: cannot map registers\n"); @@ -366,7 +363,7 @@ /* set reg */ PUSH(slot); fword("encode-int"); - PUSH(offset + MACIO_ESPDMA); + PUSH(offset); fword("encode-int"); fword("encode+"); PUSH(0x00000010); @@ -430,7 +427,8 @@ } int -ob_esp_init(unsigned int slot, uint64_t base, unsigned long offset) +ob_esp_init(unsigned int slot, uint64_t base, unsigned long espoffset, + unsigned long dmaoffset) { int id, diskcount = 0, cdcount = 0, *counter_ptr; char nodebuff[256], aliasbuff[256]; @@ -446,11 +444,11 @@ global_esp = esp; - if (espdma_init(slot, base, offset, &esp->espdma) != 0) { + if (espdma_init(slot, base, dmaoffset, &esp->espdma) != 0) { return -1; } /* Get the IO region */ - esp->ll = (void *)map_io(base + (uint64_t)offset + MACIO_ESP, + esp->ll = (void *)map_io(base + (uint64_t)espoffset, sizeof(struct esp_regs)); if (esp->ll == 0) { DPRINTF("Can't map ESP registers\n"); @@ -489,7 +487,7 @@ fword("find-device"); PUSH(slot); fword("encode-int"); - PUSH(offset + MACIO_ESP); + PUSH(espoffset); fword("encode-int"); fword("encode+"); PUSH(0x00000010); Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-11-10 09:33:13 UTC (rev 174) +++ openbios-devel/drivers/obio.c 2007-11-11 18:02:11 UTC (rev 175) @@ -736,6 +736,16 @@ fword("property"); switch (machine_id) { + case 0x71: + push_str("SPARCsystem 600(1 X 390Z55)"); + fword("encode-string"); + push_str("banner-name"); + fword("property"); + push_str("SUNW,SPARCsystem-600"); + fword("encode-string"); + push_str("name"); + fword("property"); + break; case 0x72: push_str("SPARCstation 10 (1 X 390Z55)"); fword("encode-string"); @@ -1204,7 +1214,8 @@ ob_nvram_init(slavio_base, SLAVIO_NVRAM); // 82078 FDC - ob_fd_init(slavio_base, fd_offset, FD_INTR); + if (fd_offset != (unsigned long) -1) + ob_fd_init(slavio_base, fd_offset, FD_INTR); ob_sconfig_init(slavio_base, SLAVIO_SCONFIG); Modified: openbios-devel/drivers/sbus.c =================================================================== --- openbios-devel/drivers/sbus.c 2007-11-10 09:33:13 UTC (rev 174) +++ openbios-devel/drivers/sbus.c 2007-11-11 18:02:11 UTC (rev 175) @@ -24,6 +24,11 @@ #define POWER_OFFSET 0x0a000000ULL #define CS4231_REGS 0x40 #define CS4231_OFFSET 0x0c000000ULL +#define MACIO_ESPDMA 0x00400000ULL /* ESP DMA controller */ +#define MACIO_ESP 0x00800000ULL /* ESP SCSI */ +#define SS600MP_ESPDMA 0x00081000ULL +#define SS600MP_ESP 0x00080000ULL +#define SS600MP_LEBUFFER (SS600MP_ESPDMA + 0x10) // XXX should be 0x40000 static void ob_sbus_node_init(uint64_t base) @@ -52,13 +57,14 @@ } static void -ob_le_init(unsigned int slot, unsigned long base, unsigned long offset) +ob_le_init(unsigned int slot, unsigned long base, unsigned long leoffset, + unsigned long dmaoffset) { push_str("/iommu/sbus/ledma"); fword("find-device"); PUSH(slot); fword("encode-int"); - PUSH(offset + 0x00400010); + PUSH(dmaoffset); fword("encode-int"); fword("encode+"); PUSH(0x00000020); @@ -71,7 +77,7 @@ fword("find-device"); PUSH(slot); fword("encode-int"); - PUSH(offset + 0x00c00000); + PUSH(leoffset); fword("encode-int"); fword("encode+"); PUSH(0x00000004); @@ -352,11 +358,11 @@ // NCR 53c9x, aka ESP. See // http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR53C9X.txt #ifdef CONFIG_DRIVER_ESP - ob_esp_init(slot, base, offset); + ob_esp_init(slot, base, offset + MACIO_ESP, offset + MACIO_ESPDMA); #endif // NCR 92C990, Am7990, Lance. See http://www.amd.com - ob_le_init(slot, base, offset); + ob_le_init(slot, base, offset + 0x00c00000, offset + 0x00400010); // Parallel port //ob_bpp_init(base); @@ -401,6 +407,26 @@ } static void +sbus_probe_slot_ss600mp(unsigned int slot, uint64_t base) +{ + // OpenBIOS and Qemu don't know how to do Sbus probing + switch(slot) { + case 2: // SUNW,tcx + ob_tcx_init(slot, base); + break; + case 0xf: // le, esp, bpp, power-management +#ifdef CONFIG_DRIVER_ESP + ob_esp_init(slot, base, SS600MP_ESP, SS600MP_ESPDMA); +#endif + // NCR 92C990, Am7990, Lance. See http://www.amd.com + ob_le_init(slot, base, 0x00060000, SS600MP_LEBUFFER); + break; + default: + break; + } +} + +static void ob_sbus_open(int *idx) { int ret=1; @@ -440,6 +466,7 @@ { 5, 0, 0x70000000, 0x10000000,}, }; +/* Shared with ss600mp */ static const struct sbus_offset sbus_offsets_ss10[SBUS_SLOTS] = { { 0, 0, 0xe00000000ULL, 0x10000000,}, { 1, 0, 0xe10000000ULL, 0x10000000,}, @@ -515,11 +542,34 @@ return 0; } +static int +ob_sbus_init_ss600mp(uint64_t base) +{ + unsigned int slot; + int notfirst = 0; + + for (slot = 0; slot < SBUS_SLOTS; slot++) { + if (sbus_offsets_ss10[slot].size > 0) + ob_add_sbus_range(&sbus_offsets_ss10[slot], notfirst++); + } + push_str("ranges"); + fword("property"); + + for (slot = 0; slot < SBUS_SLOTS; slot++) { + if (sbus_offsets_ss10[slot].size > 0) + sbus_probe_slot_ss600mp(slot, sbus_offsets_ss10[slot].base); + } + + return 0; +} + int ob_sbus_init(uint64_t base, int machine_id) { ob_sbus_node_init(base); switch (machine_id) { + case 0x71: + return ob_sbus_init_ss600mp(base); case 0x72: return ob_sbus_init_ss10(base); case 0x80: Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2007-11-10 09:33:13 UTC (rev 174) +++ openbios-devel/include/openbios/drivers.h 2007-11-11 18:02:11 UTC (rev 175) @@ -21,7 +21,8 @@ int ob_ide_init(void); #endif #ifdef CONFIG_DRIVER_ESP -int ob_esp_init(unsigned int slot, uint64_t base, unsigned long offset); +int ob_esp_init(unsigned int slot, uint64_t base, unsigned long espoffset, + unsigned long dmaoffset); #endif #ifdef CONFIG_DRIVER_OBIO int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset,

1 0

r174 - openbios-devel/arch/sparc64
by svn＠openbios.org 10 Nov '07

10 Nov '07

Author: blueswirl Date: 2007-11-10 10:33:13 +0100 (Sat, 10 Nov 2007) New Revision: 174 Modified: openbios-devel/arch/sparc64/openbios.c Log: Add Sparc64 CPU identification Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2007-11-09 20:40:09 UTC (rev 173) +++ openbios-devel/arch/sparc64/openbios.c 2007-11-10 09:33:13 UTC (rev 174) @@ -56,11 +56,98 @@ #define OBIO_CMDLINE_MAX 256 static char obio_cmdline[OBIO_CMDLINE_MAX]; +struct cpudef { + unsigned long iu_version; + const char *name; +}; + +static const struct cpudef sparc_defs[] = { + { + .iu_version = (0x04ULL << 48) | (0x02ULL << 32), + .name = "FJSV,GP", + }, + { + .iu_version = (0x04ULL << 48) | (0x03ULL << 32), + .name = "FJSV,GPUSK", + }, + { + .iu_version = (0x04ULL << 48) | (0x04ULL << 32), + .name = "FJSV,GPUSC", + }, + { + .iu_version = (0x04ULL << 48) | (0x05ULL << 32), + .name = "FJSV,GPUZC", + }, + { + .iu_version = (0x17ULL << 48) | (0x10ULL << 32), + .name = "SUNW,UltraSPARC", + }, + { + .iu_version = (0x17ULL << 48) | (0x11ULL << 32), + .name = "SUNW,UltraSPARC-II", + }, + { + .iu_version = (0x17ULL << 48) | (0x12ULL << 32), + .name = "SUNW,UltraSPARC-IIi", + }, + { + .iu_version = (0x17ULL << 48) | (0x13ULL << 32), + .name = "SUNW,UltraSPARC-IIe", + }, + { + .iu_version = (0x3eULL << 48) | (0x14ULL << 32), + .name = "SUNW,UltraSPARC-III", + }, + { + .iu_version = (0x3eULL << 48) | (0x15ULL << 32), + .name = "SUNW,UltraSPARC-III+", + }, + { + .iu_version = (0x3eULL << 48) | (0x16ULL << 32), + .name = "SUNW,UltraSPARC-IIIi", + }, + { + .iu_version = (0x3eULL << 48) | (0x18ULL << 32), + .name = "SUNW,UltraSPARC-IV", + }, + { + .iu_version = (0x3eULL << 48) | (0x19ULL << 32), + .name = "SUNW,UltraSPARC-IV+", + }, + { + .iu_version = (0x3eULL << 48) | (0x22ULL << 32), + .name = "SUNW,UltraSPARC-IIIi+", + }, + { + .iu_version = (0x22ULL << 48) | (0x10ULL << 32), + .name = "SUNW,UltraSPARC", + }, +}; + +static const struct cpudef * +id_cpu(void) +{ + unsigned long iu_version; + unsigned int i; + + asm("rdpr %%ver, %0\n" + : "=r"(iu_version) :); + iu_version &= 0xffffffff00000000ULL; + + for (i = 0; i < sizeof(sparc_defs)/sizeof(struct cpudef); i++) { + if (iu_version == sparc_defs[i].iu_version) + return &sparc_defs[i]; + } + printk("Unknown cpu (psr %lx), freezing!\n", iu_version); + for (;;); +} + void arch_nvram_get(char *data) { unsigned short i; unsigned char *nvptr = &nv_info; uint32_t size; + struct cpudef *cpu; extern uint32_t kernel_image; extern uint32_t kernel_size; extern uint32_t cmdline; @@ -91,6 +178,10 @@ outb((i + NVRAM_OB_OFFSET) >> 8, 0x75); data[i] = inb(0x77); } + + printk("CPUs: %x", nv_info.smp_cpus); + cpu = id_cpu(); + printk(" x %s\n", cpu->name); } void arch_nvram_put(char *data)

1 0

r173 - openbios-devel/drivers
by svn＠openbios.org 09 Nov '07

09 Nov '07

Author: blueswirl Date: 2007-11-09 21:40:09 +0100 (Fri, 09 Nov 2007) New Revision: 173 Modified: openbios-devel/drivers/obio.c Log: More CPU definitions Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2007-11-07 16:00:02 UTC (rev 172) +++ openbios-devel/drivers/obio.c 2007-11-09 20:40:09 UTC (rev 173) @@ -407,6 +407,12 @@ } +static void bad_cpu_init(void) +{ + printk("This CPU is not supported yet, freezing.\n"); + for(;;); +} + struct cpudef { unsigned long iu_version; const char *name; @@ -420,6 +426,11 @@ static const struct cpudef sparc_defs[] = { { + .iu_version = 0x00 << 24, /* Impl 0, ver 0 */ + .name = "FMI,MB86900", + .initfn = bad_cpu_init, + }, + { .iu_version = 0x04 << 24, /* Impl 0, ver 4 */ .name = "FMI,MB86904", .psr_impl = 0, @@ -458,6 +469,45 @@ .initfn = mb86904_init, }, { + .iu_version = 0x10 << 24, /* Impl 1, ver 0 */ + .name = "LSI,L64811", + .initfn = bad_cpu_init, + }, + { + .iu_version = 0x11 << 24, /* Impl 1, ver 1 */ + .name = "CY,CY7C601", + .psr_impl = 1, + .psr_vers = 1, + .impl = 1, + .vers = 1, + .mmu_nctx = 0x10, + .initfn = bad_cpu_init, + }, + { + .iu_version = 0x13 << 24, /* Impl 1, ver 3 */ + .name = "CY,CY7C611", + .initfn = bad_cpu_init, + }, + { + .iu_version = 0x40000000, + .name = "TI,TMS390Z55", + .psr_impl = 4, + .psr_vers = 0, + .impl = 0, + .vers = 4, + .dcache_line_size = 0x20, + .dcache_lines = 0x80, + .dcache_assoc = 4, + .icache_line_size = 0x40, + .icache_lines = 0x40, + .icache_assoc = 5, + .ecache_line_size = 0x20, + .ecache_lines = 0x8000, + .ecache_assoc = 1, + .mmu_nctx = 0x10000, + .initfn = tms390z55_init, + }, + { .iu_version = 0x41000000, .name = "TI,TMS390S10", .psr_impl = 4, @@ -477,17 +527,55 @@ .initfn = tms390z55_init, }, { - .iu_version = 0x40000000, - .name = "TI,TMS390Z55", + .iu_version = 0x42000000, + .name = "TI,TMS390S10", .psr_impl = 4, - .psr_vers = 0, - .impl = 0, + .psr_vers = 2, + .impl = 4, + .vers = 2, + .dcache_line_size = 0x10, + .dcache_lines = 0x80, + .dcache_assoc = 4, + .icache_line_size = 0x20, + .icache_lines = 0x80, + .icache_assoc = 5, + .ecache_line_size = 0x20, + .ecache_lines = 0x8000, + .ecache_assoc = 1, + .mmu_nctx = 0x10000, + .initfn = tms390z55_init, + }, + { + .iu_version = 0x43000000, + .name = "TI,TMS390S10", + .psr_impl = 4, + .psr_vers = 3, + .impl = 4, + .vers = 3, + .dcache_line_size = 0x10, + .dcache_lines = 0x80, + .dcache_assoc = 4, + .icache_line_size = 0x20, + .icache_lines = 0x80, + .icache_assoc = 5, + .ecache_line_size = 0x20, + .ecache_lines = 0x8000, + .ecache_assoc = 1, + .mmu_nctx = 0x10000, + .initfn = tms390z55_init, + }, + { + .iu_version = 0x44000000, + .name = "TI,TMS390S10", + .psr_impl = 4, + .psr_vers = 4, + .impl = 4, .vers = 4, - .dcache_line_size = 0x20, + .dcache_line_size = 0x10, .dcache_lines = 0x80, .dcache_assoc = 4, - .icache_line_size = 0x40, - .icache_lines = 0x40, + .icache_line_size = 0x20, + .icache_lines = 0x80, .icache_assoc = 5, .ecache_line_size = 0x20, .ecache_lines = 0x8000, @@ -514,6 +602,50 @@ .mmu_nctx = 0x10000, .initfn = rt625_init, }, + { + .iu_version = 0x1f000000, + .name = "Ross,RT620", + .psr_impl = 1, + .psr_vers = 15, + .impl = 1, + .vers = 7, + .dcache_line_size = 0x20, + .dcache_lines = 0x80, + .dcache_assoc = 4, + .icache_line_size = 0x40, + .icache_lines = 0x40, + .icache_assoc = 5, + .ecache_line_size = 0x20, + .ecache_lines = 0x8000, + .ecache_assoc = 1, + .mmu_nctx = 0x10000, + .initfn = rt625_init, + }, + { + .iu_version = 0x20000000, + .name = "BIT,B5010", + .initfn = bad_cpu_init, + }, + { + .iu_version = 0x50000000, + .name = "MC,MN10501", + .initfn = bad_cpu_init, + }, + { + .iu_version = 0x90 << 24, /* Impl 9, ver 0 */ + .name = "Weitek,W8601", + .initfn = bad_cpu_init, + }, + { + .iu_version = 0xf2000000, + .name = "GR,LEON2", + .initfn = bad_cpu_init, + }, + { + .iu_version = 0xf3000000, + .name = "GR,LEON3", + .initfn = bad_cpu_init, + }, }; static const struct cpudef * @@ -637,14 +769,15 @@ for (;;); } // Add cpus - printk("CPUs: %x\n", nv_info.smp_cpus); + printk("CPUs: %x", nv_info.smp_cpus); + cpu = id_cpu(); + printk(" x %s\n", cpu->name); for (i = 0; i < (unsigned int)nv_info.smp_cpus; i++) { push_str("/"); fword("find-device"); fword("new-device"); - cpu = id_cpu(); push_str(cpu->name); fword("device-name");

1 0

r725 - cpu/x86/pc/olpc
by svn＠openbios.org 08 Nov '07

08 Nov '07

Author: wmb Date: 2007-11-08 22:59:58 +0100 (Thu, 08 Nov 2007) New Revision: 725 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2D04 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-11-08 00:04:18 UTC (rev 724) +++ cpu/x86/pc/olpc/versions.fth 2007-11-08 21:59:58 UTC (rev 725) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 03c +macro: FW_MINOR 04 \ The EC microcode macro: EC_VERSION d02 @@ -16,7 +16,7 @@ \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 -macro: WLAN_VERSION 5.110.19.p0 +macro: WLAN_VERSION 5.110.20.p0 \ The bios_verify image macro: CRYPTO_VERSION 0.2

1 0

r724 - cpu/x86/pc/olpc
by svn＠openbios.org 08 Nov '07

08 Nov '07

Author: wmb Date: 2007-11-08 01:04:18 +0100 (Thu, 08 Nov 2007) New Revision: 724 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC trac 4707 - allow secure booting even if the real time clock is set incorrectly. When that is the case, all leases are deemed to have expired, but things like developer keys still work. Also added support for developer key expiration. If the expiration date on either a lease or a developer signature is the value 00000000T000000Z, the signature doesn't expire and is always deemed timely. Otherwise it is compared against the current system time. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-11-07 23:59:05 UTC (rev 723) +++ cpu/x86/pc/olpc/security.fth 2007-11-08 00:04:18 UTC (rev 724) @@ -3,6 +3,19 @@ \ Specs at http://wiki.laptop.org/go/Firmware_Security +: text-on screen-ih stdout ! ; + +: visible dcon-unfreeze text-on ; + +: ?unfreeze ( -- ) + game-key@ button-check and if visible unfreeze then +; + +0 0 2value base-xy +0 0 2value next-xy +d# 410 d# 540 2constant progress-xy +d# 557 d# 283 2constant sad-xy + true value debug-security? : ?lease-debug ( msg$ -- ) debug-security? if type else 2drop then @@ -12,12 +25,52 @@ ; : fail-load ( -- ) - screen-ih stdout ! + text-on ." OS Load Failed" cr quit begin again ; +0 value security-off? + +: security-failure ( -- ) + visible + ." Stopping" cr + security-off? if quit then + + d# 10000 ms + power-off +; + +: +icon-xy ( delta-x,y -- ) icon-xy d+ to icon-xy ; + + +: show-going ( -- ) + h# c0 h# c0 h# c0 rgb>565 progress-xy d# 500 d# 100 " fill-rectangle" $call-screen + d# 585 d# 613 to icon-xy " bigdot" show-icon + dcon-unfreeze +; +: show-x ( -- ) " x" show-icon ; +: show-sad ( -- ) + icon-xy + sad-xy to icon-xy " sad" show-icon + to icon-xy +; +: show-lock ( -- ) " lock" show-icon ; +: show-unlock ( -- ) " unlock" show-icon ; +: show-child ( -- ) + " erase-screen" $call-screen + d# 552 d# 383 to icon-xy " rom:xogray.565" $show-opaque + progress-xy to icon-xy \ For boot progress reports +; +: show-warnings ( -- ) + " erase-screen" $call-screen + d# 48 d# 32 to icon-xy " rom:warnings.565" $show-opaque + dcon-freeze +; + + + h# 20 buffer: cn-buf \ filename prefix - either "act" or "run" h# 20 buffer: fn-buf \ filename tail - either "os" or "rd" h# 100 buffer: pn-buf \ pathname - either "\boot" or "\boot-alt" @@ -202,39 +255,6 @@ 2nip 2r> 2swap " rmd160" invalid? 0= ; -\ earliest is the earliest acceptable date value (in seconds). -\ It is the date that the first test version of this code was -\ deployed. If a laptop has any earlier date that than, that -\ date is presumed bogus. - -d# 2007 d# 12 * 8 1- + d# 31 * d# 27 + constant earliest - -0. 2value current-seconds - -\ get-date reads the date and time from the real time clock -\ and converts it to seconds. - -\ The seconds conversion uses a simplified approach that ignores -\ leap years and the like - it assumes that all months are 31 days. -\ This is sufficient for comparison purposes so long as we use the -\ same calculation in all cases. It is not good for doing -\ arithmetic on dates. -: get-date ( -- error? ) - time&date ( s m h d m y ) - d# 12 * swap 1- + ( s m h d m' ) \ Months start at 1 - d# 31 * swap 1- + ( s m h d' ) \ Days start at 1 - dup earliest < if ( s m h d' ) - screen-ih stdout ! - ." The clock is not set properly" cr - 4drop true exit - then ( s m h d' ) - d# 24 * + ( s m h' ) - d# 60 * + ( s m' ) \ Can't overflow so far - d# 60 um* ( s d.s' ) - swap 0 d+ to current-seconds - false -; - \ break$ splits a string into an initial substring of length n \ (head$) and the residual substring (tail$). If the input \ string is shorter than n, head$ is the input string and tail$ is @@ -294,11 +314,45 @@ dup if nip nip then ; +\ earliest is the earliest acceptable date value (in seconds). +\ It is the date that the first test version of this code was +\ deployed. If a laptop has any earlier date that than, that +\ date is presumed bogus. + +" 20070101T000000Z" expiration-to-seconds drop 2constant earliest + +0. 2value current-seconds + +\ get-date reads the date and time from the real time clock +\ and converts it to seconds. + +\ The seconds conversion uses a simplified approach that ignores +\ leap years and the like - it assumes that all months are 31 days. +\ This is sufficient for comparison purposes so long as we use the +\ same calculation in all cases. It is not good for doing +\ arithmetic on dates. +: get-date ( -- ) + time&date ( s m h d m y ) + d# 12 * swap 1- + ( s m h d m' ) \ Months start at 1 + d# 31 * swap 1- + ( s m h d' ) \ Days start at 1 + d# 24 * + ( s m h' ) + d# 60 * + ( s m' ) \ Can't overflow so far + d# 60 um* ( s d.s' ) + swap 0 d+ to current-seconds +; + \ expired? determines whether or not the expiration time string is \ earlier than this machine's current time (from the real time clock). : expired? ( expiration$ -- bad? ) - expiration-to-seconds if true exit then + expiration-to-seconds if true exit then ( d.seconds ) + + current-seconds 0. d= if ( d.seconds ) + then + + \ If the date is bad, leases are deemed to have expired + current-seconds earliest d< if 2drop true exit then + current-seconds d< ; @@ -360,6 +414,22 @@ : my-sn$ ( -- adr len ) machine-id-buf d# 11 ; +: check-expiry ( exp$ -- exp$ -1|0 ) + \ Check for non-expiring case + 2dup " 00000000T000000Z" $= if 0 exit then + + dup d# 16 <> if ( expiration$ ) + " has bad expiration format" ?lease-debug-cr + -1 exit + then ( expiration$ ) + + 2dup expired? if + " expired" ?lease-debug-cr + -1 exit + then ( expiration$ ) + 0 +; + \ check-machine-signature verifies the signed object consisting \ of the machine identification info (SN + UUID) plus the expiration \ time "expiration$" against the crypto signature string sig$, @@ -378,6 +448,20 @@ : set-disposition ( adr -- ) c@ machine-id-buf d# 49 + c! ; +\ Checks the tail of a timed signature - lease or developer key +: check-timed-signature ( rem$ -- -1|0|1 ) + bl left-parse-string ( rem$ serial$ ) + my-sn$ $= 0= if 2drop 0 exit then ( rem$ ) + + \ Disposition code + bl left-parse-string 1 <> if 3drop -1 exit then ( rem$ disp-adr ) + set-disposition ( rem$ ) + + bl left-parse-string check-expiry if 4drop -1 exit then ( sig$ exp$ ) + + check-machine-signature ( -1|0|1 ) +; + \ check-lease checks a lease signature record in act01: format \ -1 means lease is for this machine and is invalid @@ -388,29 +472,8 @@ bl left-parse-string " act01:" $= 0= if " Not act01:" ?lease-debug-cr 2drop -1 exit - then - - bl left-parse-string ( rem$ serial$ ) - my-sn$ $= 0= if ( rem$ ) - " is for a different system" ?lease-debug-cr - 2drop 0 exit then ( rem$ ) - - \ Disposition code - bl left-parse-string 1 <> if 3drop -1 exit then ( rem$ disp-adr ) - set-disposition ( rem$ ) - - bl left-parse-string ( sig$ expiration$ ) - dup d# 16 <> if ( sig$ expiration$ ) - " has bad expiration format" ?lease-debug-cr - 4drop -1 exit - then ( sig$ expiration$ ) - - 2dup expired? if - " expired" ?lease-debug-cr - 4drop -1 exit - then ( sig$ expiration$ ) - check-machine-signature ( -1|0|1 ) + check-timed-signature ( -1|0|1 ) ; \ lease-valid? tries to read a lease file from the currently-selected @@ -419,13 +482,12 @@ \ a valid lease was found. : lease-valid? ( -- valid? ) - " ${DN}\security\lease.sig" expand$ ( name$ ) + " ${DN}\security\lease.sig" expand$ ( name$ ) " Trying " ?lease-debug 2dup ?lease-debug-cr - r/o open-file if drop false exit then ( ih ) + r/o open-file if drop false exit then >r ( r: ih ) + " Lease " ?lease-debug load-started - >r ( r: ih ) - " Lease " ?lease-debug ( r: ih ) - leasekey$ to pubkey$ ( r: ih ) + leasekey$ to pubkey$ begin sec-line-buf /sec-line-max r@ read-line if ( actual -eof? ) 2drop r> close-file drop false exit @@ -436,6 +498,7 @@ -1 of r> close-file drop " lock" show-icon false exit endof endcase repeat + " No matching records" ?lease-debug-cr r> close-file drop false ; @@ -455,6 +518,10 @@ ; 0 value alternate? +: show-dot ( -- ) + alternate? if " yellowdot" else " lightdot" then show-icon +; + : set-alternate ( -- ) button-o game-key? if true to alternate? exit then h# 82 cmos@ [char] A = if @@ -464,53 +531,6 @@ false to alternate? ; -0 0 2value base-xy -d# 410 d# 540 2constant progress-xy - -: text-on screen-ih stdout ! ; - -: visible dcon-unfreeze text-on ; - -: ?unfreeze ( -- ) - game-key@ button-check and if visible unfreeze then -; - -0 value security-off? - -: security-failure ( -- ) - visible - ." Stopping" cr - security-off? if quit then - - d# 10000 ms - power-off -; - -: +icon-xy ( delta-x,y -- ) icon-xy d+ to icon-xy ; - -: show-going ( -- ) - h# c0 h# c0 h# c0 rgb>565 progress-xy d# 500 d# 100 " fill-rectangle" $call-screen - d# 585 d# 613 to icon-xy " bigdot" show-icon - dcon-unfreeze -; -: show-dot ( -- ) - alternate? if " yellowdot" else " lightdot" then show-icon -; -: show-x ( -- ) " x" show-icon ; -: show-sad ( -- ) " sad" show-icon ; -: show-lock ( -- ) " lock" show-icon ; -: show-unlock ( -- ) " unlock" show-icon ; -: show-child ( -- ) - " erase-screen" $call-screen - d# 552 d# 383 to icon-xy " rom:xogray.565" $show-opaque - progress-xy to icon-xy \ For boot progress reports -; -: show-warnings ( -- ) - " erase-screen" $call-screen - d# 48 d# 32 to icon-xy " rom:warnings.565" $show-opaque - dcon-freeze -; - \ secure-load-ramdisk is called during the process of preparing an \ OS image for execution. It looks for an initrd bundle file on \ the same device where the OS image was found, in a file named @@ -568,16 +588,7 @@ : check-devel-key ( dev01$ -- -1|0|1 ) bl left-parse-string " dev01:" $= 0= if 2drop -1 exit then ( rem$ ) - bl left-parse-string ( rem$ serial$ ) - my-sn$ $= 0= if 2drop 0 exit then ( rem$ ) - - \ Disposition code - bl left-parse-string 1 <> if 3drop -1 exit then ( rem$ disp-adr ) - set-disposition ( rem$ ) - - develkey$ to pubkey$ ( rem$ ) - bl left-parse-string ( sig01$ exp$ ) - check-machine-signature ( -1|0|1 ) + check-timed-signature ; \ has-developer-key? searches for a valid developer key on the @@ -587,9 +598,10 @@ button-x game-key? if false exit then " ${DN}\security\develop.sig" expand$ ( name$ ) " Trying " ?lease-debug 2dup ?lease-debug-cr - r/o open-file if drop false exit then ( ih ) - >r + r/o open-file if drop false exit then >r ( r: ih ) + " Devel key " ?lease-debug load-started + develkey$ to pubkey$ begin sec-line-buf /sec-line-max r@ read-line if ( actual -eof? ) 2drop r> close-file drop false exit @@ -600,6 +612,7 @@ -1 of r> close-file drop false exit endof endcase repeat + " No matching records" ?lease-debug-cr r> close-file drop false ; @@ -707,7 +720,6 @@ 0<> ; -0 0 2value next-xy : load-from-list ( list$ -- devkey? ) " dev /jffs2-file-system ' ?unfreeze to scan-callout dend" eval @@ -753,7 +765,7 @@ : all-devices$ ( -- list$ ) " disk: sd: nand:" ; -d# 410 d# 540 2constant progress-xy + : secure-startup ( -- ) ['] noop to ?show-device ['] noop to load-done @@ -777,8 +789,12 @@ persistent-devkey? if true to security-off? visible exit then get-my-sn if visible ." No serial number" cr show-sad security-failure then - get-date if visible ." Invalid system date" cr show-sad security-failure then + get-date current-seconds earliest d< if + \ This is not fatal, because we don't want a brick if the RTC battery fails + visible ." Invalid system date" cr show-sad + then + load-crypto if visible ." Crytpo load failed" cr show-sad security-failure then ( ) alternate? if " \boot-alt" else " \boot" then pn-buf place

1 0

r723 - cpu/x86/pc/olpc ofw/inet
by svn＠openbios.org 08 Nov '07

08 Nov '07

Author: wmb Date: 2007-11-08 00:59:05 +0100 (Thu, 08 Nov 2007) New Revision: 723 Added: ofw/inet/sntp.fth Modified: cpu/x86/pc/olpc/fw.bth Log: Added SNTP support and the new OLPC command "ntp-set-clock". Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-11-07 23:57:36 UTC (rev 722) +++ cpu/x86/pc/olpc/fw.bth 2007-11-07 23:59:05 UTC (rev 723) @@ -138,12 +138,14 @@ [then] [ifdef] linux-support +\needs unix-seconds> fload ${BP}/ofw/fs/unixtime.fth \ Unix time calculation support-package: ext2-file-system fload ${BP}/ofw/fs/ext2fs/ext2fs.fth \ Linux file system end-support-package [then] [ifdef] jffs2-support +\needs unix-seconds> fload ${BP}/ofw/fs/unixtime.fth \ Unix time calculation support-package: jffs2-file-system fload ${BP}/ofw/fs/jffs2/jffs2.fth \ Journaling flash file system 2 end-support-package @@ -419,6 +421,23 @@ ; ' olpc-ssids to default-ssids +fload ${BP}/ofw/inet/sntp.fth +: olpc-ntp-servers ( -- ) + " time 172.18.0.1 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org" +; +' olpc-ntp-servers to ntp-servers +: ntp-time&date ( -- s m h d m y ) + ntp-timestamp abort" Can't contact NTP server" + ntp>time&date +; +: .clock ( -- ) + time&date .date space .time ." UTC" cr +; +: ntp-set-clock ( -- ) + ntp-time&date " set-time" clock-node @ $call-method + .clock +; + [ifdef] use-ppp fload ${BP}/ofw/ppp/loadppp.fth [then] Added: ofw/inet/sntp.fth =================================================================== --- ofw/inet/sntp.fth (rev 0) +++ ofw/inet/sntp.fth 2007-11-07 23:59:05 UTC (rev 723) @@ -0,0 +1,101 @@ +purpose: Get data and time from an NTP server using SNTP +\ See license at end of file + +0 value ip-ih +: $call-ip ip-ih $call-method ; + +d# 123 constant ntp-port# +h# 30 constant /sntp-request + +: send-sntp-request ( -- ) + /sntp-request " allocate-udp" $call-ip >r + r@ /sntp-request erase + 3 3 lshift \ SNTP version 3 + 3 or \ Client request + r@ c! + r@ /sntp-request ntp-port# ntp-port# " send-udp-packet" $call-ip + r> /sntp-request " free-udp" $call-ip +; +: receive-sntp-reply ( -- true | d.timestamp false ) + ntp-port# " receive-udp-packet" $call-ip if ( ) \ Timeout + true exit + then ( adr len src-port# ) + drop ( adr len ) + h# 30 < if ( adr len ) + ." Bad NTP reply length" cr + drop true exit + then ( adr ) +\ dup c@ h# c0 and if ( adr ) \ Check LI field +\ ." NTP server not synchronized" cr +\ drop true exit +\ then ( adr ) + dup h# 2c + be-l@ ( adr fraction ) + dup 0= if ( adr fraction ) + ." NTP server not synchronized" cr + 2drop true exit + then ( adr fraction ) + swap h# 28 + be-l@ ( fraction seconds ) + false ( d.timestamp false ) +; +: try-sntp ( hostname$ -- true | d.timestamp false ) + " ip" open-dev to ip-ih + ip-ih 0= if + ." Networking not available" cr + true exit + then + + d# 5,000 " set-timeout" $call-ip + " $set-host" $call-ip + send-sntp-request + receive-sntp-reply + ip-ih close-dev +; + +defer ntp-servers +: default-ntp-servers " 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org" ; +' default-ntp-servers to ntp-servers + +: ntp-timestamp ( -- true | d.timestamp false ) + ntp-servers begin dup while ( rem$ ) + bl left-parse-string ( rem$ server$ ) + ['] try-sntp catch if ( rem$ x x ) + 2drop ( rem$ ) + else ( rem$ [ true | d.timestamp false ] ) + 0= if ( rem$ d.timestamp ) + 2nip false exit + then ( rem$ ) + then ( rem$ ) + repeat ( rem$ ) + 2drop true +; + +d# 2,208,988,800 constant unix-epoch + +: ntp>time&date ( d.timestamp -- s m h m d y ) + nip unix-epoch - unix-seconds> +; + + +\ LICENSE_BEGIN +\ Copyright (c) 2007 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

r722 - ofw/inet
by svn＠openbios.org 08 Nov '07

08 Nov '07

Author: wmb Date: 2007-11-08 00:57:36 +0100 (Thu, 08 Nov 2007) New Revision: 722 Modified: ofw/inet/dns.fth Log: Handle DNS hostnames beginning with digits. This is useful for pools of NTP servers like 0.pool.ntp.org . Modified: ofw/inet/dns.fth =================================================================== --- ofw/inet/dns.fth 2007-11-07 23:55:19 UTC (rev 721) +++ ofw/inet/dns.fth 2007-11-07 23:57:36 UTC (rev 722) @@ -199,7 +199,7 @@ 1 and throw ( ) get-host-addr ( answer-ip ) ; -: (resolve) ( hostname$ -- ) +: (resolve) ( hostname$ -- 'ip ) bootnet-debug if ( hostname$ ) ." Using DNS to find the IP address of " ( hostname$ ) 2dup type cr ( hostname$ ) @@ -245,7 +245,11 @@ headers : $set-host ( hostname$ -- ) dup 0= ?bad-ip - over c@ [char] 0 [char] 9 between if $>ip else (resolve) then + 2dup ['] $>ip catch if ( hostname$ x x ) + 2drop (resolve) + else ( hostname$ 'ip ) + nip nip ( 'ip ) + then set-dest-ip ; \ LICENSE_BEGIN

1 0

r721 - ofw/core
by svn＠openbios.org 08 Nov '07

08 Nov '07

Author: wmb Date: 2007-11-08 00:55:19 +0100 (Thu, 08 Nov 2007) New Revision: 721 Modified: ofw/core/ofwfw.fth Log: Changed date display format from the US-specific form DD/MM/YY to the standard form YYYY-MM-DD. Modified: ofw/core/ofwfw.fth =================================================================== --- ofw/core/ofwfw.fth 2007-11-07 22:37:02 UTC (rev 720) +++ ofw/core/ofwfw.fth 2007-11-07 23:55:19 UTC (rev 721) @@ -18,9 +18,10 @@ headerless : 2.d ( n -- ) push-decimal (.2) type pop-base ; +: 4.d ( n -- ) push-decimal <# u# u# u# u# u#> type pop-base ; headers -: .date ( d m y -- ) swap 2.d ." /" swap 2.d ." /" d# 100 mod 2.d ; +: .date ( d m y -- ) 4.d ." -" 2.d ." -" 2.d ; : .time ( s m h -- ) 2.d ." :" 2.d ." :" 2.d ; \ Interactive diagnostic

1 0

r720 - cpu/x86/pc/olpc
by svn＠openbios.org 07 Nov '07

07 Nov '07

Author: wmb Date: 2007-11-07 23:37:02 +0100 (Wed, 07 Nov 2007) New Revision: 720 Modified: cpu/x86/pc/olpc/copynand.fth Log: Added nd-copy-nand command to handle .img files produced by nanddump. This was needed for manufacturing testing. Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2007-11-07 22:34:41 UTC (rev 719) +++ cpu/x86/pc/olpc/copynand.fth 2007-11-07 22:37:02 UTC (rev 720) @@ -13,8 +13,11 @@ 0 value #image-eblocks 0 value #crc-records +0 value nanddump-mode? + 0 value crc-buf +h# 40 constant /nand-oob : >crc ( index -- 'crc ) crc-buf swap la+ ; @@ -24,6 +27,7 @@ fileih ?dup if 0 to fileih close-dev then ; : close-nand-ihs ( -- ) + 0 to nanddump-mode? close-image-file nandih ?dup if 0 to nandih close-dev 0 to #nand-pages then crc-ih ?dup if 0 to crc-ih close-dev then @@ -94,6 +98,7 @@ : ?open-crcs ( -- ) img-has-oob? if exit then + nanddump-mode? if exit then image-name$ + 4 - " .img" caps-comp 0= if image-name$ crc-name-buf place " crc" crc-name$ + 3 - swap move @@ -114,16 +119,24 @@ image-name$ open-dev to fileih fileih 0= " Can't open NAND image file" ?nand-abort " size" fileih $call-method ( d.size ) - 2dup /nand-block um/mod swap if ( d.size #eblocks ) - \ Wrong size for the no-oob data format; try the dump-nand format - drop ( d.size #eblocks ) - h# 21100 um/mod swap ( #eblocks residue ) - 0<> " Image file size is not a multiple of the NAND erase block size" ?nand-abort - true to img-has-oob? - else ( d.size #eblocks ) + + nanddump-mode? if + 2dup h# 20000 um/mod swap if 1+ then ( d.size #eblocks ) false to img-has-oob? - nip nip ( #eblocks ) - then ( #eblocks ) + nip nip ( #eblocks ) + else + 2dup /nand-block um/mod swap if ( d.size #eblocks ) + \ Wrong size for the no-oob data format; try the dump-nand format + drop ( d.size #eblocks ) + h# 21100 um/mod swap ( #eblocks residue ) + 0<> " Image file size is not a multiple of the NAND erase block size" ?nand-abort + true to img-has-oob? + else ( d.size #eblocks ) + false to img-has-oob? + nip nip ( #eblocks ) + then ( #eblocks ) + then + to #image-eblocks #image-eblocks 0= " Image file is empty" ?nand-abort @@ -137,8 +150,17 @@ ; : read-image-block ( -- ) - load-base /nand-block " read" fileih $call-method ( len ) - /nand-block <> " Bad read of .img file" ?nand-abort ( ) + nanddump-mode? if + load-base /nand-block " read" fileih $call-method ( len ) + dup /nand-block <> if ( len ) + load-base over + /nand-page rot - h# ff fill + else + drop + then + else + load-base /nand-block " read" fileih $call-method ( len ) + /nand-block <> " Bad read of .img file" ?nand-abort ( ) + then ; : check-mem-crc ( record# -- ) @@ -230,6 +252,11 @@ close-nand-ihs ; +: nd-copy-nand ( "devspec" -- ) + true to nanddump-mode? + copy-nand + false to nanddump-mode? +; : verify-nand ( "devspec" -- ) open-nand

1 0

r719 - in ofw/fs: . ext2fs jffs2
by svn＠openbios.org 07 Nov '07

07 Nov '07

Author: wmb Date: 2007-11-07 23:34:41 +0100 (Wed, 07 Nov 2007) New Revision: 719 Added: ofw/fs/unixtime.fth Modified: ofw/fs/ext2fs/dir.fth ofw/fs/ext2fs/methods.fth ofw/fs/jffs2/jffs2.fth Log: Factored out the conversion routines to and from Unix time values (seconds since 1 Jan 1970) so only one copy is needed. This helps with OLPC trac 4707, avoiding the need for a third copy of those routines. Modified: ofw/fs/ext2fs/dir.fth =================================================================== --- ofw/fs/ext2fs/dir.fth 2007-11-07 07:56:38 UTC (rev 718) +++ ofw/fs/ext2fs/dir.fth 2007-11-07 22:34:41 UTC (rev 719) @@ -47,50 +47,11 @@ \ \ After this point, the code should be independent of the disk format! -\ time stamps - -\ date&time is number of seconds since 1970 -create days/month -\ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec - 31 c, 28 c, 31 c, 30 c, 31 c, 30 c, 31 c, 31 c, 30 c, 31 c, 30 c, 31 c, - -: >d/m ( day-in-year -- day month ) - 12 0 do - days/month i ca+ c@ 2dup < if - drop 1+ i 1+ leave - then - - - loop -; -: sec>time&date ( seconds -- s m h d m y ) - 60 u/mod 60 u/mod 24 u/mod ( s m h days ) - [ 365 4 * 1+ ] literal /mod >r ( s m h day-in-cycle ) ( r: cycles ) - dup [ 365 365 + 31 + 29 + ] literal - 2dup = if \ exactly leap year Feb 29 - 3drop 2 29 2 ( s m h year-in-cycle d m ) - else - > if 1- then \ after leap year - 365 u/mod ( s m h day-in-year year-in-cycle ) - swap >d/m ( s m h year-in-cycle d m ) - then - rot r> 4 * + 1970 + ( s m h d m y ) -; -: timestamp ( s m h d m y -- seconds ) \ since 1970 - d# 1970 - 4 /mod [ d# 365 4 * 1+ ] literal * ( s m h d m yrs days ) - swap d# 365 * + ( s m h d m days ) - swap 1- 0 ?do i days/month + c@ + loop ( s m h d days ) - + 1- ( s m h days ) - d# 24 * + d# 60 * + d# 60 * + -; - -\ e.g. time&date timestamp -\ timestamp sec>time&date should have no net effect - : init-inode ( mode inode# -- ) inode >r ( mode ) r@ /inode erase ( mode ) r@ short! ( ) - time&date timestamp ( time ) + time&date >unix-seconds ( time ) dup r@ 2 la+ int! ( time ) \ set access time dup r@ 3 la+ int! ( time ) \ set creation time r@ 4 la+ int! ( ) \ set modification time @@ -256,7 +217,7 @@ inode# inode /inode 6 /l* /string erase \ delete inode, and set its deletion time. - time&date timestamp ( time ) + time&date >unix-seconds ( time ) inode# inode 5 la+ int! update inode# free-inode ; @@ -292,7 +253,7 @@ : file-info ( id -- false | id' s m h d m y len attributes name$ true ) inode# >r file-handle to inode# ( id ) - 1+ file-sec sec>time&date file-size file-attr file-name true + 1+ file-sec unix-seconds> file-size file-attr file-name true r> to inode# ; Modified: ofw/fs/ext2fs/methods.fth =================================================================== --- ofw/fs/ext2fs/methods.fth 2007-11-07 07:56:38 UTC (rev 718) +++ ofw/fs/ext2fs/methods.fth 2007-11-07 22:34:41 UTC (rev 719) @@ -71,7 +71,7 @@ drop bfbase @ bsize free-mem \ Registered with initbuf modified? if false to modified? - time&date timestamp file-handle inode 4 la+ int! update + time&date >unix-seconds file-handle inode 4 la+ int! update then ; Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-11-07 07:56:38 UTC (rev 718) +++ ofw/fs/jffs2/jffs2.fth 2007-11-07 22:34:41 UTC (rev 719) @@ -1465,37 +1465,6 @@ file-size ; -\ This code is copied from ext2fs and could be shared -decimal -\ date&time is number of seconds since 1970 -create days/month -\ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec - 31 c, 28 c, 31 c, 30 c, 31 c, 30 c, 31 c, 31 c, 30 c, 31 c, 30 c, 31 c, - -: >d/m ( day-in-year -- day month ) - 12 0 do - days/month i ca+ c@ 2dup < if - drop 1+ i 1+ leave - then - - - loop -; -: sec>time&date ( seconds -- s m h d m y ) - 60 u/mod 60 u/mod 24 u/mod ( s m h days ) - [ 365 4 * 1+ ] literal /mod >r ( s m h day-in-cycle ) ( r: cycles ) - dup [ 365 365 + 31 + 29 + ] literal - 2dup = if \ exactly leap year Feb 29 - 3drop 2 29 2 ( s m h year-in-cycle d m ) - else - > if 1- then \ after leap year - 365 u/mod ( s m h day-in-year year-in-cycle ) - swap >d/m ( s m h year-in-cycle d m ) - then - rot r> 4 * + 1970 + ( s m h d m y ) -; -hex -\ End of common code - : next-file-info ( id -- false | id' s m h d m y len attributes name$ true ) dup 0= if drop prep-dirents minodes then ( tdirent ) dup next-minode = if drop false exit then ( tdirent ) @@ -1507,7 +1476,7 @@ 0 ( ... attributes r: tdirent ) else ( id' rinode r: tdirent ) >r ( id' r: tdirent rinode ) - r@ rimtime@ sec>time&date ( id' s m h d m y r: tdirent rinode ) + r@ rimtime@ unix-seconds> ( id' s m h d m y r: tdirent rinode ) r@ riisize@ ( id' s m h d m y len r: tdirent rinode ) r> rimode@ ( id' s m h d m y len mode r: tdirent ) then Added: ofw/fs/unixtime.fth =================================================================== --- ofw/fs/unixtime.fth (rev 0) +++ ofw/fs/unixtime.fth 2007-11-07 22:34:41 UTC (rev 719) @@ -0,0 +1,66 @@ +\ See license at end of file +purpose: Convert Unix seconds to time and date + +decimal +\ date&time is number of seconds since 1970 +create days/month +\ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec + 31 c, 28 c, 31 c, 30 c, 31 c, 30 c, 31 c, 31 c, 30 c, 31 c, 30 c, 31 c, + +: >d/m ( day-in-year -- day month ) + 12 0 do + days/month i ca+ c@ 2dup < if + drop 1+ i 1+ leave + then + - + loop +; +: unix-seconds> ( seconds -- s m h d m y ) + 60 u/mod 60 u/mod 24 u/mod ( s m h days ) + [ 365 4 * 1+ ] literal /mod >r ( s m h day-in-cycle ) ( r: cycles ) + dup [ 365 365 + 31 + 29 + ] literal + 2dup = if \ exactly leap year Feb 29 + 3drop 2 29 2 ( s m h year-in-cycle d m ) + else + > if 1- then \ after leap year + 365 u/mod ( s m h day-in-year year-in-cycle ) + swap >d/m ( s m h year-in-cycle d m ) + then + rot r> 4 * + 1970 + ( s m h d m y ) +; +: >unix-seconds ( s m h d m y -- seconds ) \ since 1970 + d# 1970 - 4 /mod [ d# 365 4 * 1+ ] literal * ( s m h d m yrs days ) + swap d# 365 * + ( s m h d m days ) + swap 1- 0 ?do i days/month + c@ + loop ( s m h d days ) + + 1- ( s m h days ) + d# 24 * + d# 60 * + d# 60 * + +; + +\ e.g. time&date >unix-seconds +\ >unix-seconds unix-seconds> should have no net effect + +hex + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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

r172 - openbios-devel/arch/sparc32
by svn＠openbios.org 07 Nov '07

07 Nov '07

Author: blueswirl Date: 2007-11-07 17:00:02 +0100 (Wed, 07 Nov 2007) New Revision: 172 Modified: openbios-devel/arch/sparc32/vectors.S Log: Enable boot mode in the exception handler for both SuperSparc and TurboSparc Modified: openbios-devel/arch/sparc32/vectors.S =================================================================== --- openbios-devel/arch/sparc32/vectors.S 2007-10-16 20:59:36 UTC (rev 171) +++ openbios-devel/arch/sparc32/vectors.S 2007-11-07 16:00:02 UTC (rev 172) @@ -95,7 +95,7 @@ set _start, %g3 set dump_exception, %g2 sub %g2, %g3, %g3 - set 1<<14, %g2 + set 3 << 13, %g2 jmp %g3 sta %g2, [%g0] ASI_M_MMUREGS

1 0

r718 - cpu/x86/pc/olpc
by svn＠openbios.org 07 Nov '07

07 Nov '07

Author: wmb Date: 2007-11-07 08:56:38 +0100 (Wed, 07 Nov 2007) New Revision: 718 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC trac 4702 - added "Tests complete - powering off" message to selftest sequence. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-11-07 07:52:07 UTC (rev 717) +++ cpu/x86/pc/olpc/fw.bth 2007-11-07 07:56:38 UTC (rev 718) @@ -497,7 +497,8 @@ ; : ?diags ( -- ) rocker-left game-key? if - text-on " test-all" eval d# 10000 ms power-off + text-on " test-all" eval + ." Tests complete - powering off" cr d# 5000 ms power-off then ; : ?fs-update ( -- )

1 0

r717 - cpu/x86/pc/olpc
by svn＠openbios.org 07 Nov '07

07 Nov '07

Author: wmb Date: 2007-11-07 08:52:07 +0100 (Wed, 07 Nov 2007) New Revision: 717 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC trac 4702 - added game key cheat code - rocker left - to invoke diagnostics. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-11-07 07:37:39 UTC (rev 716) +++ cpu/x86/pc/olpc/fw.bth 2007-11-07 07:52:07 UTC (rev 717) @@ -495,6 +495,11 @@ time&date 5drop 1 and if pong else life-demo then then ; +: ?diags ( -- ) + rocker-left game-key? if + text-on " test-all" eval d# 10000 ms power-off + then +; : ?fs-update ( -- ) button-check button-x or button-o or button-square or ( mask ) game-key-mask over and = if @@ -537,10 +542,11 @@ ['] false to interrupt-auto-boot? probe-usb interpreter-init + ?diags ?fs-update secure-startup ['] (interrupt-auto-boot?) to interrupt-auto-boot? - screen-ih stdout ! + text-on banner ?usb-keyboard auto-boot

1 0

r716 - cpu/x86/pc/olpc ofw/wifi
by svn＠openbios.org 07 Nov '07

07 Nov '07

Author: wmb Date: 2007-11-07 08:37:39 +0100 (Wed, 07 Nov 2007) New Revision: 716 Modified: cpu/x86/pc/olpc/fsupdate.fth cpu/x86/pc/olpc/fw.bth ofw/wifi/data.fth ofw/wifi/eapol.fth ofw/wifi/wifi-cfg.fth Log: OLPC trac 2740 - Added the ability to associate with one of a list of Access Point SSIDs and fixed the IP address of the school server. Filesystem update over the network is now working. Modified: cpu/x86/pc/olpc/fsupdate.fth =================================================================== --- cpu/x86/pc/olpc/fsupdate.fth 2007-11-07 07:34:31 UTC (rev 715) +++ cpu/x86/pc/olpc/fsupdate.fth 2007-11-07 07:37:39 UTC (rev 716) @@ -180,8 +180,8 @@ repeat ( rem$ ) 2drop ; -: update-devices " disk: sd: http:\\177.18.16.1" ; +: update-devices " disk: sd: http:\\172.18.0.1" ; : try-fs-update ( -- ) ." Searching for a NAND file system update image." cr - all-devices$ fs-update-from-list + update-devices fs-update-from-list ; Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-11-07 07:34:31 UTC (rev 715) +++ cpu/x86/pc/olpc/fw.bth 2007-11-07 07:37:39 UTC (rev 716) @@ -413,9 +413,11 @@ support-package: supplicant fload ${BP}/ofw/wifi/loadpkg.fth end-support-package -stand-init: - " ??,OLPCOFW" $wifi + +: olpc-ssids ( -- $ ) + " OLPCOFW"nschool-mesh-0"nschool-mesh-1"nschool-mesh-2" ; +' olpc-ssids to default-ssids [ifdef] use-ppp fload ${BP}/ofw/ppp/loadppp.fth Modified: ofw/wifi/data.fth =================================================================== --- ofw/wifi/data.fth 2007-11-07 07:34:31 UTC (rev 715) +++ ofw/wifi/data.fth 2007-11-07 07:37:39 UTC (rev 716) @@ -12,7 +12,7 @@ : enable-rsn ( -- ) " enable-rsn" $call-parent drop ; : disable-rsn ( -- ) " disable-rsn" $call-parent drop ; : disable-wep ( -- ) " disable-wep" $call-parent drop ; -: set-wep ( wep4$ wep3$ wep2$ wep1$ -- ) " set-wep" $call-parent drop ; +: set-wep ( wep4$ wep3$ wep2$ wep1$ idx -- ) " set-wep" $call-parent drop ; : associate ( ch ssid$ target-mac$ -- ok? ) " associate" $call-parent ; : supported-rates$ ( -- adr len ) " supported-rates$" $call-parent ; : set-common-rates ( adr len -- ) " set-common-rates" $call-parent ; @@ -80,15 +80,80 @@ 1 constant at-eap 2 constant at-preshared -0 0 2value country-ie \ Address of country IE +\ ===================================================================== +\ Country/region tables +: $, ( adr len -- ) here over allot swap move ; -\ ======================================================================= -\ Instance data +create countries + " US " $, h# 10 c, \ US FCC + " CA " $, h# 10 c, \ IC Canada + " SG " $, h# 10 c, \ Singapore + " EU " $, h# 30 c, \ ETSI + " AU " $, h# 30 c, \ Australia + " KR " $, h# 30 c, \ Republic of Korea + " ES " $, h# 31 c, \ Spain + " FR " $, h# 32 c, \ France + " JP " $, h# 40 c, \ Japan + " " $, h# 0 c, \ END OF LIST +: country>region ( country$ -- region ) + countries begin dup 3 + c@ while ( country$ adr ) + 3dup swap comp 0= if ( country$ adr ) + nip nip 3 + c@ exit + then ( country$ adr ) + 4 + ( country$ adr' ) + repeat ( country$ adr' ) + 3drop 0 +; + +create regions + \ US Len Channels 1-11, 100mW + h# 10 c, 3 c, 1 c, d# 11 c, d# 20 c, + + \ EU Len Channels 1-13, 100mW + h# 30 c, 3 c, 1 c, d# 13 c, d# 20 c, + + \ ES Len Channels 10-11, 100mW + h# 31 c, 3 c, d# 10 c, 2 c, d# 20 c, + + \ FR Len Channels 10-13, 100mW + h# 32 c, 3 c, d# 10 c, 4 c, d# 20 c, + + \ JP Len Channels 1-13, 50mW Channel 14, 50mW + h# 40 c, 6 c, 1 c, d# 13 c, d# 16 c, d# 14 c, 1 c, d# 16 c, + + 0 c, \ END OF LIST + +\ Seach the regions table +: region>ch/pwr ( region-code -- ch-adr,len ) + regions begin dup c@ while ( region-code adr ) + 2dup c@ = if ( region-code adr ) + nip ca1+ count exit ( region-code adr ) + then ( region-code adr ) + ca1+ count + ( region-code adr' ) + repeat ( region-code adr ) + 2drop null$ +; + +d# 15 3 * dup constant /country-ie buffer: country-ie-buf + +\ country>ie fills country-ie with the country followed by the region info + +0 instance value country-ie-len + +: set-country-ie ( country$ -- ) + country-ie-buf /country-ie erase ( country$ ) + 2dup country>region ?dup 0= if 2drop exit then ( country$ region# ) + region>ch/pwr dup 0= if 4drop exit then ( country$ ch-adr,len ) + tuck country-ie-buf 3 + swap move ( country$ len ) + over + to country-ie-len ( country$ ) + 3 max country-ie-buf swap move ( ) +; + false instance value debug? false instance value scan? -false instance value country? + 0 instance value wifi \ Current wifi-node : ptk ( -- adr ) wifi >ptk ; @@ -142,23 +207,6 @@ last-rcnt /rcnt ff fill ; - -\ ======================================================================= -\ wifi-cfg data - -: adrlen@ ( src -- adr len ) dup @ swap na1+ @ ; -: wifi-ssid$ ( -- $ ) wifi-cfg >wc-ssid adrlen@ ; -: wifi-pmk$ ( -- $ ) wifi-cfg >wc-pmk adrlen@ ; -: wifi-wep1$ ( -- $ ) wifi-cfg >wc-wep1 adrlen@ ; -: wifi-wep2$ ( -- $ ) wifi-cfg >wc-wep2 adrlen@ ; -: wifi-wep3$ ( -- $ ) wifi-cfg >wc-wep3 adrlen@ ; -: wifi-wep4$ ( -- $ ) wifi-cfg >wc-wep4 adrlen@ ; -: wifi-wep-idx ( -- n ) wifi-cfg >wc-wep-idx @ 1- 0 max 4 min ; -: wifi-country$ ( -- $ ) wifi-cfg >wc-country 3 ; - -: set-country ( adr len -- ) 2dup upper country>ie to country-ie ; - - \ LICENSE_BEGIN \ Copyright (c) 2007 FirmWorks \ Modified: ofw/wifi/eapol.fth =================================================================== --- ofw/wifi/eapol.fth 2007-11-07 07:34:31 UTC (rev 715) +++ ofw/wifi/eapol.fth 2007-11-07 07:37:39 UTC (rev 716) @@ -626,8 +626,8 @@ : set-bss-type ( bss-type -- ) dup to bss-type set-bss-type ; -: set-country-info ( adr len -- ) - country? if 2drop country-ie then \ Overwrite the country IE +: do-set-country-info ( adr len -- ) + country-ie-len if 2drop country-ie-buf country-ie-len then \ Override the country IE 3 / 3 * \ Remove pad byte ?dup 0= if drop exit then \ Nothing to set set-country-info @@ -680,7 +680,7 @@ kt-wep of wep-ok? endof ( default ) pmk-ok? swap endcase - dup 0= if ." Keys in wifi-cfg are not valid" cr then + dup if ." found" else ." Keys in wifi-cfg are not valid" then cr ; h# 0050.f201 constant wpa-tag @@ -707,15 +707,16 @@ dup 3 find-ie 0= if ." Cannot locate the channel #" cr drop false exit then drop c@ channel! \ Channel number dup 6 find-ie if drop 2 + le-w@ set-atim-window then \ ATIM window - dup 7 find-ie 0= if null$ then set-country-info \ Country channel/power info + dup 7 find-ie 0= if null$ then do-set-country-info \ Country channel/power info dup d# 48 find-ie if set-wpa2-ktype drop key-ok? exit then \ Favor RSN(WPA2) over WPA dup d# 221 find-ie if 2 pick process-wpa-ie then drop key-ok? ; : (do-associate) ( -- ok? ) - ??cr ." Associate with: " ssid$ type cr + ??cr ." Associate with: " ssid$ type space channel ssid$ target-mac$ associate 0= if false exit then + cr ktype=wpa? if do-key-handshakes done-group-key? @@ -724,23 +725,40 @@ then ; -: do-scan? ( -- scan? ) wifi-ssid$ ssid$ $= not scan? or valid? 0= or ; +\ Don't rescan the second time unless forced to +: must-scan? ( -- flag ) + ssid-reset? false to ssid-reset? ( flag ) + scan? or false to scan? ( flag' ) + valid? 0= or +; +: scan-ssid? ( ssid$ -- found? ) + dup 0= if 2drop false exit then + ssid! + ssid$ " set-ssid" $call-parent + ??cr ." Scan for: " ssid$ type space + scanbuf /buf scan 0= if ." not found" cr false exit then + debug? if scanbuf .scan then + ssid$ scanbuf find-ssid 0= if ." not found" cr false exit then + init-common-rates + ssid-valid? 0= if exit then + true valid! + report-associate-info + true +; +: try-scan ( -- okay? ) + wifi-ssid$ scan-ssid? if true exit then + default-ssids begin dup while ( rem$ ) + newline left-parse-string ( rem$' ssid$ ) + scan-ssid? if 2drop true exit then ( rem$ ) + repeat ( rem$ ) + 2drop false +; + : do-associate ( -- ok? ) disable-protection - do-scan? if - wifi-ssid$ ssid! - wifi-ssid$ " set-ssid" $call-parent - ??cr ." Scan for: " ssid$ type cr - scanbuf /buf scan 0= if ." Failed to find: " ssid$ type cr false exit then - debug? if scanbuf .scan then - ssid$ scanbuf find-ssid 0= if ." Cannot find: " ssid$ type cr false exit then - init-common-rates - ssid-valid? 0= if false exit then - true valid! - report-associate-info - then - (do-associate) + must-scan? if try-scan 0= if false exit then then + (do-associate) dup 0= if true to scan? then ; @@ -771,17 +789,15 @@ ascii , left-parse-string 2dup " debug" $= if true to debug? then 2dup " scan" $= if true to scan? then \ Force scan even if ssid$ is same - 2dup drop " country" comp 0= if \ Force different country IE + 2dup drop " country" comp 0= if \ Force different country IE 2dup [char] = left-parse-string 2drop - set-country - true to country? + 2dup upper set-country-ie then 2drop repeat drop ; : open ( -- ok? ) - wifi-country$ set-country my-args parse-args mac-adr$ init-wifi-data first-open? if Modified: ofw/wifi/wifi-cfg.fth =================================================================== --- ofw/wifi/wifi-cfg.fth 2007-11-07 07:34:31 UTC (rev 715) +++ ofw/wifi/wifi-cfg.fth 2007-11-07 07:37:39 UTC (rev 716) @@ -1,155 +1,69 @@ purpose: /package/supplicant configuration data \ See license at end of file - \ ===================================================================== \ Arguments passed onto the /supplicant support package struct - 3 field >wc-country \ Country code - /n 3 - + \ Padding - /n 2* field >wc-ssid \ adr len (upto 32 ascii bytes) - /n field >wc-wep-idx \ 1-4 - /n 2* field >wc-wep1 \ adr len (binary, len=5 or 13) - /n 2* field >wc-wep2 \ adr len - /n 2* field >wc-wep3 \ adr len - /n 2* field >wc-wep4 \ adr len - /n 2* field >wc-pmk \ adr len (binary, len=32) + /n field >wc-ssid \ pstr (upto 32 ASCII characters) + /n field >wc-wep-idx \ 1-4 + /n field >wc-wep1 \ pstr (binary, len=5 or 13) + /n field >wc-wep2 \ pstr (binary, len=5 or 13) + /n field >wc-wep3 \ pstr (binary, len=5 or 13) + /n field >wc-wep4 \ pstr (binary, len=5 or 13) + /n field >wc-pmk \ pstr (binary, len=32) constant /wifi-cfg -/wifi-cfg buffer: wifi-cfg +/wifi-cfg buffer: ram-wifi-cfg +defer wifi-cfg ' ram-wifi-cfg to wifi-cfg -\ ===================================================================== -\ Country/region tables +\ ======================================================================= +\ wifi-cfg data -: $, ( adr len -- ) here over allot swap move ; - -create country-region -here - " US " $, 10 c, \ US FCC - " CA " $, 10 c, \ IC Canada - " SG " $, 10 c, \ Singapore - " EU " $, 30 c, \ ETSI - " AU " $, 30 c, \ Australia - " KR " $, 30 c, \ Republic of Korea - " ES " $, 31 c, \ Spain - " FR " $, 32 c, \ France - " JP " $, 40 c, \ Japan -here swap - 4 / constant #country-region - -create region-ie-US -here - 1 c, d# 11 c, d# 20 c, \ Channels 1-11, 100mW -here swap - constant /region-ie-US - -create region-ie-EU -here - 1 c, d# 13 c, d# 20 c, \ Channels 1-13, 100mW -here swap - constant /region-ie-EU - -create region-ie-ES -here - d# 10 c, 2 c, d# 20 c, \ Channels 10-11, 100mW -here swap - constant /region-ie-ES - -create region-ie-FR -here - d# 10 c, 4 c, d# 20 c, \ Channels 10-13, 100mW -here swap - constant /region-ie-FR - -create region-ie-JP -here - 1 c, d# 13 c, d# 16 c, \ Channels 1-13, 50mW - d# 14 c, 1 c, d# 16 c, \ Channel 14, 50mW -here swap - constant /region-ie-JP - -d# 15 3 * dup constant /country-ie buffer: country-ie - -: country>region ( country$ -- region ) - 0 -rot #country-region 0 do ( region adr len ) - country-region i 4 * + 2 pick 2 pick comp - 0= if rot drop country-region i 4 * + 3 + c@ -rot leave then - loop 2drop ( region ) +\ Make a packed string of $, optimizing for the case where +\ $ is already in the dictionary as a packed string. +: $>pstr ( $ -- pstr ) + over in-dictionary? if ( $ ) + over c@ over = if drop 1- exit then + then ( $ ) + here >r ", r> ( pstr ) ; -: region>ch/pwr ( region -- ch-adr,len ) - case - 10 of region-ie-US /region-ie-US endof - 30 of region-ie-EU /region-ie-EU endof - 31 of region-ie-ES /region-ie-ES endof - 32 of region-ie-FR /region-ie-FR endof - 40 of region-ie-JP /region-ie-JP endof - ( default ) null$ rot - endcase -; +: pstr! ( adr len dst -- ) >r $>pstr r> ! ; -: country>ie ( country$ -- ie-adr,len ) - country-ie /country-ie erase - 2dup country>region ?dup 0= if 2drop null$ exit then - region>ch/pwr ?dup 0= if 3drop null$ exit then - tuck country-ie 3 + swap move - over + -rot 3 max country-ie swap move - country-ie swap -; +: pstr@ ( src -- adr len ) @ ?dup if count else " " then ; +: wifi-ssid$ ( -- $ ) wifi-cfg >wc-ssid pstr@ ; +: wifi-pmk$ ( -- $ ) wifi-cfg >wc-pmk pstr@ ; +: wifi-wep1$ ( -- $ ) wifi-cfg >wc-wep1 pstr@ ; +: wifi-wep2$ ( -- $ ) wifi-cfg >wc-wep2 pstr@ ; +: wifi-wep3$ ( -- $ ) wifi-cfg >wc-wep3 pstr@ ; +: wifi-wep4$ ( -- $ ) wifi-cfg >wc-wep4 pstr@ ; +: wifi-wep-idx ( -- n ) wifi-cfg >wc-wep-idx @ 1- 0 max 4 min ; +defer default-ssids ( -- $ ) ' null$ to default-ssids -\ ===================================================================== -\ Scan wireless networks - -: wifi-children ( -- ) - \ Ignore nodes that do not have device_type = wireless-network - " device_type" get-property if exit then - get-encoded-string " wireless-network" $= if - " scan-wifi" method-name 2! do-method? - then -; - -: scan-wifi ( -- ) - optional-arg-or-/$ ['] wifi-children scan-subtree -; - -: adrlen! ( adr len dst -- ) tuck na1+ ! ! ; - -\ Some syntactic sugar -: preserve$ ( $ -- $' ) - over in-dictionary? if exit then ( $ ) - here >r ", r> count -; - -: $wifi ( country,ssid$ -- ) - dup 0= abort" Empty country,SSID string" +0 value ssid-reset? +: $essid ( essid$ -- ) + dup 0= abort" Empty ESSID string" wifi-cfg /wifi-cfg erase ( adr len ) - wifi-cfg 3 blank ( adr len ) - [char] , left-parse-string ( tail$ head$ ) - 2 pick 0= if ( null$ ssid$ ) - 2swap 2drop " US" ( ssid$ country$ ) - then ( ssid$ country$ ) - dup 3 > if - type ." is too long to be a country name." cr - abort - then - wifi-cfg >wc-country swap move ( ssid$ ) - preserve$ ( ssid$' ) \ Save the string - wifi-cfg >wc-ssid adrlen! ( ) + wifi-cfg >wc-ssid pstr! ( ) + true to ssid-reset? ; : $wep ( wep$ -- ) dup 5 <> over d# 13 <> and abort" WEP key must be 5 or 13 bytes" - preserve$ ( wep$' ) wifi-cfg >wc-wep-idx dup @ ( wep$ adr idx ) dup 4 >= abort" Too many WEP keys" ( wep$ adr idx ) 2dup 1+ swap ! ( wep$ adr idx ) - 2* na+ na1+ adrlen! ( ) + 2* na+ na1+ pstr! ( ) ; : $pmk ( pmk$ -- ) dup d# 32 <> abort" PMK must be 32 bytes" - preserve$ ( pmk$' ) - wifi-cfg >wc-pmk adrlen! ( ) + wifi-cfg >wc-pmk pstr! ( ) ; - \ Stores the result at here : decode-hex ( hex$ -- bin$ ) here >r @@ -163,56 +77,40 @@ r> here over - ( bin-adr bin-len ) ; -: wifi ( "country,ssid" -- ) 0 parse $wifi ; +: essid ( "ssid" -- ) 0 parse $essid ; +alias wifi essid +alias ssid essid : wep ( "wep" -- ) parse-word decode-hex $wep ; : pmk ( "pmk" -- ) parse-word decode-hex $pmk ; +\ ===================================================================== +\ Scan wireless networks + +: wifi-children ( -- ) + \ Ignore nodes that do not have device_type = wireless-network + " device_type" get-property if exit then + get-encoded-string " wireless-network" $= if + " scan-wifi" method-name 2! do-method? + then +; + +: scan-wifi ( -- ) + optional-arg-or-/$ ['] wifi-children scan-subtree +; + + 0 [if] \ Sample usage: -: us$ ( -- $ ) " US " ; -: dlink-ssid ( -- $ ) " dlink" ; -: dlink-wep1 ( -- $ ) " "(11 22 33 44 55)" ; -: dlink-pmk ( -- $ ) " "(db 91 ee 34 a9 3c 73 48 18 35 a2 64 5b 11 d1 34 ec f3 b3 a2 ee ae 33 96 a9 0b 7d b5 1f 2f 48 78)" ; -: bad-pmk ( -- $ ) " "(00 91 ee 34 a9 3c 73 48 18 35 a2 64 5b 11 d1 34 ec f3 b3 a2 ee ae 33 96 a9 0b 7d b5 1f 2f 48 78)" ; : set-dlink-wifi-cfg ( -- ) - wifi-cfg /wifi-cfg erase - us$ wifi-cfg >wc-country swap move - dlink-ssid wifi-cfg >wc-ssid adrlen! - 1 wifi-cfg >wc-wep-idx ! - dlink-wep1 wifi-cfg >wc-wep1 adrlen! - dlink-pmk wifi-cfg >wc-pmk adrlen! + " dlink" $ssid + " "(11 22 33 44 55)" $wep + " "(db 91 ee 34 a9 3c 73 48 18 35 a2 64 5b 11 d1 34 ec f3 b3 a2 ee ae 33 96 a9 0b 7d b5 1f 2f 48 78)" $pmk ; set-dlink-wifi-cfg -: us$ ( -- $ ) " US " ; -: linksys-ssid ( -- $ ) " linksys" ; -: linksys-wep1 ( -- $ ) " "(11 22 33 44 55)" ; -: linksys-pmk ( -- $ ) " "(35 8b b7 41 ac fc 04 08 73 67 fb 79 11 cb 18 38 36 ca 54 47 49 73 cd 7a 59 35 e8 6c 4f 20 5f 13)" ; -: set-linksys-wifi-cfg ( -- ) - wifi-cfg /wifi-cfg erase - us$ wifi-cfg >wc-country swap move - linksys-ssid wifi-cfg >wc-ssid adrlen! - 1 wifi-cfg >wc-wep-idx ! - linksys-wep1 wifi-cfg >wc-wep1 adrlen! - linksys-pmk wifi-cfg >wc-pmk adrlen! -; -set-linksys-wifi-cfg - -: us$ ( -- $ ) " US " ; -: olpc-ssid ( -- $ ) " olpc" ; -: olpc-wep1 ( -- $ ) " "(11 22 33 44 55)" ; -: set-olpc-wifi-cfg ( -- ) - wifi-cfg /wifi-cfg erase - us$ wifi-cfg >wc-country swap move - olpc-ssid wifi-cfg >wc-ssid adrlen! - 1 wifi-cfg >wc-wep-idx ! - olpc-wep1 wifi-cfg >wc-wep1 adrlen! -; -set-olpc-wifi-cfg - [then] \ LICENSE_BEGIN

1 0

r715 - dev/olpc/spiflash
by svn＠openbios.org 07 Nov '07

07 Nov '07

Author: wmb Date: 2007-11-07 08:34:31 +0100 (Wed, 07 Nov 2007) New Revision: 715 Modified: dev/olpc/spiflash/spiui.fth Log: Added restore-mfg-data <filename> to restore manufacturing data saved by save-mfg-data. Also fixed a bug in save-mfg-data whereby the wrong filename is generated for old machines where the SN tag value doesn't have a trailing null. Modified: dev/olpc/spiflash/spiui.fth =================================================================== --- dev/olpc/spiflash/spiui.fth 2007-11-07 07:27:51 UTC (rev 714) +++ dev/olpc/spiflash/spiui.fth 2007-11-07 07:34:31 UTC (rev 715) @@ -122,7 +122,11 @@ [ifdef] $call-method : make-sn-name ( -- filename$ ) " SN" find-tag 0= abort" No serial number in mfg data" ( sn$ ) - dup if 1- then ( sn$' ) \ Remove Null + dup if ( sn$ ) + 2dup + 1- c@ 0= if ( sn$ ) + 1- ( sn$' ) \ Remove Null + then ( sn$ ) + then ( sn$ ) d# 11 over - dup 0> if ( sn$' #excess ) /string ( sn$' ) \ Keep last 11 characters else ( sn$' #excess ) @@ -148,6 +152,23 @@ mfg-data-range " write" r@ $call-method ( r: ihandle ) r> close-dev ; +: restore-mfg-data ( "filename" -- ) + reading + ifd @ fsize dup /flash-block > if ( len ) + drop ifd @ fclose ( ) + true abort" File is too big" + then ( len ) + mfg-data-buf swap ( adr len ) + 2dup ifd @ fgets drop ( adr len ) + ifd @ fclose + + spi-start spi-identify + mfg-data-offset erase-spi-block ( adr len ) + mfg-data-end-offset over - ( adr len offset ) + write-spi-flash ( ) + spi-reprogrammed ( ) +; + [then] : ?move-mfg-data ( -- )

1 0

r714 - dev/usb2/device/wlan
by svn＠openbios.org 07 Nov '07

07 Nov '07

Author: wmb Date: 2007-11-07 08:27:51 +0100 (Wed, 07 Nov 2007) New Revision: 714 Modified: dev/usb2/device/wlan/fw8388.fth Log: OLPC trac 4637 - workaround the "returns the wrong MAC address" problem by waiting 200 ms after firmware download before reading the MAC address. (A better fix in the Libertas firmware is expected in a few days.) Modified: dev/usb2/device/wlan/fw8388.fth =================================================================== --- dev/usb2/device/wlan/fw8388.fth 2007-11-07 07:24:22 UTC (rev 713) +++ dev/usb2/device/wlan/fw8388.fth 2007-11-07 07:27:51 UTC (rev 714) @@ -156,6 +156,7 @@ (download-fw) wait-cmd-resp drop \ A packet is sent after download completes ds-ready to driver-state + d# 200 ms marvel-get-mac-address ;

1 0

r713 - dev/usb2/device/wlan
by svn＠openbios.org 07 Nov '07

07 Nov '07

Author: wmb Date: 2007-11-07 08:24:22 +0100 (Wed, 07 Nov 2007) New Revision: 713 Modified: dev/usb2/device/wlan/usb8388.fth Log: OLPC trac 4705 - fix scan failures caused by mesh auto-start happening during the scan attempt. Modified: dev/usb2/device/wlan/usb8388.fth =================================================================== --- dev/usb2/device/wlan/usb8388.fth 2007-11-05 18:40:33 UTC (rev 712) +++ dev/usb2/device/wlan/usb8388.fth 2007-11-07 07:24:22 UTC (rev 713) @@ -388,29 +388,30 @@ : process-pmic-failure ( -- ) ; : process-gmic-failure ( -- ) ; +: .event ?cr ." Event: " type cr ; : process-ind ( adr len -- ) - ?cr drop - ." Event: " + drop 4 + le-l@ case - h# 03 of ." Link Loss" process-disconnect endof - h# 04 of ." Link Sensed" endof - h# 06 of ." MIB Changed" endof - h# 07 of ." Init Done" endof - h# 08 of ." Deauthenticated" process-disconnect endof - h# 09 of ." Disassociated" process-disconnect endof - h# 0a of ." Awake" process-wakeup endof - h# 0b of ." Sleep" process-wakeup endof - h# 0d of ." Multicast MIC error" process-gmic-failure endof - h# 0e of ." Unicast MIC error" process-pmic-failure endof - h# 11 of ." HWAC - adhoc BCN lost" endof - h# 19 of ." RSSI low" endof - h# 1a of ." SNR low" endof - h# 1b of ." Max fail" endof - h# 1c of ." RSSI high" endof - h# 1d of ." SNR high" endof + h# 03 of " Link Loss" .event process-disconnect endof + h# 04 of " Link Sensed" .event endof + h# 06 of " MIB Changed" .event endof + h# 07 of " Init Done" .event endof + h# 08 of " Deauthenticated" .event process-disconnect endof + h# 09 of " Disassociated" .event process-disconnect endof + h# 0a of " Awake" .event process-wakeup endof + h# 0b of " Sleep" .event process-wakeup endof + h# 0d of " Multicast MIC error" .event process-gmic-failure endof + h# 0e of " Unicast MIC error" .event process-pmic-failure endof + h# 11 of " HWAC - adhoc BCN lost" .event endof + h# 19 of " RSSI low" .event endof + h# 1a of " SNR low" .event endof + h# 1b of " Max fail" .event endof + h# 1c of " RSSI high" .event endof + h# 1d of " SNR high" .event endof + h# 23 of endof \ Suppress this; the user doesn't need to see it + \ h# 23 of ." Mesh auto-started" endof ( default ) ." Unknown " dup u. endcase - cr ; : process-request ( adr len -- ) @@ -440,7 +441,8 @@ then then ; -: wait-cmd-resp ( -- error? ) +\ -1 error, 0 okay, 1 retry +: wait-cmd-resp ( -- -1|0|1 ) false to got-response? false to got-data? resp-wait 0 do @@ -449,7 +451,11 @@ 1 ms loop got-response? if - cmd-resp-error? dup if ." Result = " dup u. then + cmd-resp-error? case + 0 of 0 endof \ No error + 4 of 1 endof \ Busy, so retry + ( default ) ." Result = " dup u. cr dup + endcase else ." Timeout or USB error" cr true @@ -750,7 +756,7 @@ : (scan) ( -- error? ) /cmd_802_11_scan ssid c@ if - /marvel-IE-hdr + ssid c@ + + /marvel-IE-hdr + ssid c@ + then 6 ( CMD_802_11_SCAN ) prepare-cmd ( ) resp-wait-long to resp-wait ( ) @@ -787,7 +793,8 @@ : set-ssid ( adr len -- ) h# 32 min ssid pack drop ; : scan ( adr len -- actual ) - (scan) if 2drop 0 exit then + begin (scan) dup 1 = while drop d# 1000 ms repeat \ Retry while busy + if 2drop 0 exit then respbuf /respbuf /fw-cmd /string ( adr len radr rlen ) rot min -rot swap 2 pick move ( actual ) ;

1 0

r712 - ofw/inet
by svn＠openbios.org 05 Nov '07

05 Nov '07

Author: wmb Date: 2007-11-05 19:40:33 +0100 (Mon, 05 Nov 2007) New Revision: 712 Modified: ofw/inet/arp.fth Log: Control the "ARP timeout" message from debug-net instead of from diag-switch?, thus making the problem from OLPC trac 4637 slightly easier to discern. Modified: ofw/inet/arp.fth =================================================================== --- ofw/inet/arp.fth 2007-11-05 18:38:22 UTC (rev 711) +++ ofw/inet/arp.fth 2007-11-05 18:40:33 UTC (rev 712) @@ -83,7 +83,9 @@ ; : .arp/rarp-timeout ( -- ) - " Timeout waiting for ARP/RARP packet" diag-type diag-cr + bootnet-debug if + ." Timeout waiting for ARP/RARP packet" cr + then ; : arpcom ( his-ip his-en my-ip my-en req-type en-type -- ok? )

1 0

r711 - ofw/fs/jffs2
by svn＠openbios.org 05 Nov '07

05 Nov '07

Author: wmb Date: 2007-11-05 19:38:22 +0100 (Mon, 05 Nov 2007) New Revision: 711 Modified: ofw/fs/jffs2/jffs2.fth Log: OLPC trac 4599 - first-time? must be considered in optimizing out rescanning, in case the NAND image was changed underneath JFFS2. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-11-04 17:32:52 UTC (rev 710) +++ ofw/fs/jffs2/jffs2.fth 2007-11-05 18:38:22 UTC (rev 711) @@ -118,7 +118,7 @@ : eblock>page ( eblock# -- page# ) pages/eblock * ; : page>eblock ( page# -- eblock# ) pages/eblock / ; --1 ( instance ) value have-eblock# \ For avoiding redundant reads +-1 instance value have-eblock# \ For avoiding redundant reads : (read-pages) ( page# #pages -- #read ) \ Partial reads invalidate the cache dup pages/eblock <> if -1 to have-eblock# then ( page# #pages ) @@ -824,7 +824,7 @@ ; : scan-occupied ( -- ) - " partition#" $call-parent partition# = if exit then + " partition#" $call-parent partition# = first-time? 0= and if exit then init-curvars dirents 'next-dirent ! inodes 'next-inode !

1 0

r710 - cpu/x86/pc/olpc
by svn＠openbios.org 04 Nov '07

04 Nov '07

Author: wmb Date: 2007-11-04 18:32:52 +0100 (Sun, 04 Nov 2007) New Revision: 710 Modified: cpu/x86/pc/olpc/ec.bth cpu/x86/pc/olpc/verify.bth Log: OLPC - added -q to all wget commands to tidy up the build output. Modified: cpu/x86/pc/olpc/ec.bth =================================================================== --- cpu/x86/pc/olpc/ec.bth 2007-11-04 17:29:50 UTC (rev 709) +++ cpu/x86/pc/olpc/ec.bth 2007-11-04 17:32:52 UTC (rev 710) @@ -9,7 +9,7 @@ " ${GET_EC}" expand$ nip [if] " ${GET_EC}" expand$ $sh [else] - " wget http://dev.laptop.org/pub/ec/ec_v${EC_VERSION}.img -O ec.img" expand$ $sh + " wget -q http://dev.laptop.org/pub/ec/ec_v${EC_VERSION}.img -O ec.img" expand$ $sh [then] \ This forces the creation of an ec.log file, so we don't re-fetch ec.img Modified: cpu/x86/pc/olpc/verify.bth =================================================================== --- cpu/x86/pc/olpc/verify.bth 2007-11-04 17:29:50 UTC (rev 709) +++ cpu/x86/pc/olpc/verify.bth 2007-11-04 17:32:52 UTC (rev 710) @@ -5,12 +5,12 @@ fload ${BP}/cpu/x86/pc/olpc/versions.fth -" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/os.public -O os.public" expand$ $sh -" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fw.public -O fw.public" expand$ $sh -" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fs.public -O fs.public" expand$ $sh -" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/lease.public -O lease.public" expand$ $sh -" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/developer.public -O developer.public" expand$ $sh -" wget -nv http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img -O verify.img" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/os.public -O os.public" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fw.public -O fw.public" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fs.public -O fs.public" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/lease.public -O lease.public" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/developer.public -O developer.public" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img -O verify.img" expand$ $sh \ This forces the creation of an verify.log file, so we don't re-fetch writing verify.version

1 0

r709 - cpu/x86/pc/olpc
by svn＠openbios.org 04 Nov '07

04 Nov '07

Author: wmb Date: 2007-11-04 18:29:50 +0100 (Sun, 04 Nov 2007) New Revision: 709 Added: cpu/x86/pc/olpc/verify.bth Removed: cpu/x86/pc/olpc/crypto.bth Modified: cpu/x86/pc/olpc/olpc.bth cpu/x86/pc/olpc/versions.fth Log: OLPC - Fixed a build dependency problem that sometimes prevented the crypto keys from being re-fetched automatically. Deleted: cpu/x86/pc/olpc/crypto.bth =================================================================== --- cpu/x86/pc/olpc/crypto.bth 2007-11-04 16:57:41 UTC (rev 708) +++ cpu/x86/pc/olpc/crypto.bth 2007-11-04 17:29:50 UTC (rev 709) @@ -1,18 +0,0 @@ -purpose: Fetch the Crypto code and keys - -command: &builder &this -build-now - -fload ${BP}/cpu/x86/pc/olpc/versions.fth - -" wget http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img -O verify.img" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/os.public -O os.public" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/fw.public -O fw.public" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/fs.public -O fs.public" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/lease.public -O lease.public" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/developer.public -O developer.public" expand$ $sh - -\ This forces the creation of an crypto.log file, so we don't re-fetch -writing crypto.version -" ${CRYPTO_VERSION}"n" expand$ ofd @ fputs -ofd @ fclose Modified: cpu/x86/pc/olpc/olpc.bth =================================================================== --- cpu/x86/pc/olpc/olpc.bth 2007-11-04 16:57:41 UTC (rev 708) +++ cpu/x86/pc/olpc/olpc.bth 2007-11-04 17:29:50 UTC (rev 709) @@ -22,9 +22,8 @@ in: ${BP}/dev/olpc/cafenand/build/cafenand.fc in: ${BP}/dev/olpc/cafecamera/build/cafecamera.fc in: ${BP}/clients/memtest86/memtest -in: ec.img -in: crypto.img -in: usb8388.bin +in: ${BP}/cpu/x86/pc/olpc/build/verify.img +in: ${BP}/cpu/x86/pc/olpc/build/usb8388.bin in: ${BP}/dev/pci/build/pcibridg.fc build-now Added: cpu/x86/pc/olpc/verify.bth =================================================================== --- cpu/x86/pc/olpc/verify.bth (rev 0) +++ cpu/x86/pc/olpc/verify.bth 2007-11-04 17:29:50 UTC (rev 709) @@ -0,0 +1,18 @@ +purpose: Fetch the Crypto code and keys + +command: &builder &this +build-now + +fload ${BP}/cpu/x86/pc/olpc/versions.fth + +" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/os.public -O os.public" expand$ $sh +" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fw.public -O fw.public" expand$ $sh +" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fs.public -O fs.public" expand$ $sh +" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/lease.public -O lease.public" expand$ $sh +" wget -nv http://dev.laptop.org/pub/firmware/crypto/${KEYS}/developer.public -O developer.public" expand$ $sh +" wget -nv http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img -O verify.img" expand$ $sh + +\ This forces the creation of an verify.log file, so we don't re-fetch +writing verify.version +" ${CRYPTO_VERSION}"n" expand$ ofd @ fputs +ofd @ fclose Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-11-04 16:57:41 UTC (rev 708) +++ cpu/x86/pc/olpc/versions.fth 2007-11-04 17:29:50 UTC (rev 709) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 03 +macro: FW_MINOR 03c \ The EC microcode macro: EC_VERSION d02 @@ -11,6 +11,9 @@ \ Temporarily uncomment the line and modify the path as necessary \ macro: GET_EC wget http://dev.laptop.org/~rsmith/shiny6.bin -O ec.img +macro: KEYS mpkeys +\ macro: KEYS testkeys + \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 macro: WLAN_VERSION 5.110.19.p0

1 0

r708 - cpu/x86/pc/olpc
by svn＠openbios.org 04 Nov '07

04 Nov '07

Author: wmb Date: 2007-11-04 17:57:41 +0100 (Sun, 04 Nov 2007) New Revision: 708 Modified: cpu/x86/pc/olpc/fsupdate.fth Log: Reread partition map after writing a new copy to NAND FLASH. Modified: cpu/x86/pc/olpc/fsupdate.fth =================================================================== --- cpu/x86/pc/olpc/fsupdate.fth 2007-10-30 21:00:39 UTC (rev 707) +++ cpu/x86/pc/olpc/fsupdate.fth 2007-11-04 16:57:41 UTC (rev 708) @@ -50,6 +50,7 @@ partition-map-offset /nand-page / dup " erase-block" $call-nand load-base swap nand-pages/block " write-blocks" $call-nand nand-pages/block <> abort" Can't write partition map" + " read-partmap" $call-nand ; 0 value partition-page-offset

1 0

r707 - cpu/x86/pc/olpc
by svn＠openbios.org 30 Oct '07

30 Oct '07

Author: wmb Date: 2007-10-30 22:00:39 +0100 (Tue, 30 Oct 2007) New Revision: 707 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC trac #4547 - unfreeze screen when 'dk' tag present. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-29 23:08:01 UTC (rev 706) +++ cpu/x86/pc/olpc/security.fth 2007-10-30 21:00:39 UTC (rev 707) @@ -724,8 +724,8 @@ d# 5 d# 77 +icon-xy show-dot ( list$ ) has-developer-key? if ( list$ ) + 2drop ( ) true to security-off? - 2drop ( ) visible show-unlock true exit @@ -774,7 +774,7 @@ freeze dcon-freeze then - persistent-devkey? if exit then + persistent-devkey? if true to security-off? visible exit then get-my-sn if visible ." No serial number" cr show-sad security-failure then get-date if visible ." Invalid system date" cr show-sad security-failure then

1 0

r706 - cpu/x86/pc/olpc
by svn＠openbios.org 30 Oct '07

30 Oct '07

Author: wmb Date: 2007-10-30 00:08:01 +0100 (Tue, 30 Oct 2007) New Revision: 706 Modified: cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/loaddropins.fth cpu/x86/pc/olpc/olpc.bth Log: q2d03 late - Removed support for CS5536 NAND FLASH, which caused build failures. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-10-29 22:58:41 UTC (rev 705) +++ cpu/x86/pc/olpc/devices.fth 2007-10-29 23:08:01 UTC (rev 706) @@ -153,17 +153,6 @@ fload ${BP}/cpu/x86/pc/olpc/cmos.fth \ CMOS RAM indices are 1f..ff , above RTC -stand-init: nand5536 - lx? if exit then - h# c h# 800 * config-w@ h# 11ab <> if - 0 0 " m20000000" " /" begin-package - " nand5536" do-drop-in - end-package - then -; - -\ This alias will work for either the CS5536 NAND FLASH -\ or the CaFe NAND FLASH, whichever is present. devalias nand /nandflash devalias mtd /nandflash Modified: cpu/x86/pc/olpc/loaddropins.fth =================================================================== --- cpu/x86/pc/olpc/loaddropins.fth 2007-10-29 22:58:41 UTC (rev 705) +++ cpu/x86/pc/olpc/loaddropins.fth 2007-10-29 23:08:01 UTC (rev 706) @@ -20,7 +20,6 @@ " ${BP}/dev/mmc/sdhci/build/sdhci.fc" " pci11ab,4101" $add-deflated-dropin " ${BP}/dev/mmc/sdhci/build/sdmmc.fc" " sdmmc" $add-deflated-dropin - " ${BP}/dev/geode/nandflash/build/nandflash.fc" " nand5536" $add-deflated-dropin " ${BP}/dev/geode/ac97/build/ac97.fc" " pci1022,2093" $add-deflated-dropin " builton.fth" " probe-" $add-dropin Modified: cpu/x86/pc/olpc/olpc.bth =================================================================== --- cpu/x86/pc/olpc/olpc.bth 2007-10-29 22:58:41 UTC (rev 705) +++ cpu/x86/pc/olpc/olpc.bth 2007-10-29 23:08:01 UTC (rev 706) @@ -8,7 +8,6 @@ in: ${BP}/cpu/x86/pc/olpc/build/rmstart.img in: ${BP}/cpu/x86/pc/olpc/build/paging.di in: ${BP}/cpu/x86/pc/olpc/build/fw.dic -in: ${BP}/dev/geode/nandflash/build/nandflash.fc in: ${BP}/dev/mmc/sdhci/build/sdhci.fc in: ${BP}/dev/mmc/sdhci/build/sdmmc.fc in: ${BP}/dev/geode/ac97/build/ac97.fc

1 0

r705 - cpu/x86/pc/olpc
by svn＠openbios.org 29 Oct '07

29 Oct '07

Author: wmb Date: 2007-10-29 23:58:41 +0100 (Mon, 29 Oct 2007) New Revision: 705 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2D03 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-10-29 22:52:22 UTC (rev 704) +++ cpu/x86/pc/olpc/versions.fth 2007-10-29 22:58:41 UTC (rev 705) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 02 +macro: FW_MINOR 03 \ The EC microcode macro: EC_VERSION d02 @@ -13,7 +13,7 @@ \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 -macro: WLAN_VERSION 5.110.16.p1 +macro: WLAN_VERSION 5.110.19.p0 \ The bios_verify image macro: CRYPTO_VERSION 0.2

1 0

r704 - cpu/x86/pc/olpc
by svn＠openbios.org 29 Oct '07

29 Oct '07

Author: wmb Date: 2007-10-29 23:52:22 +0100 (Mon, 29 Oct 2007) New Revision: 704 Modified: cpu/x86/pc/olpc/security.fth Log: Added a time delay before reflashing the SPI FLASH, giving the EC time to detect the battery. Otherwise the check for battery presence fails. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-29 22:02:39 UTC (rev 703) +++ cpu/x86/pc/olpc/security.fth 2007-10-29 22:52:22 UTC (rev 704) @@ -624,6 +624,14 @@ u<= ; +\ Wait until the time-stamp counter indicates a certain time after startup. +: wait-until ( ms -- ) + begin ( ms ) + dup tsc@ ms-factor um/mod nip ( ms ms time-ms ) + u<= until ( ms ) + drop +; + : load-from-device ( devname$ -- done? ) d# 16 0 +icon-xy show-dot @@ -647,12 +655,6 @@ true to file-loaded? " Updating firmware" ?lease-debug-cr - ['] ?enough-power catch ?dup if - visible - .error - security-failure - then - ec-indexed-io-off? if visible ." Restarting to enable SPI FLASH writing." cr @@ -661,6 +663,14 @@ security-failure then + d# 12,000 wait-until \ Wait for EC to notice the battery + + ['] ?enough-power catch ?dup if + visible + .error + security-failure + then + \ Latch alternate? flag for next startup alternate? if [char] A h# 82 cmos! then

1 0

r703 - cpu/x86/pc/olpc dev/olpc/cafenand ofw/fs/jffs2
by svn＠openbios.org 29 Oct '07

29 Oct '07

Author: wmb Date: 2007-10-29 23:02:39 +0100 (Mon, 29 Oct 2007) New Revision: 703 Added: dev/olpc/cafenand/redboot.fth Modified: cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/fsupdate.fth cpu/x86/pc/olpc/gui.fth cpu/x86/pc/olpc/security.fth dev/olpc/cafenand/badblock.fth dev/olpc/cafenand/cafenand.bth dev/olpc/cafenand/cafenand.fth dev/olpc/cafenand/methods.fth ofw/fs/jffs2/jffs2.fth Log: Fixed a bug in filesystem update via USB key and implemented NAND partition support. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-10-29 16:21:34 UTC (rev 702) +++ cpu/x86/pc/olpc/devices.fth 2007-10-29 22:02:39 UTC (rev 703) @@ -165,6 +165,7 @@ \ This alias will work for either the CS5536 NAND FLASH \ or the CaFe NAND FLASH, whichever is present. devalias nand /nandflash +devalias mtd /nandflash [ifdef] pseudo-nvram fload ${BP}/cpu/x86/pc/biosload/filenv.fth Modified: cpu/x86/pc/olpc/fsupdate.fth =================================================================== --- cpu/x86/pc/olpc/fsupdate.fth 2007-10-29 16:21:34 UTC (rev 702) +++ cpu/x86/pc/olpc/fsupdate.fth 2007-10-29 22:02:39 UTC (rev 703) @@ -4,28 +4,85 @@ : get-hex# ( -- n ) safe-parse-word - push-hex - $number " Bad number" ?nand-abort - pop-base + push-hex $number pop-base " Bad number" ?nand-abort ; -\ XXX implement this -: map-eblock# ( block# -- block#' ) ; +0 value partition-map-offset +0 value next-partition-start +0 value partition# +d# 256 constant /partition-entry +: partition-adr ( -- adr ) partition# /partition-entry * load-base + ; +: max-nand-offset ( -- n ) " usable-page-limit" $call-nand /nand-page * ; +: add-partition ( name$ #eblocks -- ) + partition# " max#partitions" $call-nand >= abort" Partition map overflow" + + -rot ( #eblocks name$ ) + partition-adr /partition-entry erase ( #eblocks name$ ) + d# 15 min partition-adr swap move ( #eblocks ) + next-partition-start partition-adr d# 16 + l! ( #eblocks ) + + dup -1 = if ( #eblocks ) + drop max-nand-offset ( last-offset ) + next-partition-start - ( #bytes ) + else + /nand-block * ( #bytes ) + then ( #bytes ) + + dup partition-adr d# 24 + l! \ size ( #bytes ) + + next-partition-start + to next-partition-start ( ) + next-partition-start max-nand-offset > abort" NAND size overflow" + + partition# 1+ to partition# +; +: start-partition-map ( -- ) + load-base /nand-block h# ff fill + 0 to partition# +\ 0 to next-partition-start + " partition-map-page#" $call-nand /nand-page * to partition-map-offset + + partition-map-offset to next-partition-start + " FIS directory" 1 add-partition +; +: write-partition-map ( -- ) + partition-map-offset /nand-page / dup " erase-block" $call-nand + load-base swap nand-pages/block " write-blocks" $call-nand + nand-pages/block <> abort" Can't write partition map" +; + +0 value partition-page-offset +: map-eblock# ( block# -- block#' ) partition-page-offset + ; + +\ XXX need to check for overwriting existing partition map + vocabulary nand-commands also nand-commands definitions +: set-partition: ( "partition#" -- ) + safe-parse-word " $set-partition" $call-nand abort" Nonexistent partition#" +; + +: partitions: ( "name" "#eblocks" ... -- ) + start-partition-map + begin parse-word dup while ( name$ ) + get-hex# add-partition ( ) + repeat ( null$ ) + 2drop + write-partition-map +; + : data: ( "filename" -- ) safe-parse-word fn-buf place - bundle-name$ image-name-buf place + " ${DN}${PN}\${CN}${FN}" expand$ image-name-buf place open-img ; : erase-all ( -- ) #nand-pages >eblock# show-erasing ['] show-bad ['] show-erased ['] show-bbt-block " (wipe)" $call-nand - #image-eblocks show-writing +\ #image-eblocks show-writing ; : eblock: ( "eblock#" "hashname" "hash-of-128KiB" -- ) @@ -80,6 +137,7 @@ tuck load-base h# 100000 + swap move ( len ) load-base h# 100000 + swap open-nand + ['] noop to show-progress #nand-pages >eblock# show-init @@ -112,6 +170,8 @@ 2drop ( ) show-unlock ( ) img$ do-fs-update ( ) + ." Rebooting in 10 seconds ..." cr + d# 10,000 ms bye exit then ( rem$ ) show-lock ( rem$ ) @@ -119,6 +179,7 @@ repeat ( rem$ ) 2drop ; +: update-devices " disk: sd: http:\\177.18.16.1" ; : try-fs-update ( -- ) ." Searching for a NAND file system update image." cr all-devices$ fs-update-from-list Modified: cpu/x86/pc/olpc/gui.fth =================================================================== --- cpu/x86/pc/olpc/gui.fth 2007-10-29 16:21:34 UTC (rev 702) +++ cpu/x86/pc/olpc/gui.fth 2007-10-29 22:02:39 UTC (rev 703) @@ -360,6 +360,7 @@ h# 32 buffer: icon-name : show-icon ( basename$ -- ) + [char] : left-parse-string 2nip ( basename$' ) " rom:" icon-name pack $cat ( ) " .565" icon-name $cat ( ) icon-name count $show ( ) Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-29 16:21:34 UTC (rev 702) +++ cpu/x86/pc/olpc/security.fth 2007-10-29 22:02:39 UTC (rev 703) @@ -121,7 +121,7 @@ \ bundle, piecing it together from the device (DN), path (PN), \ filename head (CN), and filename body (FN) macros. -: bundle-name$ ( -- $ ) " ${DN}:${PN}\${CN}${FN}.zip" expand$ ; +: bundle-name$ ( -- $ ) " ${DN}${PN}\${CN}${FN}.zip" expand$ ; \ bundle-present? determines the existence (or not) of a signed image \ bundle whose name is constructed from the current settings of the @@ -419,7 +419,7 @@ \ a valid lease was found. : lease-valid? ( -- valid? ) - " ${DN}:\security\lease.sig" expand$ ( name$ ) + " ${DN}\security\lease.sig" expand$ ( name$ ) " Trying " ?lease-debug 2dup ?lease-debug-cr r/o open-file if drop false exit then ( ih ) load-started @@ -584,7 +584,8 @@ \ device given by the DN macro. : has-developer-key? ( -- flag ) - " ${DN}:\security\develop.sig" expand$ ( name$ ) + button-x game-key? if false exit then + " ${DN}\security\develop.sig" expand$ ( name$ ) " Trying " ?lease-debug 2dup ?lease-debug-cr r/o open-file if drop false exit then ( ih ) >r @@ -691,7 +692,7 @@ ; : filesystem-present? ( -- flag ) - " ${DN}:\" expand$ ( name$ ) + " ${DN}\" expand$ ( name$ ) open-dev dup if dup close-dev then 0<> ; @@ -740,9 +741,8 @@ : persistent-devkey? ( -- flag ) " dk" find-tag dup if nip nip then ; -: all-devices$ ( -- list$ ) " disk sd fastnand nand" ; +: all-devices$ ( -- list$ ) " disk: sd: nand:" ; - d# 410 d# 540 2constant progress-xy : secure-startup ( -- ) ['] noop to ?show-device Modified: dev/olpc/cafenand/badblock.fth =================================================================== --- dev/olpc/cafenand/badblock.fth 2007-10-29 16:21:34 UTC (rev 702) +++ dev/olpc/cafenand/badblock.fth 2007-10-29 22:02:39 UTC (rev 703) @@ -18,6 +18,7 @@ \ Return address of byte containing bad-block info and the mask \ for the relevant bits. : >bbt ( page# -- byte-adr mask ) + partition-start + pages/eblock / ( eblock# ) 4 /mod ( remainder byte# ) bbt + ( remainder adr ) @@ -30,21 +31,7 @@ tuck swap c@ and ( mask masked-byte ) <> ; -: block-reserved? ( page# -- flag ) - >bbt ( adr mask ) - tuck swap c@ and ( mask masked-byte ) - swap h# aa and = -; - -\ Marks the block containing page# as used for another purpose -: mark-reserved ( page# -- ) - >bbt ( adr mask ) - dup h# aa and -rot ( set-mask adr mask ) - invert over c@ and ( set-mask adr masked-byte ) - rot or swap c! ( ) -; - \ Marks the block containing page# as bad : mark-bad ( page# -- ) >bbt ( adr mask ) @@ -107,6 +94,7 @@ ; : .page-byte ( page# -- ) + partition-start + push-hex ." at 0x" dup /page um* <# #s #> type ." = page 0x" dup . ." = eblock 0x" pages/eblock / u. @@ -199,26 +187,41 @@ release-bbt ; -\ Get the existing bad block table, or make a new one if necessary -: get-bbt ( -- ) - get-existing-bbt - bbt 0= if - ." No bad block table; making one" cr - make-bbt - then +0 instance value #bad-blocks +0 instance value bb-list +: make-bb-list ( -- ) + 0 usable-page-limit 0 ?do ( bb# ) + i block-bad? if 1+ then + pages/eblock +loop + to #bad-blocks + + #bad-blocks 1+ /n* alloc-mem to bb-list + + bb-list usable-page-limit 0 ?do ( adr ) + i block-bad? if ( adr ) + i over ! na+ ( adr' ) + then ( adr ) + pages/eblock +loop ( adr ) + h# 7fffffff swap ! ( ) \ "Stopper" entry ; -0 instance value resmap -0 value #reserved-eblocks -: ?free-resmap ( -- ) - resmap if - resmap #reserved-eblocks /n* free-mem - 0 to resmap +: map-page# ( page# -- page#' ) + pages/eblock /mod ( offset eblock# ) + bb-list ( offset eblock# list-adr ) + begin 2dup @ >= while ( offset eblock# list-adr ) + swap 1+ swap na1+ ( offset eblock#' list-adr' ) + repeat ( offset eblock#' list-adr' ) + pages/eblock * + ( page#' ) +; +: ?free-bb-list ( -- ) + bb-list if + bb-list #bad-blocks 1+ /n* free-mem + 0 to bb-list then ; \ The upper limit of pages below the bad block tables -: usable-page-limit ( -- page# ) +: (usable-page-limit) ( -- page# ) bbt0 if bbt0 bbt1 if bbt1 min then @@ -228,20 +231,20 @@ total-pages ; -: map-resblock ( page# #pages -- page#' #pages ) - swap pages/eblock /mod ( adr #pages offset eblock# ) - resmap swap na+ @ ( adr #pages offset res-eblock# ) - + pages/eblock * swap ( adr page#' #pages ) +\ Get the existing bad block table, or make a new one if necessary +: get-bbt ( -- ) + get-existing-bbt + bbt 0= if + ." No bad block table; making one" cr + make-bbt + then + (usable-page-limit) to usable-page-limit ; external \ Assumes that the page range doesn't cross an erase block boundary : read-blocks ( adr page# #pages -- #read ) - resmap if ( adr page# #pages ) - map-resblock - else - over block-bad? if 3drop 0 exit then - then + over block-bad? if 3drop 0 exit then rot >r 2dup r> -rot ( page# #pages adr page# #pages ) bounds ?do ( page# #pages adr ) @@ -255,11 +258,7 @@ ; : write-blocks ( adr page# #pages -- #written ) - resmap if ( adr page# #pages ) - map-resblock - else - over block-bad? if 3drop 0 exit then - then + over block-bad? if 3drop 0 exit then over >r dup >r ( adr page# #pages r: page# #pages ) bounds ?do ( adr r: page# #pages ) @@ -305,21 +304,23 @@ : .bn ( -- ) (cr . ; : (wipe) ( 'show-bad 'show-erased 'show-bbt -- ) - get-existing-bbt - bbt 0= if - \ If there is no existing bad block table, make one from factory info - make-bbt - then ( 'show-bad 'show-erased 'show-bbt ) + partition# 0= if + get-existing-bbt + bbt 0= if + \ If there is no existing bad block table, make one from factory info + make-bbt + then ( 'show-bad 'show-erased 'show-bbt ) - bbt0 if bbt0 pages/eblock / over execute then - bbt1 if bbt1 pages/eblock / over execute then + bbt0 if bbt0 pages/eblock / over execute then + bbt1 if bbt1 pages/eblock / over execute then + then drop ( 'show-bad 'show-erased ) - usable-page-limit 0 ?do ( 'show-bad 'show-erased ) + partition-size 0 ?do ( 'show-bad 'show-erased ) i block-bad? if - i pages/eblock / 2 pick execute + i partition-start + pages/eblock / 2 pick execute else - i pages/eblock / over execute + i partition-start + pages/eblock / over execute i erase-block then pages/eblock +loop ( 'show-bad 'show-erased ) @@ -330,32 +331,13 @@ : wipe ( -- ) ['] drop ['] .bn ['] drop (wipe) ; : show-bbt ( -- ) - get-bbt total-pages 0 ?do - i block-reserved? if ." Reserved " i .page-byte cr else - i block-bad? if ." Bad block" i .page-byte cr then - then + i block-bad? if ." Bad block" i .page-byte cr then pages/eblock +loop bbt1 if ." BBTable 1" bbt1 .page-byte cr then bbt0 if ." BBTable 0" bbt0 .page-byte cr then ; -: map-reserved - 0 usable-page-limit 0 ?do - i block-reserved? if 1+ then - pages/eblock +loop - dup to #reserved-eblocks - - /n* alloc-mem to resmap ( adr ) - - resmap usable-page-limit 0 ?do ( adr ) - i block-reserved? if ( adr ) - i over ! na1+ ( adr' ) - then ( adr ) - pages/eblock +loop ( adr ) - drop -; - headers \ Copy-to-NAND functions @@ -367,7 +349,7 @@ headers : (next-page#) ( -- true | page# false ) - usable-page-limit scan-page# pages/eblock + ?do + partition-size scan-page# pages/eblock + ?do i block-bad? 0= if i to scan-page# scan-page# false unloop exit @@ -416,14 +398,14 @@ : copy-block ( adr -- page# error? ) begin (next-page#) 0= while ( adr page# ) - 2dup copy&check if nip false exit then ( adr page# ) + 2dup copy&check if nip partition-start + false exit then ( adr page# ) \ Error; retry once dup erase-block ( adr page# ) - 2dup copy&check if nip false exit then ( adr page# ) + 2dup copy&check if nip partition-start + false exit then ( adr page# ) mark-bad save-bbt ( adr ) repeat ( adr ) drop ( ) - usable-page-limit pages/eblock - true ( page# error? ) + partition-size pages/eblock - partition-start + true ( page# error? ) ; : put-cleanmarker ( page# -- ) @@ -437,7 +419,7 @@ : put-cleanmarkers ( show-xt -- ) begin (next-page#) 0= while ( show-xt page# ) dup put-cleanmarker ( show-xt page# ) - pages/eblock / over execute ( show-xt ) + partition-start + pages/eblock / over execute ( show-xt ) repeat ( show-xt ) drop ; @@ -481,99 +463,6 @@ true ; -: block-erased? ( page# -- flag ) - pages/eblock bounds ?do - test-page i read-page drop - test-page /page erased? 0= if false unloop exit then - pages/eblock +loop - true -; -: enough-reserve? ( len -- flag ) - dup 0= if true exit then ( len ) - /eblock 1- + /eblock / ( #eblocks-needed ) - usable-page-limit 0 ?do ( #needed ) - i block-reserved? if 1- else ( #needed' ) - i block-erased? if 1- then ( #needed' ) - then ( #needed ) - dup 0= if drop true unloop exit then ( #needed ) - pages/eblock +loop ( #needed ) - drop false ( flag ) -; - -0 value any-marked? - -: start-fastcopy ( len -- error? ) - /page dma-alloc to test-page - enough-reserve? 0= if - test-page /page dma-free - true exit - then - false to any-marked? - - \ Erase existing fastnand area - usable-page-limit 0 ?do - i block-reserved? if - i erase-block - i mark-good true to any-marked? - then - pages/eblock +loop - - start-scan - false -; -: next-fastcopy ( adr -- ) - usable-page-limit scan-page# ?do ( adr ) - i block-erased? if ( adr ) - i pages/eblock write-blocks drop ( ) - i mark-reserved true to any-marked? ( ) - i pages/eblock + to scan-page# - unloop exit - then ( adr ) - pages/eblock +loop ( adr ) - ." Error: no more NAND fastcopy space" cr - abort -; -: end-fastcopy ( -- ) - test-page /page dma-free - any-marked? if save-bbt then -; - -0 instance value deblocker -: $call-deblocker ( ??? adr len -- ??? ) deblocker $call-method ; -: init-deblocker ( -- okay? ) - " " " deblocker" $open-package to deblocker - deblocker if - true - else - ." Can't open deblocker package" cr false - then -; -: seek ( d.offset -- status ) - resmap 0= if -1 exit then - " seek" $call-deblocker -; -: position ( -- d.offset ) - resmap 0= if 0. exit then - " position" $call-deblocker -; -: read ( adr len -- actual ) - resmap 0= if 2drop -1 exit then - " read" $call-deblocker -; -: write ( adr len -- actual ) - resmap 0= if 2drop -1 exit then - " write" $call-deblocker -; -: size ( -- d.size ) - resmap 0= if 0. exit then - #reserved-eblocks /eblock um* -; -: load ( adr -- actual ) - resmap 0= if drop 0 exit then - 0 0 seek drop - size drop read -; - \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: dev/olpc/cafenand/cafenand.bth =================================================================== --- dev/olpc/cafenand/cafenand.bth 2007-10-29 16:21:34 UTC (rev 702) +++ dev/olpc/cafenand/cafenand.bth 2007-10-29 22:02:39 UTC (rev 703) @@ -13,6 +13,7 @@ fload ${BP}/dev/olpc/cafenand/cafenand.fth fload ${BP}/dev/olpc/cafenand/configure.fth fload ${BP}/dev/olpc/cafenand/badblock.fth +fload ${BP}/dev/olpc/cafenand/redboot.fth fload ${BP}/dev/olpc/cafenand/methods.fth fload ${BP}/dev/olpc/cafenand/selftest.fth Modified: dev/olpc/cafenand/cafenand.fth =================================================================== --- dev/olpc/cafenand/cafenand.fth 2007-10-29 16:21:34 UTC (rev 702) +++ dev/olpc/cafenand/cafenand.fth 2007-10-29 22:02:39 UTC (rev 703) @@ -68,12 +68,18 @@ \ version of the CaFe chip spec that we have, but Jerry Zheng says \ that it chooses the chip select - 0 for CS0, 1 for CS1. +0 instance value partition# +0 instance value partition-start \ Boundary between chip 0 and chip 1 +0 instance value partition-size \ Boundary between chip 0 and chip 1 +0 instance value usable-page-limit \ #pages excluding bad block tables + 1 instance value chip-boundary \ Boundary between chip 0 and chip 1 0 instance value cs-mask \ Chip-select bit for command 0 register : chip0 ( -- ) 0 to cs-mask ; : chip1 ( -- ) h# 80000 to cs-mask ; : set-chip ( page# -- page#' ) + partition-start + dup chip-boundary >= if chip-boundary - chip1 else chip0 then ; Modified: dev/olpc/cafenand/methods.fth =================================================================== --- dev/olpc/cafenand/methods.fth 2007-10-29 16:21:34 UTC (rev 702) +++ dev/olpc/cafenand/methods.fth 2007-10-29 22:02:39 UTC (rev 703) @@ -24,7 +24,13 @@ total-pages 0= \ Error if there are no chips ; -: open-args ( -- arg$ ) my-args ascii : left-parse-string 2swap 2drop ; +: open-args ( -- arg$ ) + \ If the argument string starts with :, discard the rest, because + \ it is intended for the selftest function. + my-args dup 0> if ( arg$ ) + over c@ ascii : = if drop 0 then + then +; external @@ -40,21 +46,28 @@ dma-buf-va dma-buf-pa /dma-buf " dma-map-out" $call-parent /dma-buf dma-free then - ?free-resmap ; -: size ( -- d ) - resmap if - #reserved-eblocks /eblock - else - total-pages /page - then - um* +: size ( -- d ) partition-size /page um* ; + +: $set-partition ( $ -- error? ) + dup 0= if 2drop false exit then ( $ ) + over c@ ascii 0 ascii 9 between if ( $ ) \ number + base @ >r decimal $number r> base ! if true exit then ( ) + set-partition-number ( error? ) + else ( $ ) \ name + set-partition-name ( error? ) + then ( error? ) + dup if ( error? ) + ." NAND: No such partition" cr ( error? ) + then ; : open ( -- okay? ) map-regs init + 0 to partition# + 0 to partition-start configure-all if false exit then /dma-buf dma-alloc to dma-buf-va @@ -63,37 +76,29 @@ " lmove" $find 0= if ['] move then to do-lmove get-bbt + usable-page-limit to partition-size + read-partmap open-args dup if ( arg$ ) ascii , left-parse-string ( arg2$ arg1$ ) - 2dup " zip" $= if ( arg2$ arg1$ ) - 2drop ( arg2$ ) - map-reserved ( arg2$ ) - init-deblocker 0= if 2drop ?free-resmap false exit then ( arg2$ ) - \ If no file is specified, open the raw archive - dup 0= if 2drop true exit then ( arg2$ ) - - \ Otherwise interpose the filesystem handler - " zip-file-system" find-package if ( arg2$ xt ) - interpose true ( true ) - else ( arg2$ ) - ." Can't find zip-file-system package" cr ( arg2$ ) - 2drop deblocker close-package ?free-resmap ( ) - false ( false ) - then - exit - then ( arg2$ arg1$ ) - - \ Accept either "path" or "jffs2,path" - 2dup " jffs2" $= if ( arg2$ arg1$ ) - 2drop ( arg2$ ) + \ Handle partitions ( arg2$ arg1$ ) + 2dup 1 min " \" $= if ( arg2$ arg1$ ) + 2swap 2drop ( arg1$ ) + \ If there is no "mtd" specifier and there is a partition map, + \ select the boot partition. + #partitions 0>= if ( arg1$ ) + " boot" $set-partition if 2drop false exit then + then ( arg2$ arg1$ ) else ( arg2$ arg1$ ) - \ XXX probably should check that arg$2 is empty... - 2swap 2drop ( arg1$ ) - then ( arg$ ) + \ The argument is not a file so it must be a partition spec + #partitions 0< if 2drop 2drop false exit then ( arg2$ arg1$ ) + $set-partition if 2drop false exit then ( arg2$ ) + then ( arg$ ) - " jffs2-file-system" find-package if ( arg$ xt ) + dup 0= if 2drop true exit then ( arg$ ) + + " jffs2-file-system" find-package if ( arg$ xt ) interpose true ( okay? ) else ( arg$ ) ." Can't find jffs2-file-system package" cr Added: dev/olpc/cafenand/redboot.fth =================================================================== --- dev/olpc/cafenand/redboot.fth (rev 0) +++ dev/olpc/cafenand/redboot.fth 2007-10-29 22:02:39 UTC (rev 703) @@ -0,0 +1,111 @@ +purpose: Handler for Redboot FIS FLASH partition maps + +[ifdef] notdef +struct fis_image_desc { + unsigned char name[16]; // Null terminated name + uint32_t flash_base; // Address within FLASH of image + uint32_t mem_base; // Address in memory where it executes + uint32_t size; // Length of image + uint32_t entry_point; // Execution entry point + uint32_t data_length; // Length of actual data + unsigned char _pad[256-(16+7*sizeof(uint32_t))]; + uint32_t desc_cksum; // Checksum over image descriptor + uint32_t file_cksum; // Checksum over image data +}; +[then] + +d# 256 constant /partition-entry +d# 8 constant max#partitions + +: partition-map-page# ( -- page# ) +[ifdef] notdef + bbt1 if + bbt1 bbt0 if bbt0 min then ( bbtn ) + else ( ) + bbt0 dup 0= abort" No Bad Block Table" ( bbt0 ) + then ( last-bbt-page# ) + begin pages/eblock - dup while ( part-page# ) + dup block-bad? 0= if exit then ( part-page# ) + repeat +[else] + h# 10 pages/eblock * 0 do + i block-bad? 0= if i unloop exit then + pages/eblock +loop +[then] + + true abort" No place for partition map" +; + +: (#partitions) ( adr -- n ) + 0 swap ( seen adr ) + max#partitions 0 ?do ( seen adr ) + dup i /partition-entry * + ( seen adr padr ) + dup w@ h# ffff = if ( seen adr padr ) + 2drop if i else -1 then ( n ) + unloop exit ( n ) + then ( seen adr padr ) + " FIS directory" rot swap comp 0= if ( seen adr ) + nip true swap ( seen adr ) + then ( seen adr ) + loop ( seen adr ) + drop if max#partitions else -1 then +; + +/page instance buffer: part-buf + +0 instance value #partitions +: read-partmap ( -- ) + part-buf partition-map-page# + partition-start >r 0 to partition-start + read-page + r> to partition-start + if true exit then + part-buf (#partitions) to #partitions +; + +: set-partition-number ( partition# -- error? ) + dup 0= if ( partition# ) + to partition# + 0 to partition-start usable-page-limit to partition-size + false exit + then ( partition# ) + + dup #partitions u> if drop true exit then ( partition# ) + + dup to partition# ( partition# ) + + \ Partition 1 (the FIS directory entry) begins at offset 0 + 1- /partition-entry * part-buf + ( adr ) + dup d# 16 + l@ /page / to partition-start ( adr ) + d# 24 + l@ /page / to partition-size ( ) + false + start-scan +; + +\ C string length no longer than maxlen +: ncstr ( adr maxlen -- adr len ) + 2dup bounds ?do ( adr maxlen ) + i c@ 0= if drop i over - unloop exit then + loop ( adr maxlen ) +; + +: $= ( adr1 len1 adr2 len2 -- flag ) + rot over <> if 3drop false exit then ( adr1 adr2 len2 ) + comp 0= +; + +: set-partition-name ( name$ -- error? ) + #partitions dup 0< if 2drop false exit then ( name$ #partitions ) + /partition-entry * ( name$ len ) + part-buf swap bounds ?do ( name$ ) + 2dup i d# 16 ncstr $= if ( name$ ) + 2drop ( ) + i d# 16 + l@ /page / to partition-start ( ) + i d# 24 + l@ /page / to partition-size ( ) + i part-buf - /partition-entry / 1+ to partition# + start-scan + false unloop exit + then ( name$ ) + /partition-entry +loop ( name$ ) + 2drop true +; Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-10-29 16:21:34 UTC (rev 702) +++ ofw/fs/jffs2/jffs2.fth 2007-10-29 22:02:39 UTC (rev 703) @@ -85,6 +85,7 @@ : dma-free ( len -- adr ) " dma-free" $call-parent ; true value first-time? +-1 value partition# : allocate-buffers ( -- ) /eblock dma-alloc to block-buf @@ -823,7 +824,7 @@ ; : scan-occupied ( -- ) - first-time? 0= if exit then + " partition#" $call-parent partition# = if exit then init-curvars dirents 'next-dirent ! inodes 'next-inode ! @@ -1432,6 +1433,7 @@ scan-occupied ( ) + " partition#" $call-parent to partition# false to first-time? my-args " <NoFile>" $= if true exit then

1 0

r702 - ofw/core
by svn＠openbios.org 29 Oct '07

29 Oct '07

Author: wmb Date: 2007-10-29 17:21:34 +0100 (Mon, 29 Oct 2007) New Revision: 702 Modified: ofw/core/filecmds.fth Log: In ofw/core/filecmds.fth, parse the volume name with "lex" instead of "right-parse-string", thus fixing a rarely-occuring bug with argument strings that contain embedded ':' characters. Modified: ofw/core/filecmds.fth =================================================================== --- ofw/core/filecmds.fth 2007-10-29 16:17:51 UTC (rev 701) +++ ofw/core/filecmds.fth 2007-10-29 16:21:34 UTC (rev 702) @@ -60,11 +60,7 @@ : file&dir ( path$ -- basename$ dirname$ ) [char] \ right-split-string ; : parse-volume ( $1 -- path$ volume$ ) - [char] : right-split-string ( path$ volume$:|null$ ) - dup 0= if ( path$ null$ ) - 2drop current-volume-name ( path$ volume$: ) - then ( path$ volume$: ) - 1- \ Remove the : ( path$ volume$ ) + " :" lex if drop else current-volume-name 1- then ( path$ volume$: ) ; : drive-volume ( -- adr len false | xt true ) drive-name count dup if ( adr len )

1 0

r701 - cpu/x86/pc/olpc dev/usb2/hcd/ehci
by svn＠openbios.org 29 Oct '07

29 Oct '07

Author: wmb Date: 2007-10-29 17:17:51 +0100 (Mon, 29 Oct 2007) New Revision: 701 Modified: cpu/x86/pc/olpc/suspend.fth dev/usb2/hcd/ehci/probe.fth Log: OLPC trac 4501 - If USB enumeration of a device fails, ("Failed to set device address: N"), retry the reset-port / set-address sequence with a 5-second delay in between. This has proven to be effective with a problem USB disk that used to consistently fail to work with OFW. This fix does not affect startup time in the usual case of quick-response devices. Modified: cpu/x86/pc/olpc/suspend.fth =================================================================== --- cpu/x86/pc/olpc/suspend.fth 2007-10-28 21:48:00 UTC (rev 700) +++ cpu/x86/pc/olpc/suspend.fth 2007-10-29 16:17:51 UTC (rev 701) @@ -44,7 +44,7 @@ " video-save" stdout @ $call-method \ Freeze display s3 " video-restore" stdout @ $call-method \ Unfreeze display - " /usb@f,5" open-dev ?dup if " resume" 2 pick $call-method close-dev then + " /usb@f,5" open-dev ?dup if " do-resume" 2 pick $call-method close-dev then ; alias s suspend Modified: dev/usb2/hcd/ehci/probe.fth =================================================================== --- dev/usb2/hcd/ehci/probe.fth 2007-10-28 21:48:00 UTC (rev 700) +++ dev/usb2/hcd/ehci/probe.fth 2007-10-29 16:17:51 UTC (rev 701) @@ -12,7 +12,13 @@ 0 set-target ( port dev ) \ Address it as device 0 - dup set-address if 2drop exit then ( port dev ) \ Assign it usb addr dev + dup set-address if ( port dev ) \ Assign it usb addr dev + ." Retrying with a delay" cr + over reset-port d# 5000 ms + dup set-address if ( port dev ) \ Assign it usb addr dev + 2drop exit + then + then ( port dev ) dup set-target ( port dev ) \ Address it as device dev make-device-node ( ) @@ -76,7 +82,7 @@ true ; -: resume ( -- ) +: do-resume ( -- ) init-ehci-regs start-usb claim-ownership

1 0

r700 - cpu/x86/pc/olpc dev/olpc/kb3700
by svn＠openbios.org 28 Oct '07

28 Oct '07

Author: wmb Date: 2007-10-28 22:48:00 +0100 (Sun, 28 Oct 2007) New Revision: 700 Modified: cpu/x86/pc/olpc/security.fth dev/olpc/kb3700/ecio.fth Log: OLPC trac 4484 - Changed the command code for write-protect-fw from 0x29 to 0x03 to match an unannounced change in the EC code from Quanta, and also avoid calling write-protect-fw in security.fth because it hasn't been tested. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-28 21:45:07 UTC (rev 699) +++ cpu/x86/pc/olpc/security.fth 2007-10-28 21:48:00 UTC (rev 700) @@ -721,7 +721,7 @@ then ( list$ ) load-from-device if ( list$ ) - write-protect-fw ec-indexed-io-off ( list$ ) + ec-indexed-io-off ( list$ ) 2drop ( ) ['] secure-load-ramdisk to load-ramdisk " init-program" $find if Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-10-28 21:45:07 UTC (rev 699) +++ dev/olpc/kb3700/ecio.fth 2007-10-28 21:48:00 UTC (rev 700) @@ -151,7 +151,7 @@ : dcon-power-on ( -- ) 1 h# 26 ec-cmd-b! ; : reset-ec-warm ( -- ) h# 27 ec-cmd ; : reset-ec ( -- ) h# 28 ec-cmd ; -: write-protect-fw ( -- ) h# 29 ec-cmd ; +: write-protect-fw ( -- ) 3 ec-cmd ; : ebook-mode? ( -- b ) h# 2a ec-cmd-b@ ; : ec-indexed-io-off ( -- ) h# fe95 ec@ h# 40 invert and h# fe95 ec! ;

1 0

r699 - cpu/x86/pc/olpc
by svn＠openbios.org 28 Oct '07

28 Oct '07

Author: wmb Date: 2007-10-28 22:45:07 +0100 (Sun, 28 Oct 2007) New Revision: 699 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC security - when a developer key is present, security failures drop you to the ok prompt for debugging, instead of powering off. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-23 01:55:38 UTC (rev 698) +++ cpu/x86/pc/olpc/security.fth 2007-10-28 21:45:07 UTC (rev 699) @@ -475,9 +475,12 @@ game-key@ button-check and if visible unfreeze then ; +0 value security-off? + : security-failure ( -- ) visible ." Stopping" cr + security-off? if quit then d# 10000 ms power-off @@ -710,6 +713,7 @@ d# 5 d# 77 +icon-xy show-dot ( list$ ) has-developer-key? if ( list$ ) + true to security-off? 2drop ( ) visible show-unlock

1 0

r698 - cpu/x86/pc/olpc
by svn＠openbios.org 23 Oct '07

23 Oct '07

Author: wmb Date: 2007-10-23 03:55:38 +0200 (Tue, 23 Oct 2007) New Revision: 698 Modified: cpu/x86/pc/olpc/security.fth Log: q2d02 late - OLPC security - fixed the formatting of the error message in svn 697. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-23 01:51:59 UTC (rev 697) +++ cpu/x86/pc/olpc/security.fth 2007-10-23 01:55:38 UTC (rev 698) @@ -180,7 +180,7 @@ 2dup our-pubkey? if false exit then ( rem$ line$ ) 2drop ( rem$ ) repeat ( rem$ ) - " No signature for our key" ?lease-debug-cr + " No signature for our key" ?lease-debug-cr 2drop true ;

1 0

r697 - cpu/x86/pc/olpc
by svn＠openbios.org 23 Oct '07

23 Oct '07

Author: wmb Date: 2007-10-23 03:51:59 +0200 (Tue, 23 Oct 2007) New Revision: 697 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC security - added an error message for the case where there are no signatures matching our public key. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-23 01:27:37 UTC (rev 696) +++ cpu/x86/pc/olpc/security.fth 2007-10-23 01:51:59 UTC (rev 697) @@ -180,6 +180,7 @@ 2dup our-pubkey? if false exit then ( rem$ line$ ) 2drop ( rem$ ) repeat ( rem$ ) + " No signature for our key" ?lease-debug-cr 2drop true ;

1 0

r696 - cpu/x86/pc/olpc
by svn＠openbios.org 23 Oct '07

23 Oct '07

Author: wmb Date: 2007-10-23 03:27:37 +0200 (Tue, 23 Oct 2007) New Revision: 696 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2D02 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-10-23 01:24:49 UTC (rev 695) +++ cpu/x86/pc/olpc/versions.fth 2007-10-23 01:27:37 UTC (rev 696) @@ -2,14 +2,14 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 01 +macro: FW_MINOR 02 \ The EC microcode -macro: EC_VERSION d01 +macro: EC_VERSION d02 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary -\ macro: GET_EC cp /c/Temp/c2d01-1.bin ec.img +\ macro: GET_EC wget http://dev.laptop.org/~rsmith/shiny6.bin -O ec.img \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1

1 0

r695 - cpu/x86/pc/olpc
by svn＠openbios.org 23 Oct '07

23 Oct '07

Author: wmb Date: 2007-10-23 03:24:49 +0200 (Tue, 23 Oct 2007) New Revision: 695 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC trac #4396 - Turn off indexed I/O before early interaction to close a security hole. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-10-23 01:18:40 UTC (rev 694) +++ cpu/x86/pc/olpc/fw.bth 2007-10-23 01:24:49 UTC (rev 695) @@ -269,7 +269,7 @@ [ifdef] rom-loaded d# 300 i-key-wait if -\ " patch false fast-boot? startup" eval + ec-indexed-io-off ." Interacting" cr hex interact then [ifdef] lx-devel

1 0

r694 - cpu/x86/pc/olpc dev/usb2/device/wlan
by svn＠openbios.org 23 Oct '07

23 Oct '07

Author: wmb Date: 2007-10-23 03:18:40 +0200 (Tue, 23 Oct 2007) New Revision: 694 Added: cpu/x86/pc/olpc/wlantest.fth Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/rtcwake.fth dev/usb2/device/wlan/usb8388.fth Log: OLPC - Added rtc-wackup command for suspend-resume testing, and made it slightly easier to include the WLAN version of auto-wakeup. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-10-23 00:59:11 UTC (rev 693) +++ cpu/x86/pc/olpc/fw.bth 2007-10-23 01:18:40 UTC (rev 694) @@ -336,6 +336,10 @@ fload ${BP}/ofw/gui/ofpong.fth fload ${BP}/cpu/x86/pc/olpc/life.fth 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] @@ -384,6 +388,7 @@ then ec-reboot \ Tell the EC to reboot us, so the EC can reset too + begin again ; ' dcon-reset-all to reset-all Modified: cpu/x86/pc/olpc/rtcwake.fth =================================================================== --- cpu/x86/pc/olpc/rtcwake.fth 2007-10-23 00:59:11 UTC (rev 693) +++ cpu/x86/pc/olpc/rtcwake.fth 2007-10-23 01:18:40 UTC (rev 694) @@ -1,16 +1,33 @@ -\ Suspend/resume test with RTC wakeup -d# 2 value rtc-alarm-delay +purpose: Suspend/resume test with RTC wakeup +\ See license at end of file -h# 41 constant cmos-alarm-day \ CMOS offset of day alarm -h# 40 constant cmos-alarm-month \ CMOS offset of month alarm -cmos-alarm-day 0 h# 5140.0055 msr! -cmos-alarm-month 0 h# 5140.0056 msr! +: enable-rtc-irq ( -- ) h# a1 pc@ h# fe and h# a1 pc! ; +: disable-rtc-irq ( -- ) h# a1 pc@ 1 or h# a1 pc! ; +0 value cmos-alarm-day \ Offset of day alarm in CMOS +0 value cmos-alarm-month \ Offset of month alarm in CMOS + +: set-alarm-offsets ( -- ) + h# 10. h# 5140.0055 wrmsr + h# 11. h# 5140.0056 wrmsr + + h# 5140.0055 rdmsr drop to cmos-alarm-day + h# 5140.0056 rdmsr drop to cmos-alarm-month +; + +false value enable-rtc-irq? + +: rtc-handler ( -- ) h# c cmos@ drop ." R" ; \ Clear RTC interrupt flags + : enable-rtc-alarm ( -- ) + ['] rtc-handler 8 interrupt-handler! + + enable-rtc-irq? if enable-rtc-irq then h# c cmos@ drop \ Clear RTC interrupt flags h# b cmos@ h# 20 or h# b cmos! ; : disable-rtc-alarm ( -- ) + disable-rtc-irq h# b cmos@ h# 20 invert and h# b cmos! ; : bcd-cmos! ( binary -- ) " bcd!" clock-node @ $call-method ; @@ -24,13 +41,42 @@ 5 bcd-cmos! 3 bcd-cmos! 1 bcd-cmos! ( ) enable-rtc-alarm ; - -: rs ( -- ) +d# 1 constant rtc-alarm-delay +: pm-sleep-rtc ( -- ) + false to enable-rtc-irq? \ Spec says that IRQ is not necessary rtc-alarm-delay set-rtc-alarm + h# 400.0000 0 acpi-l! \ Enable RTC SCI s disable-rtc-alarm + 0 0 acpi-l! \ Disable RTC SCI ; -patch 500.0000 100.0000 s3 \ Turn on RTC wakeup too -: rss begin d# 50 ms rs ." ." key? until ; +: rtc-wackup + set-alarm-offsets + 0 + begin pm-sleep-rtc space dup . (cr 1+ key? until + key drop +; -.( 'rs' does it once, 'rss' does it until you type a key) cr +\ LICENSE_BEGIN +\ Copyright (c) 2007 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/wlantest.fth =================================================================== --- cpu/x86/pc/olpc/wlantest.fth (rev 0) +++ cpu/x86/pc/olpc/wlantest.fth 2007-10-23 01:18:40 UTC (rev 694) @@ -0,0 +1,29 @@ +purpose: Wireless LAN auto-wakeup (requires modified WLAN firmware) + +0 value patched? +: wackup + patched? 0= if + " /wlan" find-device + " patch exit link-up? close" evaluate + dend + true to patched? + then + + sci-wakeup + + " /wlan" open-dev >r + " broadcast-wakeup" r@ $call-method + r> close-dev + + 0 + begin + " /wlan" open-dev >r + " autostart" r@ $call-method + " sleep" r@ $call-method + r> close-dev + 5 ms + s + 1+ dup . + d# 500 ms + key? until +; Modified: dev/usb2/device/wlan/usb8388.fth =================================================================== --- dev/usb2/device/wlan/usb8388.fth 2007-10-23 00:59:11 UTC (rev 693) +++ dev/usb2/device/wlan/usb8388.fth 2007-10-23 01:18:40 UTC (rev 694) @@ -1164,7 +1164,7 @@ : broadcast-wakeup ( -- ) wake-on-unicast wake-on-broadcast or host-sleep-config ; : sleep ( -- ) host-sleep-activate ; -[ifdef] notdef \ This is test code that only works with a special debug version of the Libertas firmware +[ifdef] wlan-wackup \ This is test code that only works with a special debug version of the Libertas firmware : autostart ( -- ) h# 82 h# 9b ( CMD_MESH_ACCESS ) prepare-cmd 5 +xw \ CMD_ACT_SET_ANYCAST

1 0

r693 - cpu/x86/pc/olpc dev/olpc/kb3700
by svn＠openbios.org 23 Oct '07

23 Oct '07

Author: wmb Date: 2007-10-23 02:59:11 +0200 (Tue, 23 Oct 2007) New Revision: 693 Modified: cpu/x86/pc/olpc/security.fth dev/olpc/kb3700/ecio.fth Log: OLPC trac #4397 - Reboot using the new EC command that reset the EC too, thus re-enabling indexed I/O, thus making auto-firmware-update possible. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-20 09:10:33 UTC (rev 692) +++ cpu/x86/pc/olpc/security.fth 2007-10-23 00:59:11 UTC (rev 693) @@ -652,7 +652,7 @@ visible ." Restarting to enable SPI FLASH writing." cr d# 3000 ms - ec-reboot + ec-ixio-reboot security-failure then Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-10-20 09:10:33 UTC (rev 692) +++ dev/olpc/kb3700/ecio.fth 2007-10-23 00:59:11 UTC (rev 693) @@ -210,8 +210,18 @@ \ This restarts the EC and the CPU, resetting the EC state to its default. \ EC indexed I/O will come up in enabled state. -: ec-reboot ( -- ) h# db ec-cmd66 begin again ; +: ec-reboot ( -- ) h# db ec-cmd66 ; +: ec-ixio-reboot ( -- ) + ['] ec-reboot catch if + ." Automatic restart failed. Remove/reinstall the battery and AC." cr + d# 10,000 ms + power-off + else + begin again \ Just wait for it to happen + then +; + : ec-indexed-io-off? ( -- flag ) h# ff14 ec@ h# ff = ; : ?ixio-restart ( -- ) ec-indexed-io-off? if @@ -219,7 +229,7 @@ ." Restarting to enable SPI FLASH writing. Try again after the system restarts." black-letters cr d# 5000 ms - ec-reboot + ec-ixio-reboot then ;

1 0

r692 - cpu/x86/pc/olpc
by svn＠openbios.org 20 Oct '07

20 Oct '07

Author: wmb Date: 2007-10-20 11:10:33 +0200 (Sat, 20 Oct 2007) New Revision: 692 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC trac #4336 - Fixed bug in signature parsing for developer keys. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-20 09:06:33 UTC (rev 691) +++ cpu/x86/pc/olpc/security.fth 2007-10-20 09:10:33 UTC (rev 692) @@ -146,13 +146,13 @@ : invalid? ( data$ sig01$ exp-hashname$ -- error? ) 2>r parse-sig if - ." Bad signature format in " bundle-name$ type cr + ." Bad signature format" cr 2r> 2drop true exit then ( data$ hashname$ sig$ r: exp$ ) \ Check for duplicate hashname attacks 2swap 2dup 2r> $= 0= if ( data$ sig$ hashname$ ) - ." Wrong hash name in " bundle-name$ type cr + ." Wrong hash name" cr 4drop 2drop true exit then ( data$ sig$ hashname$ ) @@ -164,24 +164,22 @@ then ; +: our-pubkey? ( sig01$ -- flag ) + bl left-parse-string " sig01:" $= 0= if 2drop false exit then ( rem$ ) + bl left-parse-string 2drop \ Discard hash name ( rem$ ) + bl left-parse-string 2nip \ Get key signature ( key$ ) + /sig 2* min hex-decode if 2drop false exit then ( binary-key$ ) + pubkey$ dup 3 pick - 0 max /string $= ( flag ) +; + \ Look for a line that starts with "sig01: " and whose key signature \ matches the trailing bytes of our currently-selected public key. : next-sig01$ ( sig$ -- true | rem$ sig01$ false ) - begin dup while ( rem$ ) - newline left-parse-string ( rem$' line$ ) - 2dup ( rem$' line$ line$ ) - bl left-parse-string " sig01:" $= if ( rem$' line$ rem1$ ) - bl left-parse-string 2drop ( rem$' line$ rem1$ ) \ Discard hash name - bl left-parse-string ( rem$' line$ rem1$ key$ ) - /sig 2* min hex-decode 0= if ( rem$' line$ rem1$ keyb$ ) - pubkey$ dup 3 pick - 0 max /string ( rem$' line$ rem1$ keyb$ pubkey$' ) - $= if ( rem$' line$ rem1$ ) - 2drop false exit - then ( rem$' line$ rem1$ ) - then ( rem$' line$ rem1$ ) - then ( rem$ line$ $ ) - 4drop ( rem$ ) - repeat ( rem$ ) + begin dup while ( rem$ ) + newline left-parse-string ( rem$' line$ ) + 2dup our-pubkey? if false exit then ( rem$ line$ ) + 2drop ( rem$ ) + repeat ( rem$ ) 2drop true ; @@ -364,13 +362,17 @@ \ check-machine-signature verifies the signed object consisting \ of the machine identification info (SN + UUID) plus the expiration \ time "expiration$" against the crypto signature string sig$, -\ returning 1 if valid, -1 if invalid. (The unusual return value -\ encoding is because the caller of check-machine-signature returns -\ a tree-state flag; see check-lease.) +\ returning 1 if valid, -1 if invalid, 0 if the key signature +\ doesn't match our pubkey. : check-machine-signature ( sig$ expiration$ -- -1|1 ) - machine-id-buf d# 51 + swap move ( sig$ ) - machine-id-buf d# 67 2swap " sha256" invalid? if -1 else 1 then + 2over our-pubkey? if ( sig$ exp$ ) + machine-id-buf d# 51 + swap move ( sig$ ) + machine-id-buf d# 67 2swap ( id$ sig$ ) + " sha256" invalid? if -1 else 1 then ( -1|1 ) + else ( sig$ exp$ ) + 4drop 0 ( 0 ) + then ( -1|0|1 ) ; : set-disposition ( adr -- ) c@ machine-id-buf d# 49 + c! ; @@ -407,7 +409,7 @@ " expired" ?lease-debug-cr 4drop -1 exit then ( sig$ expiration$ ) - check-machine-signature ( -1|1 ) + check-machine-signature ( -1|0|1 ) ; \ lease-valid? tries to read a lease file from the currently-selected @@ -569,8 +571,9 @@ bl left-parse-string 1 <> if 3drop -1 exit then ( rem$ disp-adr ) set-disposition ( rem$ ) - develkey$ to pubkey$ - " 00000000T000000Z" check-machine-signature + develkey$ to pubkey$ ( rem$ ) + bl left-parse-string ( sig01$ exp$ ) + check-machine-signature ( -1|0|1 ) ; \ has-developer-key? searches for a valid developer key on the

1 0

r691 - cpu/x86/pc/olpc
by svn＠openbios.org 20 Oct '07

20 Oct '07

Author: wmb Date: 2007-10-20 11:06:33 +0200 (Sat, 20 Oct 2007) New Revision: 691 Modified: cpu/x86/pc/olpc/countdwn.fth Log: OLPC - Increased countdown to 5 seconds because its harder to catch it with security activated. Modified: cpu/x86/pc/olpc/countdwn.fth =================================================================== --- cpu/x86/pc/olpc/countdwn.fth 2007-10-20 07:42:32 UTC (rev 690) +++ cpu/x86/pc/olpc/countdwn.fth 2007-10-20 09:06:33 UTC (rev 691) @@ -34,7 +34,7 @@ false ; : (interrupt-auto-boot?) ( -- flag ) - 3 + 5 ." Type the Esc key to interrupt automatic startup" cr show-countdown ;

1 0

r690 - cpu/x86/pc/olpc dev/olpc/kb3700
by svn＠openbios.org 20 Oct '07

20 Oct '07

Author: wmb Date: 2007-10-20 09:42:32 +0200 (Sat, 20 Oct 2007) New Revision: 690 Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/security.fth dev/olpc/kb3700/ecio.fth Log: OLPC - Use new EC command that permits reflashing after reset-all, without having to remove all power. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-10-19 07:02:17 UTC (rev 689) +++ cpu/x86/pc/olpc/fw.bth 2007-10-20 07:42:32 UTC (rev 690) @@ -336,12 +336,7 @@ fload ${BP}/ofw/gui/ofpong.fth fload ${BP}/cpu/x86/pc/olpc/life.fth fload ${BP}/cpu/x86/pc/olpc/sound.fth -: olpc-power-off ( -- ) - gx-power-off \ Try the nice way first - d# 20 ms - ec-power-off \ Then try the hard way -; -' olpc-power-off to power-off +' gx-power-off to power-off [then] @@ -388,8 +383,7 @@ 2drop 2drop then - 1. h# 5140.0017 wrmsr \ DIVIL_SOFT_RESET MSR, 5536 page 367 - begin again + ec-reboot \ Tell the EC to reboot us, so the EC can reset too ; ' dcon-reset-all to reset-all Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-19 07:02:17 UTC (rev 689) +++ cpu/x86/pc/olpc/security.fth 2007-10-20 07:42:32 UTC (rev 690) @@ -647,7 +647,9 @@ ec-indexed-io-off? if visible - .ec-ixio-msg + ." Restarting to enable SPI FLASH writing." cr + d# 3000 ms + ec-reboot security-failure then Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-10-19 07:02:17 UTC (rev 689) +++ dev/olpc/kb3700/ecio.fth 2007-10-20 07:42:32 UTC (rev 690) @@ -189,66 +189,55 @@ \ the port 66 command sequence. : sci-quiet ( -- ) h# 50 h# ff03 ec! ; -\ While accessing the SPI FLASH, we have to turn off the keyboard controller, -\ because it continuously fetches from the SPI FLASH when it's on. That -\ interferes with our accesses. -: ec-indexed-io-off? ( -- flag ) h# ff14 ec@ h# ff = ; -: .ec-ixio-msg ( -- ) - ." Writing to the SPI FLASH is disabled." cr - ." Disconnect/reconnect the battery and AC and try again." cr -; +\ kbc-pause temporarily halts execution of the keyboard controller microcode. +\ kbc-resume makes it run again, picking up where it left off. +\ This is useful for accessing the SPI FLASH in cases where you do not +\ overwrite the keyboard controller microcodes. +: kbc-pause ( -- ) h# dd ec-cmd66 ; +: kbc-resume ( -- ) h# df ec-cmd66 ; + 0 value kbc-off? -: kbc-off ( -- ) - kbc-off? if exit then \ Fast bail out - ec-indexed-io-off? if .ec-ixio-msg abort then - h# d8 ec-cmd66 \ Prepare for reset - h# ff14 ec@ 1 or h# ff14 ec! - true to kbc-off? -; -: ec-power-off ( -- ) - 1 h# ff14 ec! - 1 h# ff01 ec! \ Tell the EC to bounce us on restart - 0 h# ff14 ec! -; - -\ Unfortunately, since the system reset is mediated by the keyboard -\ controller, turning the keyboard controller back on resets the system. - : kbc-on ( -- ) + \ Release the reset line to the 8051 microcontroller in the EC, + \ thus letting it restart with possibly-new microcode. h# ff14 ec@ 1 invert and h# ff14 ec! \ Innocuous if already on false to kbc-off? ; -: fancy-kbc-on ( -- ) - 2 h# ff01 ec! \ Prevent full system reset - h# ff14 ec@ 1 invert and h# ff14 ec! \ Innocuous if already on - d# 400 ms \ Give the EC time to start up - h# 44 h# fc80 ec! \ Re-enable scan code conversion and system flag - h# 43 h# fc81 ec! \ Re-enable fast gate and ibf/obf interrupts - h# f h# fe51 ec! \ Clear pending interrupts - h# f h# fe50 ec! \ Re-enable GPT interrupts - h# 0 h# fea7 ec! \ Clear FLASH write enable - h# 4 h# fead ec! \ fast read mode - h# fe95 ec@ h# 80 or h# fe95 ec! \ Write-protect LPC - h# 3 h# ff04 ec! \ enable IBF/OBF interrupts -\ h# 40 h# ff08 ec! \ Clear some interrupt - h# ff30 ec@ h# 10 or h# ff30 ec! \ Enable interrupt from GPIO04, PCI_RST# +\ This restarts the EC and the CPU, resetting the EC state to its default. +\ EC indexed I/O will come up in enabled state. +: ec-reboot ( -- ) h# db ec-cmd66 begin again ; - false to kbc-off? +: ec-indexed-io-off? ( -- flag ) h# ff14 ec@ h# ff = ; +: ?ixio-restart ( -- ) + ec-indexed-io-off? if + cr red-letters + ." Restarting to enable SPI FLASH writing. Try again after the system restarts." + black-letters cr + d# 5000 ms + ec-reboot + then ; -\ kbc-pause temporarily halts execution of the keyboard controller microcode. -\ kbc-resume makes it run again, picking up where it left off. -\ This is useful for accessing the SPI FLASH in cases where you do not -\ overwrite the keyboard controller microcodes. +\ While accessing the SPI FLASH, we have to turn off the keyboard controller, +\ because it continuously fetches from the SPI FLASH when it's on. That +\ interferes with our accesses. -: kbc-pause ( -- ) h# dd ec-cmd66 ; -: kbc-resume ( -- ) h# df ec-cmd66 ; +\ Unfortunately, since the system reset is mediated by the keyboard +\ controller, turning the keyboard controller back on resets the system. +: kbc-off ( -- ) + kbc-off? if exit then \ Fast bail out + ?ixio-restart + h# d8 ec-cmd66 \ Prepare for reset + h# ff14 ec@ 1 or h# ff14 ec! + true to kbc-off? +; + : io-spi@ ( reg# -- b ) h# fea8 + ec@ ; : io-spi! ( b reg# -- ) h# fea8 + ec! ; @@ -261,9 +250,7 @@ : io-spi-reprogrammed ( -- ) ." Restarting..." d# 2000 ms cr - kbc-on - begin again -\ ." Keyboard back on" cr + kbc-on begin again ; : io-spi-start ( -- ) @@ -281,6 +268,7 @@ ; : use-local-ec ( -- ) ['] io-spi-start to spi-start ; use-local-ec + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r689 - cpu/x86/pc/olpc
by svn＠openbios.org 19 Oct '07

19 Oct '07

Author: wmb Date: 2007-10-19 09:02:17 +0200 (Fri, 19 Oct 2007) New Revision: 689 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC security - When searching for a signature string, look for one whose key signature matches the trailing portion of our pubkey, instead of just taking the first line with a "sig01:" format. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-18 22:53:21 UTC (rev 688) +++ cpu/x86/pc/olpc/security.fth 2007-10-19 07:02:17 UTC (rev 689) @@ -164,14 +164,23 @@ then ; -\ Look for a line that starts with "sig01: " +\ Look for a line that starts with "sig01: " and whose key signature +\ matches the trailing bytes of our currently-selected public key. : next-sig01$ ( sig$ -- true | rem$ sig01$ false ) begin dup while ( rem$ ) newline left-parse-string ( rem$' line$ ) - 2dup 7 min " sig01: " $= if ( rem$ line$ ) - false exit - then ( rem$ line$ ) - 2drop ( rem$ ) + 2dup ( rem$' line$ line$ ) + bl left-parse-string " sig01:" $= if ( rem$' line$ rem1$ ) + bl left-parse-string 2drop ( rem$' line$ rem1$ ) \ Discard hash name + bl left-parse-string ( rem$' line$ rem1$ key$ ) + /sig 2* min hex-decode 0= if ( rem$' line$ rem1$ keyb$ ) + pubkey$ dup 3 pick - 0 max /string ( rem$' line$ rem1$ keyb$ pubkey$' ) + $= if ( rem$' line$ rem1$ ) + 2drop false exit + then ( rem$' line$ rem1$ ) + then ( rem$' line$ rem1$ ) + then ( rem$ line$ $ ) + 4drop ( rem$ ) repeat ( rem$ ) 2drop true ; @@ -182,7 +191,7 @@ 2nip " sha256" invalid? 0= ; -\ Find two sig01: lines, the first with sha256 and the seconcd with rmd160, +\ Find two sig01: lines, the first with sha256 and the second with rmd160, \ and check their signatures : fw-valid? ( data$ sig$ -- okay? ) 2swap 2>r ( sig$ r: data$ )

1 0

r688 - cpu/x86/pc/olpc
by svn＠openbios.org 19 Oct '07

19 Oct '07

Author: wmb Date: 2007-10-19 00:53:21 +0200 (Fri, 19 Oct 2007) New Revision: 688 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC security - disable X-button reversion from secure to non-secure mode. The X button now forces secure mode when in non-secure mode, instead of going in either direction. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-18 22:43:46 UTC (rev 687) +++ cpu/x86/pc/olpc/security.fth 2007-10-18 22:53:21 UTC (rev 688) @@ -586,7 +586,7 @@ r> close-file drop false ; -: ?toggle-secure ( -- ) button-x game-key? if secure? 0= to secure? then ; +: ?force-secure ( -- ) button-x game-key? if true to secure? then ; 6 buffer: fw#buf : (fw-version) ( base-adr -- n ) @@ -735,7 +735,7 @@ button-rotate game-key? if show-warnings then show-child - ?toggle-secure + ?force-secure secure? 0= if unfreeze visible exit then

1 0

r687 - cpu/x86/pc/olpc dev/olpc/kb3700
by svn＠openbios.org 19 Oct '07

19 Oct '07

Author: wmb Date: 2007-10-19 00:43:46 +0200 (Fri, 19 Oct 2007) New Revision: 687 Modified: cpu/x86/pc/olpc/security.fth dev/olpc/kb3700/ecio.fth Log: OLPC trac #1193 - disable indexed I/O when entering the kernel in secure mode. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-18 21:26:57 UTC (rev 686) +++ cpu/x86/pc/olpc/security.fth 2007-10-18 22:43:46 UTC (rev 687) @@ -465,7 +465,7 @@ : security-failure ( -- ) visible - ." Security failure" cr + ." Stopping" cr d# 10000 ms power-off @@ -636,6 +636,12 @@ security-failure then + ec-indexed-io-off? if + visible + .ec-ixio-msg + security-failure + then + \ Latch alternate? flag for next startup alternate? if [char] A h# 82 cmos! then @@ -696,7 +702,7 @@ then ( list$ ) load-from-device if ( list$ ) -\ write-protect-fw ec-indexed-io-off ( list$ ) + write-protect-fw ec-indexed-io-off ( list$ ) 2drop ( ) ['] secure-load-ramdisk to load-ramdisk " init-program" $find if Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-10-18 21:26:57 UTC (rev 686) +++ dev/olpc/kb3700/ecio.fth 2007-10-18 22:43:46 UTC (rev 687) @@ -193,9 +193,16 @@ \ because it continuously fetches from the SPI FLASH when it's on. That \ interferes with our accesses. +: ec-indexed-io-off? ( -- flag ) h# ff14 ec@ h# ff = ; +: .ec-ixio-msg ( -- ) + ." Writing to the SPI FLASH is disabled." cr + ." Disconnect/reconnect the battery and AC and try again." cr +; + 0 value kbc-off? : kbc-off ( -- ) kbc-off? if exit then \ Fast bail out + ec-indexed-io-off? if .ec-ixio-msg abort then h# d8 ec-cmd66 \ Prepare for reset h# ff14 ec@ 1 or h# ff14 ec! true to kbc-off?

1 0

r686 - cpu/x86/pc/olpc
by svn＠openbios.org 18 Oct '07

18 Oct '07

Author: wmb Date: 2007-10-18 23:26:57 +0200 (Thu, 18 Oct 2007) New Revision: 686 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC suspend/resume - Added configed-out code to checksum memory around suspend/resume. Enable it for specific test builds. OLPC trac #4223. (this commit goes with the last one; I missed a file). Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-10-18 21:25:41 UTC (rev 685) +++ cpu/x86/pc/olpc/fw.bth 2007-10-18 21:26:57 UTC (rev 686) @@ -268,9 +268,6 @@ disable-interrupts [ifdef] rom-loaded d# 300 - h# 1454 pl@ 2 and if - ." Interacting due to botched resume" cr hex interact - then i-key-wait if \ " patch false fast-boot? startup" eval ." Interacting" cr hex interact @@ -507,6 +504,15 @@ " keyboard" open-dev ?dup if set-stdin then ; +: ?resume-botch + h# 1454 pl@ 2 and if + red-letters + ." Interacting due to botched resume" cr + black-letters + hex interact + then +; + : startup ( -- ) standalone? 0= if exit then @@ -514,6 +520,8 @@ console-start + ?resume-botch + board-revision 0= if ." EC problem - remove all power and restart" cr begin again

1 0

r685 - cpu/x86/pc/olpc
by svn＠openbios.org 18 Oct '07

18 Oct '07

Author: wmb Date: 2007-10-18 23:25:41 +0200 (Thu, 18 Oct 2007) New Revision: 685 Modified: cpu/x86/pc/olpc/draminit.fth cpu/x86/pc/olpc/resume.bth Log: OLPC suspend/resume - Added configed-out code to checksum memory around suspend/resume. Enable it for specific test builds. OLPC trac #4223. Modified: cpu/x86/pc/olpc/draminit.fth =================================================================== --- cpu/x86/pc/olpc/draminit.fth 2007-10-16 23:46:10 UTC (rev 684) +++ cpu/x86/pc/olpc/draminit.fth 2007-10-18 21:25:41 UTC (rev 685) @@ -59,7 +59,10 @@ 0 1430 port-wl h# 1b # al mov al h# 80 # out char r 3f8 port-wb begin 3fd port-rb 40 bitand 0<> until - resume-entry # sp mov sp jmp + + resume-data # sp mov + resume-entry # ax mov ax call \ This might return if checksumming fails + char x 3f8 port-wb begin 3fd port-rb 40 bitand 0<> until then h# 1c # al mov al h# 80 # out Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-10-16 23:46:10 UTC (rev 684) +++ cpu/x86/pc/olpc/resume.bth 2007-10-18 21:25:41 UTC (rev 685) @@ -23,6 +23,7 @@ \ create reset-smbus \ create reset-smbus-bitbang \ create restore-usb-power +\ create checksum-test h# fe00.0000 constant gp-pa h# fe00.4000 constant dc-pa @@ -256,6 +257,15 @@ begin dx ax in h# e0 # al and h# c0 # al cmp loopne [then] +[ifdef] checksum-test + \ Checksum memory from 1M to top (excluding framebuffer) + bx bx xor + h# 0010.0000 # si mov + h# 0ef0.0000 2 rshift # cx mov \ Word count + begin ax lods ax bx add loopa + bx resume-data h# 10 - #) mov \ Save checksum +[then] + \ Stop video refresh h# 4758 # h# fe00.4000 #) mov \ Unlock DC registers h# 0 # h# fe00.4004 #) mov \ Turn off access to display memory @@ -328,6 +338,15 @@ si bx cmp = until +[ifdef] checksum-test + \ Checksum memory from 1M to top (excluding framebuffer) + bx bx xor + h# 0010.0000 # si mov + h# 0ef0.0000 2 rshift # cx mov \ Word count + begin ax lods ax bx add loopa + bx resume-data h# 10 - #) cmp <> if ret then +[then] + h# 38 [bp] si lea \ Save area ax lods ax dx xchg ax lods ax dx xchg h# 4c00.0014 wmsr \ RSTPLL

1 0

Device node naming for device_type pci?
by Asif Haswarey 18 Oct '07

18 Oct '07

Hi, This might be a very basic question but I could not find a clear answer in the OpenFirmware PCI Bus Binding doc. Child node names are represented in a device-tree like so: devname@dev#,fun <mailto:devname@dev#,fun> # After looking at the pci bus-binding, I figured that the device naming convention (ie. representation within a device-path in a device-tree) is the same for PCI-to-PCI bridges with device_type property = pci. Well this does not seem to be the case on the SPARC system I am using: /pci@1f,700000 .properties available 81000000 00000000 00000700 00000000 0000f900 82000000 00000000 00108000 00000000 00078000 82000000 00000000 00580000 00000000 bfa80000 82000000 00000000 e0000000 00000000 00000000 reg 00000400 0ff00000 00000000 0000b000 00000400 0fc10000 00000000 00007020 000007f6 00000000 00000000 00000100 00000400 0ff80000 00000000 00010000 ranges 00000000 00000000 00000000 000007f6 00000000 00000000 01000000 01000000 00000000 00000000 000007f6 01000000 00000000 01000000 02000000 00000000 00000000 000007f7 00000000 00000001 00000000 03000000 00000000 00000000 000007f7 00000000 00000001 00000000 virtual-dma c0 00 00 00 20 00 00 00 #virtual-dma-size-cells 00000001 #virtual-dma-addr-cells 00000001 no-streaming-cache clock-frequency 03ef1480 bus-range 00 00 00 00 00 00 00 00 bus-parity-generated no-probe-list 0 compatible pci108e,a801 pci108e,8001 name pci device_type pci #address-cells 00000003 #size-cells 00000002 implementation# 00000023 version# 00000004 portid 0000001f interrupt-map 00001000 00000000 00000000 00000001 f00684c8 0000001c 00001800 00000000 00000000 00000001 f00684c8 00000014 00001800 00000000 00000000 00000002 f00684c8 00000015 00001800 00000000 00000000 00000003 f00684c8 00000016 00001800 00000000 00000000 00000004 f00684c8 00000017 ino-bitmap 10 f0 00 00 00 1b 00 08 interrupt-map-mask 00fff800 00000000 00000000 00000007 #interrupt-cells 00000001 66mhz-capable slot-names 00 00 00 08 50 43 49 34 00 interrupts 00000033 00000030 00000031 00000034 00000023 If I use the first phy-hi value from the reg property, and extract the dev# and fun# as described in the OpenFirmware PCI Bus Binding, I get dev# = 0x00, fun# = 0x04. So how does Sun get: dev# = 0x1f fun# = 0x700000 [and valid fun#s range from 0 .. 7] Perhaps I am supposed to look at another property. Does anyone know which one that would be? Thanks for any help on this! -Asif

2 1

[PATCH] Add support for accessing the LinuxBIOS CMOS settings from Open Firmware
by Jens Freimann 17 Oct '07

17 Oct '07

Hi, this patch adds a new file lbcmos.fth to cpu/x86/pc/biosload which makes it possible to view and manipulate CMOS settings. For instructions on how to use it type "help-lbcmos" on the ok prompt. With kind regards, Jens

5 6

r684 - cpu/x86/pc/olpc
by svn＠openbios.org 17 Oct '07

17 Oct '07

Author: wmb Date: 2007-10-17 01:46:10 +0200 (Wed, 17 Oct 2007) New Revision: 684 Modified: cpu/x86/pc/olpc/versions.fth Log: q2d01 - fixed version number botch. Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-10-16 23:41:41 UTC (rev 683) +++ cpu/x86/pc/olpc/versions.fth 2007-10-16 23:46:10 UTC (rev 684) @@ -1,8 +1,8 @@ \ Version numbers of items included in the OLPC firmware image \ The overall firmware revision -macro: FW_MAJOR C -macro: FW_MINOR d01 +macro: FW_MAJOR D +macro: FW_MINOR 01 \ The EC microcode macro: EC_VERSION d01

1 0

r683 - cpu/x86/pc/olpc
by svn＠openbios.org 17 Oct '07

17 Oct '07

Author: wmb Date: 2007-10-17 01:41:41 +0200 (Wed, 17 Oct 2007) New Revision: 683 Modified: cpu/x86/pc/olpc/versions.fth Log: q2d01 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-10-16 23:39:11 UTC (rev 682) +++ cpu/x86/pc/olpc/versions.fth 2007-10-16 23:41:41 UTC (rev 683) @@ -2,14 +2,14 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 28b +macro: FW_MINOR d01 \ The EC microcode -macro: EC_VERSION c24 +macro: EC_VERSION d01 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary -macro: GET_EC cp ./shiny5.bin ec.img +\ macro: GET_EC cp /c/Temp/c2d01-1.bin ec.img \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1

1 0

r682 - cpu/x86/pc/olpc
by svn＠openbios.org 17 Oct '07

17 Oct '07

Author: wmb Date: 2007-10-17 01:39:11 +0200 (Wed, 17 Oct 2007) New Revision: 682 Modified: cpu/x86/pc/olpc/crypto.bth Log: OLPC - Switch to new public keys for mass production start. Modified: cpu/x86/pc/olpc/crypto.bth =================================================================== --- cpu/x86/pc/olpc/crypto.bth 2007-10-16 23:37:42 UTC (rev 681) +++ cpu/x86/pc/olpc/crypto.bth 2007-10-16 23:39:11 UTC (rev 682) @@ -6,11 +6,11 @@ fload ${BP}/cpu/x86/pc/olpc/versions.fth " wget http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img -O verify.img" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/testkeys/os.public -O os.public" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/testkeys/fw.public -O fw.public" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/testkeys/fs.public -O fs.public" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/testkeys/lease.public -O lease.public" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/testkeys/developer.public -O developer.public" expand$ $sh +" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/os.public -O os.public" expand$ $sh +" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/fw.public -O fw.public" expand$ $sh +" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/fs.public -O fs.public" expand$ $sh +" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/lease.public -O lease.public" expand$ $sh +" wget http://dev.laptop.org/pub/firmware/crypto/mpkeys/developer.public -O developer.public" expand$ $sh \ This forces the creation of an crypto.log file, so we don't re-fetch writing crypto.version

1 0

r681 - dev
by svn＠openbios.org 17 Oct '07

17 Oct '07

Author: wmb Date: 2007-10-17 01:37:42 +0200 (Wed, 17 Oct 2007) New Revision: 681 Modified: dev/pckbd.fth Log: OLPC keyboard - bail out early from init/reset sequence if the keyboard is already sending us stuff. Modified: dev/pckbd.fth =================================================================== --- dev/pckbd.fth 2007-10-16 18:24:46 UTC (rev 680) +++ dev/pckbd.fth 2007-10-16 23:37:42 UTC (rev 681) @@ -359,6 +359,7 @@ clear-state [ifdef] ?olpc-keyboard ?olpc-keyboard + keyboard-present? if exit then [else] get-initial-state

1 0

r171 - openbios-devel/modules
by svn＠openbios.org 16 Oct '07

16 Oct '07

Author: blueswirl Date: 2007-10-16 22:59:36 +0200 (Tue, 16 Oct 2007) New Revision: 171 Modified: openbios-devel/modules/deblocker.c openbios-devel/modules/disk-label.c openbios-devel/modules/sun-parts.c Log: Fix 8 byte alignment problems Modified: openbios-devel/modules/deblocker.c =================================================================== --- openbios-devel/modules/deblocker.c 2007-09-29 11:33:31 UTC (rev 170) +++ openbios-devel/modules/deblocker.c 2007-10-16 20:59:36 UTC (rev 171) @@ -20,7 +20,7 @@ #include "modules.h" typedef struct { - ducell mark; + ucell mark_hi, mark_lo; xt_t read_xt; xt_t write_xt; @@ -79,7 +79,8 @@ /* -1 means seek to EOF (at least in our implementation) */ if( (dcell)mark == -1 ) RET(-1); - di->mark = mark; + di->mark_hi = pos_hi; + di->mark_lo = pos_lo; /* 0,1 == success, -1 == error */ PUSH(0); @@ -89,7 +90,8 @@ static void deblk_tell( deblk_info_t *di ) { - DPUSH( di->mark ); + PUSH( di->mark_lo ); + PUSH( di->mark_hi ); } @@ -110,9 +112,10 @@ static void split( deblk_info_t *di, char *data, int len, work_t w[3] ) { + ducell mark = ((ducell)di->mark_hi << BITS) | di->mark_lo; memset( w, 0, sizeof(work_t[3]) ); - w[0].offs = di->mark % di->blksize; + w[0].offs = mark % di->blksize; w[0].blk_buf = di->buf; w[0].data = data; if( w[0].offs ) { @@ -141,13 +144,14 @@ char *dest = (char*)POP(); int last=0, retlen=0; work_t w[3]; + ducell mark = ((ducell)di->mark_hi << BITS) | di->mark_lo; /* printk("read: %x %x\n", (int)dest, len ); */ if( !xt ) return -1; - blk = di->mark / di->blksize; + blk = mark / di->blksize; split( di, dest, len, w ); for( i=0; !last && i<3; i++ ) { @@ -174,8 +178,11 @@ retlen += w[i].len; blk += n; } - if( retlen > 0 ) - di->mark += retlen; + if( retlen > 0 ) { + mark += retlen; + di->mark_hi = mark >> BITS; + di->mark_lo = mark & (ucell) -1; + } return retlen; } Modified: openbios-devel/modules/disk-label.c =================================================================== --- openbios-devel/modules/disk-label.c 2007-09-29 11:33:31 UTC (rev 170) +++ openbios-devel/modules/disk-label.c 2007-10-16 20:59:36 UTC (rev 171) @@ -22,8 +22,8 @@ typedef struct { int fd; - ducell offs; - ducell size; + ucell offs_hi, offs_lo; + ucell size_hi, size_lo; int type; /* partition type or -1 */ ihandle_t part_ih; @@ -94,8 +94,10 @@ if( !(xt=find_ih_method("get-info", di->part_ih)) ) goto out; call_package( xt , di->part_ih ); - di->size = DPOP(); - di->offs = DPOP(); + di->size_hi = POP(); + di->size_lo = POP(); + di->offs_hi = POP(); + di->offs_lo = POP(); di->type = POP(); } @@ -139,12 +141,14 @@ { llong pos = DPOP(); int ret; + ducell offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; + ducell size = ((ducell)di->size_hi << BITS) | di->size_lo; if( pos != -1 ) - pos += di->offs; - else if( di->size ) { + pos += offs; + else if( size ) { /* printk("Seek EOF\n"); */ - pos = di->offs + di->size; + pos = offs + size; } else { /* let parent handle the EOF seek. */ } @@ -159,8 +163,9 @@ dlabel_tell( dlabel_info_t *di ) { llong pos = tell( di->fd ); + ducell offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; if( pos != -1 ) - pos -= di->offs; + pos -= offs; DPUSH( pos ); } @@ -179,7 +184,8 @@ dlabel_offset( dlabel_info_t *di ) { ullong rel = DPOP(); - rel += di->offs; + ducell offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; + rel += offs; DPUSH( rel ); } Modified: openbios-devel/modules/sun-parts.c =================================================================== --- openbios-devel/modules/sun-parts.c 2007-09-29 11:33:31 UTC (rev 170) +++ openbios-devel/modules/sun-parts.c 2007-10-16 20:59:36 UTC (rev 171) @@ -25,8 +25,8 @@ #endif typedef struct { - ullong offs; - ullong size; + ucell offs_hi, offs_lo; + ucell size_hi, size_lo; int type; } sunparts_info_t; @@ -95,6 +95,7 @@ unsigned char buf[512]; struct sun_disklabel *p; unsigned int i, bs; + ducell offs, size; DPRINTF("sunparts_open '%s'\n", str ); @@ -136,12 +137,16 @@ parnum = 0; DPRINTF("Selected partition %d\n", parnum); - di->offs = (llong)__be32_to_cpu(p->partitions[parnum].start_cylinder) * + offs = (llong)__be32_to_cpu(p->partitions[parnum].start_cylinder) * __be16_to_cpu(p->ntrks) * __be16_to_cpu(p->nsect) * bs; - di->size = (llong)__be32_to_cpu(p->partitions[parnum].num_sectors) * bs; + di->offs_hi = offs >> BITS; + di->offs_lo = offs & (ucell) -1; + size = (llong)__be32_to_cpu(p->partitions[parnum].num_sectors) * bs; + di->size_hi = size >> BITS; + di->size_lo = size & (ucell) -1; di->type = __be32_to_cpu(p->infos[parnum].id); - DPRINTF("Found Sun partition table, offs %d size %d\n", (int)di->offs, (int)di->size); + DPRINTF("Found Sun partition table, offs %lld size %lld\n", offs, size); RET( -1 ); } @@ -161,8 +166,10 @@ { DPRINTF("Sun get_info\n"); PUSH( di->type ); - DPUSH( di->offs ); - DPUSH( di->size ); + PUSH( di->offs_lo ); + PUSH( di->offs_hi ); + PUSH( di->size_lo ); + PUSH( di->size_hi ); } static void

1 0

r680 - ofw/fs/jffs2
by svn＠openbios.org 16 Oct '07

16 Oct '07

Author: wmb Date: 2007-10-16 20:24:46 +0200 (Tue, 16 Oct 2007) New Revision: 680 Modified: ofw/fs/jffs2/jffs2.fth Log: Fixed a bug introduced by r674, resolving OLPC Trac #4227. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-10-15 01:03:25 UTC (rev 679) +++ ofw/fs/jffs2/jffs2.fth 2007-10-16 18:24:46 UTC (rev 680) @@ -446,6 +446,7 @@ \ with millions (literally) of obsolete records. variable prev-dirent -1 prev-dirent ! \ Needed for erasing old one +variable prev-pino -1 prev-pino ! \ Needed for restoring old state for regenerating variable prev-offset -1 prev-offset ! \ Needed for restoring old state for regenerating d# 256 instance buffer: prev-name @@ -457,6 +458,8 @@ 2drop ( boffset pino ) dup cur-pino @ <> if exit then ( boffset pino ) + + prev-pino @ cur-pino ! prev-dirent @ 'next-dirent ! prev-offset @ dirent-offset ! ; @@ -478,6 +481,7 @@ swap pack-offset swap ( offset pino ) dup cur-pino @ <> if ( offset pino ) + cur-pino @ prev-pino ! ( offset pino ) dup cur-pino ! ( offset pino ) encode-dirent-long ( offset dirent-len ) else ( offset pino )

1 0

Instantly switching between Windows and Linux
by Marcos Reyes 16 Oct '07

16 Oct '07

I would like to know if it would be possible, now or in the future, to instantly switch between two running operating systems on one machine. For example by dividing the RAM on the machine to be dedicated to each OS, and having a buffer for device states. It would be really cool, for example, to launch a shortcut from within windows that launches a program in Linux. Though some multitasking would be lost, as processes in Windows would be suspended. Or maybe not, with multi-processor systems? I don't know anything about this... just a dream. Would be great to migrate people to Linux. M

3 3

[PATCH] Change qemu-loaded to linuxbios-loaded (and vice versa) in a few places
by Jens Freimann 16 Oct '07

16 Oct '07

Hi, this patch only effects the biosload build. In a few places linuxbios-loaded is used where qemu-loaded should be used and vice versa. This patch changes that, so that running LinuxBIOS + OFW on real hardware works by only enabling linuxbios-loaded in config.fth. With kind regards, Jens

3 3

r679 - cpu/x86/pc/olpc
by svn＠openbios.org 15 Oct '07

15 Oct '07

Author: wmb Date: 2007-10-15 03:03:25 +0200 (Mon, 15 Oct 2007) New Revision: 679 Modified: cpu/x86/pc/olpc/loaddropins.fth Log: OLPC build - hasher.img is no longer needed. Modified: cpu/x86/pc/olpc/loaddropins.fth =================================================================== --- cpu/x86/pc/olpc/loaddropins.fth 2007-10-12 09:23:29 UTC (rev 678) +++ cpu/x86/pc/olpc/loaddropins.fth 2007-10-15 01:03:25 UTC (rev 679) @@ -58,5 +58,3 @@ " fs.public" " fspubkey" $add-dropin \ Incompressible " lease.public" " leasepubkey" $add-dropin \ Incompressible " developer.public" " develpubkey" $add-dropin \ Incompressible - - " hasher.img" " hasher" $add-deflated-dropin

1 0

r678 - ofw/fs/jffs2
by svn＠openbios.org 12 Oct '07

12 Oct '07

Author: wmb Date: 2007-10-12 11:23:29 +0200 (Fri, 12 Oct 2007) New Revision: 678 Modified: ofw/fs/jffs2/jffs2.fth Log: Fixed a bug introduced by svn 674. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-10-12 09:03:59 UTC (rev 677) +++ ofw/fs/jffs2/jffs2.fth 2007-10-12 09:23:29 UTC (rev 678) @@ -551,7 +551,7 @@ \ If the first encoded dirent is short-form, the pino is the same as \ before and thus matches. ax ax xor 0 [si] al mov \ ax: b - ax shr carry? if \ 1-byte form + al shr carry? if \ 1-byte form 2 # ax shl ax 0 [dx] add \ Update dirent-offset 1 # si add \ skip byte offset 4 [sp] si xchg \ Put adr back on stack and restore si @@ -563,7 +563,7 @@ op: 0 [si] ax mov \ ax: w ax ax and 0<> if \ 2-byte form - 2 # ax shl ax 0 [dx] add \ Update dirent-offset + 1 # ax shl ax 0 [dx] add \ Update dirent-offset 2 # si add \ skip word offset 4 [sp] si xchg \ Put adr back on stack and restore si 0 [dx] bp mov \ bp: offset @@ -575,14 +575,15 @@ long-offsets on begin - ax ax xor 0 [si] al mov \ ax: b - ax shr carry? if \ 1-byte form + ax ax xor + 0 [si] al mov \ ax: b + al shr carry? if \ 1-byte form 2 # ax shl ax 0 [dx] add \ Update dirent-offset 1 # si add \ skip byte offset else op: 0 [si] ax mov \ ax: w ax ax or 0<> if \ Short form - 2 # ax shl ax 0 [dx] add \ Update dirent-offset + 1 # ax shl ax 0 [dx] add \ Update dirent-offset 2 # si add \ skip word offset else d# 6 [si] ax mov ax 0 [dx] mov \ Update dirent-offset @@ -626,7 +627,7 @@ drop ( adr ) dup w@ ?dup if ( adr w ) - /l* dirent-offset +! ( adr ) + /w* dirent-offset +! ( adr ) dirent-offset @ ( adr offset ) swap wa1+ swap ( adr' offset ) true ( adr offset true ) @@ -638,7 +639,7 @@ 2/ /l* dirent-offset +! ( adr ) ca1+ ( adr' ) w@+ swap ?dup if ( adr' w ) - /l* dirent-offset +! ( adr' ) + /w* dirent-offset +! ( adr' ) else ( adr' ) l@+ swap cur-pino ! ( adr' ) l@+ swap dirent-offset ! ( adr' )

1 0

r677 - cpu/x86/pc/olpc
by svn＠openbios.org 12 Oct '07

12 Oct '07

Author: wmb Date: 2007-10-12 11:03:59 +0200 (Fri, 12 Oct 2007) New Revision: 677 Modified: cpu/x86/pc/olpc/security.fth Log: Fixed a bug introduced by svn 671. Also reverted the Indexed I/O turn-off because the kernel isn't ready for it yet. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-12 09:00:06 UTC (rev 676) +++ cpu/x86/pc/olpc/security.fth 2007-10-12 09:03:59 UTC (rev 677) @@ -361,7 +361,7 @@ : check-machine-signature ( sig$ expiration$ -- -1|1 ) machine-id-buf d# 51 + swap move ( sig$ ) - machine-id-buf d# 67 2swap sha-valid? if 1 else -1 then + machine-id-buf d# 67 2swap " sha256" invalid? if -1 else 1 then ; : set-disposition ( adr -- ) c@ machine-id-buf d# 49 + c! ; @@ -696,6 +696,7 @@ then ( list$ ) load-from-device if ( list$ ) +\ write-protect-fw ec-indexed-io-off ( list$ ) 2drop ( ) ['] secure-load-ramdisk to load-ramdisk " init-program" $find if

1 0

r676 - cpu/x86/pc/olpc dev
by svn＠openbios.org 12 Oct '07

12 Oct '07

Author: wmb Date: 2007-10-12 11:00:06 +0200 (Fri, 12 Oct 2007) New Revision: 676 Added: cpu/x86/pc/olpc/keymap.fth cpu/x86/pc/olpc/parsekbd.py Modified: cpu/x86/pc/olpc/mfgdata.fth cpu/x86/pc/olpc/setwp.fth dev/pckbd.fth Log: OLPC trac #3985 - ASCII keymaps from the KA manufacturing data tag. Added: cpu/x86/pc/olpc/keymap.fth =================================================================== --- cpu/x86/pc/olpc/keymap.fth (rev 0) +++ cpu/x86/pc/olpc/keymap.fth 2007-10-12 09:00:06 UTC (rev 676) @@ -0,0 +1,90 @@ +purpose: Populate keymaps from the KA manufacturing data tag +\ See license at end of file + +\ Per http://wiki.laptop.org/Manufacturing_Data#Keyboard_ASCII_Map + +h# 60 constant /submap + +\ Special hack for the OLPC keyboard multiply/divide key, which is +\ sometimes used for ASCII punctuation +: ?multkey ( scancode -- scancode' ) + \ Translate down to the range that fits in the ASCII keymaps + dup h# 73 = if drop h# 5f then +; + +: !map ( scancode ascii submap# -- ) + /submap * rot ?multkey + oem-keymap + 1+ c! +; + +\ Clear out a range of map entries +: zap ( first last -- ) + 1+ swap ?do i 0 0 !map i 0 1 !map loop +; + +: punctuation " 0123456789!""#$%&'()*+,-./:;<=>?@[\]^_`{|}~" drop ; +: fill-keymap ( value$ -- ) + oem-keymap /keymap 0 fill ( adr len ) + 3 oem-keymap c! ( adr len ) \ #submaps + \ Prime the shift and unshift maps with special characters + [ also keyboards ] us [ previous ] 3 + oem-keymap 1+ /submap 2* move + + \ Clear out some the map entries for the alphanumeric/punctuation stations, + \ so we don't have confusing leftovers from the US map + 2 h# d zap h# 10 h# 1b zap h# 1e h# 29 zap h# 2b h# 35 zap + + \ Set the a-z entries - assume unshifted and infer shifted + 2dup d# 26 min 0 ?do ( value$ adr ) + dup i + c@ ( value$ adr scancode ) + [char] a i + ( value$ adr scancode ascii ) + 2dup 0 !map ( value$ adr scancode ascii ) \ Unshifted + h# 20 xor 1 !map ( value$ adr ) \ Shifted + loop ( value$ adr ) + drop ( value$ ) + dup d# 26 min /string ( value$' ) + + \ Set the 0-9 and punctuation entries in specifed maps + d# 42 min 0 ?do ( adr ) + dup i 2* + ( adr adr' ) + dup c@ ( adr adr' scancode ) + punctuation i + c@ ( adr adr' scancode ascii ) + rot 1+ c@ !map ( adr ) + loop ( adr ) + drop +; + +\ If a KA tag is present, parse it into a keymap +: olpc-keymap? ( -- got? ) + " KA" " find-tag" eval if ( value$ ) + ?free-keymap + /keymap alloc-mem to oem-keymap ( adr' len' ) + fill-keymap + oem-keymap to keymap + true + else + false + then +; + +\ LICENSE_BEGIN +\ Copyright (c) 2007 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 Modified: cpu/x86/pc/olpc/mfgdata.fth =================================================================== --- cpu/x86/pc/olpc/mfgdata.fth 2007-10-12 00:11:50 UTC (rev 675) +++ cpu/x86/pc/olpc/mfgdata.fth 2007-10-12 09:00:06 UTC (rev 676) @@ -9,23 +9,39 @@ : invalid-tag? ( adr -- data-adr flag ) -1 hibit? if true exit then \ Name char must be 7-bit ASCII -2 hibit? if true exit then \ Name char must be 7-bit ASCII - -3 hibit? if true exit then \ Length must be 7 bits - dup 3 - c@ ( adr len ) - over 4 - c@ ( adr len ~len ) - xor h# ff <> if true exit then ( adr ) - dup 3 - c@ - 4 - ( adr' ) + -3 hibit? if \ Long (5-byte tag) format ( adr ) + dup 4 - c@ dup h# 80 and if drop true exit then ( adr low ) + over 5 - c@ dup h# 80 and if 2drop true exit then ( adr low high ) + 2dup xor h# ff xor ( adr low high check ) + 3 pick 3 - c@ <> if 3drop true exit then ( adr low high ) + 7 << + ( adr length ) + - 5 - ( data-adr ) + else \ Short (4-byte tag) format + dup 3 - c@ ( adr len ) + over 4 - c@ ( adr len ~len ) + xor h# ff <> if true exit then ( adr ) + dup 3 - c@ - 4 - ( data-adr ) + then + false ; : last-mfg-data ( top-adr -- adr ) begin invalid-tag? until ; : another-tag? ( adr -- adr false | adr' data$ name-adr true ) - dup invalid-tag? if ( adr data-adr ) + dup invalid-tag? if ( adr data-adr ) drop false exit - then ( adr data-adr ) - dup rot ( data-adr data-adr adr ) - 2dup swap - 4 - ( data-adr data-adr adr data-len ) - swap 2- true ( adr' data$ adr ) + then ( adr data-adr ) + >r 2- ( name-adr r: data-adr ) + dup 1- c@ h# 80 and if ( name-adr r: data-adr ) \ 5-byte format + dup 2- c@ ( name-adr lowlen r: data-adr ) + over 3 - c@ 7 lshift + ( name-adr len r: data-adr ) + else ( name-adr r: data-adr ) \ 4-byte format + dup 1- c@ ( name-adr len r: data-adr ) + then ( name-adr len r: data-adr ) + r> rot >r ( len data-adr r: name-adr ) + dup rot r> ( adr data$ name-adr ) + true ( adr data$ name-adr true ) ; \ Mfg data used to be at the end of the EC erase block, but Added: cpu/x86/pc/olpc/parsekbd.py =================================================================== --- cpu/x86/pc/olpc/parsekbd.py (rev 0) +++ cpu/x86/pc/olpc/parsekbd.py 2007-10-12 09:00:06 UTC (rev 676) @@ -0,0 +1,219 @@ +#!/usr/bin/python +# parsekbd.py +# Usage: python parsekbd.py OLPC_Nigeria_Keyboard +# +# Gets the wiki page (e.g.) http://wiki.laptop.org/go/OLPC_Nigeria_Keyboard +# Parses the keyboard table contained therein and converts it to a KA +# tag per http://wiki.laptop.org/go/Manufacturing_Data#Keyboard_ASCII_Map. +# +# The output is stored in a file named (e.g.) OLPC_Nigeria_Keyboard.ka +# +# Warnings on standard output tell you if duplicate entries are discarded +# or if some ASCII characters are not present. +# +# In a few cases, this program substitutes dead_{grave,circumflex,tilde} +# for {grave,asciicircumflex,asciitilde} because the ascii versions are +# in inaccessible locations (the firmware has only shift, unshift, AltGr +# maps, so a Shift-AltGr symbol is inaccessible). + +from sys import * +from urllib import * +from HTMLParser import HTMLParser + +state = 0 +keys = 128*[0] +modifiers = 128*[0] +column = 0 +keyid = 0 + +# Convert from textual names of punctuation characters to the ASCII character +punctuation = { + 'exclam':ord('!'), + 'at':ord('@'), + 'numbersign':ord('#'), + 'dollar':ord('$'), + 'percent':ord('%'), + 'asciicircum':ord('^'), + 'dead_circumflex':ord('^'), + 'ampersand':ord('&'), + 'asterisk':ord('*'), + 'parenleft':ord('('), + 'parenright':ord(')'), + 'underscore':ord('_'), + 'plus':ord('+'), + 'minus':ord('-'), + 'equal':ord('='), + 'semicolon':ord(';'), + 'colon':ord(':'), + 'apostrophe':ord('\''), + 'grave':ord('`'), + 'dead_grave':ord('`'), + 'quotedbl':ord('"'), + 'dblquote':ord('"'), + 'bar':ord('|'), + 'less':ord('<'), + 'greater':ord('>'), + 'period':ord('.'), + 'slash':ord('/'), + 'backslash':ord('\\'), + 'question':ord('?'), + 'comma':ord(','), + 'bracketleft':ord('['), + 'bracketright':ord(']'), + 'braceleft':ord('{'), + 'braceright':ord('}'), + 'asciitilde':ord('~') , + 'dead_tilde':ord('~') , + 'backspace':8, + 'space':32, + 'tab':9, + 'linefeed':10, + 'enter':13, + 'esc':27, + 'escape':27, + 'del':127, + 'delete':127, + '&':ord('&'), + '<':ord('<'), + '>':ord('>'), +} + +def string_to_ascii(s): + if len(s) == 0: + return -1 + if len(s) == 1: + return ord(s) + try: + i = punctuation[s] + return i + except: + pass + if (len(s) == 3) & (s[:2] == 'C-'): + return ord(s[2]) & 0x1f + return -1 + +def handle_key(modifier, s): + global keyid + ascii = string_to_ascii(s) + if ascii == -1: + return + if keys[ascii] != 0: + if (ascii >= 0x20) & (((modifier & 1) == 0) & (keys[ascii] != keyid)): + print "Discard",hex(ascii),chr(ascii),modifier,keyid,modifiers[keyid] + return + if ascii < 0x20: + if (modifier & 2) != 0: # ctrl + if keys[ascii + 0x60] == keyid: + return + if keys[ascii + 0x40] == keyid: + return + keys[ascii] = keyid + modifiers[ascii] = modifier + +class MyHTMLParser(HTMLParser): + def handle_starttag(self, tag, attrs): + global state, column, keyid + if tag == 'table': + state = state + 1 + elif tag == 'tr': + column = 0 + keyid = 0 + elif tag == 'td': + column = column + 1; + + def handle_data(self, data): + global state, column, keyid + if state != 1: + return + s = data.strip() + if column == 1: # XKB key + pass + elif column == 2: # HID + pass + elif column == 3: # Key + if s.isdigit(): + keyid = int(s) + elif column == 4: # Unmodified + handle_key(0,s) + elif column == 5: # Shift + handle_key(1,s) + elif column == 6: # AltGR + handle_key(4,s) + elif column == 7: # Shift AltGr + # handle_key(5,s) + pass + elif column == 8: # Ctrl + handle_key(2,s) + elif column == 9: # Fn + handle_key(8,s) + elif column == 10: # comment + pass + + +# This table converts from the IBM physical keystation number to +# the corresponding scancode value in scan set 1. + +# 0 1 3 3 4 5 6 7 8 9 +scan1_map = [ + 0x00, 0x29, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, # 0x + 0x0a, 0x0b, 0x0c, 0x0d, 0x00, 0x0e, 0x0f, 0x10, 0x11, 0x12, # 1x + 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x2b, # 2x + 0x3a, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, # 3x + 0x27, 0x28, 0x2b, 0x1c, 0x2a, 0x56, 0x2c, 0x2d, 0x2e, 0x2f, # 4x + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x73, 0x36, 0x1d, 0x00, # 5x + 0x38, 0x39, 0x38, 0x00, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, # 6x + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # 7x + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # 8x + 0x45, 0x47, 0x4B, 0x4F, 0x00, 0x00, 0x48, 0x4C, 0x50, 0x52, # 9x + 0x37, 0x49, 0x4D, 0x51, 0x53, 0x4A, 0x4E, 0x00, 0x1c, 0x00, # 10x + 0x01, 0x00, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, # 11x + 0x43, 0x44, 0x57, 0x58, 0x00, 0x46, 0x00, 0x00, 0x00, 0x00, # 12x + 0x79, 0x01, 0x00, 0x5c, 0x73, 0x6e, 0x00, 0x00, 0x00, 0x00, # 13x (analog intermediates) + 0x00, 0x00, 0x00, 0x00, 0x00, # 14x +] + +def put_ka_format(outfile): + global keys, modifiers + # a-z - output scancode only; unshifted map is implied + # and shifted map is derived automatically + for i in range(ord('a'),ord('a')+26): + if (keys[i] == 0): + print "Missing",chr(i) + if modifiers[i] != 0: + print chr(i),"is modified" + outfile.write(chr(scan1_map[keys[i]])) + + # Numbers and punctuation - output scancode and keymap number + for i in '0123456789!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~': + ascii = ord(i) + if (keys[ascii] == 0): + print "Missing",i + if (modifiers[ascii] & 0xa) != 0: + print i,"is Ctrl or Fn" + outfile.write(chr(scan1_map[keys[ascii]])) + + if (modifiers[ascii] & 0x4) != 0: + # modifier & 4 implies AltGr map + outfile.write(chr(2)) + else: + # otherwise it's either the shift (1) or unshift (0) map + outfile.write(chr(modifiers[ascii] & 1)) + + outfile.write(chr(0)) # Null terminator + + outfile.write(chr(111 ^ 0xff)) + outfile.write(chr(111)) + outfile.write('KA') + +if len(argv) != 2: + print "Usage: python parsekbd.py PageName" +else: + infile = urlopen('http://wiki.laptop.org/go/' + argv[1]) + myparser=MyHTMLParser() + myparser.feed(infile.read()) + myparser.close() + infile.close() + + outfile = open(argv[1] + '.ka', 'w') + put_ka_format(outfile) + outfile.close() Property changes on: cpu/x86/pc/olpc/parsekbd.py ___________________________________________________________________ Name: svn:executable + * Modified: cpu/x86/pc/olpc/setwp.fth =================================================================== --- cpu/x86/pc/olpc/setwp.fth 2007-10-12 00:11:50 UTC (rev 675) +++ cpu/x86/pc/olpc/setwp.fth 2007-10-12 09:00:06 UTC (rev 676) @@ -117,19 +117,57 @@ : $add-tag ( value$ name$ -- ) ?tagname-valid ( value$ name$ ) 2dup find-tag abort" Tagname already exists" ( value$ name$ ) + get-mfg-data ram-last-mfg-data >r ( value$ name$ r: adr ) - 2 pick 1+ over + 3 + ( value$ name$ record-len r: adr ) + + \ Check for enough space for the new tag + 2 pick ( value$ name$ datalen r: adr ) + dup d# 16383 > abort" Tag data too long" + dup d# 127 > if 4 else 3 then + ( value$ name$ datalen' r: adr ) + over + ( value$ name$ record-len r: adr ) r@ over - mfg-data-buf u<= abort" Not enough space for new tag" + + \ Ensure that the space is not being used for something else r@ over - swap ?erased ( value$ name$ r: adr ) + + \ Copy the tag name r@ 2- swap move ( value$ r: adr ) - dup 1+ dup r@ 3 - c! invert r@ 4 - c! ( value$ r: adr ) - 0 r@ 5 - c! ( value$ r: adr ) - r> 5 - over - ( value$ data-adr ) - swap move - put-mfg-data + + \ Set the length field + dup ( value$ len r: adr ) + dup d# 127 > if ( value$ len r: adr ) + \ 5-byte tag format - (top) check, lowlen, highlen (bottom) + dup 7 rshift swap h# 7f and ( value$ len-high len-low r: adr ) + 2dup xor h# ff xor ( value$ len-high len-low check r: adr ) + r@ 3 - c! r@ 4 - c! r@ 5 - c! ( value$ r: adr ) + r> 5 - ( value$ end-adr ) + else ( value$ len' r: adr ) + \ 4-byte tag format - (top) len, ~len (bottom) + dup r@ 3 - c! invert r@ 4 - c! ( value$ r: adr ) + r> 4 - ( value$ end-adr ) + then ( value$ end-adr ) + + \ Copy the value data + over - swap move ( ) + + put-mfg-data ( ) ; +: add-null ( adr len -- adr' len' ) $cstr cscount 1+ ; + : add-tag ( "name$" "value$" -- ) - safe-parse-word 0 parse 2swap $add-tag + safe-parse-word 0 parse add-null 2swap $add-tag ; + +: $delete-tag ( name$ -- ) + tag-setup ( ram-value$ ) + 2dup + c@ h# 80 and ( ram-value$ tag-style ) + if 4 else 5 then + >r ( tag-adr tag-len ) + ram-last-mfg-data >r ( tag-adr r: len bot-adr ) + r@ 2r@ + ( tag-adr src-adr dst-adr r: len bot-adr ) + rot r@ - ( src-adr dst-adr copy-len r: len bot-adr ) + move ( r: len bot-adr ) + r> r> h# ff fill ( ) + put-mfg-data +; Modified: dev/pckbd.fth =================================================================== --- dev/pckbd.fth 2007-10-12 00:11:50 UTC (rev 675) +++ dev/pckbd.fth 2007-10-12 09:00:06 UTC (rev 676) @@ -211,6 +211,21 @@ oem-keymap if oem-keymap /keymap free-mem then 0 to oem-keymap ; +[ifdef] olpc +: ?olpc-keyboard ( -- ) + " enable-intf" $call-parent + begin get-data? while + drop + true to keyboard-present? + 5 ms + repeat + keyboard-present? if exit then + kbd-reset 0= to keyboard-present? +; + +fload ${BP}/cpu/x86/pc/olpc/keymap.fth +[then] + : choose-type ( -- ) my-args dup if [char] , left-parse-string 2swap 2drop ( $ ) @@ -231,6 +246,10 @@ exit then +[ifdef] olpc-keymap? + olpc-keymap? if exit then +[then] + " us" set-keyboard \ pc-keyboard-type set-keyboard ; @@ -335,21 +354,10 @@ false ; -: ?olpc-keyboard ( -- ) - " enable-intf" $call-parent - begin get-data? while - drop - true to keyboard-present? - 5 ms - repeat - keyboard-present? if exit then - kbd-reset 0= to keyboard-present? -; - : reset ( -- ) init-data clear-state -[ifdef] olpc +[ifdef] ?olpc-keyboard ?olpc-keyboard [else] get-initial-state @@ -677,6 +685,8 @@ \ Split the scancode into the up/down indicator and the key identifier h# 80 /mod 0= swap ( down? scan ) +[ifdef] ?multkey ?multkey [then] + \ Exit if the scancode is one that is never used for ASCII characters dup h# 60 >= if 2drop false exit then ( down? scan )

1 0

[PATCH] Add support for accessing the LinuxBIOS table from Open Firmware
by Jens Freimann 12 Oct '07

12 Oct '07

Hi, this patch adds a new file lbtable.fth to cpu/x86/pc/biosload which makes it possible to print the LinuxBIOS table or access single entries. For instructions on how to use it type "help-lbtable" on the ok prompt. With kind regards, Jens

2 1

r675 - dev/usb2/device/wlan ofw/wifi
by svn＠openbios.org 12 Oct '07

12 Oct '07

Author: wmb Date: 2007-10-12 02:11:50 +0200 (Fri, 12 Oct 2007) New Revision: 675 Modified: dev/usb2/device/wlan/usb8388.fth ofw/wifi/eapol.fth Log: OLPC trac 4185 - Use the Libertas wlan "filtered scan" feature so association works even when there are too many APs to fit in one scan response buffer. Modified: dev/usb2/device/wlan/usb8388.fth =================================================================== --- dev/usb2/device/wlan/usb8388.fth 2007-10-12 00:04:02 UTC (rev 674) +++ dev/usb2/device/wlan/usb8388.fth 2007-10-12 00:11:50 UTC (rev 675) @@ -710,6 +710,11 @@ constant /chan-list-IE struct + /marvel-IE-hdr + + d# 34 field >ssid +constant /ssid-IE + +struct 1 field >bss-type 6 field >bss-id /chan-list-IE field >chan-list-IE @@ -730,6 +735,8 @@ h# 0050.f202 constant amoui \ WPA authentication suite +d# 34 instance buffer: ssid + : make-chan-list-param ( adr -- ) #channels 0 do dup i /chan-list * + @@ -742,23 +749,43 @@ ; : (scan) ( -- error? ) - /cmd_802_11_scan 6 ( CMD_802_11_SCAN ) prepare-cmd - resp-wait-long to resp-wait - BSS_ANY outbuf >fw-data tuck >bss-type c! + /cmd_802_11_scan ssid c@ if + /marvel-IE-hdr + ssid c@ + + then + 6 ( CMD_802_11_SCAN ) prepare-cmd ( ) + resp-wait-long to resp-wait ( ) + BSS_ANY outbuf >fw-data tuck >bss-type c! ( 'fw-data ) - dup >chan-list-IE h# 101 over >type-id le-w! - #channels /chan-list * over >/payload le-w! - >chan-list make-chan-list-param + dup >chan-list-IE ( 'fw-data 'chan-list ) + h# 101 over >type-id le-w! ( 'fw-data 'chan-list ) + #channels /chan-list * over >/payload le-w! ( 'fw-data 'chan-list ) + >chan-list make-chan-list-param ( 'fw-data ) - >probes-IE h# 102 over >type-id le-w! - 2 over >/payload le-w! - #probes swap >probes le-w! + dup >probes-IE ( 'fw-data 'probes ) + h# 102 over >type-id le-w! ( 'fw-data 'probes ) + 2 over >/payload le-w! ( 'fw-data 'probes ) + #probes swap >probes le-w! ( 'fw-data ) - /cmd_802_11_scan outbuf-bulk-out if true exit then + ssid c@ if ( 'fw-data ) + \ Attach an SSID TLV to filter the result + /cmd_802_11_scan + ( 'ssid ) + h# 000 over >type-id le-w! ( 'ssid ) + ssid c@ over >/payload le-w! ( 'ssid ) + ssid count rot /marvel-IE-hdr + swap move ( ) + /cmd_802_11_scan /marvel-IE-hdr ssid c@ + + ( cmdlen ) + else ( 'fw-data ) + drop + /cmd_802_11_scan ( cmdlen ) + then ( cmdlen ) + + outbuf-bulk-out if true exit then wait-cmd-resp ; external +\ Ask the device to look for the indicated SSID. +: set-ssid ( adr len -- ) h# 32 min ssid pack drop ; + : scan ( adr len -- actual ) (scan) if 2drop 0 exit then respbuf /respbuf /fw-cmd /string ( adr len radr rlen ) Modified: ofw/wifi/eapol.fth =================================================================== --- ofw/wifi/eapol.fth 2007-10-12 00:04:02 UTC (rev 674) +++ ofw/wifi/eapol.fth 2007-10-12 00:11:50 UTC (rev 675) @@ -730,6 +730,7 @@ disable-protection do-scan? if wifi-ssid$ ssid! + wifi-ssid$ " set-ssid" $call-parent ??cr ." Scan for: " ssid$ type cr scanbuf /buf scan 0= if ." Failed to find: " ssid$ type cr false exit then debug? if scanbuf .scan then

1 0

r674 - cpu/x86/pc/olpc ofw/fs/jffs2
by svn＠openbios.org 12 Oct '07

12 Oct '07

Author: wmb Date: 2007-10-12 02:04:02 +0200 (Fri, 12 Oct 2007) New Revision: 674 Modified: cpu/x86/pc/olpc/addrs.fth ofw/fs/jffs2/jffs2.fth Log: Workaround for OLPC trac 4184 - Increase the size of the JFFS2 dirent buffer, shrink the footprint of entries in that buffer, and do not store dirents that obsolete the immediately-preceding one, all with the goal of surviving "millions of dirents" JFFS2 filesystem pathologies. Modified: cpu/x86/pc/olpc/addrs.fth =================================================================== --- cpu/x86/pc/olpc/addrs.fth 2007-10-11 22:15:10 UTC (rev 673) +++ cpu/x86/pc/olpc/addrs.fth 2007-10-12 00:04:02 UTC (rev 674) @@ -74,9 +74,9 @@ h# 20.0000 constant heap-size h# 300.0000 constant jffs2-dirent-base -h# 400.0000 constant jffs2-inode-base -h# 600.0000 constant dma-base -h# a00.0000 constant dma-size +h# 500.0000 constant jffs2-inode-base +h# 700.0000 constant dma-base +h# 900.0000 constant dma-size h# f.0000 constant suspend-base \ In the DOS hole h# f.0008 constant resume-entry Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-10-11 22:15:10 UTC (rev 673) +++ ofw/fs/jffs2/jffs2.fth 2007-10-12 00:04:02 UTC (rev 674) @@ -414,56 +414,117 @@ d# 18 ( len ) ; -: encode-dirent ( boffset pino adr len -- ) - 2 pick >r ( boffset pino adr len r: pino ) - crctab -rot ($crc) ( boffset hash ) - next-dirent ! ( boffset ) +\ There are three dirent record formats: +\ delta is current-dirent-offset - last-dirent-offset +\ 1-byte format: (delta >> 1) | 1 \ for delta < 0x200 +\ 2-byte format: (delta >> 1) | 0, (delta >> 9) \ for delta < 0x20000 +\ 10-byte format: 0.w, pino.l, offset.l \ For delta >= 0x20000 or different pino +\ +\ The reason for this complexity is to save space in the dirent map in the +\ face of JFFS2 pathologies that could cause the dirent map to overflow. +\ An example would be a filesystem with millions of hard links to the same file. - pack-offset ( offset ) +: +dirent ( adr -- adr' ) + c@+ dup 1 and if drop exit then ( adr' c ) + >r c@+ r> swap bwjoin ( adr' w ) + 0= if 2 na+ then +; - dup dirent-offset @ - 2 rshift ( offset delta ) - dup h# 10000 < ( offset delta short-offset? ) - r@ cur-pino @ = and ( offset delta short-encode? ) +: #dirents ( -- n ) + 0 + next-dirent dirents ( n endadr adr ) + begin 2dup > while +dirent rot 1+ -rot repeat ( n endadr adr ) + 2drop +; - if ( offset delta ) - next-dirent na1+ w! ( offset ) - 6 ( offset de-len ) - else ( offset ) - drop 0 next-dirent na1+ w! ( offset ) - r@ next-dirent 6 + ! ( offset ) \ Encode pino - dup next-dirent d# 10 + ! ( offset ) \ Encode offset - d# 14 ( offset de-len ) - then ( offset r: pino ) - r> cur-pino ! ( offset de-len ) - 'next-dirent +! ( offset ) - dirent-offset ! ( ) +\ ?erase-previous is an optimization/workaround for a JFFS2 pathology +\ in which multiple nearly-identical dirents appears one after another. +\ The pathology is caused by a garbage collection bug; we don't +\ know if the situation can also appear for other reasons. +\ The optimization overwrites the previous dirent record if the next +\ one supersedes it, thus preventing the dirent buffer from filling up +\ with millions (literally) of obsolete records. + +variable prev-dirent -1 prev-dirent ! \ Needed for erasing old one +variable prev-offset -1 prev-offset ! \ Needed for restoring old state for regenerating +d# 256 instance buffer: prev-name + +: ?erase-previous ( boffset pino adr len -- boffset pino ) + 2dup prev-name count $= 0= if ( boffset pino adr len ) + d# 255 min prev-name place ( boffset pino ) + exit + then ( boffset pino adr len ) + 2drop ( boffset pino ) + + dup cur-pino @ <> if exit then ( boffset pino ) + prev-dirent @ 'next-dirent ! + prev-offset @ dirent-offset ! ; +: encode-dirent-long ( offset pino -- offset dirent-len ) + 0 next-dirent w! ( offset pino) + next-dirent wa1+ ! ( offset ) + dup next-dirent 6 + ! ( offset ) + d# 10 ( offset dirent-len ) +; + +: encode-dirent ( boffset pino adr len -- ) + ?erase-previous ( boffset pino ) + + next-dirent d# 10 + jffs2-inode-base > if + ." JFFS2 dirent overflow - " #dirents .d ." dirents" cr + abort + then + + swap pack-offset swap ( offset pino ) + dup cur-pino @ <> if ( offset pino ) + dup cur-pino ! ( offset pino ) + encode-dirent-long ( offset dirent-len ) + else ( offset pino ) + over dirent-offset @ - 1 rshift ( offset pino delta ) + dup h# 10000 >= if ( offset pino delta ) + drop encode-dirent-long ( offset dirent-len ) + else ( offset pino delta ) + dup h# 100 < if ( offset pino delta ) + 1 or next-dirent c! ( offset pino ) + drop 1 ( offset dirent-len ) + else ( offset pino delta ) + next-dirent le-w! ( offset pino ) + drop 2 ( offset dirent-len ) + then + then ( offset dirent-len ) + then ( offset dirent-len ) + next-dirent prev-dirent ! ( offset dirent-len ) + 'next-dirent +! ( offset ) + dirent-offset @ prev-offset ! ( offset ) + dirent-offset ! ( ) +; + +: c@+ ( adr -- c adr' ) dup c@ swap ca1+ ; : w@+ ( adr -- w adr' ) dup w@ swap wa1+ ; : l@+ ( adr -- l adr' ) dup l@ swap la1+ ; -: decode-dirent ( adr -- false | adr' offset pino hash true ) +: decode-dirent ( adr -- false | adr' offset pino true ) dup next-dirent >= if drop false exit then - l@+ ( hash adr' ) - w@+ ( hash w adr' ) - swap ?dup if ( hash adr' w ) \ Short form -\ swap -rot ( adr' hash w ) -\ /l* dirent-offset +! ( adr' hash ) - - /l* dirent-offset +! ( hash adr' ) - swap ( adr' hash ) - - dirent-offset @ ( adr' hash offset ) - cur-pino @ rot ( adr' offset pino hash ) - else ( hash adr' ) \ Long form - l@+ over cur-pino ! ( hash pino adr' ) - l@+ over dirent-offset ! ( hash pino offset adr' ) - swap 2swap swap ( adr' offset pino hash ) - then + dup c@ dup 1 and if ( adr c ) \ 1-byte form + 2/ /l* dirent-offset +! ( adr ) + ca1+ ( adr' ) + dirent-offset @ ( adr offset ) + cur-pino @ ( adr offset pino ) + else ( adr c ) \ Longer form + w@+ ?dup if ( adr' w ) \ 2-byte form + /w* dirent-offset +! ( adr ) + dirent-offset @ ( adr offset ) + cur-pino @ ( adr offset pino ) + else ( adr ) \ Long form + l@+ over cur-pino ! ( pino adr' ) + l@+ over dirent-offset ! ( pino offset adr' ) + swap rot ( adr offset pino ) + then ( adr offset pino ) + then ( adr offset pino ) true ; - \ Information that we need about the working file/directory \ The working file changes at each level of a path search @@ -472,7 +533,7 @@ 0 instance value wf-type \ Type - 4 for directory, d# 10 for symlink, etc 1 [if] -code (next-pino-match) ( adr next-dirent pino cur-pino dirent-offset -- false | adr' offset hash true ) +code (next-pino-match) ( adr next-dirent pino cur-pino dirent-offset -- false | adr' offset true ) dx pop \ dx: dirent-offset cx pop \ cx: cur-pino bx pop \ bx: pino @@ -489,37 +550,51 @@ \ If the first encoded dirent is short-form, the pino is the same as \ before and thus matches. - ax ax xor op: 4 [si] ax mov \ ax: w - ax ax or 0<> if \ Short form + ax ax xor 0 [si] al mov \ ax: b + ax shr carry? if \ 1-byte form 2 # ax shl ax 0 [dx] add \ Update dirent-offset - 0 [si] cx mov \ cx: hash - 6 # si add \ skip long hash and word offset + 1 # si add \ skip byte offset 4 [sp] si xchg \ Put adr back on stack and restore si 0 [dx] bp mov \ bp: offset 0 [sp] bp xchg \ Put offset on stack and restore bp - cx push \ Put hash on stack -1 # push \ Put true on stack next then + op: 0 [si] ax mov \ ax: w + ax ax and 0<> if \ 2-byte form + 2 # ax shl ax 0 [dx] add \ Update dirent-offset + 2 # si add \ skip word offset + 4 [sp] si xchg \ Put adr back on stack and restore si + 0 [dx] bp mov \ bp: offset + 0 [sp] bp xchg \ Put offset on stack and restore bp + -1 # push \ Put true on stack + next + then + + long-offsets on begin - ax ax xor op: 4 [si] ax mov \ ax: w - ax ax or 0<> if \ Short form + ax ax xor 0 [si] al mov \ ax: b + ax shr carry? if \ 1-byte form 2 # ax shl ax 0 [dx] add \ Update dirent-offset - 6 # si add \ skip long hash and word offset + 1 # si add \ skip byte offset else - d# 10 [si] ax mov ax 0 [dx] mov \ Update dirent-offset - d# 6 [si] ax mov ax 0 [cx] mov \ Update cur-pino - d# 14 # si add \ skip record - ax bx cmp = if - d# -14 [si] cx mov \ cx: hash - 4 [sp] si xchg \ Put adr back on stack and restore si - 0 [dx] bp mov \ bp: offset - 0 [sp] bp xchg \ Put offset on stack and restore bp - cx push \ Put hash on stack - -1 # push \ Put true on stack - next + op: 0 [si] ax mov \ ax: w + ax ax or 0<> if \ Short form + 2 # ax shl ax 0 [dx] add \ Update dirent-offset + 2 # si add \ skip word offset + else + d# 6 [si] ax mov ax 0 [dx] mov \ Update dirent-offset + d# 2 [si] ax mov ax 0 [cx] mov \ Update cur-pino + d# 10 # si add \ skip record + ax bx cmp = if + 4 [sp] si xchg \ Put adr back on stack and restore si + 0 [dx] bp mov \ bp: offset + 0 [sp] bp xchg \ Put offset on stack and restore bp + -1 # push \ Put true on stack + next + then then then bp si cmp = until @@ -530,35 +605,46 @@ 4 # sp add \ clean stack ax ax xor 0 # 0 [sp] mov \ return false c; -: next-pino-match ( adr -- false | pino adr' offset hash true ) +: next-pino-match ( adr -- false | pino adr' offset true ) next-dirent wd-inum cur-pino dirent-offset (next-pino-match) ; [then] [ifndef] next-pino-match -: next-pino-match ( adr -- false | adr' offset hash true ) +: next-pino-match ( adr -- false | adr' offset true ) dup next-dirent >= if drop false exit then \ If the first encoded dirent is short-form, the pino is the same as \ before and thus matches. - dup la1+ w@ ?dup if ( adr w ) + dup c@ dup 1 and if ( adr b ) + 2/ /l* dirent-offset +! ( adr ) + dirent-offset @ ( adr offset ) + swap ca1+ swap ( adr' offset ) + true ( adr offset true ) + exit + then ( adr b ) + drop ( adr ) + + dup w@ ?dup if ( adr w ) /l* dirent-offset +! ( adr ) dirent-offset @ ( adr offset ) - swap l@+ wa1+ ( offset hash adr' ) - -rot true ( offset hash adr' ) + swap wa1+ swap ( adr' offset ) + true ( adr offset true ) exit then ( adr ) begin ( adr ) - la1+ w@+ swap ?dup if ( adr' w ) + dup c@ dup 1 and if ( adr b ) + 2/ /l* dirent-offset +! ( adr ) + ca1+ ( adr' ) + w@+ swap ?dup if ( adr' w ) /l* dirent-offset +! ( adr' ) else ( adr' ) l@+ swap cur-pino ! ( adr' ) l@+ swap dirent-offset ! ( adr' ) wd-inum cur-pino @ = if ( adr' ) dirent-offset @ ( adr' offset ) - over -3 la+ -1 wa+ l@ ( adr' offset hash ) - true ( adr' offset hash true ) + true ( adr' offset true ) exit then ( adr ) then ( adr ) @@ -575,7 +661,7 @@ r@ 1 j@ r@ 2 j@ ( offset pino ) r@ d# 22 + r> 5 la+ c@ ( offset pino adr namelen ) dup >r encode-dirent ( r: namelen ) - r> d# 24 + ( len ) + r> d# 24 + ( len ) ; [ifdef] notdef @@ -595,6 +681,7 @@ xattr-type of drop d# 18 ( ." XA" cr ) endof xref-type of drop 6 ( ." R" cr ) endof h# ffff of drop dup ( find-nonblank ) endof \ Keep scanning to end + debug-me ." Unrecognized summary node type " dup .x cr abort endcase ; @@ -1042,15 +1129,6 @@ then ; -: +dirent ( adr -- adr' ) na1+ dup w@ 0= if 2 na+ then wa1+ ; - -: #dirents ( -- n ) - 0 - next-dirent dirents ( n endadr adr ) - begin 2dup > while +dirent rot 1+ -rot repeat ( n endadr adr ) - 2drop -; - char \ instance value delimiter defer $resolve-path @@ -1083,19 +1161,13 @@ : $find-name ( name$ -- error? ) -1 to my-vers ( name$ ) - wd-inum crctab 2over ($crc) >r ( name$ r: hash ) 0 dirent-offset ! - dirents begin next-pino-match while ( name$ adr' offset hash ) - \ Check for a hash match - r@ = if ( name$ adr offset ) - 2over ?update-dirent ( name$ adr ) - else ( name$ adr offset ) - drop ( name$ adr ) - then ( name$ adr ) - repeat ( name$ r: hash ) - 2drop r> drop ( ) - my-vers 0< if true exit then ( ) + dirents begin next-pino-match while ( name$ adr' offset ) + 2over ?update-dirent ( name$ adr ) + repeat ( name$ ) + 2drop ( ) + my-vers 0< if true exit then ( ) wf-type 4 = if wf-inum to wd-inum then false ; @@ -1209,8 +1281,8 @@ : prep-dirents ( -- ) minodes 'next-minode ! \ Empty the list dirents ( adr ) - begin next-pino-match while ( adr' offset hash ) - drop insert-dirent ( adr ) + begin next-pino-match while ( adr' offset ) + insert-dirent ( adr ) repeat ( ) ;

1 0

[PATCH] Read size of installed memory from LinuxBIOS table
by Jens Freimann 12 Oct '07

12 Oct '07

Hi, this patch makes OFW read the size of installed RAM from the LinuxBIOS table instead of fetching it from mem-info-pa. With kind regards, Jens

3 3

r673 - dev/olpc/kb3700
by svn＠openbios.org 12 Oct '07

12 Oct '07

Author: wmb Date: 2007-10-12 00:15:10 +0200 (Fri, 12 Oct 2007) New Revision: 673 Modified: dev/olpc/kb3700/ecio.fth Log: OLPC ecio.fth - added new command ec-indexed-io-off for later use when we pull the plug on indexed I/O. Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-10-10 00:18:33 UTC (rev 672) +++ dev/olpc/kb3700/ecio.fth 2007-10-11 22:15:10 UTC (rev 673) @@ -154,6 +154,8 @@ : write-protect-fw ( -- ) h# 29 ec-cmd ; : ebook-mode? ( -- b ) h# 2a ec-cmd-b@ ; +: ec-indexed-io-off ( -- ) h# fe95 ec@ h# 40 invert and h# fe95 ec! ; + 0 [if] \ EC mailbox access words

1 0

[PATCH] Create device tree by parsing LinuxBIOS device tree
by Jens Freimann 10 Oct '07

10 Oct '07

Hi, this patch adds support to create the OFW device tree from the LinuxBIOS device tree, so it doesn't need to do all the probing etc. again. With kind regards, Jens

1 0

r672 - ofw/fs/jffs2
by svn＠openbios.org 10 Oct '07

10 Oct '07

Author: wmb Date: 2007-10-10 02:18:33 +0200 (Wed, 10 Oct 2007) New Revision: 672 Modified: ofw/fs/jffs2/jffs2.fth Log: JFFS2 reader - When a page read occurs, don't abort and don't discard previously-read good pages within that erase block. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-10-10 00:15:02 UTC (rev 671) +++ ofw/fs/jffs2/jffs2.fth 2007-10-10 00:18:33 UTC (rev 672) @@ -118,21 +118,29 @@ : page>eblock ( page# -- eblock# ) pages/eblock / ; -1 ( instance ) value have-eblock# \ For avoiding redundant reads -: read-pages ( page# #pages -- error? ) +: (read-pages) ( page# #pages -- #read ) \ Partial reads invalidate the cache dup pages/eblock <> if -1 to have-eblock# then ( page# #pages ) - tuck block-buf -rot " read-blocks" $call-parent ( #pages #read ) - <> + block-buf -rot " read-blocks" $call-parent ( #read ) ; +: read-pages ( page# #pages -- error? ) tuck (read-pages) <> ; : read-eblock ( eblock# -- ) - dup have-eblock# <> if ( eblock# ) - to have-eblock# ( ) - have-eblock# eblock>page pages/eblock read-pages - abort" jffs2: bad read" - else - drop - then ( ) + dup have-eblock# <> if ( eblock# ) + to have-eblock# ( ) + have-eblock# eblock>page pages/eblock (read-pages) ( npages ) + dup pages/eblock <> if ( npages ) + ." JFFS2: bad read - eblock# " have-eblock# .x ." page " dup .x cr + /page * ( block-offset ) + dup block-buf + ( block-offset adr ) + /eblock rot - ( adr erase-length ) + h# ff fill ( ) + else ( npages ) + drop ( ) + then ( ) + else ( eblock# ) + drop ( ) + then ( ) ; 0 ( instance ) value sumsize

1 0

r671 - cpu/x86/pc/olpc
by svn＠openbios.org 10 Oct '07

10 Oct '07

Author: wmb Date: 2007-10-10 02:15:02 +0200 (Wed, 10 Oct 2007) New Revision: 671 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC security - When processing signature blobs, search for sig01: lines, ignoring others, thus paving the way for new formats in the future. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-10 00:10:18 UTC (rev 670) +++ cpu/x86/pc/olpc/security.fth 2007-10-10 00:15:02 UTC (rev 671) @@ -163,14 +163,35 @@ " Signature valid" ?lease-debug-cr then ; -: sha-valid? ( data$ sig01$ -- okay? ) " sha256" invalid? 0= ; -: fw-valid? ( data$ 2*sig$ -- okay? ) - 2swap 2>r ( 2*sig$ r: data$ ) - newline left-parse-string ( rmd-sig$ sha-sig$ r: data$ ) - 2r@ 2swap sha-valid? 0= if ( rmd-sig$ r: data$ ) + +\ Look for a line that starts with "sig01: " +: next-sig01$ ( sig$ -- true | rem$ sig01$ false ) + begin dup while ( rem$ ) + newline left-parse-string ( rem$' line$ ) + 2dup 7 min " sig01: " $= if ( rem$ line$ ) + false exit + then ( rem$ line$ ) + 2drop ( rem$ ) + repeat ( rem$ ) + 2drop true +; + +\ Find a sig01: line and check its sha256/rsa signature +: sha-valid? ( data$ sig01$ -- okay? ) + next-sig01$ if 2drop false exit then ( data$ rem$ sig01$ ) + 2nip " sha256" invalid? 0= +; + +\ Find two sig01: lines, the first with sha256 and the seconcd with rmd160, +\ and check their signatures +: fw-valid? ( data$ sig$ -- okay? ) + 2swap 2>r ( sig$ r: data$ ) + next-sig01$ if 2r> 2drop false exit then ( rem$ sig01$ ) + 2r@ 2swap sha-valid? 0= if ( rem$ r: data$ ) 2r> 4drop false exit - then ( rmd-sig$ r: data$ ) - 2r> 2swap " rmd160" invalid? 0= + then ( rmd-sig$ r: data$ ) + next-sig01$ if 2r> 2drop false exit then ( rem$ sig01$ ) + 2nip 2r> 2swap " rmd160" invalid? 0= ; \ earliest is the earliest acceptable date value (in seconds).

1 0

r670 - cpu/x86/pc/olpc
by svn＠openbios.org 10 Oct '07

10 Oct '07

Author: wmb Date: 2007-10-10 02:10:18 +0200 (Wed, 10 Oct 2007) New Revision: 670 Added: cpu/x86/pc/olpc/timertest.fth Modified: cpu/x86/pc/olpc/devices.fth Log: OLPC Trac #4050 - added selftest /isa/timer to catch broken 14 MHz clocks. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-10-10 00:08:32 UTC (rev 669) +++ cpu/x86/pc/olpc/devices.fth 2007-10-10 00:10:18 UTC (rev 670) @@ -64,6 +64,8 @@ [then] +fload ${BP}/cpu/x86/pc/olpc/timertest.fth \ Selftest for PIT timer + 1 [if] dev /interrupt-controller h# 20 to vector-base0 @@ -111,6 +113,9 @@ [then] fload ${BP}/dev/pci/isaall.fth +\ We don't need a serial selftest because the serial port is internal only +\ and the selftest turns off the diag device +dev /serial warning @ warning off : selftest false ; warning ! device-end devalias com1 /isa/serial@i3f8:115200 devalias mouse /isa/8042/mouse devalias d disk Added: cpu/x86/pc/olpc/timertest.fth =================================================================== --- cpu/x86/pc/olpc/timertest.fth (rev 0) +++ cpu/x86/pc/olpc/timertest.fth 2007-10-10 00:10:18 UTC (rev 670) @@ -0,0 +1,61 @@ +purpose: Selftest for ISA timer +\ See license at end of file + +dev /isa/timer + +: wait-rollover ( -- error? ) + get-msecs d# 200 + begin ( time-limit ) + 0 count@ 1 = if drop false exit then + dup get-msecs - ( time-limit diff ) + 0<= until + drop true +; +: selftest ( -- error? ) + 0 count@ 0= if + 1 ms + 0 count@ 0= if + ." The ISA PIT timer is not ticking." cr + ." Possible cause: bad 14 MHz clock to CS5536 chip." cr + true exit + then + then + + wait-rollover if + ." The ISA PIT timer did not reach a count of 1." cr + true exit + then + + 1 ms + + 0 count@ d# 10000 d# 11000 between 0= if + ." The ISA PIT timer is ticking at the wrong rate." cr + true exit + then + + false +; + +device-end +\ LICENSE_BEGIN +\ Copyright (c) 2007 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

r669 - ofw/core
by svn＠openbios.org 10 Oct '07

10 Oct '07

Author: wmb Date: 2007-10-10 02:08:32 +0200 (Wed, 10 Oct 2007) New Revision: 669 Modified: ofw/core/ofwcore.fth Log: test-all - If an individual test fails, highlight (red letters) the error message and wait 10 seconds so the user can see it. Modified: ofw/core/ofwcore.fth =================================================================== --- ofw/core/ofwcore.fth 2007-10-10 00:07:12 UTC (rev 668) +++ ofw/core/ofwcore.fth 2007-10-10 00:08:32 UTC (rev 669) @@ -3211,7 +3211,12 @@ method-name 2@ current-device ( method-adr,len phandle ) execute-phandle-method drop ( result ) - ?dup if ??cr ." Selftest failed. Return code = " .d cr then + ?dup if + red-letters + ??cr ." Selftest failed. Return code = " .d cr + d# 10000 ms + black-letters + then then ( ) ;

1 0

r668 - cpu/x86/pc/olpc
by svn＠openbios.org 10 Oct '07

10 Oct '07

Author: wmb Date: 2007-10-10 02:07:12 +0200 (Wed, 10 Oct 2007) New Revision: 668 Modified: cpu/x86/pc/olpc/resume.bth Log: OLPC resume - Fixed that "reset-smbus-bitbang" code that unwedges the SMBUS, but left it commented out, because the kernel does it too. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-10-05 18:36:19 UTC (rev 667) +++ cpu/x86/pc/olpc/resume.bth 2007-10-10 00:07:12 UTC (rev 668) @@ -340,33 +340,32 @@ [ifdef] reset-smbus-bitbang \ GPIO15 is SMB_DATA \ GPIO14 is SMB_CLOCK + h# c000 # ax mov \ Mask to set SMB_DATA and SMB_CLOCK + h# 1000 # dx mov ax dx out \ Set output values to high + h# 1004 # dx mov ax dx out \ Set pins to output h# c0000000 # ax mov \ Mask to clear SMB_DATA and SMB_CLOCK h# 1010 # dx mov ax dx out \ Deselect OUT AUX1 h# 1014 # dx mov ax dx out \ Deselect OUT AUX2 h# 1034 # dx mov ax dx out \ Deselect IN AUX1 - h# c000 # ax mov \ Mask to set SMB_DATA and SMB_CLOCK - h# 1000 # dx mov ax dx out \ Set output values to high - h# 1004 # dx mov ax dx out \ Set pins to output - h# 1000 # dx mov \ Output value register - - 8 # cx mov \ Generate 8 low pulses on SMB_CLOCK + d# 16 # cx mov \ Generate 8 low pulses on SMB_CLOCK begin \ 5 uS delay (slightly longer for GX) rdtsc ax bx mov d# 5 d# 500 * # bx add begin rdtsc bx ax sub 0>= until + h# 1000 # dx mov \ Output value register h# 40000000 # ax mov ax dx out \ Clear SMB_CLOCK \ 5 uS delay (slightly longer for GX) rdtsc ax bx mov d# 5 d# 500 * # bx add begin rdtsc bx ax sub 0>= until + h# 1000 # dx mov \ Output value register h# 4000 # ax mov ax dx out \ Set SMB_CLOCK - loopa - \ 50 uS delay (slightly longer for GX) + \ 5 uS delay (slightly longer for GX) rdtsc ax bx mov d# 5 d# 500 * # bx add begin rdtsc bx ax sub 0>= until [then]

1 0

Instantly switching between Windows and Linux
by Marcos Reyes 10 Oct '07

10 Oct '07

I would like to know if it would be possible, now or in the future, to instantly switch between two running operating systems on one machine. For example by dividing the RAM on the machine to be dedicated to each OS, and having a buffer for device states. It would be really cool, for example, to launch a shortcut from within windows that launches a program in Linux. Though some multitasking would be lost, as processes in Windows would be suspended. Or maybe not, with multi-processor systems? I don't know anything about this... just a dream. Would be great to migrate people to Linux. M

1 0

[PATCH] Fix Linux/x86 load without virtual-mode -- take 2
by Torsten Duwe 08 Oct '07

08 Oct '07

> I'll have to see yet what's wrong with earlyprintk. Linux fixups didn't get called because there was no way the Linux ELF kernel could be recognised as such. So the fix to the fix is a one-liner plus a comment. The recogniser needs further refinement, but on top of LinuxBIOSv2 this boots Linux at least in qemu and on my real machine. Please apply! Signed-off-by: Torsten Duwe <duwe(a)lst.de>

1 0

r667 - dev/olpc/cafenand
by svn＠openbios.org 05 Oct '07

05 Oct '07

Author: wmb Date: 2007-10-05 20:36:19 +0200 (Fri, 05 Oct 2007) New Revision: 667 Modified: dev/olpc/cafenand/ecc.fth Log: OLPC NAND driver - fixed ECC correction bug. Modified: dev/olpc/cafenand/ecc.fth =================================================================== --- dev/olpc/cafenand/ecc.fth 2007-10-04 08:19:30 UTC (rev 666) +++ dev/olpc/cafenand/ecc.fth 2007-10-05 18:36:19 UTC (rev 667) @@ -95,7 +95,7 @@ \ Find the degree of a polynomial. The degree of the 0 polynomial is 0. : poly-deg ( poly -- ) 0 9 1 do ( 'poly degree ) - over i wa+ @ if drop i then ( 'poly degree' ) + over i wa+ w@ if drop i then ( 'poly degree' ) loop ( 'poly degree ) nip ( degree ) ;

1 0

r666 - cpu/x86/pc/olpc
by svn＠openbios.org 04 Oct '07

04 Oct '07

Author: wmb Date: 2007-10-04 10:19:30 +0200 (Thu, 04 Oct 2007) New Revision: 666 Added: cpu/x86/pc/olpc/fsupdate.fth Modified: cpu/x86/pc/olpc/copynand.fth cpu/x86/pc/olpc/crypto.bth cpu/x86/pc/olpc/crypto.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/loaddropins.fth cpu/x86/pc/olpc/security.fth cpu/x86/pc/olpc/versions.fth Log: OLPC - Secure NAND file system update. Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2007-10-02 07:52:21 UTC (rev 665) +++ cpu/x86/pc/olpc/copynand.fth 2007-10-04 08:19:30 UTC (rev 666) @@ -198,6 +198,8 @@ defer show-done ' cr to show-done +: >eblock# ( page# -- eblock# ) nand-pages/block / ; + : copy-nand ( "devspec" -- ) open-nand get-img-filename @@ -206,7 +208,7 @@ ['] noop to show-progress - #nand-pages nand-pages/block / dup show-init ( #eblocks ) + #nand-pages >eblock# dup show-init ( #eblocks ) show-erasing ( ) ['] show-bad ['] show-erased ['] show-bbt-block " (wipe)" $call-nand @@ -219,7 +221,7 @@ load-base " copy-block" $call-nand ( page# error? ) " Error writing to NAND FLASH" ?nand-abort ( page# ) ?skip-oob - nand-pages/block / show-written ( ) + >eblock# show-written ( ) loop show-cleaning @@ -319,7 +321,7 @@ ; : alloc-crc-buf ( -- ) - #nand-pages nand-pages/block / to #crc-records + #nand-pages >eblock# to #crc-records #crc-records /l* alloc-mem to crc-buf ; @@ -370,7 +372,7 @@ \ The stack is empty at the end of each line unless otherwise noted dump-oob? if #nand-pages else " usable-page-limit" $call-nand then 0 do - (cr i nand-pages/block / . + (cr i >eblock# . load-base i nand-pages/block " read-blocks" $call-nand nand-pages/block = if load-base /nand-block written? if Modified: cpu/x86/pc/olpc/crypto.bth =================================================================== --- cpu/x86/pc/olpc/crypto.bth 2007-10-02 07:52:21 UTC (rev 665) +++ cpu/x86/pc/olpc/crypto.bth 2007-10-04 08:19:30 UTC (rev 666) @@ -6,9 +6,9 @@ fload ${BP}/cpu/x86/pc/olpc/versions.fth " wget http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img -O verify.img" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/bios_hash-${CRYPTO_VERSION}.img -O hasher.img" expand$ $sh " wget http://dev.laptop.org/pub/firmware/crypto/testkeys/os.public -O os.public" expand$ $sh " wget http://dev.laptop.org/pub/firmware/crypto/testkeys/fw.public -O fw.public" expand$ $sh +" wget http://dev.laptop.org/pub/firmware/crypto/testkeys/fs.public -O fs.public" expand$ $sh " wget http://dev.laptop.org/pub/firmware/crypto/testkeys/lease.public -O lease.public" expand$ $sh " wget http://dev.laptop.org/pub/firmware/crypto/testkeys/developer.public -O developer.public" expand$ $sh Modified: cpu/x86/pc/olpc/crypto.fth =================================================================== --- cpu/x86/pc/olpc/crypto.fth 2007-10-02 07:52:21 UTC (rev 665) +++ cpu/x86/pc/olpc/crypto.fth 2007-10-04 08:19:30 UTC (rev 666) @@ -5,29 +5,6 @@ h# d0000 constant verify-bss \ The address the code is linked to run at h# 10000 constant /verify-bss -1 [if] -h# 70000 constant hasher-base \ The address the code is linked to run at -h# 80000 constant hasher-bss -h# 18000 constant /hasher-bss -variable hashlen -d# 128 buffer: hashbuf - -: get-hasher ( -- ) - " hasher" find-drop-in 0= if 4drop true exit then ( prog$ ) - 2dup hasher-base swap move free-mem ( hashname$ ) -; - -: hash ( data$ hashname$ -- result$ ) - d# 128 hashlen ! - $cstr hashbuf hashlen ( databuf datalen hashname-cstr resbuf &reslen ) - - hasher-bss /hasher-bss erase - - hasher-base dup h# 10 - sp-call abort" Hash failed" drop 4drop ( ) - hashbuf hashlen @ -; -[then] - 0 value crypto-loaded? : load-crypto ( -- error? ) crypto-loaded? if false exit then @@ -43,14 +20,23 @@ $cstr verify-bss /verify-bss erase ( data$ sig$ key$ 'hashname ) verify-base dup h# 10 - sp-call >r 3drop 4drop r> ( result ) - -\ XXX free-mem in suspend.fth and fw.bth after find-drop-in -\ XXX clean out dead code in usb.fth ; -: getbin " usb8388.bin" find-drop-in 0= abort" No usb8388.bin" ; -: getsig " usb8388.sig" find-drop-in 0= abort" No usb8388.sig" ; +\ This is a hack that saves a lot of memory. The crypto verifier +\ code has a mode where it will just compute and return the hash value, +\ instead of going on to verify the hash's signature. In that mode, +\ we use sig$ for the address and length of the result buffer, key-adr +\ to return the actual return length, and pass in key-len = 0 to denote +\ that we want only hashing. +variable hashlen +d# 128 buffer: hashbuf +: hash ( data$ hashname$ -- result$ ) + 2>r hashbuf d# 128 hashlen 0 2r> ( data$ sig$ key$ hashname$ ) + signature-bad? abort" Hash failed" ( ) + hashbuf hashlen @ +; + \ LICENSE_BEGIN \ Copyright (c) 2007 FirmWorks \ Added: cpu/x86/pc/olpc/fsupdate.fth =================================================================== --- cpu/x86/pc/olpc/fsupdate.fth (rev 0) +++ cpu/x86/pc/olpc/fsupdate.fth 2007-10-04 08:19:30 UTC (rev 666) @@ -0,0 +1,125 @@ +purpose: Secure NAND updater + +\ Depends on words from security.fth and copynand.fth + +: get-hex# ( -- n ) + safe-parse-word + push-hex + $number " Bad number" ?nand-abort + pop-base +; + +\ XXX implement this +: map-eblock# ( block# -- block#' ) ; + + +vocabulary nand-commands +also nand-commands definitions + +: data: ( "filename" -- ) + safe-parse-word fn-buf place + bundle-name$ image-name-buf place + open-img +; + +: erase-all ( -- ) + #nand-pages >eblock# show-erasing + ['] show-bad ['] show-erased ['] show-bbt-block " (wipe)" $call-nand + #image-eblocks show-writing +; + +: eblock: ( "eblock#" "hashname" "hash-of-128KiB" -- ) + get-hex# ( eblock# ) + read-image-block + load-base /nand-block safe-parse-word ( eblock# data$ hashname$ ) + hash ( eblock# result$ ) + safe-parse-word hex-decode " Malformed hash string" ?nand-abort + $= if ( eblock# ) + drop + else ( eblock# ) + ." Bad hash for eblock# " .x cr + abort + then ( ) + + load-base " copy-block" $call-nand ( page# error? ) + " Error writing to NAND FLASH" ?nand-abort ( page# ) + >eblock# show-written ( ) +; + +: bytes: ( "eblock#" "page#" "offset" "length" "data" -- ) + get-hex# get-hex# 2>r ( r: eblock# page# ) + get-hex# get-hex# ( offset length r: eblock# page# ) + 2dup + h# 840 >= abort" Offset + length exceeds page + OOB size" + safe-parse-word hex-decode ( offset length data$ ) + rot over <> abort" Length mismatch" ( offset data$ ) + r> r> map-eblock# nand-pages/block * + ( offset data$ page#') + -rot 2swap swap ( data$ page# offset ) + " pio-write-raw" $call-nand abort" NAND write error" +; + +: cleanmarkers ( -- ) + show-cleaning + ['] show-clean " put-cleanmarkers" $call-nand +; + +: mark-pending: ( "eblock#" -- ) + get-hex# map-eblock# nand-pages/block * ( page# ) + " COMP" rot h# 838 + " pio-write-raw" $call-nand abort" NAND write error" +; + +: mark-complete: ( "eblock#" -- ) + get-hex# map-eblock# nand-pages/block * + " LETE" rot h# 83c + " pio-write-raw" $call-nand abort" NAND write error" +; + +previous definitions + +: do-fs-update ( img$ -- ) + tuck load-base h# 100000 + swap move ( len ) + load-base h# 100000 + swap + open-nand + ['] noop to show-progress + #nand-pages >eblock# show-init + +\ clear-context nand-commands +also nand-commands + + ['] include-buffer catch if nip nip .error security-failure then + +previous +\ only forth also definitions + + show-done + close-nand-ihs +; + +: fs-update-from-list ( devlist$ -- ) + load-crypto if visible ." Crytpo load failed" cr show-sad security-failure then + + visible ( devlist$ ) + begin dup while ( rem$ ) + bl left-parse-string ( rem$ dev$ ) + dn-buf place ( rem$ ) + + null$ pn-buf place ( rem$ ) + null$ cn-buf place ( rem$ ) + " fs" bundle-present? if ( rem$ ) + " Filesystem image found - " ?lease-debug + fskey$ to pubkey$ ( rem$ ) + img$ sig$ sha-valid? if ( rem$ ) + 2drop ( ) + show-unlock ( ) + img$ do-fs-update ( ) + exit + then ( rem$ ) + show-lock ( rem$ ) + then ( rem$ ) + repeat ( rem$ ) + 2drop +; +: try-fs-update ( -- ) + ." Searching for a NAND file system update image." cr + all-devices$ fs-update-from-list +; Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-10-02 07:52:21 UTC (rev 665) +++ cpu/x86/pc/olpc/fw.bth 2007-10-04 08:19:30 UTC (rev 666) @@ -334,6 +334,7 @@ fload ${BP}/cpu/x86/pc/olpc/gamekeys.fth fload ${BP}/cpu/x86/pc/olpc/linux.fth fload ${BP}/cpu/x86/pc/olpc/security.fth +fload ${BP}/cpu/x86/pc/olpc/fsupdate.fth fload ${BP}/cpu/x86/pc/olpc/setwp.fth fload ${BP}/ofw/gui/ofpong.fth fload ${BP}/cpu/x86/pc/olpc/life.fth @@ -496,6 +497,12 @@ time&date 5drop 1 and if pong else life-demo then then ; +: ?fs-update ( -- ) + button-check button-x or button-o or button-square or ( mask ) + game-key-mask over and = if + try-fs-update + then +; : open-keyboard ( -- ) " keyboard" open-dev ?dup if set-stdin then ; @@ -521,6 +528,7 @@ ['] false to interrupt-auto-boot? probe-usb interpreter-init + ?fs-update secure-startup ['] (interrupt-auto-boot?) to interrupt-auto-boot? screen-ih stdout ! Modified: cpu/x86/pc/olpc/loaddropins.fth =================================================================== --- cpu/x86/pc/olpc/loaddropins.fth 2007-10-02 07:52:21 UTC (rev 665) +++ cpu/x86/pc/olpc/loaddropins.fth 2007-10-04 08:19:30 UTC (rev 666) @@ -55,6 +55,7 @@ " verify.img" " verify" $add-deflated-dropin " os.public" " ospubkey" $add-dropin \ Incompressible " fw.public" " fwpubkey" $add-dropin \ Incompressible + " fs.public" " fspubkey" $add-dropin \ Incompressible " lease.public" " leasepubkey" $add-dropin \ Incompressible " developer.public" " develpubkey" $add-dropin \ Incompressible Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-02 07:52:21 UTC (rev 665) +++ cpu/x86/pc/olpc/security.fth 2007-10-04 08:19:30 UTC (rev 666) @@ -3,8 +3,6 @@ \ Specs at http://wiki.laptop.org/go/Firmware_Security -: boot-device-list " disk sd nand" ; - true value debug-security? : ?lease-debug ( msg$ -- ) debug-security? if type else 2drop then @@ -53,6 +51,7 @@ then rot >r 2dup r> 2! ( key$ ) ; +" fspubkey" key: fskey$ " ospubkey" key: oskey$ " fwpubkey" key: fwkey$ " develpubkey" key: develkey$ @@ -73,10 +72,6 @@ \ binary form at sig-buf. It returns the adr,len of the binary string. : hex-decode ( hex$ -- true | sig$ false ) - dup /sig 2* <> if - ( ." Bad signature length" cr ) - 2drop true exit - then ( hex$ ) sig-buf -rot ( adr hex$ ) bounds ?do ( adr ) i 2 push-hex $number pop-base if ( adr ) @@ -97,6 +92,8 @@ bl left-parse-string dup d# 6 <> if 4drop true exit then 2swap ( hash$ rem$ ) bl left-parse-string nip d# 64 <> if 4drop true exit then ( hash$ rem$ ) newline left-parse-string 2swap nip 0<> if 4drop true exit then ( hash$ data$ ) + dup /sig 2* <> if ( ." Bad signature length" cr ) 2drop true exit then ( hash$ data$ ) + hex-decode if 2drop true else false then ; @@ -141,8 +138,6 @@ \ hashname remembers the most recently used hashname to guard against \ attacks based on reuse of the same (presumably compromized) hash. -d# 32 buffer: hashname - \ invalid? checks the validity of data$ against the ASCII signature \ record sig01$, using the public key that pubkey$ points to. \ It also verifies that the hashname contained in sig01$ is the @@ -344,7 +339,6 @@ \ a tree-state flag; see check-lease.) : check-machine-signature ( sig$ expiration$ -- -1|1 ) - 0 hashname c! machine-id-buf d# 51 + swap move ( sig$ ) machine-id-buf d# 67 2swap sha-valid? if 1 else -1 then ; @@ -510,7 +504,6 @@ r> to load-path " RD found - " ?lease-debug - 0 hashname c! img$ sig$ sha-valid? if show-unlock load-base to ramdisk-adr @@ -606,7 +599,6 @@ else " minus" show-icon " new - " ?lease-debug - 0 hashname c! fwkey$ to pubkey$ img$ sig$ fw-valid? if visible @@ -617,6 +609,12 @@ true to file-loaded? " Updating firmware" ?lease-debug-cr + ['] ?enough-power catch ?dup if + visible + .error + security-failure + then + \ Latch alternate? flag for next startup alternate? if [char] A h# 82 cmos! then @@ -636,7 +634,6 @@ d# 16 0 +icon-xy show-dot " os" bundle-present? if " OS found - " ?lease-debug - 0 hashname c! oskey$ to pubkey$ img$ sig$ sha-valid? if img$ tuck load-base swap move !load-size @@ -667,17 +664,18 @@ icon-xy to base-xy icon-xy image-width 0 d+ to next-xy ( list$ ) - filesystem-present? if + filesystem-present? if ( list$ ) - d# 5 d# 77 +icon-xy show-dot - has-developer-key? if + d# 5 d# 77 +icon-xy show-dot ( list$ ) + has-developer-key? if ( list$ ) + 2drop ( ) visible show-unlock true exit - then + then ( list$ ) - load-from-device if - 2drop + load-from-device if ( list$ ) + 2drop ( ) ['] secure-load-ramdisk to load-ramdisk " init-program" $find if execute show-going go @@ -685,12 +683,12 @@ show-x security-failure then - then + then ( list$ ) - next-xy to icon-xy + next-xy to icon-xy ( list$ ) repeat ( list$ ) - " sad" show-icon - 2drop false + " sad" show-icon ( list$ ) + 2drop false ( ) ; : persistent-devkey? ( -- flag ) " dk" find-tag dup if nip nip then ; Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-10-02 07:52:21 UTC (rev 665) +++ cpu/x86/pc/olpc/versions.fth 2007-10-04 08:19:30 UTC (rev 666) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 28 +macro: FW_MINOR 28b \ The EC microcode macro: EC_VERSION c24 @@ -16,4 +16,4 @@ macro: WLAN_VERSION 5.110.16.p1 \ The bios_verify image -macro: CRYPTO_VERSION 0.1 +macro: CRYPTO_VERSION 0.2

1 0

r665 - cpu/x86/pc/olpc
by svn＠openbios.org 02 Oct '07

02 Oct '07

Author: wmb Date: 2007-10-02 09:52:21 +0200 (Tue, 02 Oct 2007) New Revision: 665 Modified: cpu/x86/pc/olpc/security.fth Log: q2c28 late addition 4 - This is getting tedious. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-02 07:26:52 UTC (rev 664) +++ cpu/x86/pc/olpc/security.fth 2007-10-02 07:52:21 UTC (rev 665) @@ -442,19 +442,17 @@ : text-on screen-ih stdout ! ; +: visible dcon-unfreeze text-on ; + : ?unfreeze ( -- ) - game-key@ button-check and if - dcon-unfreeze text-on - unfreeze - then + game-key@ button-check and if visible unfreeze then ; : security-failure ( -- ) + visible ." Security failure" cr - get-msecs d# 10000 + begin ( limit ) - ?unfreeze - dup get-msecs - - 0< until drop + + d# 10000 ms power-off ; @@ -583,13 +581,13 @@ base @ >r d# 36 base ! fw#buf 5 $number if show-x - ." Invalid firmware version number" security-failure + visible ." Invalid firmware version number" security-failure then pop-base ; : firmware-up-to-date? ( img$ -- ) - /flash <> if show-x ." Invalid Firmware image" security-failure then ( adr ) + /flash <> if show-x visible ." Invalid Firmware image" security-failure then ( adr ) (fw-version) ( file-version# ) rom-pa (fw-version) ( file-version# rom-version# ) u<= @@ -611,7 +609,7 @@ 0 hashname c! fwkey$ to pubkey$ img$ sig$ fw-valid? if - dcon-unfreeze text-on + visible img$ tuck flash-buf swap move ( len ) @@ -624,6 +622,7 @@ reflash \ Should power-off and reboot show-x + visible ." Reflash returned, unexpectedly" cr security-failure then @@ -672,7 +671,7 @@ d# 5 d# 77 +icon-xy show-dot has-developer-key? if - dcon-unfreeze text-on + visible show-unlock true exit then @@ -712,24 +711,24 @@ ?toggle-secure - secure? 0= if dcon-unfreeze unfreeze text-on exit then + secure? 0= if unfreeze visible exit then button-check game-key? if - dcon-unfreeze unfreeze text-on + unfreeze visible else freeze dcon-freeze then persistent-devkey? if exit then - get-my-sn if ." No serial number" cr show-sad security-failure then - get-date if ." Invalid system date" cr show-sad security-failure then + get-my-sn if visible ." No serial number" cr show-sad security-failure then + get-date if visible ." Invalid system date" cr show-sad security-failure then - load-crypto if show-sad security-failure then ( ) + load-crypto if visible ." Crytpo load failed" cr show-sad security-failure then ( ) alternate? if " \boot-alt" else " \boot" then pn-buf place all-devices$ load-from-list if exit then \ Returns only if no images found - ." Boot failed" cr show-sad security-failure + visible ." Boot failed" cr show-sad security-failure ;

1 0

r664 - cpu/x86/pc/olpc
by svn＠openbios.org 02 Oct '07

02 Oct '07

Author: wmb Date: 2007-10-02 09:26:52 +0200 (Tue, 02 Oct 2007) New Revision: 664 Modified: cpu/x86/pc/olpc/security.fth Log: q2c28 late addition 3 - This time for sure! Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-02 07:20:53 UTC (rev 663) +++ cpu/x86/pc/olpc/security.fth 2007-10-02 07:26:52 UTC (rev 664) @@ -712,10 +712,10 @@ ?toggle-secure - secure? 0= if unfreeze text-on exit then + secure? 0= if dcon-unfreeze unfreeze text-on exit then button-check game-key? if - unfreeze text-on + dcon-unfreeze unfreeze text-on else freeze dcon-freeze then

1 0

r663 - cpu/x86/pc/olpc
by svn＠openbios.org 02 Oct '07

02 Oct '07

Author: wmb Date: 2007-10-02 09:20:53 +0200 (Tue, 02 Oct 2007) New Revision: 663 Modified: cpu/x86/pc/olpc/security.fth Log: q2c28 late addition 2 - fixed a problem with the sense of the x button when security isn't enabled via wp. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-02 06:40:25 UTC (rev 662) +++ cpu/x86/pc/olpc/security.fth 2007-10-02 07:20:53 UTC (rev 663) @@ -710,16 +710,16 @@ button-rotate game-key? if show-warnings then show-child - button-check button-x or game-key? if + ?toggle-secure + + secure? 0= if unfreeze text-on exit then + + button-check game-key? if unfreeze text-on else freeze dcon-freeze then - ?toggle-secure - - secure? 0= if exit then - persistent-devkey? if exit then get-my-sn if ." No serial number" cr show-sad security-failure then

1 0

r662 - cpu/x86/pc/olpc dev/olpc/kb3700
by svn＠openbios.org 02 Oct '07

02 Oct '07

Author: wmb Date: 2007-10-02 08:40:25 +0200 (Tue, 02 Oct 2007) New Revision: 662 Modified: cpu/x86/pc/olpc/boardrev.fth cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/security.fth dev/olpc/kb3700/ecio.fth Log: q2c28 late additions - made fw autoupdate work, and various other usability improvements. Modified: cpu/x86/pc/olpc/boardrev.fth =================================================================== --- cpu/x86/pc/olpc/boardrev.fth 2007-10-02 04:56:15 UTC (rev 661) +++ cpu/x86/pc/olpc/boardrev.fth 2007-10-02 06:40:25 UTC (rev 662) @@ -24,7 +24,8 @@ h# a18 else lx? if - board-id@ case + ['] board-id@ catch if 0 then case + 0 of 0 endof \ EC broken h# b2 of h# b30 endof \ preB3 ( board-id ) dup h# 10 * 8 + swap \ E.g. b3 -> b38 endcase Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-10-02 04:56:15 UTC (rev 661) +++ cpu/x86/pc/olpc/devices.fth 2007-10-02 06:40:25 UTC (rev 662) @@ -247,7 +247,8 @@ fload ${BP}/cpu/x86/pc/olpc/boardrev.fth \ Board revision decoding stand-init: Date to EC - time&date d# 2000 - ec-date! 3drop + time&date d# 2000 - ['] ec-date! catch if 3drop then + 3drop ; stand-init: Wireless reset Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-10-02 04:56:15 UTC (rev 661) +++ cpu/x86/pc/olpc/fw.bth 2007-10-02 06:40:25 UTC (rev 662) @@ -506,6 +506,12 @@ no-page console-start + + board-revision 0= if + ." EC problem - remove all power and restart" cr + begin again + then + read-game-keys stdout off \ probe-pci Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-02 04:56:15 UTC (rev 661) +++ cpu/x86/pc/olpc/security.fth 2007-10-02 06:40:25 UTC (rev 662) @@ -143,35 +143,40 @@ d# 32 buffer: hashname -\ valid? checks the validity of data$ against the ASCII signature +\ invalid? checks the validity of data$ against the ASCII signature \ record sig01$, using the public key that pubkey$ points to. -\ It also verifies that the hashname contained in sig01$ is not -\ the same one that was last used (for verification of firmware -\ images against two different hashes). +\ It also verifies that the hashname contained in sig01$ is the +\ expected one. -: valid? ( data$ sig01$ -- okay? ) +: invalid? ( data$ sig01$ exp-hashname$ -- error? ) + 2>r parse-sig if ." Bad signature format in " bundle-name$ type cr - false exit - then ( data$ hashname$ sig$ ) + 2r> 2drop true exit + then ( data$ hashname$ sig$ r: exp$ ) - 2swap d# 31 min ( data$ sig$ hashname$' ) - \ Check for duplicate hashname attacks - 2dup hashname count $= if ( data$ sig$ hashname$ ) - ." Duplicate hash name in " bundle-name$ type cr - 4drop false exit + 2swap 2dup 2r> $= 0= if ( data$ sig$ hashname$ ) + ." Wrong hash name in " bundle-name$ type cr + 4drop 2drop true exit then ( data$ sig$ hashname$ ) - hashname place ( data$ sig$ ) - - pubkey$ hashname count signature-bad? 0= ( okay? ) + pubkey$ 2swap signature-bad? ( error? ) dup if - " Signature valid" ?lease-debug-cr + " Signature invalid" ?lease-debug-cr else - " Signature invalid" ?lease-debug-cr + " Signature valid" ?lease-debug-cr then ; +: sha-valid? ( data$ sig01$ -- okay? ) " sha256" invalid? 0= ; +: fw-valid? ( data$ 2*sig$ -- okay? ) + 2swap 2>r ( 2*sig$ r: data$ ) + newline left-parse-string ( rmd-sig$ sha-sig$ r: data$ ) + 2r@ 2swap sha-valid? 0= if ( rmd-sig$ r: data$ ) + 2r> 4drop false exit + then ( rmd-sig$ r: data$ ) + 2r> 2swap " rmd160" invalid? 0= +; \ earliest is the earliest acceptable date value (in seconds). \ It is the date that the first test version of this code was @@ -341,7 +346,7 @@ : check-machine-signature ( sig$ expiration$ -- -1|1 ) 0 hashname c! machine-id-buf d# 51 + swap move ( sig$ ) - machine-id-buf d# 67 2swap valid? if 1 else -1 then + machine-id-buf d# 67 2swap sha-valid? if 1 else -1 then ; : set-disposition ( adr -- ) c@ machine-id-buf d# 49 + c! ; @@ -422,48 +427,6 @@ cn-buf place ; -\ olpc-load-image is factor that is close the top level of the -\ secure boot process. Given a directory prefix (e.g. "\boot") -\ and a space-delimited list of device names, it searches -\ each device in that list for an OS bundle in that directory. -\ The name of the OS bundle file is either "actos.zip" or -\ "runos.zip" according to whether or not a valid lease for -\ this machine is present on the same device. - -: olpc-load-image ( list$ -- okay? ) - begin dup while ( list$ ) - bl left-parse-string ( list$ devname$ ) - dn-buf place ( list$' ) - ?leased ( list$ ) - " os" bundle-present? if ( list$ ) - " OS found - " ?lease-debug - 0 hashname c! - oskey$ to pubkey$ - img$ sig$ valid? if - img$ tuck load-base swap move !load-size - 2drop true exit - then - then ( list$ ) - repeat ( list$ ) - 2drop false -; - -\ secure-load is the top level of the secure OS loading process. -\ It searches for lease files and signed OS image bundles on several -\ different devices. If an OS bundle is not found, it then searches -\ the NAND FLASH for an alternate OS image. - -: secure-load ( -- okay? ) - load-crypto if false exit then - - get-my-sn if false exit then - get-date if false exit then - - " \boot" pn-buf place boot-device-list olpc-load-image if true exit then - " \boot-alt" pn-buf place " nand" olpc-load-image if true exit then - false -; - 0 value alternate? : set-alternate ( -- ) button-o game-key? if true to alternate? exit then @@ -481,9 +444,8 @@ : ?unfreeze ( -- ) game-key@ button-check and if - dcon-unfreeze + dcon-unfreeze text-on unfreeze - text-on then ; @@ -496,17 +458,13 @@ power-off ; +: +icon-xy ( delta-x,y -- ) icon-xy d+ to icon-xy ; + : show-going ( -- ) h# c0 h# c0 h# c0 rgb>565 progress-xy d# 500 d# 100 " fill-rectangle" $call-screen d# 585 d# 613 to icon-xy " bigdot" show-icon dcon-unfreeze ; - -: show-check ( -- ) - icon-xy base-xy to icon-xy " check" show-icon to icon-xy -; -: +icon-xy ( delta-x,y -- ) icon-xy d+ to icon-xy ; - : show-dot ( -- ) alternate? if " yellowdot" else " lightdot" then show-icon ; @@ -555,7 +513,7 @@ " RD found - " ?lease-debug 0 hashname c! - img$ sig$ valid? if + img$ sig$ sha-valid? if show-unlock load-base to ramdisk-adr img$ dup to /ramdisk ( adr len ) @@ -569,30 +527,12 @@ r> to load-path ; -\ secure-boot performs the secure boot process - -: secure-boot ( -- ) - debug-security? if screen-ih stdout ! then - ['] secure-load-ramdisk to load-ramdisk - secure-load 0= if fail-load then - loaded sync-cache " init-program" $find if execute else 2drop then - go -; - false value secure? stand-init: wp " wp" find-tag if 2drop true to secure? then ; -\ do-secure-boot performs either the secure boot algorithm or the -\ historical boot algorithm depending on the presence of a "wp" -\ manufacturing data tag. - -: do-secure-boot ( -- ) secure? if secure-boot else boot then ; -\ " do-secure-boot" ' boot-command set-config-string-default - - \ check-devel-key tests the developer signature string "dev01$". \ -1 means the signature is for this machine and is invalid @@ -634,16 +574,6 @@ r> close-file drop false ; -\ developer? searches a list of devices (given by "developer-device-list") -\ for a valid developer key - -: checked-load-started ( -- ) - not-screen? if exit then - show-check -; -\ ' checked-load-started to load-started -\ noop to load-started - : ?toggle-secure ( -- ) button-x game-key? if secure? 0= to secure? then ; 6 buffer: fw#buf @@ -680,11 +610,14 @@ " new - " ?lease-debug 0 hashname c! fwkey$ to pubkey$ - img$ sig$ valid? if + img$ sig$ fw-valid? if + dcon-unfreeze text-on + img$ tuck flash-buf swap move ( len ) + ?image-valid ( ) true to file-loaded? - " Updating firmware" ?lease-debug + " Updating firmware" ?lease-debug-cr \ Latch alternate? flag for next startup alternate? if [char] A h# 82 cmos! then @@ -706,7 +639,7 @@ " OS found - " ?lease-debug 0 hashname c! oskey$ to pubkey$ - img$ sig$ valid? if + img$ sig$ sha-valid? if img$ tuck load-base swap move !load-size show-unlock true exit @@ -739,6 +672,7 @@ d# 5 d# 77 +icon-xy show-dot has-developer-key? if + dcon-unfreeze text-on show-unlock true exit then Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-10-02 04:56:15 UTC (rev 661) +++ dev/olpc/kb3700/ecio.fth 2007-10-02 06:40:25 UTC (rev 662) @@ -253,6 +253,7 @@ : io-spi-reprogrammed ( -- ) ." Restarting..." d# 2000 ms cr kbc-on + begin again \ ." Keyboard back on" cr ; @@ -266,6 +267,7 @@ 7 to spi-us \ Measured time for "1 fea9 ec!" is 7.9 uS ignore-power-button \ Guard against the user panicing + disable-interrupts \ Don't poll the EC kbc-off ; : use-local-ec ( -- ) ['] io-spi-start to spi-start ;

1 0

r661 - cpu/x86/pc/olpc
by svn＠openbios.org 02 Oct '07

02 Oct '07

Author: wmb Date: 2007-10-02 06:56:15 +0200 (Tue, 02 Oct 2007) New Revision: 661 Modified: cpu/x86/pc/olpc/versions.fth Log: q2c28 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-10-02 04:56:02 UTC (rev 660) +++ cpu/x86/pc/olpc/versions.fth 2007-10-02 04:56:15 UTC (rev 661) @@ -2,14 +2,14 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 27 +macro: FW_MINOR 28 \ The EC microcode macro: EC_VERSION c24 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary -\ macro: GET_EC cp ./ec_wlan_debug.bin ec.img +macro: GET_EC cp ./shiny5.bin ec.img \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1

1 0

r660 - cpu/x86/pc/olpc
by svn＠openbios.org 02 Oct '07

02 Oct '07

Author: wmb Date: 2007-10-02 06:56:02 +0200 (Tue, 02 Oct 2007) New Revision: 660 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC pretty boot - enable text for x button and after-the-fact check button. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-02 04:39:49 UTC (rev 659) +++ cpu/x86/pc/olpc/security.fth 2007-10-02 04:56:02 UTC (rev 660) @@ -477,10 +477,13 @@ 0 0 2value base-xy d# 410 d# 540 2constant progress-xy +: text-on screen-ih stdout ! ; + : ?unfreeze ( -- ) game-key@ button-check and if dcon-unfreeze unfreeze + text-on then ; @@ -757,7 +760,6 @@ 2drop false ; -: text-on screen-ih stdout ! ; : persistent-devkey? ( -- flag ) " dk" find-tag dup if nip nip then ; : all-devices$ ( -- list$ ) " disk sd fastnand nand" ; @@ -774,7 +776,7 @@ button-rotate game-key? if show-warnings then show-child - button-check game-key? if + button-check button-x or game-key? if unfreeze text-on else freeze dcon-freeze

1 0

Successor to IEEE 1275 (Was:FCode Limit (Was:Dictionary size limit per device instance))
by Loye Young 02 Oct '07

02 Oct '07

Why doesn't this group specify on its own a new standard to replace IEEE 1275? It should, IMHO. What's wrong with attempting an IEEE standard? IEEE is chock full of people from the "big guys" (Intel, the proprietary BIOS/EFI/UEFI vendors, etc.), each of whom have a different dog in the race, so it would essentially go nowhere. Phoenix wants its own proprietary BIOS thing as long as possible. Intel wants EFI or UEFI, but doesn't want it to be an open standard. (I know they have the tiano.org project and trumpted loudly the coming open EFI standard, but I've actually talked to the engineers and executives over at Intel; they have contractually committed NOT to open the bootloader in order to protect the proprietary vendors. EFI is in fact simply an obfuscation layer to protect the code. The UEFI group is dead in the water. No movement for a long time. None expected. AMD has opened its hardware and plans to do more within the next few months. Chinese ODMs would be happy to apply the standards if one could be developed. OEMs like me need some better guidance on engineering the machine. This group is a relatively vendor-neutral forum. Should we just go it alone? No. We invite developers who actually will work on the code, (from this list, LinuxBIOS, Codegen, playground.sun.com/1275, etc.), component manufacturers who actually open their hardware (not just give press releases and make speeches), and ODMs/OEMs who will actually ship OpenBIOS. Examples of manufacturers who are actually opening their hardware are AMD, Solaris, and to some extent Apple. Who else would be interested? The open source community has been increasingly vocal about its desire for more open boot loaders. See, e.g., http://www.fsf.org/campaigns/free-bios.html What good would a standard to if no recognized standard organization adopted it? Standards organizations are only as good as the standards they promulgate. Given the current mess in the bool loader world, a detailed published standard would carry its own weight because engineers like having specifications already written down. Essentially, the manufacturers are likely to say "Some published reference is better than none." Happy Trails, Loye Young Isaac & Young Computer Company Laredo, Texas http://www.iycc.biz

1 0

r659 - cpu/x86/pc/olpc dev/geode/display
by svn＠openbios.org 02 Oct '07

02 Oct '07

Author: wmb Date: 2007-10-02 06:39:49 +0200 (Tue, 02 Oct 2007) New Revision: 659 Modified: cpu/x86/pc/olpc/crypto.fth cpu/x86/pc/olpc/gui.fth dev/geode/display/gxfb.fth Log: OLPC pretty boot - Fixed memory allocation problem with large image. Modified: cpu/x86/pc/olpc/crypto.fth =================================================================== --- cpu/x86/pc/olpc/crypto.fth 2007-10-02 04:35:36 UTC (rev 658) +++ cpu/x86/pc/olpc/crypto.fth 2007-10-02 04:39:49 UTC (rev 659) @@ -48,71 +48,9 @@ \ XXX clean out dead code in usb.fth ; -1 [if] - -\ Check that the version is an upgrade? - -: >rom-name$ ( device$ -- path$ ) - image-name-buf place ( ) - " :\boot\olpcfw.rom" image-name-buf $cat ( ) - image-name$ -; -: sig-name$ ( -- path$ ) - image-name$ + 4 - " .rom" caps-comp 0= if - " sig" image-name$ + 3 - swap move - image-name$ - else - 2drop " " - then -; -: $dev-update-flash ( device$ -- ) - >rom-name$ $get-image if exit then ( data$ ) - - sig-name$ $get-image if - ." Missing firmware update signature file: " sig-name$ type cr - free-mem exit - then ( data$ sig$ ) - - 2over 2over signature-bad? if ( data$ sig$ ) - ." Firmware update image signature mismatch: " sig-name$ type cr - free-mem free-mem exit - then ( data$ sig$ ) - - free-mem ( data$ ) - - 2dup flash-buf swap move ( data$ ) - tuck free-mem ( data-len ) - ['] ?image-valid catch if ( x ) - drop ." Firmware image failed sanity checks" cr ( ) - exit - then ( x ) - - true to file-loaded? - reflash -; -[then] - : getbin " usb8388.bin" find-drop-in 0= abort" No usb8388.bin" ; : getsig " usb8388.sig" find-drop-in 0= abort" No usb8388.sig" ; -: tc ( -- ) - getbin getsig - signature-bad? if - ." Signature was bad, expected good" cr - then - getbin over 1 swap +! - getsig - signature-bad? 0= if - ." Signature was good, expected bad (corrupt image)" cr - then - - getbin - getsig over 40 + 1 swap +! - signature-bad? 0= if - ." Signature was good, expected bad (corrupt signature)" cr - then -; - \ LICENSE_BEGIN \ Copyright (c) 2007 FirmWorks \ Modified: cpu/x86/pc/olpc/gui.fth =================================================================== --- cpu/x86/pc/olpc/gui.fth 2007-10-02 04:35:36 UTC (rev 658) +++ cpu/x86/pc/olpc/gui.fth 2007-10-02 04:39:49 UTC (rev 659) @@ -26,25 +26,26 @@ icon-xy image-width image-height ; +: image-base ( -- adr ) " graphmem" $call-screen ; + : $get-image ( filename$ -- true | adr,len false ) r/o open-file if drop true exit then >r ( r: fd ) - r@ fsize dup alloc-mem swap ( bmp-adr,len r: fd ) + + image-base r@ fsize ( bmp-adr,len r: fd ) 2dup r@ fgets over <> ( bmp-adr,len error? r: fd ) r> fclose ( bmp-adr,len ) - if free-mem true else false then ( true | bmp-adr,len false ) + if 2drop true else false then ( true | bmp-adr,len false ) ; : $show ( filename$ -- ) not-screen? if 2drop exit then 0 to image-width \ In case $show fails $get-image if exit then - 2dup prep-565 " draw-transparent-rectangle" $call-screen - free-mem + prep-565 " draw-transparent-rectangle" $call-screen ; : $show-opaque ( filename$ -- ) not-screen? if 2drop exit then $get-image if exit then - 2dup prep-565 " draw-rectangle" $call-screen - free-mem + prep-565 " draw-rectangle" $call-screen ; : advance ( -- ) icon-xy image-width 0 d+ to icon-xy Modified: dev/geode/display/gxfb.fth =================================================================== --- dev/geode/display/gxfb.fth 2007-10-02 04:35:36 UTC (rev 658) +++ dev/geode/display/gxfb.fth 2007-10-02 04:39:49 UTC (rev 659) @@ -544,6 +544,8 @@ h# 0f color@ h# ff color! \ Set color ff to white (same as 15) ; +0 instance value graphmem + : init-all ( -- ) \ Initializes the controller smb-init map-io-regs \ Enable IO registers @@ -559,6 +561,8 @@ 4 of frame-buffer-adr /fb h# ffff.ffff lfill endof endcase 7 to background-color + + frame-buffer-adr /fb + to graphmem ; : display-remove ( -- )

1 0

r658 - cpu/x86/pc/olpc
by svn＠openbios.org 02 Oct '07

02 Oct '07

Author: wmb Date: 2007-10-02 06:35:36 +0200 (Tue, 02 Oct 2007) New Revision: 658 Modified: cpu/x86/pc/olpc/usb.fth Log: Fixed innocuous stack problem in usb-quiet Modified: cpu/x86/pc/olpc/usb.fth =================================================================== --- cpu/x86/pc/olpc/usb.fth 2007-10-02 03:22:33 UTC (rev 657) +++ cpu/x86/pc/olpc/usb.fth 2007-10-02 04:35:36 UTC (rev 658) @@ -86,8 +86,8 @@ : usb-quiet ( -- ) [ ' go-hook behavior compile, ] \ Chain to old behavior - " usb1" " reset-usb" execute-device-method - " usb2" " reset-usb" execute-device-method + " usb1" " reset-usb" execute-device-method drop + " usb2" " reset-usb" execute-device-method drop ; ' usb-quiet to go-hook

1 0

r657 - cpu/x86/pc/olpc cpu/x86/pc/olpc/images ofw/fs/jffs2
by svn＠openbios.org 02 Oct '07

02 Oct '07

Author: wmb Date: 2007-10-02 05:22:33 +0200 (Tue, 02 Oct 2007) New Revision: 657 Added: cpu/x86/pc/olpc/images/warnings.565 cpu/x86/pc/olpc/images/warnings.bmp.gz Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/loaddropins.fth cpu/x86/pc/olpc/security.fth ofw/fs/jffs2/jffs2.fth Log: Added UL warning screen (behind rotate button) and cleaned up some problems with pretty boot sequencing. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-10-01 23:10:06 UTC (rev 656) +++ cpu/x86/pc/olpc/fw.bth 2007-10-02 03:22:33 UTC (rev 657) @@ -491,12 +491,6 @@ then ; -: ?sound ( -- ) - button-rotate game-key? 0= if sound then -; -: ?freeze ( -- ) - button-rotate game-key? 0= if freeze then -; : ?games ( -- ) rocker-right game-key? if time&date 5drop 1 and if pong else life-demo then @@ -513,50 +507,19 @@ console-start read-game-keys -[ifdef] notdef - fast-boot? if -( D) stdout off \ banner - probe-pci - ?sound - open-keyboard -( D) \ ?games - ?freeze -\ ['] false to interrupt-auto-boot? - probe-usb -\ " nand" $dev-update-flash - interpreter-init - secure-startup -( D) screen-ih stdout ! \ -( D) ?usb-keyboard \ - else -( D) banner \ stdout off - probe-pci - ?sound - open-keyboard -( D) ?games \ - ?freeze - probe-usb -( D) ?usb-keyboard \ - interpreter-init - secure-startup - then -[else] - stdout off \ - probe-pci - ?sound - open-keyboard - ?games - ?freeze - ['] false to interrupt-auto-boot? - probe-usb -\ " nand" $dev-update-flash - interpreter-init - secure-startup - ['] (interrupt-auto-boot?) to interrupt-auto-boot? - screen-ih stdout ! - banner - ?usb-keyboard -[then] + stdout off \ + probe-pci + sound + open-keyboard + ?games + ['] false to interrupt-auto-boot? + probe-usb + interpreter-init + secure-startup + ['] (interrupt-auto-boot?) to interrupt-auto-boot? + screen-ih stdout ! + banner + ?usb-keyboard auto-boot blue-letters ." Type 'help' for more information." black-letters Added: cpu/x86/pc/olpc/images/warnings.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/warnings.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/warnings.bmp.gz =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/warnings.bmp.gz ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: cpu/x86/pc/olpc/loaddropins.fth =================================================================== --- cpu/x86/pc/olpc/loaddropins.fth 2007-10-01 23:10:06 UTC (rev 656) +++ cpu/x86/pc/olpc/loaddropins.fth 2007-10-02 03:22:33 UTC (rev 657) @@ -28,6 +28,7 @@ " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/warnings.565" " warnings.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/lightdot.565" " lightdot.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/yellowdot.565" " yellowdot.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/darkdot.565" " darkdot.565" $add-deflated-dropin Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-10-01 23:10:06 UTC (rev 656) +++ cpu/x86/pc/olpc/security.fth 2007-10-02 03:22:33 UTC (rev 657) @@ -478,7 +478,10 @@ d# 410 d# 540 2constant progress-xy : ?unfreeze ( -- ) - game-key@ button-check and if dcon-unfreeze then + game-key@ button-check and if + dcon-unfreeze + unfreeze + then ; : security-failure ( -- ) @@ -508,8 +511,17 @@ : show-sad ( -- ) " sad" show-icon ; : show-lock ( -- ) " lock" show-icon ; : show-unlock ( -- ) " unlock" show-icon ; +: show-child ( -- ) + " erase-screen" $call-screen + d# 552 d# 383 to icon-xy " rom:xogray.565" $show-opaque + progress-xy to icon-xy \ For boot progress reports +; +: show-warnings ( -- ) + " erase-screen" $call-screen + d# 48 d# 32 to icon-xy " rom:warnings.565" $show-opaque + dcon-freeze +; - \ secure-load-ramdisk is called during the process of preparing an \ OS image for execution. It looks for an initrd bundle file on \ the same device where the OS image was found, in a file named @@ -709,7 +721,6 @@ 0 0 2value next-xy : load-from-list ( list$ -- devkey? ) - button-check game-key? 0= if dcon-freeze then " dev /jffs2-file-system ' ?unfreeze to scan-callout dend" eval begin dup while ( list$ ) @@ -751,6 +762,7 @@ : all-devices$ ( -- list$ ) " disk sd fastnand nand" ; + d# 410 d# 540 2constant progress-xy : secure-startup ( -- ) ['] noop to ?show-device @@ -759,10 +771,15 @@ set-alternate - d# 552 d# 383 to icon-xy " rom:xogray.565" $show-opaque - progress-xy to icon-xy \ For boot progress reports + button-rotate game-key? if show-warnings then + show-child - button-check game-key? if text-on then + button-check game-key? if + unfreeze text-on + else + freeze dcon-freeze + then + ?toggle-secure secure? 0= if exit then Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-10-01 23:10:06 UTC (rev 656) +++ ofw/fs/jffs2/jffs2.fth 2007-10-02 03:22:33 UTC (rev 657) @@ -729,7 +729,7 @@ inodes 'next-inode ! pages/chip 0 do i page>eblock to the-eblock# - i h# ff and 0= if scan-callout then + i h# 3fff and 0= if scan-callout then i no-summary? if i possible-nodes? if i scan-raw-nodes then then

1 0

r656 - cpu/x86/pc/olpc cpu/x86/pc/olpc/images ofw/fs/jffs2
by svn＠openbios.org 02 Oct '07

02 Oct '07

Author: wmb Date: 2007-10-02 01:10:06 +0200 (Tue, 02 Oct 2007) New Revision: 656 Added: cpu/x86/pc/olpc/images/bigdot.565 cpu/x86/pc/olpc/images/bigdot.bmp Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/gui.fth cpu/x86/pc/olpc/linux.fth cpu/x86/pc/olpc/loaddropins.fth cpu/x86/pc/olpc/security.fth ofw/fs/jffs2/jffs2.fth Log: More pretty boot. Freeze the screen during boot probing, only showing detailed progress if you press the check button. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-09-30 18:03:33 UTC (rev 655) +++ cpu/x86/pc/olpc/fw.bth 2007-10-01 23:10:06 UTC (rev 656) @@ -300,10 +300,6 @@ probe-usb ; -[ifdef] linux-support -fload ${BP}/cpu/x86/pc/olpc/linux.fth -[then] - fload ${BP}/ofw/gui/bmptools.fth fload ${BP}/dev/null.fth fload ${BP}/ofw/core/bailout.fth @@ -336,6 +332,7 @@ 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/linux.fth fload ${BP}/cpu/x86/pc/olpc/security.fth fload ${BP}/cpu/x86/pc/olpc/setwp.fth fload ${BP}/ofw/gui/ofpong.fth @@ -349,6 +346,7 @@ ' olpc-power-off to power-off [then] + : dimmer ( -- ) screen-ih if " dimmer" screen-ih $call-method then ; : brighter ( -- ) screen-ih if " brighter" screen-ih $call-method then ; @@ -493,13 +491,6 @@ then ; -: go-hook-freeze - [ ' go-hook behavior compile, ] - 0 " set-source" $call-screen -; -: freeze ( -- ) ['] go-hook-freeze to go-hook ; -: unfreeze ( -- ) ['] usb-quiet to go-hook ; - : ?sound ( -- ) button-rotate game-key? 0= if sound then ; Modified: cpu/x86/pc/olpc/gui.fth =================================================================== --- cpu/x86/pc/olpc/gui.fth 2007-09-30 18:03:33 UTC (rev 655) +++ cpu/x86/pc/olpc/gui.fth 2007-10-01 23:10:06 UTC (rev 656) @@ -389,6 +389,16 @@ ; ' (?show-device) to ?show-device +: dcon-freeze ( -- ) 0 " set-source" $call-screen d# 30 ms ; +: dcon-unfreeze ( -- ) 1 " set-source" $call-screen d# 30 ms ; + +: go-hook-freeze + [ ' go-hook behavior compile, ] + 0 " set-source" $call-screen +; +: freeze ( -- ) ['] go-hook-freeze to go-hook ; +: unfreeze ( -- ) ['] usb-quiet to go-hook ; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Added: cpu/x86/pc/olpc/images/bigdot.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/bigdot.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/bigdot.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/bigdot.bmp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: cpu/x86/pc/olpc/linux.fth =================================================================== --- cpu/x86/pc/olpc/linux.fth 2007-09-30 18:03:33 UTC (rev 655) +++ cpu/x86/pc/olpc/linux.fth 2007-10-01 23:10:06 UTC (rev 656) @@ -263,7 +263,7 @@ ; ' ?memtest-elf-map-in is elf-map-in -: memtest ( -- ) " rom:memtest" $boot ; +: memtest ( -- ) unfreeze " rom:memtest" $boot ; : sym ( "name" -- adr ) parse-word $sym> 0= if err-sym-not-found throw then Modified: cpu/x86/pc/olpc/loaddropins.fth =================================================================== --- cpu/x86/pc/olpc/loaddropins.fth 2007-09-30 18:03:33 UTC (rev 655) +++ cpu/x86/pc/olpc/loaddropins.fth 2007-10-01 23:10:06 UTC (rev 656) @@ -37,18 +37,10 @@ " ${BP}/cpu/x86/pc/olpc/images/minus.565" " minus.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/x.565" " x.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/sad.565" " sad.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/bigdot.565" " bigdot.565" $add-deflated-dropin -\ " ${BP}/cpu/x86/pc/olpc/images/topkey.565" " topkey.565" $add-deflated-dropin -\ " ${BP}/cpu/x86/pc/olpc/images/dot0.565" " mark0.565" $add-deflated-dropin -\ " ${BP}/cpu/x86/pc/olpc/images/dot1.565" " mark1.565" $add-deflated-dropin -\ " ${BP}/cpu/x86/pc/olpc/images/dot2.565" " mark2.565" $add-deflated-dropin -\ " ${BP}/cpu/x86/pc/olpc/images/dot3.565" " mark3.565" $add-deflated-dropin -\ " ${BP}/cpu/x86/pc/olpc/images/lock2.565" " lock2.565" $add-deflated-dropin -\ " ${BP}/cpu/x86/pc/olpc/images/unlock2.565" " unlock2.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/check.565" " check.565" $add-deflated-dropin -\ " ${BP}/cpu/x86/pc/olpc/images/leasekey.565" " leasekey.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/xogray.565" " xogray.565" $add-deflated-dropin -\ " ${BP}/cpu/x86/pc/olpc/images/olpclogo.565" " olpc.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " nand.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " fastnand.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/ethernet.565" " ethernet.565" $add-deflated-dropin Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-09-30 18:03:33 UTC (rev 655) +++ cpu/x86/pc/olpc/security.fth 2007-10-01 23:10:06 UTC (rev 656) @@ -3,11 +3,6 @@ \ Specs at http://wiki.laptop.org/go/Firmware_Security -: security-failure ( -- ) - ." Security failure" cr - d# 10000 ms power-off -; - : boot-device-list " disk sd nand" ; true value debug-security? @@ -419,7 +414,12 @@ \ present) or "actos.zip" (the activation version of the OS). : ?leased ( -- ) - lease-valid? if " run" else " act" then cn-buf place + " ak" find-tag if + 2drop " run" + else + lease-valid? if " run" else " act" then + then + cn-buf place ; \ olpc-load-image is factor that is close the top level of the @@ -475,6 +475,27 @@ ; 0 0 2value base-xy +d# 410 d# 540 2constant progress-xy + +: ?unfreeze ( -- ) + game-key@ button-check and if dcon-unfreeze then +; + +: security-failure ( -- ) + ." Security failure" cr + get-msecs d# 10000 + begin ( limit ) + ?unfreeze + dup get-msecs - + 0< until drop + power-off +; + +: show-going ( -- ) + h# c0 h# c0 h# c0 rgb>565 progress-xy d# 500 d# 100 " fill-rectangle" $call-screen + d# 585 d# 613 to icon-xy " bigdot" show-icon + dcon-unfreeze +; + : show-check ( -- ) icon-xy base-xy to icon-xy " check" show-icon to icon-xy ; @@ -688,7 +709,11 @@ 0 0 2value next-xy : load-from-list ( list$ -- devkey? ) + button-check game-key? 0= if dcon-freeze then + " dev /jffs2-file-system ' ?unfreeze to scan-callout dend" eval + begin dup while ( list$ ) + ?unfreeze bl left-parse-string ( list$ devname$ ) 2dup dn-buf place ( list$ devname$ ) @@ -707,7 +732,9 @@ load-from-device if 2drop ['] secure-load-ramdisk to load-ramdisk - " init-program" $find if execute go then + " init-program" $find if + execute show-going go + then show-x security-failure then @@ -723,6 +750,8 @@ : persistent-devkey? ( -- flag ) " dk" find-tag dup if nip nip then ; : all-devices$ ( -- list$ ) " disk sd fastnand nand" ; + +d# 410 d# 540 2constant progress-xy : secure-startup ( -- ) ['] noop to ?show-device ['] noop to load-done @@ -731,7 +760,7 @@ set-alternate d# 552 d# 383 to icon-xy " rom:xogray.565" $show-opaque - d# 410 d# 540 to icon-xy \ For boot progress reports + progress-xy to icon-xy \ For boot progress reports button-check game-key? if text-on then ?toggle-secure Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-09-30 18:03:33 UTC (rev 655) +++ ofw/fs/jffs2/jffs2.fth 2007-10-01 23:10:06 UTC (rev 656) @@ -3,6 +3,8 @@ d# 20,000 constant max-inodes +defer scan-callout ' noop to scan-callout + 0 value debug-scan? \ True to display progress reports 0 instance value block-buf \ Start address of working buffer @@ -727,6 +729,7 @@ inodes 'next-inode ! pages/chip 0 do i page>eblock to the-eblock# + i h# ff and 0= if scan-callout then i no-summary? if i possible-nodes? if i scan-raw-nodes then then

1 0

r655 - cpu/x86 cpu/x86/build forth/lib
by svn＠openbios.org 30 Sep '07

30 Sep '07

Author: wmb Date: 2007-09-30 20:03:33 +0200 (Sun, 30 Sep 2007) New Revision: 655 Modified: cpu/x86/build/builder.dic cpu/x86/disassem.fth forth/lib/util.fth Log: Fixed address calculation bug in disassembler (16-bit mode only), made dis16 and dis32 appear in the forth vocabulary, add "mib" and "kib" for convenience. Modified: cpu/x86/build/builder.dic =================================================================== (Binary files differ) Modified: cpu/x86/disassem.fth =================================================================== --- cpu/x86/disassem.fth 2007-09-29 20:03:38 UTC (rev 654) +++ cpu/x86/disassem.fth 2007-09-30 18:03:33 UTC (rev 655) @@ -21,11 +21,14 @@ : op16@ ( -- w ) op8@ op8@ bwjoin ; : op32@ ( -- l ) op16@ op16@ wljoin ; +: bext ( b -- l ) d# 24 << d# 24 >>a ; +: wext ( w -- l ) d# 16 << d# 16 >>a ; + \ change size of data true value op32? : opv@ ( -- l | w ) op32? if op32@ else op16@ then ; true value ad32? -: adv@ ( -- l | w ) ad32? if op32@ else op16@ then ; +: adv@ ( -- l | w ) ad32? if op32@ else op16@ wext then ; : dis16 ( -- ) false is op32? false is ad32? ; : dis32 ( -- ) true is op32? true is ad32? ; \ XXX We should also change the register names e.g. from "eax" to "ax" @@ -42,9 +45,6 @@ : midbits ( -- n ) 3 3 ibits ; : hibits ( -- n ) 6 2 ibits ; -: bext ( b -- l ) d# 24 << d# 24 >>a ; -: wext ( w -- l ) d# 16 << d# 16 >>a ; - hex : ., ( -- ) ." ," ; @@ -594,6 +594,8 @@ alias pc!dis1 pc!dis1 alias +dis +dis alias dis dis +alias dis16 dis16 +alias dis32 dis32 previous previous previous definitions \ LICENSE_BEGIN Modified: forth/lib/util.fth =================================================================== --- forth/lib/util.fth 2007-09-29 20:03:38 UTC (rev 654) +++ forth/lib/util.fth 2007-09-30 18:03:33 UTC (rev 655) @@ -72,6 +72,9 @@ : bits ( n bit# #bits -- bits ) -rot rshift swap lowbits ; : bit ( n bit# -- ) 1 bits ; +: kib ( n -- nkib ) d# 10 lshift ; \ Convert to kilobytes +: mib ( n -- nmib ) d# 20 lshift ; \ Convert to megabytes + : log2 ( n -- log2-of-n ) 0 begin ( n log ) swap 2/ ( log n' )

1 0

[PATCH] Fix Linux/x86 load without virtual-mode
by Torsten Duwe 30 Sep '07

30 Sep '07

Release early, release often. Openfirmware seems to insist on virtual-mode when loading a Linux/x86 kernel as plain ELF binary (vmlinu_x_). Here's my proposed fix to load and launch it when virtual-mode is not defined. Qemu+gdb confirms the loaded kernel makes it to the halt after panic, at least. I'll have to see yet what's wrong with earlyprintk. Signed-off-by: Torsten Duwe <duwe(a)lst.de>

1 0

r654 - cpu/x86/pc/olpc
by svn＠openbios.org 29 Sep '07

29 Sep '07

Author: wmb Date: 2007-09-29 22:03:38 +0200 (Sat, 29 Sep 2007) New Revision: 654 Modified: cpu/x86/pc/olpc/crypto.bth Log: OLPC build scripts - Corrected the name of bios_hash. Modified: cpu/x86/pc/olpc/crypto.bth =================================================================== --- cpu/x86/pc/olpc/crypto.bth 2007-09-29 19:40:22 UTC (rev 653) +++ cpu/x86/pc/olpc/crypto.bth 2007-09-29 20:03:38 UTC (rev 654) @@ -6,7 +6,7 @@ fload ${BP}/cpu/x86/pc/olpc/versions.fth " wget http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img -O verify.img" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/bios_hasher-${CRYPTO_VERSION}.img -O hasher.img" expand$ $sh +" wget http://dev.laptop.org/pub/firmware/crypto/bios_hash-${CRYPTO_VERSION}.img -O hasher.img" expand$ $sh " wget http://dev.laptop.org/pub/firmware/crypto/testkeys/os.public -O os.public" expand$ $sh " wget http://dev.laptop.org/pub/firmware/crypto/testkeys/fw.public -O fw.public" expand$ $sh " wget http://dev.laptop.org/pub/firmware/crypto/testkeys/lease.public -O lease.public" expand$ $sh

1 0

r653 - in cpu/x86: . pc/olpc
by svn＠openbios.org 29 Sep '07

29 Sep '07

Author: wmb Date: 2007-09-29 21:40:22 +0200 (Sat, 29 Sep 2007) New Revision: 653 Added: cpu/x86/pc/olpc/devsmall.fth cpu/x86/pc/olpc/fwsmall.bth cpu/x86/pc/olpc/smallconfig.fth cpu/x86/small.bth Log: Check in experimental small-Forth build scripts to avoid losing them. Added: cpu/x86/pc/olpc/devsmall.fth =================================================================== --- cpu/x86/pc/olpc/devsmall.fth (rev 0) +++ cpu/x86/pc/olpc/devsmall.fth 2007-09-29 19:40:22 UTC (rev 653) @@ -0,0 +1,223 @@ +\ See license at end of file +purpose: Load device drivers according to configuration definitions + +: gx? ( -- flag ) h# 4c000017 msr@ drop 4 rshift 2 = ; +: lx? ( -- flag ) h# 4c000017 msr@ drop 4 rshift 3 = ; + +fload ${BP}/cpu/x86/pc/isaio.fth + +fload ${BP}/cpu/x86/pc/olpc/vsapci.fth \ PCI configuration access with some hacks + +0 0 " " " /" begin-package + fload ${BP}/cpu/x86/pc/mappci.fth \ Map PCI to root + fload ${BP}/dev/pcibus.fth \ Generic PCI bus package + fload ${BP}/cpu/x86/pc/olpc/pcinode.fth \ System-specific words for PCI +end-package +stand-init: PCI host bridge + " /pci" " init" execute-device-method drop +; + +fload ${BP}/dev/pciprobe.fth \ Generic PCI probing + +\ Use the CPU chip's Time Stamp Counter for timing; it does just what we want +fload ${BP}/cpu/x86/tsc.fth + +stand-init: + d# 1000 rounded-/ dup to ms-factor ( cpu-clock-khz ) + d# 1000 rounded-/ to us-factor ( ) +; + +[ifdef] use-root-isa +0 0 " " " /" begin-package + fload ${BP}/cpu/x86/pc/isabus.fth \ ISA Bus Bridge under root node +end-package +[then] + +[ifdef] use-pci-isa + +[ifdef] addresses-assigned +[ifdef] use-pci-isa +\ This must precede isamisc.fth in the load file, to execute it first +fload ${BP}/cpu/x86/pc/moveisa.fth +[then] +[then] + +0 0 " 0" " /pci" begin-package + fload ${BP}/dev/pci/isa.fth \ ISA bus bridge under PCI node + fload ${BP}/dev/pci/isamisc.fth +end-package + +[then] + +1 [if] +dev /interrupt-controller +h# 20 to vector-base0 +h# 28 to vector-base1 +device-end + +warning @ warning off +: probe-pci ( -- ) + probe-pci + " /pci" " make-interrupt-map" execute-device-method drop +; +warning ! + +0 0 dropin-base <# u#s u#> " /" begin-package + " flash" device-name + + h# 10.0000 + dup value /device + constant /device-phys + my-address my-space /device-phys reg + fload ${BP}/cpu/x86/pc/flashpkg.fth + + : init ( comp$ /device -- ) + to /device 2>r + 0 0 encode-bytes + 2r> encode-string encode+ + " rom" encode-string encode+ + " compatible" property +[ifdef] enable-flash-select + /device /device-phys <> if enable-flash-select then +[then] + ; + +end-package +" rom" dropin-base <# u#s " /flash@" hold$ u#> $devalias + +: foo-save-state here 5 + ; ' foo-save-state to save-state + +fload ${BP}/cpu/x86/forthint.fth \ Low-level interrupt handling code +fload ${BP}/dev/isa/irq.fth \ ISA interrupt dispatcher +fload ${BP}/cpu/x86/pc/isatick.fth \ Use ISA timer as the alarm tick timer + +[ifdef] resident-packages +support-package: 16550 +fload ${BP}/dev/16550pkg/16550.fth \ Serial port support package +end-support-package +[then] + +fload ${BP}/dev/pci/isaall.fth +devalias com1 /isa/serial@i3f8:115200 +devalias sd /sd/disk + + +dev /8042 + patch false ctlr-selftest open +device-end + +0 [if] +0 0 " i70" " /isa" begin-package \ Real-time clock node + fload ${BP}/dev/ds1385r.fth + 8 encode-int 0 encode-int encode+ " interrupts" property + 2 encode-int " device#" property +end-package +[then] + +fload ${BP}/cpu/x86/pc/cpunode.fth + +fload ${BP}/cpu/x86/pc/olpc/cmos.fth \ CMOS RAM indices are 1f..ff , above RTC + +[if] 0 +[ifdef] use-null-nvram +fload ${BP}/cpu/x86/pc/nullnv.fth +stand-init: Null-NVRAM + " /null-nvram" open-dev to nvram-node + ['] init-config-vars catch drop +; +[then] +[then] + +fload ${BP}/cpu/x86/inoutstr.fth \ Multiple I/O port read/write +fload ${BP}/dev/isa/diaguart.fth \ ISA COM port driver +\ : inituarts ascii G uemit ascii o uemit ; \ They are already on + +h# 3f8 is uart-base +fload ${BP}/forth/lib/sysuart.fth \ Use UART for key and emit + +[ifndef] save-flash +: save-flash ; +: restore-flash ; +[then] + +\needs md5init fload ${BP}/ofw/ppp/md5.fth \ MD5 hash + +fload ${BP}/dev/olpc/kb3700/ecspi.fth \ EC chip SPI FLASH access + +warning @ warning off +: stand-init stand-init h# fff0.0000 to flash-base ; +warning ! + +fload ${BP}/dev/olpc/kb3700/ecserial.fth \ Serial access to EC chip + +fload ${BP}/dev/olpc/kb3700/ecio.fth \ I/O space access to EC chip + +fload ${BP}/cpu/x86/pc/olpc/boardrev.fth \ Board revision decoding + +fload ${BP}/cpu/x86/pc/olpc/mfgdata.fth \ Manufacturing data + +fload ${BP}/dev/olpc/spiflash/spiflash.fth \ SPI FLASH programming +fload ${BP}/dev/olpc/spiflash/spiui.fth \ User interface for SPI FLASH programming +fload ${BP}/dev/olpc/spiflash/recover.fth \ XO-to-XO SPI FLASH recovery +: ofw-fw-filename$ " disk:\boot\olpc.rom" ; +' ofw-fw-filename$ to fw-filename$ + +: +i encode-int encode+ ; : 0+i 0 +i ; + +fload ${BP}/cpu/x86/fb16-ops.fth +fload ${BP}/ofw/termemu/fb16.fth +0 0 " 1,1" " /pci" begin-package + fload ${BP}/dev/olpc/dcon/dconsmb.fth \ SMB access to DCON chip + fload ${BP}/dev/olpc/dcon/dcon.fth \ DCON control + fload ${BP}/dev/geode/display/loadpkg.fth \ Geode display + + 0 0 encode-bytes + h# 8200.0910 +i 0+i h# fd00.0000 +i 0+i h# 0080.0000 +i \ Frame buffer + h# 8200.0914 +i 0+i h# fe00.0000 +i 0+i h# 0000.4000 +i \ GP + h# 8200.0918 +i 0+i h# fe00.4000 +i 0+i h# 0000.4000 +i \ DC + h# 8200.091c +i 0+i h# fe00.8000 +i 0+i h# 0000.4000 +i \ VP + h# 8200.0920 +i 0+i h# fe00.c000 +i 0+i h# 0000.4000 +i \ VIP (LX only) + " assigned-addresses" property + +end-package +devalias screen /display + +0 0 " c,1" " /pci" begin-package + fload ${BP}/dev/mmc/sdhci/sdhci.fth \ SD host controller +.( Gots to do init in sdhci.fth) cr + new-device + fload ${BP}/dev/mmc/sdhci/sdmmc.fth + finish-device +end-package + + +\ fload ${BP}/dev/geode/acpi.fth \ Power management + +[ifdef] rom-loaded +fload ${BP}/cpu/x86/pc/olpc/gpioinit.fth +fload ${BP}/cpu/x86/pc/olpc/chipinit.fth +[then] + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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/fwsmall.bth =================================================================== --- cpu/x86/pc/olpc/fwsmall.bth (rev 0) +++ cpu/x86/pc/olpc/fwsmall.bth 2007-09-29 19:40:22 UTC (rev 653) @@ -0,0 +1,324 @@ +purpose: Build Open Firmware for OLPC +\ See license at end of file + +dictionary: ${BP}/cpu/x86/build/kernel.dic +command: &x86forth &dictionary &this +in: builton.fth +build-now + + +fload ${BP}/cpu/x86/small.bth + +hex +' $report-name is include-hook + +fload ${BP}/cpu/x86/pc/olpc/smallconfig.fth + +: headerless ; : headers ; : headerless0 ; + +' (quit) to quit + +create debug-startup +: \Tags [compile] \ ; immediate +: \NotTags [compile] \ ; immediate + +fload ${BP}/cpu/x86/pc/segments.fth \ Segment selectors (address spaces) + +: RAMbase ( -- adr ) fw-virt-base ; +: RAMtop ( -- adr ) RAMbase /fw-ram + ; + +h# 00.0000 value dp-loc \ Set in patchboot +: stacktop ( -- adr ) RAMtop ; +: dict-limit ( -- adr ) RAMtop h# 06.0000 - ; + +\ XXX What we should do is pass in the top address in SP, and have +\ boot.fth allocate the user area by subtracting user-size. But +\ we need some way of finding it again for exception re-entry. +\ prom-main-task is used in arch/pc/boot.fth . The constant +\ value is wired into the assembly code +stacktop user-size - constant prom-main-task \ user area for main task + +0 value load-limit \ Top address of area at load-base +' 2drop to sync-cache + +def-load-base to load-base + +fload ${BP}/cpu/x86/msr.fth \ Access to machine specific registers + +h# 1000 to pagesize +d# 12 to pageshift + +dev / +1 encode-int " #address-cells" property +device-end + +\ Memory management services +fload ${BP}/ofw/core/memlist.fth \ Resource list common routines +fload ${BP}/ofw/core/showlist.fth \ Linked list display tool +fload ${BP}/ofw/core/allocph1.fth \ S Physical memory allocator +fload ${BP}/ofw/core/availpm.fth \ Available memory list + +fload ${BP}/cpu/x86/pc/rootnode.fth \ Platform-specific root node changes + +fload ${BP}/cpu/x86/pc/olpc/gpio.fth \ Rudimentary GPIO driver +fload ${BP}/cpu/x86/pc/olpc/probemem.fth \ Memory probing + +[ifdef] virtual-mode +fload ${BP}/cpu/x86/loadvmem.fth \ /mmu node + +stand-init: MMU + " /mmu" open-dev mmu-node ! +; +fload ${BP}/cpu/x86/pc/initdict.fth \ Dynamic dictionary allocation +[then] + +fload ${BP}/cpu/x86/crc32.fth \ Assembly language Zip CRC calculation +fload ${BP}/forth/lib/crc32.fth \ High-level portion of CRC calculation + +[ifdef] resident-packages + +[ifdef] linux-support +support-package: ext2-file-system + fload ${BP}/ofw/fs/ext2fs/ext2fs.fth \ Linux file system +end-support-package +[then] + +[ifdef] jffs2-support +support-package: jffs2-file-system + fload ${BP}/ofw/fs/jffs2/jffs2.fth \ Journaling flash file system 2 +end-support-package +[then] + +support-package: zip-file-system + fload ${BP}/ofw/fs/zipfs.fth \ Zip file system +end-support-package +[then] + +\ Load file format handlers + +: call32 ; + +: release-load-area ( boundary-adr -- ) drop ; + +headerless +[ifdef] virtual-mode +: (initial-heap) ( -- adr len ) sp0 @ ps-size - dict-limit tuck - ; +[else] +: (initial-heap) ( -- adr len ) RAMtop heap-size ; +[then] +' (initial-heap) is initial-heap +headers + +[ifdef] virtual-mode +fload ${BP}/cpu/x86/pc/mmusetup.fth \ Initial values for MMU lists +dev /mmu +: claim-rom ( -- ) + (initial-claim) + rom-pa h# ffff.0000 over - claim-virtual drop \ ROM 1-1 map +; +' claim-rom to initial-claim +dend +[then] + +fload ${BP}/cpu/x86/pc/olpc/devsmall.fth + +\ fload ${BP}/cpu/x86/pc/olpc/countdwn.fth \ Startup countdown + +fload ${BP}/cpu/x86/pc/boot.fth + +[ifdef] use-usb +: usb-port-power-map ( -- n ) +[ifdef] lx-devel + h# 3ea exit \ USB4:PWR2 USB3:PWR1 USB2:PWR1 USB1:PWR1 +[then] + board-revision h# b10 h# b2f between if \ B1 and B2 + h# 3ab \ USB4:PWR1 USB3:PWR1 USB2:PWR1 USB1:PWR2 + else + \ A-test doesn't switch USB power, so the value doesn't matter. + \ preB3 and presumably later use this value + h# 3aa \ USB4:PWR1 USB3:PWR1 USB2:PWR1 USB1:PWR1 + then +; +fload ${BP}/cpu/x86/pc/olpc/usb.fth +[then] + +\ false to stand-init-debug? +true to stand-init-debug? + +hex +: i-key-wait ( ms -- pressed? ) + cr ." Type 'i' to interrupt stand-init sequence" cr + 0 do + key? if + key upc ascii I = if true unloop exit then + then + 1 ms + loop + false +; + +\ stand-init-debug? [if] +warning @ warning off +: init +\ initial-heap add-memory + init + + standalone? if + disable-interrupts + d# 300 + i-key-wait if + ." Interacting" cr hex interact + then + + setup + then +; +\ warning ! +[then] + +' noop to .firmware + +: probe-all ( -- ) + probe-pci +[ifdef] use-usb + probe-usb +[then] +; + +[ifdef] linux-support +fload ${BP}/cpu/x86/pc/olpc/linux.fth +[then] + +fload ${BP}/dev/null.fth + +[ifdef] olpc +\ 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/security.fth +[then] + +\ Eliminate 4 second delay in install console for the case where +\ there is no keyboard. The delay is unnecessary because the screen +\ does not go blank when the device is closed. +patch drop ms install-console + +: dcon-reset-all ( -- ) + " screen" " dcon-off" ['] execute-device-method catch if + 2drop 2drop + then + + 1. h# 5140.0017 wrmsr \ DIVIL_SOFT_RESET MSR, 5536 page 367 + begin again +; +' dcon-reset-all to reset-all + +alias reboot bye + +alias crcgen drop ( crc byte -- crc' ) +fload ${BP}/cpu/x86/pc/saveabs.fth + +\ fload ${BP}/cpu/x86/pc/report.fth +fload ${BP}/ofw/core/dualconsole.fth + +0 value game-key-mask + +: read-game-keys ( -- ) + board-revision h# b20 < if + h# 100 to game-key-mask + exit + then + + game-key@ dup to game-key-mask if + ." Release the game key to continue" cr + begin d# 100 ms game-key@ 0= until + then +; + +: interpreter-init ( -- ) + hex + warning on + only forth also definitions + + install-alarm + + #line off + +\ .built cr +; + +: console-start ( -- ) +[ifdef] rom-loaded + video-map cr +[then] + " screen" open-dev ?dup if + set-stdout +\ logo-banner drop +\ close-dev +\ 0 stdout ! + then + + install-dual-console + +\ ." nvramrc" cr +\ use-nvramrc? if nvramrc safe-evaluate then +; +: optional-startup ( -- ) +[ifdef] use-usb + probe-usb + ?usb-keyboard +[then] +; + +: open-keyboard ( -- ) + " keyboard" open-dev ?dup if set-stdin then +; + + +: startup ( -- ) + standalone? 0= if exit then + + console-start + read-game-keys + banner + probe-pci + open-keyboard + optional-startup + interpreter-init + \ do-update + + quit +; + +.( --- Saving smallfw.dic ...) +" smallfw.dic" $save-forth cr + +\ patch foo decimal cold + +[ifndef] notdef +.( --- Saving fw.img ...) +" smallfw.img" RAMbase save-abs-rom cr +[then] + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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/smallconfig.fth =================================================================== --- cpu/x86/pc/olpc/smallconfig.fth (rev 0) +++ cpu/x86/pc/olpc/smallconfig.fth 2007-09-29 19:40:22 UTC (rev 653) @@ -0,0 +1,77 @@ +\ See license at end of file +purpose: Establish configuration definitions + +create olpc \ OLPC-specific build + +\ --- The environment that "boots" us --- +\ - Image Format - Example Media - previous stage bootloader + +\ - OBMD format - ROM - direct boot from ROM +create rom-loaded + +\ - ELF format (no pheader) - ROM - LinuxBIOS direct +\ create linuxbios-loaded + +\ - Linux kernel format - USB Key w/ FAT FS - LinuxBIOS w/ stripped Linux payload +\ create bzimage-loaded + +\ - ELF format w/ Multiboot signature - various - GRUB +\ create grub-loaded + +\ - (Syslinux) COM32 format - USB Key w/ FAT FS - Syslinux +\ create syslinux-loaded + + +\ create virtual-mode +create addresses-assigned \ Define if base addresses are already assigned +\ create serial-console \ Define to default to serial port for console +create pc +\ create linux-support +\ create jffs2-support +\ create use-elf + +\ create use-timestamp-counter \ Use CPU's timestamp counter for timing ... + \ ... this is worthwhile if your CPU has one. + +create resident-packages +\ create use-watch-all +\ create use-root-isa +create no-floppy-node +create no-com2-node +create no-lpt-node +create use-pci-isa +create basic-isa +create isa-dma-only + +create use-null-nvram + +\ Uncomment this to compile for the LX development board +\ It's not possible to use one ROM image for both OLPC and +\ the LX board, because of the ROM size difference. +\ create lx-devel \ Support for the LX development board + +fload ${BP}/cpu/x86/pc/olpc/addrs.fth + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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/small.bth =================================================================== --- cpu/x86/small.bth (rev 0) +++ cpu/x86/small.bth 2007-09-29 19:40:22 UTC (rev 653) @@ -0,0 +1,235 @@ +\ See license at end of file +purpose: Load file for Forth toolkit, without firmware + +dictionary: ${BP}/cpu/x86/build/kernel.dic +command: &x86forth &dictionary &this +build-now + + ' noop is include-hook +\ ' $report-name is include-hook +\ : rn (cr 2dup type 15 spaces ; ' rn is include-hook + +create no-tools +create no-heads +create resident-packages + +fload ${BP}/forth/lib/fwsetup.fth + +: dot hex transtart . transize . there . ouser . hedge . limit . cr decimal ; +.( after: ) dot + +transient + +\ Variables controlling inclusion of optional packages. + +[ifdef] no-heads +false +[else] +true +[then] +value assembler? \ 5280 bytes +true value forth-debug? \ 1064 bytes + +resident + +[ifndef] partial-no-heads transient [then] +fload ${BP}/forth/lib/filetool.fth \ needed for dispose, savefort.fth + +\NotTags fload ${BP}/forth/lib/dispose.fth +[ifndef] partial-no-heads resident [then] + +[ifndef] partial-no-heads transient [then] +\NotTags fload ${BP}/forth/lib/headless.fth +\NotTags fload ${BP}/forth/lib/showspac.fth +[ifndef] partial-no-heads resident [then] + +fload ${BP}/forth/lib/romable.fth + +fload ${BP}/forth/lib/hidden.fth + +fload ${BP}/forth/kernel/hashcach.fth + +fload ${BP}/forth/lib/th.fth +\ fload ${BP}/forth/lib/ansiterm.fth + +fload ${BP}/forth/kernel/splits.fth +fload ${BP}/forth/kernel/endian.fth + +fload ${BP}/forth/lib/strings.fth +fload ${BP}/forth/lib/stringop.fth + +fload ${BP}/forth/lib/fastspac.fth + +fload ${BP}/forth/lib/patch.fth +fload ${BP}/forth/lib/cirstack.fth \ Circular stack +\ fload ${BP}/forth/lib/pseudors.fth \ Interpretable >r and r> + +\ fload ${BP}/forth/lib/headtool.fth + +fload ${BP}/forth/lib/needs.fth + +\ fload ${BP}/forth/lib/suspend.fth +alias exit? false + +fload ${BP}/forth/lib/util.fth +\ fload ${BP}/forth/lib/format.fth +: to-column ( column# -- ) drop space ; + +fload ${BP}/forth/lib/stringar.fth + +fload ${BP}/forth/lib/parses1.fth \ String parsing + +\ fload ${BP}/forth/lib/dump.fth +\ fload ${BP}/forth/lib/words.fth +\ fload ${BP}/forth/lib/decomp.fth + +\ Uses over-vocabulary from words.fth +[ifndef] partial-no-heads transient [then] +\ \NotTags fload ${BP}/forth/lib/dumphead.fth +[ifndef] partial-no-heads resident [then] + +\ fload ${BP}/forth/lib/seechain.fth + +\ fload ${BP}/forth/lib/loadedit.fth \ Command line editor module + +\ fload ${BP}/forth/lib/caller.fth + +\ fload ${BP}/forth/lib/callfind.fth +fload ${BP}/forth/lib/substrin.fth +\ fload ${BP}/forth/lib/sift.fth + +fload ${BP}/forth/lib/array.fth + +fload ${BP}/forth/lib/linklist.fth \ Linked list routines + +fload ${BP}/forth/lib/lex.fth + +\ fload ${BP}/forth/lib/autold.fth \ Autoload mechanism + +[ifndef] partial-no-heads transient [then] +fload ${BP}/forth/lib/initsave.fth \ Common code for save-forth et al +fload ${BP}/forth/lib/reminder.fth \ Reminders +[ifndef] partial-no-heads resident [then] + +assembler? [if] +fload ${BP}/cpu/x86/assem.fth +fload ${BP}/cpu/x86/code.fth +fload ${BP}/forth/lib/loclabel.fth +[else] +transient fload ${BP}/cpu/x86/assem.fth resident +fload ${BP}/cpu/x86/code.fth +transient fload ${BP}/forth/lib/loclabel.fth resident +[then] +fload ${BP}/cpu/x86/asmspec.fth \ Special registers + +\ fload ${BP}/cpu/x86/decompm.fth + + +: be-l, ( l -- ) here set-swap-bit here 4 allot be-l! ; + +[ifndef] partial-no-heads transient [then] +fload ${BP}/cpu/x86/saveexp.fth +fload ${BP}/cpu/x86/savefort.fth +[ifndef] partial-no-heads resident [then] +alias $save-forth $save-forth + +\ [ifdef] resident-packages +\ fload ${BP}/cpu/x86/disassem.fth +\ [else] +\ autoload: disassem.fth +\ defines: dis +\ defines: +dis +\ defines: pc!dis1 +\ [then] + +\ fload ${BP}/forth/lib/instdis.fth + +fload ${BP}/cpu/x86/objsup.fth +fload ${BP}/forth/lib/objects.fth + +\ fload ${BP}/cpu/x86/cpustate.fth +\ fload ${BP}/cpu/x86/register.fth + +\ fload ${BP}/forth/lib/savedstk.fth +\ fload ${BP}/forth/lib/rstrace.fth +\ fload ${BP}/cpu/x86/ftrace.fth +\ fload ${BP}/cpu/x86/ctrace.fth +\ fload ${BP}/cpu/x86/showcras.fth + +\ forth-debug? [if] +\ fload ${BP}/cpu/x86/debugm.fth \ Forth debugger support +\ fload ${BP}/forth/lib/debug.fth \ Forth debugger +\ [then] + +\ start-module \ Breakpointing +\ fload ${BP}/cpu/x86/cpubpsup.fth \ Breakpoint support +\ fload ${BP}/forth/lib/breakpt.fth +\ fload ${BP}/cpu/x86/Linux/catchexc.fth \ OS signal handling +\ end-module + +: edit-file ( adr len maxlen -- len' ) drop nip ; +: edit-line ( adr len maxlen -- len' ) drop nip ; +defer light ' noop to light +alias cancel noop +: vsift? ( adr len voc-xt -- adr len exit? ) drop true ; +alias .in noop +defer .voc ' noop is .voc +alias save-state-common noop +defer save-state +alias init-exceptions noop +defer deny-history? +alias not-dark noop +alias (debug drop +alias cpeek c@ +alias wpeek w@ +alias lpeek l@ +alias cpoke c! +alias wpoke w! +alias lpoke l! +0 value load-base +variable file-size +: loaded load-base file-size @ ; +: !load-size file-size ! ; +defer ?inflate-loaded ' noop is ?inflate-loaded +alias external noop + +\needs no-heads create no-heads +fload ${BP}/cpu/x86/basefw.bth + +: reg ( phys.. size ) encode-reg " reg" property ; +: ($callback) ( nargs name$ -- error? ) 2drop 0 ?do drop loop true ; +: memory-test-suite ( adr len -- error? ) 2drop false ; +: byte-load ( adr stride -- ) 2drop ; +: model " model" string-property ; + +[ifndef] no-heads +resident dispose 0 0 set-transize \ true is suppress-transient +\ .( zeroed: ) dot + +' noop is include-hook ' noop is include-exit-hook +.( --- Saving small.dic --- ) " small.dic" $save-forth cr +[then] + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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

r652 - cpu/x86/Linux
by svn＠openbios.org 29 Sep '07

29 Sep '07

Author: wmb Date: 2007-09-29 21:36:29 +0200 (Sat, 29 Sep 2007) New Revision: 652 Removed: cpu/x86/Linux/graphics/ Log: Deleted mistakenly-added directory.

1 0

r651 - cpu/x86/Linux/graphics
by svn＠openbios.org 29 Sep '07

29 Sep '07

Author: wmb Date: 2007-09-29 21:34:52 +0200 (Sat, 29 Sep 2007) New Revision: 651 Removed: cpu/x86/Linux/graphics/graphdev.fth cpu/x86/Linux/graphics/run Log: Deleted redundant files Deleted: cpu/x86/Linux/graphics/graphdev.fth =================================================================== --- cpu/x86/Linux/graphics/graphdev.fth 2007-09-29 19:33:09 UTC (rev 650) +++ cpu/x86/Linux/graphics/graphdev.fth 2007-09-29 19:34:52 UTC (rev 651) @@ -1,42 +0,0 @@ -purpose: Simulation of OFW graphics using X - -dev / new-device - " xgraphics" device-name - : open ( -- okay? ) d# 1200 d# 900 d# 392 syscall 2drop retval 0= ; - : close ( -- ) d# 396 syscall ; - - : fill-rectangle ( color565 x y w h -- ) d# 404 syscall 4drop drop ; -finish-device - -: get-color ( r g b -- color ) - d# 400 syscall 3drop retval -; - -: open-screen - " /xgraphics" open-dev to screen-ih -; - -0 value xred -0 value xgreen -0 value xblue -0 value xmagenta -0 value xblack -0 value xmagenta - -: demo ( -- ) - open-screen - - h# ff h# 00 h# 00 get-color to xred - h# 00 h# ff h# 00 get-color to xgreen - h# 00 h# 00 h# ff get-color to xblue - h# ff h# 00 h# ff get-color to xmagenta - 0 0 0 get-color to xblack - h# ff h# ff h# ff get-color to xmagenta - - d# 500 0 do i xred show-state loop - d# 1000 d# 500 do i xblue show-state loop - d# 1500 d# 1000 do i xgreen show-state loop - d# 2000 d# 1500 do i xmagenta show-state loop - - xblack d# 400 d# 300 d# 50 d# 60 " fill-rectangle" $call-screen -; Deleted: cpu/x86/Linux/graphics/run =================================================================== --- cpu/x86/Linux/graphics/run 2007-09-29 19:33:09 UTC (rev 650) +++ cpu/x86/Linux/graphics/run 2007-09-29 19:34:52 UTC (rev 651) @@ -1,2 +0,0 @@ -#!/bin/sh -./forth fw.dic graphdev.fth -

1 0

r650 - in cpu/x86/Linux: . graphics
by svn＠openbios.org 29 Sep '07

29 Sep '07

Author: wmb Date: 2007-09-29 21:33:09 +0200 (Sat, 29 Sep 2007) New Revision: 650 Added: cpu/x86/Linux/graphics/ cpu/x86/Linux/graphics/graphdev.fth cpu/x86/Linux/graphics/run Log: Added X graphics support for use under Linux. Added: cpu/x86/Linux/graphics/graphdev.fth =================================================================== --- cpu/x86/Linux/graphics/graphdev.fth (rev 0) +++ cpu/x86/Linux/graphics/graphdev.fth 2007-09-29 19:33:09 UTC (rev 650) @@ -0,0 +1,42 @@ +purpose: Simulation of OFW graphics using X + +dev / new-device + " xgraphics" device-name + : open ( -- okay? ) d# 1200 d# 900 d# 392 syscall 2drop retval 0= ; + : close ( -- ) d# 396 syscall ; + + : fill-rectangle ( color565 x y w h -- ) d# 404 syscall 4drop drop ; +finish-device + +: get-color ( r g b -- color ) + d# 400 syscall 3drop retval +; + +: open-screen + " /xgraphics" open-dev to screen-ih +; + +0 value xred +0 value xgreen +0 value xblue +0 value xmagenta +0 value xblack +0 value xmagenta + +: demo ( -- ) + open-screen + + h# ff h# 00 h# 00 get-color to xred + h# 00 h# ff h# 00 get-color to xgreen + h# 00 h# 00 h# ff get-color to xblue + h# ff h# 00 h# ff get-color to xmagenta + 0 0 0 get-color to xblack + h# ff h# ff h# ff get-color to xmagenta + + d# 500 0 do i xred show-state loop + d# 1000 d# 500 do i xblue show-state loop + d# 1500 d# 1000 do i xgreen show-state loop + d# 2000 d# 1500 do i xmagenta show-state loop + + xblack d# 400 d# 300 d# 50 d# 60 " fill-rectangle" $call-screen +; Added: cpu/x86/Linux/graphics/run =================================================================== --- cpu/x86/Linux/graphics/run (rev 0) +++ cpu/x86/Linux/graphics/run 2007-09-29 19:33:09 UTC (rev 650) @@ -0,0 +1,2 @@ +#!/bin/sh +./forth fw.dic graphdev.fth - Property changes on: cpu/x86/Linux/graphics/run ___________________________________________________________________ Name: svn:executable + *

1 0

r649 - cpu/x86/pc/olpc
by svn＠openbios.org 29 Sep '07

29 Sep '07

Author: wmb Date: 2007-09-29 21:26:47 +0200 (Sat, 29 Sep 2007) New Revision: 649 Added: cpu/x86/pc/olpc/gamekeys.fth Log: Moved game-key support from fw.bth into separate file. Added: cpu/x86/pc/olpc/gamekeys.fth =================================================================== --- cpu/x86/pc/olpc/gamekeys.fth (rev 0) +++ cpu/x86/pc/olpc/gamekeys.fth 2007-09-29 19:26:47 UTC (rev 649) @@ -0,0 +1,27 @@ +purpose: Access to game keys (buttons on front panel) + +h# 1 constant button-square +h# 2 constant button-check +h# 4 constant rocker-up +h# 8 constant rocker-down +h# 10 constant rocker-left +h# 20 constant rocker-right +h# 40 constant button-rotate +h# 80 constant button-o +h# 100 constant button-x + +0 value game-key-mask + +: read-game-keys ( -- ) +[ifdef] lx-devel false exit [then] + board-revision h# b18 < if + button-x to game-key-mask \ Force slow boot + exit + then + + game-key@ dup to game-key-mask if + ." Release the game key to continue" cr + begin d# 100 ms game-key@ 0= until + then +; +: game-key? ( mask -- flag ) game-key-mask and 0<> ;

1 0

r648 - cpu/x86/pc/olpc
by svn＠openbios.org 29 Sep '07

29 Sep '07

Author: wmb Date: 2007-09-29 21:26:04 +0200 (Sat, 29 Sep 2007) New Revision: 648 Modified: cpu/x86/pc/olpc/copynand.fth Log: copy-nand - support reloading files saved with dump-nand, with OOB data inline. Modified: cpu/x86/pc/olpc/copynand.fth =================================================================== --- cpu/x86/pc/olpc/copynand.fth 2007-09-29 19:25:03 UTC (rev 647) +++ cpu/x86/pc/olpc/copynand.fth 2007-09-29 19:26:04 UTC (rev 648) @@ -90,7 +90,10 @@ h# 100 buffer: crc-name-buf : crc-name$ ( -- adr len ) crc-name-buf count ; +0 value img-has-oob? + : ?open-crcs ( -- ) + img-has-oob? if exit then image-name$ + 4 - " .img" caps-comp 0= if image-name$ crc-name-buf place " crc" crc-name$ + 3 - swap move @@ -98,6 +101,10 @@ then #crc-records if ." Check file is " crc-name$ type cr + + #image-eblocks if + #image-eblocks #crc-records <> " CRC file length is wrong" ?nand-abort + then then ; @@ -106,13 +113,26 @@ : open-img ( "devspec" -- ) image-name$ open-dev to fileih fileih 0= " Can't open NAND image file" ?nand-abort - " size" fileih $call-method /nand-block um/mod ( residue #eblocks ) - to #image-eblocks ( residue ) - 0<> " Image file size is not a multiple of the NAND erase block size" ?nand-abort + " size" fileih $call-method ( d.size ) + 2dup /nand-block um/mod swap if ( d.size #eblocks ) + \ Wrong size for the no-oob data format; try the dump-nand format + drop ( d.size #eblocks ) + h# 21100 um/mod swap ( #eblocks residue ) + 0<> " Image file size is not a multiple of the NAND erase block size" ?nand-abort + true to img-has-oob? + else ( d.size #eblocks ) + false to img-has-oob? + nip nip ( #eblocks ) + then ( #eblocks ) + to #image-eblocks + #image-eblocks 0= " Image file is empty" ?nand-abort +; - #crc-records if - #image-eblocks #crc-records <> " CRC file length is wrong" ?nand-abort +: ?skip-oob ( -- ) + img-has-oob? if + load-base h# 1100 " read" fileih $call-method ( len ) + h# 1100 <> " Bad read of OOB data in .img file" ?nand-abort ( ) then ; @@ -181,8 +201,8 @@ : copy-nand ( "devspec" -- ) open-nand get-img-filename + open-img ?open-crcs - open-img ['] noop to show-progress @@ -198,6 +218,7 @@ i ?check-crc load-base " copy-block" $call-nand ( page# error? ) " Error writing to NAND FLASH" ?nand-abort ( page# ) + ?skip-oob nand-pages/block / show-written ( ) loop @@ -233,8 +254,8 @@ hex open-nand close-nand-ihs \ To set sizes get-img-filename + open-img ?open-crcs - open-img #crc-records 0= " No CRC file" ?nand-abort ['] noop to show-progress

1 0

r647 - cpu/x86/pc/olpc cpu/x86/pc/olpc/images dev/geode/display dev/video/common ofw/termemu
by svn＠openbios.org 29 Sep '07

29 Sep '07

Author: wmb Date: 2007-09-29 21:25:03 +0200 (Sat, 29 Sep 2007) New Revision: 647 Added: cpu/x86/pc/olpc/images/check.565 cpu/x86/pc/olpc/images/check.bmp cpu/x86/pc/olpc/images/darkdot.565 cpu/x86/pc/olpc/images/darkdot.bmp cpu/x86/pc/olpc/images/develkey.565 cpu/x86/pc/olpc/images/develkey.bmp cpu/x86/pc/olpc/images/lightdot.565 cpu/x86/pc/olpc/images/lightdot.bmp cpu/x86/pc/olpc/images/lock.565 cpu/x86/pc/olpc/images/lock.bmp cpu/x86/pc/olpc/images/minus.565 cpu/x86/pc/olpc/images/minus.bmp cpu/x86/pc/olpc/images/plus.565 cpu/x86/pc/olpc/images/plus.bmp cpu/x86/pc/olpc/images/sad.565 cpu/x86/pc/olpc/images/sad.bmp cpu/x86/pc/olpc/images/topkey.565 cpu/x86/pc/olpc/images/topkey.bmp cpu/x86/pc/olpc/images/unlock.565 cpu/x86/pc/olpc/images/unlock.bmp cpu/x86/pc/olpc/images/x.565 cpu/x86/pc/olpc/images/x.bmp cpu/x86/pc/olpc/images/xogray.565 cpu/x86/pc/olpc/images/xogray.bmp cpu/x86/pc/olpc/images/yellowdot.565 cpu/x86/pc/olpc/images/yellowdot.bmp Modified: cpu/x86/pc/olpc/crypto.bth cpu/x86/pc/olpc/crypto.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/gui.fth cpu/x86/pc/olpc/images/sd.565 cpu/x86/pc/olpc/images/sd.bmp cpu/x86/pc/olpc/loaddropins.fth cpu/x86/pc/olpc/security.fth dev/geode/display/gxfb.fth dev/video/common/rectangle16.fth ofw/termemu/fb16.fth Log: New pretty-boot scheme tied in with security (omnibus checkin of many files) Modified: cpu/x86/pc/olpc/crypto.bth =================================================================== --- cpu/x86/pc/olpc/crypto.bth 2007-09-29 19:16:30 UTC (rev 646) +++ cpu/x86/pc/olpc/crypto.bth 2007-09-29 19:25:03 UTC (rev 647) @@ -6,6 +6,7 @@ fload ${BP}/cpu/x86/pc/olpc/versions.fth " wget http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img -O verify.img" expand$ $sh +" wget http://dev.laptop.org/pub/firmware/crypto/bios_hasher-${CRYPTO_VERSION}.img -O hasher.img" expand$ $sh " wget http://dev.laptop.org/pub/firmware/crypto/testkeys/os.public -O os.public" expand$ $sh " wget http://dev.laptop.org/pub/firmware/crypto/testkeys/fw.public -O fw.public" expand$ $sh " wget http://dev.laptop.org/pub/firmware/crypto/testkeys/lease.public -O lease.public" expand$ $sh Modified: cpu/x86/pc/olpc/crypto.fth =================================================================== --- cpu/x86/pc/olpc/crypto.fth 2007-09-29 19:16:30 UTC (rev 646) +++ cpu/x86/pc/olpc/crypto.fth 2007-09-29 19:25:03 UTC (rev 647) @@ -5,18 +5,24 @@ h# d0000 constant verify-bss \ The address the code is linked to run at h# 10000 constant /verify-bss -0 [if] -h# c0000 constant hasher-base \ The address the code is linked to run at +1 [if] +h# 70000 constant hasher-base \ The address the code is linked to run at +h# 80000 constant hasher-bss +h# 18000 constant /hasher-bss variable hashlen d# 128 buffer: hashbuf +: get-hasher ( -- ) + " hasher" find-drop-in 0= if 4drop true exit then ( prog$ ) + 2dup hasher-base swap move free-mem ( hashname$ ) +; + : hash ( data$ hashname$ -- result$ ) - " hasher" find-drop-in 0= if 4drop true exit then ( data$ hashname$ prog$ ) - 2dup hasher-base swap move free-mem ( data$ hashname$ ) - d# 128 hashlen ! - 2>r swap hashlen hashbuf 2swap 2r> $cstr ( &reslen resbuf datalen databuf hashname-cstr ) + $cstr hashbuf hashlen ( databuf datalen hashname-cstr resbuf &reslen ) + hasher-bss /hasher-bss erase + hasher-base dup h# 10 - sp-call abort" Hash failed" drop 4drop ( ) hashbuf hashlen @ ; @@ -25,7 +31,9 @@ 0 value crypto-loaded? : load-crypto ( -- error? ) crypto-loaded? if false exit then - " verify" find-drop-in 0= if true exit then ( prog$ ) + " verify" find-drop-in 0= if + ." Can't find crypto code" cr true exit + then ( prog$ ) 2dup verify-base swap move free-mem ( ) true to crypto-loaded? false Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-09-29 19:16:30 UTC (rev 646) +++ cpu/x86/pc/olpc/fw.bth 2007-09-29 19:25:03 UTC (rev 647) @@ -272,7 +272,7 @@ ." Interacting due to botched resume" cr hex interact then i-key-wait if - " patch false fast-boot? startup" eval +\ " patch false fast-boot? startup" eval ." Interacting" cr hex interact then [ifdef] lx-devel @@ -335,6 +335,7 @@ \ 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/security.fth fload ${BP}/cpu/x86/pc/olpc/setwp.fth fload ${BP}/ofw/gui/ofpong.fth @@ -438,23 +439,9 @@ \ fload ${BP}/cpu/x86/pc/report.fth fload ${BP}/ofw/core/dualconsole.fth -0 value game-key-mask - -: read-game-keys ( -- ) -[ifdef] lx-devel false exit [then] - board-revision h# b18 < if - h# 100 to game-key-mask - exit - then - - game-key@ dup to game-key-mask if - ." Release the game key to continue" cr - begin d# 100 ms game-key@ 0= until - then -; : fast-boot? ( -- flag ) [ifdef] rom-loaded - game-key-mask h# 120 and 0= + button-x game-key? 0= [else] false [then] @@ -506,11 +493,6 @@ then ; -: optional-startup ( -- ) - probe-usb - ?usb-keyboard -; - : go-hook-freeze [ ' go-hook behavior compile, ] 0 " set-source" $call-screen @@ -519,13 +501,13 @@ : unfreeze ( -- ) ['] usb-quiet to go-hook ; : ?sound ( -- ) - game-key-mask h# 40 and 0= if sound then + button-rotate game-key? 0= if sound then ; : ?freeze ( -- ) - game-key-mask h# 40 and 0= if freeze then + button-rotate game-key? 0= if freeze then ; : ?games ( -- ) - game-key-mask h# 20 and if + rocker-right game-key? if time&date 5drop 1 and if pong else life-demo then then ; @@ -540,36 +522,51 @@ console-start read-game-keys +[ifdef] notdef fast-boot? if - stdout off +( D) stdout off \ banner probe-pci ?sound open-keyboard +( D) \ ?games ?freeze - ['] false to interrupt-auto-boot? +\ ['] false to interrupt-auto-boot? probe-usb \ " nand" $dev-update-flash interpreter-init -[ifndef] lx-devel - enable-power-button -[then] - auto-boot - screen-ih stdout ! - ?usb-keyboard + secure-startup +( D) screen-ih stdout ! \ +( D) ?usb-keyboard \ else - banner +( D) banner \ stdout off probe-pci ?sound open-keyboard +( D) ?games \ + ?freeze + probe-usb +( D) ?usb-keyboard \ + interpreter-init + secure-startup + then +[else] + stdout off \ + probe-pci + ?sound + open-keyboard ?games ?freeze - optional-startup + ['] false to interrupt-auto-boot? + probe-usb +\ " nand" $dev-update-flash interpreter-init -[ifndef] lx-devel - enable-power-button + secure-startup + ['] (interrupt-auto-boot?) to interrupt-auto-boot? + screen-ih stdout ! + banner + ?usb-keyboard [then] - auto-boot - then + auto-boot blue-letters ." Type 'help' for more information." black-letters cr cr Modified: cpu/x86/pc/olpc/gui.fth =================================================================== --- cpu/x86/pc/olpc/gui.fth 2007-09-29 19:16:30 UTC (rev 646) +++ cpu/x86/pc/olpc/gui.fth 2007-09-29 19:25:03 UTC (rev 647) @@ -3,6 +3,7 @@ d# 0 d# 0 2value first-icon-xy 0 0 2value icon-xy +0 0 2value last-xy 0 value text-y : ?next-row ( -- ) @@ -14,15 +15,15 @@ then ; -: show-565 ( image-adr,len -- ) +: prep-565 ( image-adr,len -- bits-adr x y w h ) drop dup " C565" comp abort" Not in C565 format" dup 4 + le-w@ to image-width dup 6 + le-w@ to image-height 8 + ?next-row + icon-xy to last-xy icon-xy image-width image-height - " draw-rectangle" $call-screen ; : $get-image ( filename$ -- true | adr,len false ) @@ -34,13 +35,21 @@ ; : $show ( filename$ -- ) not-screen? if 2drop exit then - $get-image if exit then 2dup show-565 free-mem + 0 to image-width \ In case $show fails + $get-image if exit then + 2dup prep-565 " draw-transparent-rectangle" $call-screen + free-mem ; -: $show&advance ( filename$ -- ) - 0 to image-width \ In case $show fails - $show +: $show-opaque ( filename$ -- ) + not-screen? if 2drop exit then + $get-image if exit then + 2dup prep-565 " draw-rectangle" $call-screen + free-mem +; +: advance ( -- ) icon-xy image-width 0 d+ to icon-xy ; +: $show&advance ( filename$ -- ) $show advance ; : fix-cursor ( -- ) cursor-on ['] user-ok to (ok) user-ok ; @@ -247,7 +256,7 @@ \ Make the terminal emulator use a region that avoids the logo area : avoid-logo ( -- ) - 0 h# f ( fg-color bg-color ) + screen-ih package( foreground-color background-color )package ( fg-color bg-color ) screen-wh drop char-wh drop d# 80 * - 2/ ( fg-color bg-color x ) text-y ( fg-color bg-color x y ) char-wh drop d# 80 * ( fg-color bg-color x y w ) @@ -309,7 +318,9 @@ avoid-logo 0 to image-width 0 to image-height \ In case $show-bmp fails - " rom:olpc.565" $show&advance +[ifdef] old-way + " rom:olpc.565" $show&advance +[then] icon-xy to first-icon-xy @@ -347,13 +358,13 @@ h# 32 buffer: icon-name -: show-icon-file ( basename$ -- ) +: show-icon ( basename$ -- ) " rom:" icon-name pack $cat ( ) " .565" icon-name $cat ( ) - icon-name count $show&advance ( ) + icon-name count $show ( ) ; -: ?show-icon ( adr len -- ) +: ?show-package-icon ( adr len -- ) locate-device if exit then ( phandle ) " icon" 2 pick get-package-property 0= if ( phandle prop$ ) @@ -362,19 +373,19 @@ then ( phandle ) " iconname" 2 pick get-package-property 0= if ( phandle prop$ ) - get-encoded-string show-icon-file ( phandle ) + get-encoded-string show-icon advance ( phandle ) drop exit then ( phandle ) " name" 2 pick get-package-property 0= if ( phandle prop$ ) - get-encoded-string show-icon-file ( phandle ) + get-encoded-string show-icon advance ( phandle ) drop exit then ( phandle ) drop ; : (?show-device) ( adr len -- adr len ) - not-screen? 0= if 2dup ?show-icon then + not-screen? 0= if 2dup ?show-package-icon then ; ' (?show-device) to ?show-device Added: cpu/x86/pc/olpc/images/check.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/check.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/check.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/check.bmp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/darkdot.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/darkdot.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/darkdot.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/darkdot.bmp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/develkey.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/develkey.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/develkey.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/develkey.bmp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/lightdot.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/lightdot.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/lightdot.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/lightdot.bmp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/lock.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/lock.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/lock.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/lock.bmp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/minus.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/minus.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/minus.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/minus.bmp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/plus.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/plus.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/plus.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/plus.bmp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/sad.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/sad.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/sad.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/sad.bmp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: cpu/x86/pc/olpc/images/sd.565 =================================================================== (Binary files differ) Modified: cpu/x86/pc/olpc/images/sd.bmp =================================================================== (Binary files differ) Added: cpu/x86/pc/olpc/images/topkey.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/topkey.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/topkey.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/topkey.bmp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/unlock.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/unlock.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/unlock.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/unlock.bmp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/x.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/x.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/x.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/x.bmp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/xogray.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/xogray.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/xogray.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/xogray.bmp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/yellowdot.565 =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/yellowdot.565 ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: cpu/x86/pc/olpc/images/yellowdot.bmp =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/yellowdot.bmp ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: cpu/x86/pc/olpc/loaddropins.fth =================================================================== --- cpu/x86/pc/olpc/loaddropins.fth 2007-09-29 19:16:30 UTC (rev 646) +++ cpu/x86/pc/olpc/loaddropins.fth 2007-09-29 19:25:03 UTC (rev 647) @@ -28,13 +28,34 @@ " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/olpclogo.565" " olpc.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " nandflash.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/lightdot.565" " lightdot.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/yellowdot.565" " yellowdot.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/darkdot.565" " darkdot.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/lock.565" " lock.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/unlock.565" " unlock.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/plus.565" " plus.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/minus.565" " minus.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/x.565" " x.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/sad.565" " sad.565" $add-deflated-dropin + +\ " ${BP}/cpu/x86/pc/olpc/images/topkey.565" " topkey.565" $add-deflated-dropin +\ " ${BP}/cpu/x86/pc/olpc/images/dot0.565" " mark0.565" $add-deflated-dropin +\ " ${BP}/cpu/x86/pc/olpc/images/dot1.565" " mark1.565" $add-deflated-dropin +\ " ${BP}/cpu/x86/pc/olpc/images/dot2.565" " mark2.565" $add-deflated-dropin +\ " ${BP}/cpu/x86/pc/olpc/images/dot3.565" " mark3.565" $add-deflated-dropin +\ " ${BP}/cpu/x86/pc/olpc/images/lock2.565" " lock2.565" $add-deflated-dropin +\ " ${BP}/cpu/x86/pc/olpc/images/unlock2.565" " unlock2.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/check.565" " check.565" $add-deflated-dropin +\ " ${BP}/cpu/x86/pc/olpc/images/leasekey.565" " leasekey.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/xogray.565" " xogray.565" $add-deflated-dropin +\ " ${BP}/cpu/x86/pc/olpc/images/olpclogo.565" " olpc.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " nand.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " fastnand.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/ethernet.565" " ethernet.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/usbkey.565" " usbdisk.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/usbkey.565" " disk.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/xo.565" " xo.565" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/sd.565" " sdmmc.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/sd.565" " sd.565" $add-deflated-dropin " ${BP}/ofw/termemu/gallant.obf" " font" $add-deflated-dropin @@ -43,3 +64,5 @@ " fw.public" " fwpubkey" $add-dropin \ Incompressible " lease.public" " leasepubkey" $add-dropin \ Incompressible " developer.public" " develpubkey" $add-dropin \ Incompressible + + " hasher.img" " hasher" $add-deflated-dropin Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-09-29 19:16:30 UTC (rev 646) +++ cpu/x86/pc/olpc/security.fth 2007-09-29 19:25:03 UTC (rev 647) @@ -3,7 +3,11 @@ \ Specs at http://wiki.laptop.org/go/Firmware_Security -: developer-device-list " disk sd nand" ; +: security-failure ( -- ) + ." Security failure" cr + d# 10000 ms power-off +; + : boot-device-list " disk sd nand" ; true value debug-security? @@ -131,7 +135,8 @@ \ bundle whose name is constructed from the current settings of the \ device (DN), path (PN), filename head (CN), and filename body (FN). -: bundle-present? ( -- flag ) +: bundle-present? ( fn$ -- flag ) + fn-buf place bundle-name$ " Trying " ?lease-debug 2dup ?lease-debug-cr ['] (boot-read) catch if 2drop false exit then @@ -166,6 +171,11 @@ hashname place ( data$ sig$ ) pubkey$ hashname count signature-bad? 0= ( okay? ) + dup if + " Signature valid" ?lease-debug-cr + else + " Signature invalid" ?lease-debug-cr + then ; \ earliest is the earliest acceptable date value (in seconds). @@ -374,12 +384,6 @@ 4drop -1 exit then ( sig$ expiration$ ) check-machine-signature ( -1|1 ) - - dup 0< if - " has bad signature" ?lease-debug-cr - else - " valid" ?lease-debug-cr - then ; \ lease-valid? tries to read a lease file from the currently-selected @@ -391,6 +395,7 @@ " ${DN}:\security\lease.sig" expand$ ( name$ ) " Trying " ?lease-debug 2dup ?lease-debug-cr r/o open-file if drop false exit then ( ih ) + load-started >r ( r: ih ) " Lease " ?lease-debug ( r: ih ) leasekey$ to pubkey$ ( r: ih ) @@ -400,8 +405,8 @@ then ( actual -eof? ) while ( actual ) sec-line-buf swap check-lease case ( -1|0|1 ) - 1 of r> close-file drop true exit endof - -1 of r> close-file drop false exit endof + 1 of r> close-file drop " unlock" show-icon true exit endof + -1 of r> close-file drop " lock" show-icon false exit endof endcase repeat r> close-file drop false @@ -414,7 +419,7 @@ \ present) or "actos.zip" (the activation version of the OS). : ?leased ( -- ) - lease-valid? if " run" else " act" then cn-buf place + lease-valid? if " run" else " act" then cn-buf place ; \ olpc-load-image is factor that is close the top level of the @@ -425,22 +430,18 @@ \ "runos.zip" according to whether or not a valid lease for \ this machine is present on the same device. -: olpc-load-image ( list$ dirname$ -- okay? ) - pn-buf place ( list$ ) +: olpc-load-image ( list$ -- okay? ) begin dup while ( list$ ) bl left-parse-string ( list$ devname$ ) dn-buf place ( list$' ) ?leased ( list$ ) - bundle-present? if ( list$ ) + " os" bundle-present? if ( list$ ) " OS found - " ?lease-debug 0 hashname c! oskey$ to pubkey$ img$ sig$ valid? if - " Signature valid" ?lease-debug-cr img$ tuck load-base swap move !load-size 2drop true exit - else - " Signature invalid" ?lease-debug-cr then then ( list$ ) repeat ( list$ ) @@ -453,21 +454,41 @@ \ the NAND FLASH for an alternate OS image. : secure-load ( -- okay? ) - load-crypto if ( ) - ." Can't get crypto code" cr ( ) - false exit - then ( ) + load-crypto if false exit then get-my-sn if false exit then get-date if false exit then - " os" fn-buf place - - boot-device-list " \boot" olpc-load-image if true exit then - " nand" " \boot-alt" olpc-load-image if true exit then + " \boot" pn-buf place boot-device-list olpc-load-image if true exit then + " \boot-alt" pn-buf place " nand" olpc-load-image if true exit then false ; +0 value alternate? +: set-alternate ( -- ) + button-o game-key? if true to alternate? exit then + h# 82 cmos@ [char] A = if + [char] N h# 82 cmos! + true to alternate? exit + then + false to alternate? +; + +0 0 2value base-xy +: show-check ( -- ) + icon-xy base-xy to icon-xy " check" show-icon to icon-xy +; +: +icon-xy ( delta-x,y -- ) icon-xy d+ to icon-xy ; + +: show-dot ( -- ) + alternate? if " yellowdot" else " lightdot" then show-icon +; +: show-x ( -- ) " x" show-icon ; +: show-sad ( -- ) " sad" show-icon ; +: show-lock ( -- ) " lock" show-icon ; +: show-unlock ( -- ) " unlock" show-icon ; + + \ secure-load-ramdisk is called during the process of preparing an \ OS image for execution. It looks for an initrd bundle file on \ the same device where the OS image was found, in a file named @@ -490,27 +511,28 @@ ['] load-path behavior >r ( r: xt ) ['] ramdisk-buf to load-path ( r: xt ) - " rd" fn-buf place - bundle-present? if + d# 16 0 +icon-xy show-dot + \ cn-buf is already set as a result of the ?leased that + \ happened before loading the OS file + " rd" bundle-present? if r> to load-path " RD found - " ?lease-debug 0 hashname c! img$ sig$ valid? if - " Signature valid" ?lease-debug-cr + show-unlock load-base to ramdisk-adr img$ dup to /ramdisk ( adr len ) load-base swap move ( ) exit else - " Signature invalid" ?lease-debug-cr + show-unlock fail-load then then r> to load-path ; - \ secure-boot performs the secure boot process : secure-boot ( -- ) @@ -527,12 +549,12 @@ " wp" find-tag if 2drop true to secure? then ; -\ ?secure-boot performs either the secure boot algorithm or the +\ do-secure-boot performs either the secure boot algorithm or the \ historical boot algorithm depending on the presence of a "wp" \ manufacturing data tag. -: ?secure-boot ( -- ) secure? if secure-boot else boot then ; -" ?secure-boot" ' boot-command set-config-string-default +: do-secure-boot ( -- ) secure? if secure-boot else boot then ; +\ " do-secure-boot" ' boot-command set-config-string-default \ check-devel-key tests the developer signature string "dev01$". @@ -559,8 +581,10 @@ : has-developer-key? ( -- flag ) " ${DN}:\security\develop.sig" expand$ ( name$ ) + " Trying " ?lease-debug 2dup ?lease-debug-cr r/o open-file if drop false exit then ( ih ) >r + load-started begin sec-line-buf /sec-line-max r@ read-line if ( actual -eof? ) 2drop r> close-file drop false exit @@ -577,71 +601,153 @@ \ developer? searches a list of devices (given by "developer-device-list") \ for a valid developer key -: developer? ( -- flag ) - get-my-sn if false exit then +: checked-load-started ( -- ) + not-screen? if exit then + show-check +; +\ ' checked-load-started to load-started +\ noop to load-started - load-crypto if ( ) - ." Can't get crypt code" cr ( ) - false exit - then ( ) +: ?toggle-secure ( -- ) button-x game-key? if secure? 0= to secure? then ; - developer-device-list ( list$ ) - begin dup while ( list$ ) - bl left-parse-string dn-buf place ( list$' ) - has-developer-key? if ( list$' ) - 2drop true exit - then ( list$ ) - repeat ( list$ ) - 2drop false +6 buffer: fw#buf +: (fw-version) ( base-adr -- n ) + h# f.ffc7 + fw#buf 5 move + fw#buf 4 + c@ bl = if [char] 0 fw#buf 4 + c! then + base @ >r d# 36 base ! + fw#buf 5 $number if + show-x + ." Invalid firmware version number" security-failure + then + pop-base ; +: firmware-up-to-date? ( img$ -- ) + /flash <> if show-x ." Invalid Firmware image" security-failure then ( adr ) + (fw-version) ( file-version# ) + rom-pa (fw-version) ( file-version# rom-version# ) + u<= +; -fexit +: load-from-device ( devname$ -- done? ) -Firmware security use cases: + d# 16 0 +icon-xy show-dot + null$ cn-buf place + " bootfw" bundle-present? if + " FW found - " ?lease-debug -a) load image signing: + img$ firmware-up-to-date? if + " plus" show-icon + " current FW is up-to-date" ?lease-debug-cr + else + " minus" show-icon + " new - " ?lease-debug + 0 hashname c! + fwkey$ to pubkey$ + img$ sig$ valid? if + img$ tuck flash-buf swap move ( len ) + ?image-valid ( ) + true to file-loaded? + " Updating firmware" ?lease-debug -Package: {run,act}{os,rd}.zip -Expiration: none -Signed object: OS or RD image file in .zip file -Signature: sha256_rsa256.sig in .zip file -Verification Algorithm: sha256 -> rsa256 -Verification Key: OLPC-run-public-key + \ Latch alternate? flag for next startup + alternate? if [char] A h# 82 cmos! then -Rule: Don't run the image if the signature fails + reflash \ Should power-off and reboot + show-x + ." Reflash returned, unexpectedly" cr + security-failure + then + show-lock + then + then -b) Firmware update key + d# 16 0 +icon-xy show-dot + ?leased \ Sets cn-buf -Package: /boot/bootfw.zip -Expiration: none (but should be versioned to avoid repeated updates) -Signed object: image in .zip file -Signature1: sha255.rsa in .zip file -Signature2: whirl.rsa in .zip file -Verification Algorithm: sha256 -> rsa256, whirlpool -> rsa256 -Verification Key: OLPC-fw-public-key + d# 16 0 +icon-xy show-dot + " os" bundle-present? if + " OS found - " ?lease-debug + 0 hashname c! + oskey$ to pubkey$ + img$ sig$ valid? if + img$ tuck load-base swap move !load-size + show-unlock + true exit + then + show-lock + then + false ( done? ) +; -Rule: If the developer key is valid, enter unlocked firmware state +: filesystem-present? ( -- flag ) + " ${DN}:\" expand$ ( name$ ) + open-dev dup if dup close-dev then + 0<> +; -c) Developer key +0 0 2value next-xy +: load-from-list ( list$ -- devkey? ) + begin dup while ( list$ ) + bl left-parse-string ( list$ devname$ ) + 2dup dn-buf place ( list$ devname$ ) -Package: /security/develop.key -Expiration: none -Signed object: <serial#>:<uuid>:00000000T000000Z (representing the machine) -Signature: rsa256 data in sig01 line -Verification Algorithm: rsa256 -Verification Key: OLPC-devel-public-key + show-icon ( list$ xy ) + icon-xy to base-xy + icon-xy image-width 0 d+ to next-xy ( list$ ) -Rule: If the developer key is valid, enter unlocked firmware state + filesystem-present? if -d) Activation lease + d# 5 d# 77 +icon-xy show-dot + has-developer-key? if + show-unlock + true exit + then -Package: /security/lease -Expiration: Yes - time on signature line -Signed object: <serial#>:<uuid>:<expiration time> (representing the machine) -Signature: rsa256 data in sig01 line -Verification Algorithm: rsa256 -Verification Key: OLPC-act-public-key + load-from-device if + 2drop + ['] secure-load-ramdisk to load-ramdisk + " init-program" $find if execute go then + show-x + security-failure + then + then -Rule: If the lease is invalid, invoke act{os,rd}.zip instead of run{os,rd}.zip + next-xy to icon-xy + repeat ( list$ ) + " sad" show-icon + 2drop false +; +: text-on screen-ih stdout ! ; +: persistent-devkey? ( -- flag ) " dk" find-tag dup if nip nip then ; + +: all-devices$ ( -- list$ ) " disk sd fastnand nand" ; +: secure-startup ( -- ) + ['] noop to ?show-device + ['] noop to load-done + ['] noop to load-started + + set-alternate + + d# 552 d# 383 to icon-xy " rom:xogray.565" $show-opaque + d# 410 d# 540 to icon-xy \ For boot progress reports + + button-check game-key? if text-on then + ?toggle-secure + + secure? 0= if exit then + + persistent-devkey? if exit then + + get-my-sn if ." No serial number" cr show-sad security-failure then + get-date if ." Invalid system date" cr show-sad security-failure then + + load-crypto if show-sad security-failure then ( ) + + alternate? if " \boot-alt" else " \boot" then pn-buf place + + all-devices$ load-from-list if exit then \ Returns only if no images found + + ." Boot failed" cr show-sad security-failure +; Modified: dev/geode/display/gxfb.fth =================================================================== --- dev/geode/display/gxfb.fth 2007-09-29 19:16:30 UTC (rev 646) +++ dev/geode/display/gxfb.fth 2007-09-29 19:25:03 UTC (rev 647) @@ -555,9 +555,10 @@ map-frame-buffer bytes/pixel case 1 of frame-buffer-adr /fb h# 0f fill endof - 2 of frame-buffer-adr /fb h# ffff wfill endof + 2 of frame-buffer-adr /fb h# c0 dup dup rgb>565 wfill endof 4 of frame-buffer-adr /fb h# ffff.ffff lfill endof endcase + 7 to background-color ; : display-remove ( -- ) Modified: dev/video/common/rectangle16.fth =================================================================== --- dev/video/common/rectangle16.fth 2007-09-29 19:16:30 UTC (rev 646) +++ dev/video/common/rectangle16.fth 2007-09-29 19:25:03 UTC (rev 647) @@ -29,6 +29,24 @@ loop ( adr' wbytes fbadr' ) 3drop ; + +: draw-transparent-rectangle ( adr x y w h -- ) + rectangle-setup ( adr wbytes fbadr h ) + >r rot r> ( wbytes fbadr adr h ) + 0 ?do ( wbytes fbadr adr ) + 2 pick 0 ?do ( wbytes fbadr adr ) + dup w@ >r wa1+ r> ( wbytes fbadr adr' color ) + dup h# ffff = if ( wbytes fbadr adr color ) + drop ( wbytes fbadr adr ) + else ( wbytes fbadr adr color ) + 2 pick i + w! ( wbytes fbadr adr ) + then ( wbytes fbadr adr ) + /w +loop ( wbytes fbadr adr ) + swap /scanline + swap ( wbytes fbadr' adr ) + loop ( wbytes fbadr' adr' ) + 3drop +; + : read-rectangle ( adr x y w h -- ) rectangle-setup 0 ?do ( adr wbytes fbadr ) 3dup -rot move ( adr wbytes fbadr ) Modified: ofw/termemu/fb16.fth =================================================================== --- ofw/termemu/fb16.fth 2007-09-29 19:16:30 UTC (rev 646) +++ ofw/termemu/fb16.fth 2007-09-29 19:25:03 UTC (rev 647) @@ -93,7 +93,8 @@ aa 00 00 rgb>565 , \ Dark red aa 00 aa rgb>565 , \ Dark magenta aa 55 aa rgb>565 , \ Brown - aa aa aa rgb>565 , \ Light gray +\ aa aa aa rgb>565 , \ Light gray + c0 c0 c0 rgb>565 , \ Light gray (OLPC background) 55 55 55 rgb>565 , \ Dark gray 55 55 ff rgb>565 , \ Light blue 55 ff 55 rgb>565 , \ Light green @@ -117,7 +118,7 @@ text-foreground16 screen-background16 fb16-invert ; : fb16-erase-screen ( -- ) - frame-buffer-adr bytes/line16 screen-height * screen-background16 fb-fill + frame-buffer-adr bytes/line16 screen-height * screen-background16 wfill ; : fb16-blink-screen ( -- ) \ Better done by poking the DAC fb16-invert-screen fb16-invert-screen @@ -156,7 +157,7 @@ headerless : move-line16 ( src-line-adr dst-line-adr -- ) emu-bytes/line fb-move ; -: erase-line16 ( line-adr -- ) emu-bytes/line screen-background16 fb-fill ; +: erase-line16 ( line-adr -- ) emu-bytes/line screen-background16 wfill ; : erase-lines16 ( last-line first-line -- ) ?do i erase-line16 bytes/line16 +loop ; @@ -208,7 +209,7 @@ : erase-chars16 ( #chars start-col# -- ) swap char-width 2* * swap ( #bytes start-col# ) column-adr16 char-height 0 do ( #bytes adr ) - 2dup swap text-background16 fb-fill ( #bytes adr ) + 2dup swap text-background16 wfill ( #bytes adr ) bytes/line16 + ( #bytes adr' ) loop 2drop ( ) ;

1 0

r646 - dev/olpc/cafenand
by svn＠openbios.org 29 Sep '07

29 Sep '07

Author: wmb Date: 2007-09-29 21:16:30 +0200 (Sat, 29 Sep 2007) New Revision: 646 Modified: dev/olpc/cafenand/selftest.fth Log: CaFe NAND selftest - added some messages detailing which failure modes occurred. Modified: dev/olpc/cafenand/selftest.fth =================================================================== --- dev/olpc/cafenand/selftest.fth 2007-09-29 19:12:46 UTC (rev 645) +++ dev/olpc/cafenand/selftest.fth 2007-09-29 19:16:30 UTC (rev 646) @@ -51,17 +51,19 @@ ; : read-eblock ( adr page# -- error? ) pages/eblock read-blocks pages/eblock <> + dup if ." SAVE" cr then ; : write-eblock ( adr page# -- error? ) dup erase-block pages/eblock write-blocks pages/eblock <> + dup if ." RESTORE" cr then ; : test-eblock ( page# pattern -- error? ) obuf erase-size 2 pick fill ibuf erase-size rot invert fill - obuf over write-eblock if drop true exit then - ibuf swap read-eblock if true exit then - ibuf obuf erase-size comp + obuf over write-eblock if ." WRITE " obuf c@ . cr drop true exit then + ibuf swap read-eblock if ." READ " obuf c@ . cr true exit then + ibuf obuf erase-size comp dup if ." COMP " obuf c@ . cr then ; \ Destroy content of flash. No argument.

1 0

r645 - cpu/x86/pc/olpc
by svn＠openbios.org 29 Sep '07

29 Sep '07

Author: wmb Date: 2007-09-29 21:12:46 +0200 (Sat, 29 Sep 2007) New Revision: 645 Modified: cpu/x86/pc/olpc/linuxserial.fth Log: linuxserial.fth - don't reopen serial device if it is already open. Modified: cpu/x86/pc/olpc/linuxserial.fth =================================================================== --- cpu/x86/pc/olpc/linuxserial.fth 2007-09-28 01:18:30 UTC (rev 644) +++ cpu/x86/pc/olpc/linuxserial.fth 2007-09-29 19:12:46 UTC (rev 645) @@ -32,6 +32,7 @@ ; : $open-serial ( dev$ -- ) \ e.g. " /dev/ttyS0" + serial-fd -1 <> if 2drop then $cstr 0 2 rot 8 syscall 3drop retval to serial-fd serial-fd 0< abort" Can't open serial device" raw 8n1 blocking @@ -46,7 +47,7 @@ line-name place ; -: open-serial ( "devname" -- ) +: open-serial ( -- ) line-name c@ if line-name count else " /dev/ttyS0" then $open-serial ;

1 0

r170 - openbios-devel/arch/sparc32
by svn＠openbios.org 29 Sep '07

29 Sep '07

Author: blueswirl Date: 2007-09-29 13:33:31 +0200 (Sat, 29 Sep 2007) New Revision: 170 Modified: openbios-devel/arch/sparc32/vectors.S Log: Fix exception handling and printout Modified: openbios-devel/arch/sparc32/vectors.S =================================================================== --- openbios-devel/arch/sparc32/vectors.S 2007-08-11 07:45:33 UTC (rev 169) +++ openbios-devel/arch/sparc32/vectors.S 2007-09-29 11:33:31 UTC (rev 170) @@ -26,8 +26,8 @@ #define __ASSEMBLY #include "psr.h" #include "asi.h" -#define ASI_BP ASI_M_BYPASS -#define SER_ADDR 0x71100004 +#define SER_ADDR5 0x71100004 +#define SER_ADDR10 0xf1100004 .section ".text.vectors", "ax" .align 16384 @@ -91,53 +91,50 @@ rd %psr, %g2 andn %g2, PSR_ET, %g2 wr %g2, %psr - ! Disable mmu - call dump_exception - sta %g0, [%g0] ASI_M_MMUREGS -_forever: - /* Loop forever */ - b _forever ; - nop + ! Disable mmu, re-enable boot mode + set _start, %g3 + set dump_exception, %g2 + sub %g2, %g3, %g3 + set 1<<14, %g2 + jmp %g3 + sta %g2, [%g0] ASI_M_MMUREGS + outstr: - /* void outstr (unsigned long port, const unsigned char *str); + /* void outstr (unsigned long port5, unsigned long port10, + * const unsigned char *str); * Writes a string on an IO port. */ -1: ldub [%o1], %o3 +1: lduba [%o2] ASI_M_KERNELTXT, %o3 cmp %o3, 0 be 2f nop - stba %o3, [%o0] ASI_BP + stba %o3, [%o0] ASI_M_BYPASS + stba %o3, [%o1] ASI_M_CTL b 1b - inc %o1 + inc %o2 2: retl nop -outdigit: - /* void outdigit (unsigned long port, uint8_t digit); - * Dumps a single digit on serial port. - */ - add %o1, '0', %o1 - retl - stba %o1, [%o0] ASI_BP - outhex: - /* void outhex (unsigned long port, uint32_t value); + /* void outhex (unsigned long port5, unsigned long port10, + * uint32_t value); * Dumps a 32 bits hex number on serial port */ - mov %o1, %o2 + mov %o2, %o4 set 28, %o3 - srl %o2, %o3, %o1 -1: and %o1, 0xf, %o1 - cmp %o1, 9 + srl %o4, %o3, %o2 +1: and %o2, 0xf, %o2 + cmp %o2, 9 bgt 2f nop b 3f - add %o1, '0', %o1 -2: add %o1, 'a' - 10, %o1 -3: stba %o1, [%o0] ASI_BP + add %o2, '0', %o2 +2: add %o2, 'a' - 10, %o2 +3: stba %o2, [%o0] ASI_M_BYPASS + stba %o2, [%o1] ASI_M_CTL subcc %o3, 4, %o3 bge 1b - srl %o2, %o3, %o1 + srl %o4, %o3, %o2 retl nop @@ -146,34 +143,37 @@ * Dump a message when catching an exception */ dump_exception: - set SER_ADDR + 2, %o0 - set (_BUG_message_0), %o1 + set SER_ADDR5 + 2, %o0 + set SER_ADDR10 + 2, %o1 + set (_BUG_message_0), %o2 call outstr nop call outhex - mov %g1, %o1 + mov %g1, %o2 - set (_BUG_message_1), %o1 + set (_BUG_message_1), %o2 call outstr nop call outhex - mov %l1, %o1 + mov %l1, %o2 - set (_BUG_message_2), %o1 + set (_BUG_message_2), %o2 call outstr nop call outhex - mov %l2, %o1 + mov %l2, %o2 - set (_BUG_message_3), %o1 + set (_BUG_message_3), %o2 call outstr nop +_forever: + /* Loop forever */ + b _forever ; + nop - retl - nop /* Register window handlers */ #include "wof.S" #include "wuf.S" @@ -182,8 +182,8 @@ _BUG_message_0: .string "Unhandled Exception 0x" _BUG_message_1: - .string "\nPC = 0x" + .string "\r\nPC = 0x" _BUG_message_2: .string " NPC = 0x" _BUG_message_3: - .string "\nStopping execution\n" + .string "\r\nStopping execution\r\n"

1 0

r644 - cpu/x86/pc/olpc
by svn＠openbios.org 28 Sep '07

28 Sep '07

Author: wmb Date: 2007-09-28 03:18:30 +0200 (Fri, 28 Sep 2007) New Revision: 644 Modified: cpu/x86/pc/olpc/resume.bth Log: resume.bth - third try is the charm. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-09-28 01:15:27 UTC (rev 643) +++ cpu/x86/pc/olpc/resume.bth 2007-09-28 01:18:30 UTC (rev 644) @@ -358,7 +358,7 @@ h# 40000000 # ax mov ax dx out \ Clear SMB_CLOCK - \ 50 uS delay (slightly longer for GX) + \ 5 uS delay (slightly longer for GX) rdtsc ax bx mov d# 5 d# 500 * # bx add begin rdtsc bx ax sub 0>= until @@ -367,7 +367,7 @@ loopa \ 50 uS delay (slightly longer for GX) - rdtsc ax bx mov d# 50 d# 500 * # bx add + rdtsc ax bx mov d# 5 d# 500 * # bx add begin rdtsc bx ax sub 0>= until [then]

1 0

r643 - cpu/x86/pc/olpc
by svn＠openbios.org 28 Sep '07

28 Sep '07

Author: wmb Date: 2007-09-28 03:15:27 +0200 (Fri, 28 Sep 2007) New Revision: 643 Modified: cpu/x86/pc/olpc/resume.bth Log: svn 640 for resume.bth was pessimistic - the SMBUS clock rate was 10 kHz instead of the correct 100 kHz. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-09-27 23:30:15 UTC (rev 642) +++ cpu/x86/pc/olpc/resume.bth 2007-09-28 01:15:27 UTC (rev 643) @@ -352,14 +352,14 @@ 8 # cx mov \ Generate 8 low pulses on SMB_CLOCK begin - \ 50 uS delay (slightly longer for GX) - rdtsc ax bx mov d# 50 d# 500 * # bx add + \ 5 uS delay (slightly longer for GX) + rdtsc ax bx mov d# 5 d# 500 * # bx add begin rdtsc bx ax sub 0>= until h# 40000000 # ax mov ax dx out \ Clear SMB_CLOCK \ 50 uS delay (slightly longer for GX) - rdtsc ax bx mov d# 50 d# 500 * # bx add + rdtsc ax bx mov d# 5 d# 500 * # bx add begin rdtsc bx ax sub 0>= until h# 4000 # ax mov ax dx out \ Set SMB_CLOCK

1 0

r642 - dev/geode
by svn＠openbios.org 28 Sep '07

28 Sep '07

Author: wmb Date: 2007-09-28 01:30:15 +0200 (Fri, 28 Sep 2007) New Revision: 642 Modified: dev/geode/acpi.fth Log: Geode acpi.fth - Removed unnecessary cruft from gx-power-off . Modified: dev/geode/acpi.fth =================================================================== --- dev/geode/acpi.fth 2007-09-27 22:11:13 UTC (rev 641) +++ dev/geode/acpi.fth 2007-09-27 23:30:15 UTC (rev 642) @@ -20,26 +20,18 @@ \ Shorten off delay to .5 sec : quick-power-button ( -- ) d# 32768 pm-enable or h# 40 pm! ; +\ This turns off the main CPU, but the EC stays on. : gx-power-off ( -- ) - \ The rest of this will succeed in turning off the CPU, but the EC will - \ stay on. The ec-power-off above turns off both the EC and CPU, so the - \ rest of this is for historical interest only. - - \ Recipe from AMD; no way I would have figured this out from manual - 5 d# 10 << 1 or 8 acpi-w! \ S5 - power off - \ Enable all of these controls with 0 delay pm-enable h# 10 pm! \ PM_SCLK pm-enable h# 20 pm! \ PM_IN_SLPCTL pm-enable h# 34 pm! \ PM_WKXD pm-enable h# 30 pm! \ PM_WKD - \ Should be "2 acpi-w@", but 16-bit writes to ACPI and PM regs are broken - 0 acpi-l@ h# 100.0000 or 0 acpi-l! \ Enable button wakeup in PM1_EN h# 2ffff h# 54 pm! \ Clear status bits i PM_SSC - h# 1301 rdmsr swap 2 or swap h# 1301 wrmsr \ Set SMM_SUSP_EN h# ffff.ffff h# 18 acpi-l! \ Clear status bits in PM_GPE0_STS - 8 acpi-l@ h# 2000 or 8 acpi-l! \ SLP_EN in PM1_CNT - Down we go + + h# 2000 8 acpi-l! \ SLP_EN in PM1_CNT - Down we go ; ' gx-power-off is power-off

1 0

r641 - dev/olpc/kb3700
by svn＠openbios.org 28 Sep '07

28 Sep '07

Author: rsmith Date: 2007-09-28 00:11:13 +0200 (Fri, 28 Sep 2007) New Revision: 641 Modified: dev/olpc/kb3700/ecio.fth Log: - Rename dcon-enable dcon-disable to power on/off to prevent - confusion with the words in the dcon device Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-09-27 22:06:12 UTC (rev 640) +++ dev/olpc/kb3700/ecio.fth 2007-09-27 22:11:13 UTC (rev 641) @@ -147,8 +147,8 @@ : wlan-on ( -- ) 1 h# 23 ec-cmd-b! ; : wlan-wake ( -- ) h# 24 ec-cmd ; : wlan-reset ( -- ) h# 25 ec-cmd ; -: dcon-disable ( -- ) 0 h# 26 ec-cmd-b! ; -: dcon-enable ( -- ) 1 h# 26 ec-cmd-b! ; +: dcon-power-off ( -- ) 0 h# 26 ec-cmd-b! ; +: dcon-power-on ( -- ) 1 h# 26 ec-cmd-b! ; : reset-ec-warm ( -- ) h# 27 ec-cmd ; : reset-ec ( -- ) h# 28 ec-cmd ; : write-protect-fw ( -- ) h# 29 ec-cmd ;

1 0

r640 - cpu/x86/pc/olpc
by svn＠openbios.org 28 Sep '07

28 Sep '07

Author: wmb Date: 2007-09-28 00:06:12 +0200 (Fri, 28 Sep 2007) New Revision: 640 Modified: cpu/x86/pc/olpc/resume.bth Log: OLPC resume - added code to bitbang the DCON SMBUS, generating 8 clock pulses with DATA held high, in order to clear the DCON in case it sees a false start condition. This is per a suggestion from HiMax. To enable this code, uncomment the "create reset-smbus-bitbang" line. Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2007-09-27 17:25:13 UTC (rev 639) +++ cpu/x86/pc/olpc/resume.bth 2007-09-27 22:06:12 UTC (rev 640) @@ -20,7 +20,8 @@ \ This code will be copied to RAM at suspend-base \ create save-display -create reset-smbus +\ create reset-smbus +\ create reset-smbus-bitbang \ create restore-usb-power h# fe00.0000 constant gp-pa @@ -336,6 +337,40 @@ ax lods ax dx xchg ax lods ax dx xchg h# c000.2001 wmsr \ Video output format ax lods ax dx xchg ax lods ax dx xchg h# c000.2011 wmsr \ TFTP pad select +[ifdef] reset-smbus-bitbang + \ GPIO15 is SMB_DATA + \ GPIO14 is SMB_CLOCK + h# c0000000 # ax mov \ Mask to clear SMB_DATA and SMB_CLOCK + h# 1010 # dx mov ax dx out \ Deselect OUT AUX1 + h# 1014 # dx mov ax dx out \ Deselect OUT AUX2 + h# 1034 # dx mov ax dx out \ Deselect IN AUX1 + h# c000 # ax mov \ Mask to set SMB_DATA and SMB_CLOCK + h# 1000 # dx mov ax dx out \ Set output values to high + h# 1004 # dx mov ax dx out \ Set pins to output + + h# 1000 # dx mov \ Output value register + + 8 # cx mov \ Generate 8 low pulses on SMB_CLOCK + begin + \ 50 uS delay (slightly longer for GX) + rdtsc ax bx mov d# 50 d# 500 * # bx add + begin rdtsc bx ax sub 0>= until + + h# 40000000 # ax mov ax dx out \ Clear SMB_CLOCK + + \ 50 uS delay (slightly longer for GX) + rdtsc ax bx mov d# 50 d# 500 * # bx add + begin rdtsc bx ax sub 0>= until + + h# 4000 # ax mov ax dx out \ Set SMB_CLOCK + + loopa + + \ 50 uS delay (slightly longer for GX) + rdtsc ax bx mov d# 50 d# 500 * # bx add + begin rdtsc bx ax sub 0>= until +[then] + h# 1038 # dx mov \ Low bank - first contiguous GPIO register h# 3c /l / # cx mov \ Register count (stop at lock register) begin

1 0

r639 - cpu/x86/pc/olpc/sdtools
by svn＠openbios.org 27 Sep '07

27 Sep '07

Author: wmb Date: 2007-09-27 19:25:13 +0200 (Thu, 27 Sep 2007) New Revision: 639 Modified: cpu/x86/pc/olpc/sdtools/ecio.fth Log: OLPC SDKIT - Changed the names of the EC commands dcon-{en,dis}able to dcon-power-{on,off} to fix a name conflict with dcon-enable in the DCON driver. Modified: cpu/x86/pc/olpc/sdtools/ecio.fth =================================================================== --- cpu/x86/pc/olpc/sdtools/ecio.fth 2007-09-26 19:56:06 UTC (rev 638) +++ cpu/x86/pc/olpc/sdtools/ecio.fth 2007-09-27 17:25:13 UTC (rev 639) @@ -77,8 +77,8 @@ : wlan-on ( -- ) 1 h# 23 ec-cmd-b! ; : wlan-wake ( -- ) h# 24 ec-cmd-out ; : wlan-reset ( -- ) h# 25 ec-cmd-out ; -: dcon-disable ( -- ) 0 h# 26 ec-cmd-b! ; -: dcon-enable ( -- ) 1 h# 26 ec-cmd-b! ; +: dcon-power-on ( -- ) 0 h# 26 ec-cmd-b! ; +: dcon-power-off ( -- ) 1 h# 26 ec-cmd-b! ; : reset-ec-warm ( -- ) h# 27 ec-cmd-out ; : reset-ec ( -- ) h# 28 ec-cmd-out ; : write-protect-fw ( -- ) h# 29 ec-cmd-out ;

1 0

r638 - dev/olpc/kb3700
by svn＠openbios.org 26 Sep '07

26 Sep '07

Author: rsmith Date: 2007-09-26 21:56:06 +0200 (Wed, 26 Sep 2007) New Revision: 638 Modified: dev/olpc/kb3700/battery.fth Log: - Add trickle charge indication support. This should appear in EC firmware Q2c28 Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2007-09-26 02:36:53 UTC (rev 637) +++ dev/olpc/kb3700/battery.fth 2007-09-26 19:56:06 UTC (rev 638) @@ -54,6 +54,7 @@ ," charging-full " ," discharge " ," abnormal: " + ," trickle " end-string-array : .bat-type ( -- ) @@ -84,7 +85,7 @@ ." AC:" dup h# 10 and if ." on " else ." off " then ( stat ) ." PCB: " pcb-temp 2.d ." C " - dup 1 and if + dup h# 81 and if ." Battery: " .bat-type soc .% ." " @@ -96,6 +97,7 @@ dup 8 and if ." error " then dup h# 20 and if ." charging " then dup h# 40 and if ." discharging " then + dup h# 80 and if ." trickle " then else ." No battery" then

1 0

Re: [OpenBIOS] [Qemu-devel] Qemu and Linux 2.4
by Blue Swirl 26 Sep '07

26 Sep '07

On 9/26/07, Alexander Voropay <alec(a)nwpi.ru> wrote: > <vlad(a)comsys.ro> wrote: > > >>> - QEMU malta emulation is not really complete, to put it mildly > >> Out of curiosity, what parts did you miss? > > Like, for example, the PCI stuff. So I can use the network card. > > PCI stuff in the QEMU/Malta works fine, but pseudo-bootrom > does not perform PCI enumeration and leaves uninitialized PCI BARs. > > Linux MIPS/Malta 2.4 can not perform PCI enumeration too. The LANCE > Ethernet driver *requres* a pre-initialized BARs. The situation even worse, > since current Linux 2.4 can't be even built with NEW_PCI and PCI_AUTO > options at all (due to linkage error). > > http://www.linux-mips.org/wiki/PCI_Subsystem > > There is the same PCI problem with NetBSD/evbmips and seems VxWorks/Malta. > > > And yes, I am aware of YAMON. > > AFAIK, YAMON may runs on the MIPS hardware only, and may not > be redistribuded in the source or binary form. > > Anyway, YAMON binary does not work on the Qemu/Malta. The Galileo > chip is far more complicated then Qemu emulation. It contains four DMA > channels, four timers e.t.c. e.t.c. > > >> I recommend to improve the Qemu Malta emulation, and make it work with > >> 2.4 Malta kernels. (ISTR it used to work, so it shouldn't need a lot to > >> get there.) > > > > I'm sure that improving the Qemu Malta emulation is a very noble goal, > > but for people that need a working 2.4 kernel NOW, my patch could be > > useful. Having the QEMU target in 2.6 surely helped me. > > The only thing we need is a good bootrom (BIOS) for the MIPS/Malta > (Free-YAMON ;) Someone could port OpenBIOS or LinuxBIOS to MIPS.

1 0

r637 - cpu/x86/pc/olpc
by svn＠openbios.org 26 Sep '07

26 Sep '07

Author: wmb Date: 2007-09-26 04:36:53 +0200 (Wed, 26 Sep 2007) New Revision: 637 Modified: cpu/x86/pc/olpc/devices.fth Log: OLPC - Leave the EC SCI control register alone; Richard has it under control. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-09-25 04:47:24 UTC (rev 636) +++ cpu/x86/pc/olpc/devices.fth 2007-09-26 02:36:53 UTC (rev 637) @@ -246,10 +246,6 @@ fload ${BP}/cpu/x86/pc/olpc/boardrev.fth \ Board revision decoding -stand-init: Quiet SCI - sci-quiet -; - stand-init: Date to EC time&date d# 2000 - ec-date! 3drop ;

1 0

r636 - dev/geode
by svn＠openbios.org 25 Sep '07

25 Sep '07

Author: wmb Date: 2007-09-25 06:47:24 +0200 (Tue, 25 Sep 2007) New Revision: 636 Modified: dev/geode/acpi.fth Log: Oops - fixed a typo in previous checkin. Modified: dev/geode/acpi.fth =================================================================== --- dev/geode/acpi.fth 2007-09-25 04:30:34 UTC (rev 635) +++ dev/geode/acpi.fth 2007-09-25 04:47:24 UTC (rev 636) @@ -12,13 +12,14 @@ : pm@ ( offset -- n ) pm-base + pl@ ; : pm! ( n offset -- ) pm-base + pl! ; +h# 4000.0000 constant pm-enable + : enable-power-button ( -- ) 2 acpi-w@ h# 100 or 2 acpi-w! ; : disable-power-button ( -- ) 2 acpi-w@ h# 100 invert and 2 acpi-w! ; : ignore-power-button ( -- ) 0 h# 40 pm! ; \ Shorten off delay to .5 sec : quick-power-button ( -- ) d# 32768 pm-enable or h# 40 pm! ; -h# 4000.0000 constant pm-enable : gx-power-off ( -- ) \ The rest of this will succeed in turning off the CPU, but the EC will \ stay on. The ec-power-off above turns off both the EC and CPU, so the

1 0

r635 - in dev: geode olpc/kb3700
by svn＠openbios.org 25 Sep '07

25 Sep '07

Author: wmb Date: 2007-09-25 06:30:34 +0200 (Tue, 25 Sep 2007) New Revision: 635 Modified: dev/geode/acpi.fth dev/olpc/kb3700/ecio.fth Log: OLPC - second try to guard again bricks due to pressing the power button at the wrong time. Modified: dev/geode/acpi.fth =================================================================== --- dev/geode/acpi.fth 2007-09-19 23:58:43 UTC (rev 634) +++ dev/geode/acpi.fth 2007-09-25 04:30:34 UTC (rev 635) @@ -14,6 +14,9 @@ : enable-power-button ( -- ) 2 acpi-w@ h# 100 or 2 acpi-w! ; : disable-power-button ( -- ) 2 acpi-w@ h# 100 invert and 2 acpi-w! ; +: ignore-power-button ( -- ) 0 h# 40 pm! ; +\ Shorten off delay to .5 sec +: quick-power-button ( -- ) d# 32768 pm-enable or h# 40 pm! ; h# 4000.0000 constant pm-enable : gx-power-off ( -- ) @@ -44,7 +47,7 @@ stand-init h# 5140.000e rdmsr drop h# fff0 and to acpi-base h# 5140.000f rdmsr drop h# fff0 and to pm-base - d# 32768 pm-enable or h# 40 pm! \ Shorten off delay to .5 sec + quick-power-button ; warning ! Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2007-09-19 23:58:43 UTC (rev 634) +++ dev/olpc/kb3700/ecio.fth 2007-09-25 04:30:34 UTC (rev 635) @@ -251,9 +251,8 @@ : io-spi-out ( b -- ) spicmd! spi-cmd-wait ; : io-spi-reprogrammed ( -- ) - ." Powering off..." d# 2000 ms cr - power-off -\ kbc-on + ." Restarting..." d# 2000 ms cr + kbc-on \ ." Keyboard back on" cr ; @@ -266,8 +265,8 @@ 7 to spi-us \ Measured time for "1 fea9 ec!" is 7.9 uS + ignore-power-button \ Guard against the user panicing kbc-off - disable-power-button \ Guard against the user panicing ; : use-local-ec ( -- ) ['] io-spi-start to spi-start ; use-local-ec

1 0

r634 - cpu/x86/pc/olpc
by svn＠openbios.org 20 Sep '07

20 Sep '07

Author: wmb Date: 2007-09-20 01:58:43 +0200 (Thu, 20 Sep 2007) New Revision: 634 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC security - added dispostion code to lease and devkey formats. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-09-19 23:57:43 UTC (rev 633) +++ cpu/x86/pc/olpc/security.fth 2007-09-19 23:58:43 UTC (rev 634) @@ -283,7 +283,7 @@ \ including serial number, UUID, and expiration time, is place. \ That string is the signed object for lease and developer key verification. -d# 65 buffer: machine-id-buf +d# 67 buffer: machine-id-buf \ get-my-sn get the machine identification info including serial number \ and UUID from the manufacturing data, placing it into machine-id-buf @@ -315,6 +315,8 @@ [char] : machine-id-buf d# 48 + c! + [char] : machine-id-buf d# 50 + c! + false ; @@ -333,10 +335,12 @@ : check-machine-signature ( sig$ expiration$ -- -1|1 ) 0 hashname c! - machine-id-buf d# 49 + swap move ( sig$ ) - machine-id-buf d# 65 2swap valid? if 1 else -1 then + machine-id-buf d# 51 + swap move ( sig$ ) + machine-id-buf d# 67 2swap valid? if 1 else -1 then ; +: set-disposition ( adr -- ) c@ machine-id-buf d# 49 + c! ; + \ check-lease checks a lease signature record in act01: format \ -1 means lease is for this machine and is invalid @@ -348,16 +352,23 @@ " Not act01:" ?lease-debug-cr 2drop -1 exit then + bl left-parse-string ( rem$ serial$ ) my-sn$ $= 0= if ( rem$ ) " is for a different system" ?lease-debug-cr 2drop 0 exit then ( rem$ ) + + \ Disposition code + bl left-parse-string 1 <> if 3drop -1 exit then ( rem$ disp-adr ) + set-disposition ( rem$ ) + bl left-parse-string ( sig$ expiration$ ) dup d# 16 <> if ( sig$ expiration$ ) " has bad expiration format" ?lease-debug-cr 4drop -1 exit then ( sig$ expiration$ ) + 2dup expired? if " expired" ?lease-debug-cr 4drop -1 exit @@ -535,6 +546,10 @@ bl left-parse-string ( rem$ serial$ ) my-sn$ $= 0= if 2drop 0 exit then ( rem$ ) + \ Disposition code + bl left-parse-string 1 <> if 3drop -1 exit then ( rem$ disp-adr ) + set-disposition ( rem$ ) + develkey$ to pubkey$ " 00000000T000000Z" check-machine-signature ;

1 0

r633 - cpu/x86/pc/olpc
by svn＠openbios.org 20 Sep '07

20 Sep '07

Author: wmb Date: 2007-09-20 01:57:43 +0200 (Thu, 20 Sep 2007) New Revision: 633 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC build - Load sound.fth Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-09-19 22:22:01 UTC (rev 632) +++ cpu/x86/pc/olpc/fw.bth 2007-09-19 23:57:43 UTC (rev 633) @@ -339,6 +339,7 @@ fload ${BP}/cpu/x86/pc/olpc/setwp.fth fload ${BP}/ofw/gui/ofpong.fth fload ${BP}/cpu/x86/pc/olpc/life.fth +fload ${BP}/cpu/x86/pc/olpc/sound.fth : olpc-power-off ( -- ) gx-power-off \ Try the nice way first d# 20 ms

1 0

r632 - cpu/x86/pc/olpc dev dev/olpc/dcon
by svn＠openbios.org 20 Sep '07

20 Sep '07

Author: wmb Date: 2007-09-20 00:22:01 +0200 (Thu, 20 Sep 2007) New Revision: 632 Modified: cpu/x86/pc/olpc/fw.bth dev/olpc/dcon/dcon.fth dev/pckbd.fth Log: OLPC - made it possible to control screen brightness and startup sound volume from the keyboard. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-09-19 22:21:09 UTC (rev 631) +++ cpu/x86/pc/olpc/fw.bth 2007-09-19 22:22:01 UTC (rev 632) @@ -347,6 +347,39 @@ ' olpc-power-off to power-off [then] +: dimmer ( -- ) screen-ih if " dimmer" screen-ih $call-method then ; +: brighter ( -- ) screen-ih if " brighter" screen-ih $call-method then ; + +dev /8042/keyboard +0 value waiting-up? +: olpc-check-abort ( scan-code -- abort? ) \ Square pressed? + last-scan over to last-scan ( scan-code old-scan-code ) + h# e0 <> if drop false exit then ( scan-code ) + + check-abort? 0= if drop false exit then ( scan-code ) + + dup h# 7f and h# 5d <> if drop false exit then ( scan-code ) + + h# 80 and if \ Up + false to waiting-up? + false ( abort? ) + else + secure? if false else waiting-up? 0= then ( abort? ) + true to waiting-up? + then +; +patch olpc-check-abort check-abort get-scan + +: handle-volume? ( scan-code -- scan-code flag ) + dup h# 43 = if dimmer true exit then + dup h# 44 = if brighter true exit then + dup h# 57 = if softer true exit then + dup h# 58 = if louder true exit then + false +; +' handle-volume? to scan-handled? +dend + \ Eliminate 4 second delay in install console for the case where \ there is no keyboard. The delay is unnecessary because the screen \ does not go blank when the device is closed. @@ -477,14 +510,6 @@ ?usb-keyboard ; -: start-sound ( -- ) - playback-volume >r d# -9 to playback-volume - ['] load-started behavior >r - ['] noop to load-started - " rom:splash" ['] $play-wav catch if 2drop then - r> to load-started - r> to playback-volume -; : go-hook-freeze [ ' go-hook behavior compile, ] 0 " set-source" $call-screen @@ -492,11 +517,11 @@ : freeze ( -- ) ['] go-hook-freeze to go-hook ; : unfreeze ( -- ) ['] usb-quiet to go-hook ; -: ?start-sound ( -- ) - game-key-mask h# 40 and 0= if start-sound then +: ?sound ( -- ) + game-key-mask h# 40 and 0= if sound then ; : ?freeze ( -- ) - game-key-mask h# 10 and 0= if freeze then + game-key-mask h# 40 and 0= if freeze then ; : ?games ( -- ) game-key-mask h# 20 and if @@ -517,7 +542,8 @@ fast-boot? if stdout off probe-pci - ?start-sound + ?sound + open-keyboard ?freeze ['] false to interrupt-auto-boot? probe-usb @@ -528,12 +554,11 @@ [then] auto-boot screen-ih stdout ! - open-keyboard ?usb-keyboard else banner probe-pci - ?start-sound + ?sound open-keyboard ?games ?freeze Modified: dev/olpc/dcon/dcon.fth =================================================================== --- dev/olpc/dcon/dcon.fth 2007-09-19 22:21:09 UTC (rev 631) +++ dev/olpc/dcon/dcon.fth 2007-09-19 22:22:01 UTC (rev 632) @@ -117,6 +117,9 @@ : timeout! ( to -- ) 8 dcon! ; \ def: h# ffff : scanint! ( si -- ) 9 dcon! ; \ def: h# 0000 : bright! ( level -- ) d# 10 dcon! ; \ def: h# xxxF +: bright@ ( -- level ) d# 10 dcon@ ; +: brighter ( -- ) bright@ 1+ h# f min bright! ; +: dimmer ( -- ) bright@ 1- 0 max bright! ; \ Colour swizzle, AA, no passthrough, backlight : set-color ( color? -- ) Modified: dev/pckbd.fth =================================================================== --- dev/pckbd.fth 2007-09-19 22:21:09 UTC (rev 631) +++ dev/pckbd.fth 2007-09-19 22:22:01 UTC (rev 632) @@ -386,6 +386,8 @@ init-data kbd-reset 0= to keyboard-present? ; +defer scan-handled? +' false to scan-handled? headerless : check-abort ( scan-code -- flag ) \ Ctrl-break pressed? check-abort? if @@ -409,12 +411,11 @@ begin get-data? while ( scan-code ) - dup enque ( scan-code ) - \ In the following code, we must be careful to unlock the \ queue before calling user-abort, because a timer interrupt \ can occur at any time after user-abort is executed. - check-abort if + dup check-abort if ( scan-code ) + drop unlock user-abort \ Wait here for long enough to ensure that an alarm timer tick \ will happen if it is going to happen. This is the safest @@ -430,7 +431,8 @@ \ if the alarm tick is turned off. d# 20 ms exit - then + then ( scan-code ) + scan-handled? if drop else enque then ( ) repeat unlock ;

1 0

r631 - cpu/x86/pc/olpc
by svn＠openbios.org 20 Sep '07

20 Sep '07

Author: wmb Date: 2007-09-20 00:21:09 +0200 (Thu, 20 Sep 2007) New Revision: 631 Modified: cpu/x86/pc/olpc/devices.fth Log: OLPC - set the EC date from the RTC at startup, per Quanta's request. They need the date for long-term battery-management purposes. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2007-09-19 22:19:21 UTC (rev 630) +++ cpu/x86/pc/olpc/devices.fth 2007-09-19 22:21:09 UTC (rev 631) @@ -117,34 +117,12 @@ devalias n nand devalias sd /sd/disk - dev /8042 [ifndef] lx-devel patch false ctlr-selftest open [then] device-end -dev /8042/keyboard -0 value waiting-up? -: olpc-check-abort ( scan-code -- abort? ) \ Square pressed? - last-scan over to last-scan ( scan-code old-scan-code ) - h# e0 <> if drop false exit then ( scan-code ) - - check-abort? 0= if drop false exit then ( scan-code ) - - dup h# 7f and h# 5d <> if drop false exit then ( scan-code ) - - h# 80 and if \ Up - false to waiting-up? - false ( abort? ) - else - waiting-up? 0= ( abort? ) - true to waiting-up? - then -; -patch olpc-check-abort check-abort get-scan -dend - 0 0 " i70" " /isa" begin-package \ Real-time clock node fload ${BP}/dev/ds1385r.fth 8 encode-int 0 encode-int encode+ " interrupts" property @@ -272,6 +250,10 @@ sci-quiet ; +stand-init: Date to EC + time&date d# 2000 - ec-date! 3drop +; + stand-init: Wireless reset [ifdef] lx-devel exit [then]

1 0

r630 - cpu/x86/pc/olpc dev/geode/ac97
by svn＠openbios.org 20 Sep '07

20 Sep '07

Author: wmb Date: 2007-09-20 00:19:21 +0200 (Thu, 20 Sep 2007) New Revision: 630 Added: cpu/x86/pc/olpc/sound.fth Modified: dev/geode/ac97/ac97.fth Log: OLPC audio - Added persistent storage for the startup sound playback volume. Added: cpu/x86/pc/olpc/sound.fth =================================================================== --- cpu/x86/pc/olpc/sound.fth (rev 0) +++ cpu/x86/pc/olpc/sound.fth 2007-09-19 22:19:21 UTC (rev 630) @@ -0,0 +1,64 @@ +purpose: Manage startup sound, with persistent storage for its volume +\ See license at end of file + +h# -9 constant default-volume +: set-saved-volume ( volume -- ) dup h# 80 cmos! invert h# 81 cmos! ; + +: get-saved-volume ( -- volume ) + h# 80 cmos@ h# 81 cmos@ ( volume check ) + over xor h# ff <> if ( volume ) + drop default-volume set-saved-volume + default-volume + then + + dup h# 80 and if \ Sign extend + h# ffffff00 or + else + dup 0> if + drop default-volume set-saved-volume + default-volume + then + then +; + +: +volume ( increment -- ) + get-saved-volume + 0 min d# -50 max set-saved-volume + audio-ih if get-saved-volume " set-volume" $call-audio then +; +: softer ( -- ) -2 +volume ; +: louder ( -- ) 2 +volume ; + +: sound ( -- ) + get-saved-volume d# -50 <= if exit then + playback-volume >r get-saved-volume to playback-volume + ['] load-started behavior >r + ['] noop to load-started + " rom:splash" ['] $play-wav catch if 2drop then + r> to load-started + r> to playback-volume +; + + +\ LICENSE_BEGIN +\ Copyright (c) 2006 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 Modified: dev/geode/ac97/ac97.fth =================================================================== --- dev/geode/ac97/ac97.fth 2007-09-19 22:17:59 UTC (rev 629) +++ dev/geode/ac97/ac97.fth 2007-09-19 22:19:21 UTC (rev 630) @@ -225,6 +225,7 @@ : set-volume ( db -- ) dup 0> if drop 0 then negate 1+ 2* 3 / dup bwjoin to volume + volume h# 38 codec! \ headphone/surround output pin gain ; : open-out ( -- )

1 0

r629 - cpu/x86/pc/olpc
by svn＠openbios.org 20 Sep '07

20 Sep '07

Author: wmb Date: 2007-09-20 00:17:59 +0200 (Thu, 20 Sep 2007) New Revision: 629 Modified: cpu/x86/pc/olpc/setwp.fth Log: OLPC manufacturing data - new "change-tag" and "add-tag" commands. Modified: cpu/x86/pc/olpc/setwp.fth =================================================================== --- cpu/x86/pc/olpc/setwp.fth 2007-09-19 22:17:16 UTC (rev 628) +++ cpu/x86/pc/olpc/setwp.fth 2007-09-19 22:17:59 UTC (rev 629) @@ -32,10 +32,10 @@ \ Find RAM address of tag, given FLASH address : tag>ram-adr ( adr len -- ram-adr ) - drop 2+ ( adr' ) \ Address of "ww" tag + drop ( adr' ) \ Address of "ww" tag rom-pa mfg-data-offset + - ( offset ) - dup /flash-block u>= abort" Bad ww offset" \ Sanity check + dup /flash-block u>= abort" Bad tag offset" \ Sanity check mfg-data-buf + ( ram-adr ) ; @@ -44,7 +44,8 @@ : mfg-data-setup ( tag$ -- ram-adr ) get-mfg-data 2dup find-tag 0= if ." No " type ." tag" cr abort then ( tag$ adr len ) - tag>ram-adr >r ( tag$ r: ram-adr ) + \ The 2+ below skips the length bytes to the tagname field + tag>ram-adr 2+ >r ( tag$ r: ram-adr ) r@ 2 $= 0= abort" Tag mismatch in RAM" ( r: ram-adr ) r> ; @@ -69,3 +70,66 @@ board-revision h# b48 < abort" Only supported on B4 and later" set-wp ; + +: ?tagname-valid ( tagname$ -- tagname$ ) + dup 2 <> abort" Tag name must be 2 characters long" +; +: tag-setup ( tagname$ -- ram-value$ ) + ?tagname-valid + get-mfg-data + 2dup find-tag 0= if ." No " type ." tag" cr abort then ( tagname$ value$ ) + 2nip ( value$ ) + tuck tag>ram-adr swap ( ram-value$ ) +; + +: value-mismatch? ( new-value$ old-value$ -- flag ) + dup if + \ non-empty old value string + 2dup + 1- c@ 0= if ( new-value$ old-value$ ) + \ Old value ends in null character; subtract that from the count + 1- ( new-value$ old-value$' ) + then ( new-value$ old-value$ ) + rot <> ( new-adr old-adr flag ) + nip nip ( old-len new-value$ ) + else ( new-value$ old-value$ ) + \ empty old value string; new one had better be empty too + 2drop 0<> nip ( flag ) + then +; + +: $change-tag ( value$ tagname$ -- ) + tag-setup ( new-value$ old-value$ ) + 2over 2over value-mismatch? abort" New value and old value have different lengths" + drop swap move ( ) + put-mfg-data +; + +: change-tag ( "tagname" "new-value" -- ) + safe-parse-word ( tagname$ ) + 0 parse ( tagname$ new-value$ ) + 2swap $change-tag +; + +: ram-last-mfg-data ( -- adr ) + mfg-data-buf /flash-block + last-mfg-data +; + +: $add-tag ( value$ name$ -- ) + ?tagname-valid ( value$ name$ ) + 2dup find-tag abort" Tagname already exists" ( value$ name$ ) + get-mfg-data + ram-last-mfg-data >r ( value$ name$ r: adr ) + 2 pick 1+ over + 3 + ( value$ name$ record-len r: adr ) + r@ over - mfg-data-buf u<= abort" Not enough space for new tag" + r@ over - swap ?erased ( value$ name$ r: adr ) + r@ 2- swap move ( value$ r: adr ) + dup 1+ dup r@ 3 - c! invert r@ 4 - c! ( value$ r: adr ) + 0 r@ 5 - c! ( value$ r: adr ) + r> 5 - over - ( value$ data-adr ) + swap move + put-mfg-data +; + +: add-tag ( "name$" "value$" -- ) + safe-parse-word 0 parse 2swap $add-tag +;

1 0

r628 - cpu/x86/pc/olpc
by svn＠openbios.org 20 Sep '07

20 Sep '07

Author: wmb Date: 2007-09-20 00:17:16 +0200 (Thu, 20 Sep 2007) New Revision: 628 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC security - added new "secure?" value initialized by the presence of the wp tag, instead of calling wp? directly. This will help when developer keys are enabled. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-09-19 09:58:27 UTC (rev 627) +++ cpu/x86/pc/olpc/security.fth 2007-09-19 22:17:16 UTC (rev 628) @@ -510,15 +510,17 @@ go ; -\ wp? returns true if a "wp" manufacturing data tag is present +false value secure? -: wp? ( -- flag ) " wp" find-tag dup if nip nip then ; +stand-init: wp + " wp" find-tag if 2drop true to secure? then +; \ ?secure-boot performs either the secure boot algorithm or the \ historical boot algorithm depending on the presence of a "wp" \ manufacturing data tag. -: ?secure-boot ( -- ) wp? if secure-boot else boot then ; +: ?secure-boot ( -- ) secure? if secure-boot else boot then ; " ?secure-boot" ' boot-command set-config-string-default

1 0

r627 - cpu/x86/pc/olpc
by svn＠openbios.org 19 Sep '07

19 Sep '07

Author: wmb Date: 2007-09-19 11:58:27 +0200 (Wed, 19 Sep 2007) New Revision: 627 Modified: cpu/x86/pc/olpc/versions.fth Log: q2c27 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2007-09-19 09:52:41 UTC (rev 626) +++ cpu/x86/pc/olpc/versions.fth 2007-09-19 09:58:27 UTC (rev 627) @@ -2,18 +2,18 @@ \ The overall firmware revision macro: FW_MAJOR C -macro: FW_MINOR 26 +macro: FW_MINOR 27 \ The EC microcode macro: EC_VERSION c24 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary -\ macro: GET_EC cp ./proto4.bin ec.img +\ macro: GET_EC cp ./ec_wlan_debug.bin ec.img \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 macro: WLAN_VERSION 5.110.16.p1 -\ The bios_crypto image -macro: CRYPTO_VERSION 0.0 +\ The bios_verify image +macro: CRYPTO_VERSION 0.1

1 0

r626 - cpu/x86/pc/olpc
by svn＠openbios.org 19 Sep '07

19 Sep '07

Author: wmb Date: 2007-09-19 11:52:41 +0200 (Wed, 19 Sep 2007) New Revision: 626 Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/life.fth Log: Life performance improvements. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-09-19 05:35:55 UTC (rev 625) +++ cpu/x86/pc/olpc/fw.bth 2007-09-19 09:52:41 UTC (rev 626) @@ -500,7 +500,7 @@ ; : ?games ( -- ) game-key-mask h# 20 and if - time&date 5drop 1 and if pong else d# 1200 life then + time&date 5drop 1 and if pong else life-demo then then ; : open-keyboard ( -- ) Modified: cpu/x86/pc/olpc/life.fth =================================================================== --- cpu/x86/pc/olpc/life.fth 2007-09-19 05:35:55 UTC (rev 625) +++ cpu/x86/pc/olpc/life.fth 2007-09-19 09:52:41 UTC (rev 626) @@ -1,7 +1,7 @@ \ rgb color value -h# ff 0 0 rgb>565 constant xred \ red -h# 0 0 0 rgb>565 constant xblack \ black +h# ff ff 0 rgb>565 constant lf_fg \ yellow +h# 0 0 0 rgb>565 constant lf_bg \ black \ screen size constant d# 128 constant lf_width @@ -18,13 +18,13 @@ : >work ( i j -- adr ) swap lf_width * + lf_board_work + ; : show-cell ( state y x -- ) - >offset swap if xred else xblack then show-state + >offset swap if lf_fg else lf_bg then show-state ; \ display the board of life : lf_board_print ( -- ) - lf_height 0 do - lf_width 0 do + lf_height 1- 1 do + lf_width 1- 1 do j i >cell c@ j i show-cell loop loop @@ -35,12 +35,29 @@ : xy+ ( x1 y1 x2 y2 -- x3 y3 ) rot + -rot + swap ; +code sumcell ( adr -- sum ) + bx pop + ax ax xor + lf_width negate [bx] al add + lf_width 1- negate [bx] al add + lf_width 1+ negate [bx] al add + -1 [bx] al add + 1 [bx] al add + lf_width [bx] al add + lf_width 1- [bx] al add + lf_width 1+ [bx] al add + + ax push +c; + + : +sum ( i j +i +j -- i j ) 2over xy+ ( i j i' j' ) >cell c@ cell-sum +! ( i j ) ; : lf_check_live_i_j ( i j -- ncell ) +[ifdef] notdef cell-sum off ( i j ) -1 -1 +sum -1 0 +sum @@ -51,6 +68,9 @@ 1 0 +sum 1 1 +sum ( i j ) 2drop cell-sum @ ( sum ) +[else] + >offset lf_board + sumcell +[then] ; \ one step evolve the board @@ -61,132 +81,151 @@ lf_board lf_width + lf_board lf_width lf_height 1 - * + lf_width move \ copy the column before last to the first one and the second to the last - lf_height 0 do - i lf_width 2 - >cell @ i 0 >cell c! - i 1 >cell @ i lf_width 1 - >cell c! + lf_board ( adr ) + lf_height 0 do ( adr ) + dup lf_width + ( adr end-adr ) + over 1+ c@ over 1- c! ( adr end-adr ) + tuck 2- c@ swap c! ( end-adr ) loop + drop - lf_height 1 - 1 do - lf_width 1 - 1 do - j i lf_check_live_i_j ( sum1 ) - j i >cell c@ if ( sum1 ) + 0 ( row-offset ) + lf_height 1- 1 do ( row-offset ) + lf_width + ( row-offset ) + dup 1+ lf_width 2- bounds do ( row-offset ) + i lf_board + dup sumcell ( row adr sum1 ) + swap c@ if ( row sum1 ) \ caso in cui nella cella c'e' 1 - 2 3 between ( 0|-1 ) - else ( sum1 ) + 2 3 between ( row 0|-1 ) + dup 0= if i lf_bg show-state then + else ( row sum1 ) \ caso in cui nella cella c'e' 0 - 3 = ( 0|-1 ) - then - negate ( 0|1 ) - dup j i >work c! ( 0|1 ) - dup j i >cell c@ <> if ( 0|1 ) - j i show-cell - else - drop - then - loop + 3 = ( row 0|-1 ) + dup if i lf_fg show-state then + then ( row 0|-1 ) + negate ( row 0|1 ) + i lf_board_work + c! ( row 0|1 ) + loop ( row ) loop + drop +[then] lf_board_work lf_board /board move ; -decimal -\ initialize data -: set-cell ( i j -- ) >cell 1 swap c! ; -: init-board ( -- ) - lf_board /board erase -[ifdef] notdef - 2 2 set-cell - 3 3 set-cell - 4 3 set-cell - 4 2 set-cell - 4 1 set-cell -[else] +: compile-pattern ( -- ) + begin refill while + parse-word tuck ", + 0= if exit then + repeat +; +: place-pattern ( x y adr -- ) + -rot >cell swap ( board-adr pattern-adr ) + begin dup c@ while ( board-adr pattern-adr ) + 2dup count bounds ?do ( board-adr pattern-adr board-adr ) + i c@ [char] . <> negate ( board-adr pattern-adr board-adr value ) + over c! 1+ ( board-adr pattern-adr board-adr' ) + loop ( board-adr pattern-adr board-adr ) + drop ( board-adr pattern-adr ) + swap lf_width + swap +str ( board-adr' pattern-adr' ) + repeat ( board-adr pattern-adr ) + 2drop +; +: life-pattern: + create compile-pattern + does> ( x y adr ) place-pattern +; - \ R-pentominos - \ This placement evolves nicely - \ 20 20 set-cell 20 21 set-cell 21 19 set-cell 21 20 set-cell 22 20 set-cell +life-pattern: r-pentomino +.** +**. +.*. - \ This placement is boring - \ 40 20 set-cell 40 21 set-cell 41 19 set-cell 41 20 set-cell 42 20 set-cell +life-pattern: twin-bees +.OO........................ +.OO........................ +........................... +...............O........... +OO.............OO........OO +OO..............OO.......OO +...........OO..OO.......... +........................... +........................... +........................... +...........OO..OO.......... +OO..............OO......... +OO.............OO.......... +...............O........... +........................... +.OO........................ +.OO........................ - \ This one is excellent! - \ 20 40 set-cell 20 41 set-cell 21 39 set-cell 21 40 set-cell 22 40 set-cell - - \ This one almost dies out, then explodes into a complex arrangement with - \ stuff happening everywhere. - \ 20 60 set-cell 20 61 set-cell 21 59 set-cell 21 60 set-cell 22 60 set-cell +life-pattern: turtle +.OOO.......O +.OO..O.OO.OO +...OOO....O +.O..O.O...O +O....O....O +O....O....O +.O..O.O...O +...OOO....O +.OO..O.OO.OO +.OOO.......O - \ This one takes a long time to kill off the glider gun, then lasts for a long time - \ 20 80 set-cell 20 81 set-cell 21 79 set-cell 21 80 set-cell 22 80 set-cell +life-pattern: gosper-gun +........................O +......................O.O +............OO......OO............OO +...........O...O....OO............OO +OO........O.....O...OO +OO........O...O.OO....O.O +..........O.....O.......O +...........O...O +............OO - \ This one takes out the block at the right side of the glider gun, which - \ disperses in an interesting pattern, then the whole arena dies quickly - \ 20 78 set-cell 20 79 set-cell 21 77 set-cell 21 78 set-cell 22 78 set-cell - \ This one is absolutely brilliant! It takes out the glider gun, which - \ disperse in a boring way, but then the rest of the pattern just keeps - \ changing and changing, after looking like it is about to die several times. - \ It eventually dies about about 5000 generations. - 20 79 set-cell 20 80 set-cell 21 78 set-cell 21 79 set-cell 22 79 set-cell +: erase-board ( -- ) lf_board /board erase ; - \ Glider gun - 55 21 set-cell - 55 22 set-cell - 56 21 set-cell - 56 22 set-cell - 53 34 set-cell - 53 33 set-cell - 54 32 set-cell - 55 31 set-cell - 56 31 set-cell - 57 31 set-cell - 58 32 set-cell - 59 33 set-cell - 59 34 set-cell - 56 35 set-cell - 54 36 set-cell - 55 37 set-cell - 56 37 set-cell - 56 38 set-cell - 57 37 set-cell - 58 36 set-cell - - 55 41 set-cell - 54 41 set-cell - 53 41 set-cell - 55 42 set-cell - 54 42 set-cell - 53 42 set-cell - - 52 43 set-cell - 52 45 set-cell - 51 45 set-cell - 56 43 set-cell - 56 45 set-cell - 57 45 set-cell - - 53 55 set-cell - 53 56 set-cell - 54 55 set-cell - 54 56 set-cell - -[then] +\ initialize data +: set-cell ( i j -- ) >cell 1 swap c! ; +: init-board ( -- ) ; hex -: show-board ( -- ) +: generations ( n -- ) cursor-off " erase-screen" $call-screen lf_board_print + ( n ) 0 do + lf_board_evolve + key? if key drop leave then + loop + cursor-on ; +: life-demo ( -- ) + page + erase-board + d# 20 d# 78 r-pentomino + d# 51 d# 21 gosper-gun + d# 5500 generations +; -\ Version that displays the result in-place -: generations ( n -- ) - show-board - ( n ) 0 do lf_board_evolve loop -; -: life ( #generations -- ) +life-pattern: toad-flipper +.O..............O. +.O..............O. +O.O............O.O +.O..............O. +.O......O.......O. +.O......OO......O. +.O......OO......O. +O.O......O.....O.O +.O..............O. +.O..............O. + + +: flip-toad page - init-board - generations + erase-board + d# 40 d# 40 toad-flipper + d# 500 generations ; \ 500 generations

1 0

r625 - cpu/x86/pc/olpc
by svn＠openbios.org 19 Sep '07

19 Sep '07

Author: wmb Date: 2007-09-19 07:35:55 +0200 (Wed, 19 Sep 2007) New Revision: 625 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC trac 3543 - fixed game keys on B1 machines. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-09-19 03:00:03 UTC (rev 624) +++ cpu/x86/pc/olpc/fw.bth 2007-09-19 05:35:55 UTC (rev 625) @@ -408,7 +408,7 @@ : read-game-keys ( -- ) [ifdef] lx-devel false exit [then] - board-revision h# b20 < if + board-revision h# b18 < if h# 100 to game-key-mask exit then

1 0

r624 - cpu/x86/pc/olpc
by svn＠openbios.org 19 Sep '07

19 Sep '07

Author: wmb Date: 2007-09-19 05:00:03 +0200 (Wed, 19 Sep 2007) New Revision: 624 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC - Enable pretty boot and startup sound by default. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2007-09-19 02:59:37 UTC (rev 623) +++ cpu/x86/pc/olpc/fw.bth 2007-09-19 03:00:03 UTC (rev 624) @@ -478,7 +478,7 @@ ; : start-sound ( -- ) - playback-volume >r d# -21 to playback-volume + playback-volume >r d# -9 to playback-volume ['] load-started behavior >r ['] noop to load-started " rom:splash" ['] $play-wav catch if 2drop then @@ -493,21 +493,20 @@ : unfreeze ( -- ) ['] usb-quiet to go-hook ; : ?start-sound ( -- ) - game-key-mask h# 40 and if start-sound then + game-key-mask h# 40 and 0= if start-sound then ; +: ?freeze ( -- ) + game-key-mask h# 10 and 0= if freeze then +; : ?games ( -- ) game-key-mask h# 20 and if time&date 5drop 1 and if pong else d# 1200 life then then ; -: ?freeze ( -- ) - game-key-mask h# 10 and if freeze then -; : open-keyboard ( -- ) " keyboard" open-dev ?dup if set-stdin then ; - : startup ( -- ) standalone? 0= if exit then

1 0

r623 - cpu/x86/pc/olpc/images
by svn＠openbios.org 19 Sep '07

19 Sep '07

Author: wmb Date: 2007-09-19 04:59:37 +0200 (Wed, 19 Sep 2007) New Revision: 623 Added: cpu/x86/pc/olpc/images/Edge1-8k-EQ-Comp-Amp-Short.wav Log: Checked in new OLPC startup sound. Added: cpu/x86/pc/olpc/images/Edge1-8k-EQ-Comp-Amp-Short.wav =================================================================== (Binary files differ) Property changes on: cpu/x86/pc/olpc/images/Edge1-8k-EQ-Comp-Amp-Short.wav ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream

1 0

r622 - cpu/x86/pc/olpc
by svn＠openbios.org 19 Sep '07

19 Sep '07

Author: wmb Date: 2007-09-19 04:58:53 +0200 (Wed, 19 Sep 2007) New Revision: 622 Modified: cpu/x86/pc/olpc/setwp.fth Log: OLPC - Added new "enable-security" and "disable-security" commands per cscott's request. Modified: cpu/x86/pc/olpc/setwp.fth =================================================================== --- cpu/x86/pc/olpc/setwp.fth 2007-09-19 02:58:07 UTC (rev 621) +++ cpu/x86/pc/olpc/setwp.fth 2007-09-19 02:58:53 UTC (rev 622) @@ -62,3 +62,10 @@ [char] w swap 1+ c! ( ) put-mfg-data ; + +alias disable-security clear-wp + +: enable-security ( -- ) + board-revision h# b48 < abort" Only supported on B4 and later" + set-wp +;

1 0

r621 - cpu/x86/pc/olpc
by svn＠openbios.org 19 Sep '07

19 Sep '07

Author: wmb Date: 2007-09-19 04:58:07 +0200 (Wed, 19 Sep 2007) New Revision: 621 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC security - fixed bug with bootpath reporting in the secure boot code. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2007-09-19 02:57:26 UTC (rev 620) +++ cpu/x86/pc/olpc/security.fth 2007-09-19 02:58:07 UTC (rev 621) @@ -474,18 +474,29 @@ \ Bad idea, because the cmdline would need to be signed too \ " /lzip:\cmdline" zip-extent to cmdline + 0 to /ramdisk + + ['] load-path behavior >r ( r: xt ) + ['] ramdisk-buf to load-path ( r: xt ) + " rd" fn-buf place bundle-present? if + r> to load-path + " RD found - " ?lease-debug 0 hashname c! img$ sig$ valid? if " Signature valid" ?lease-debug-cr - " /lzip:\data.img" $load-ramdisk exit + load-base to ramdisk-adr + img$ dup to /ramdisk ( adr len ) + load-base swap move ( ) + exit else " Signature invalid" ?lease-debug-cr fail-load then then + r> to load-path ;

1 0

r620 - cpu/x86/pc/olpc
by svn＠openbios.org 19 Sep '07

19 Sep '07

Author: wmb Date: 2007-09-19 04:57:26 +0200 (Wed, 19 Sep 2007) New Revision: 620 Modified: cpu/x86/pc/olpc/olpc.bth Log: OLPC - use new startup sound from U2. Modified: cpu/x86/pc/olpc/olpc.bth =================================================================== --- cpu/x86/pc/olpc/olpc.bth 2007-09-19 02:57:04 UTC (rev 619) +++ cpu/x86/pc/olpc/olpc.bth 2007-09-19 02:57:26 UTC (rev 620) @@ -74,7 +74,9 @@ [ifndef] lx-devel " ${BP}/clients/memtest86/memtest" " memtest" $add-deflated-dropin - " ${BP}/cpu/x86/pc/olpc/images/olpc16EQima.wav" " splash" $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 [then] [ifdef] lx-devel " ${BP}/dev/pci/build/pcibridg.fc" " class060400" $add-deflated-dropin

1 0

r619 - cpu/x86/pc/olpc
by svn＠openbios.org 19 Sep '07

19 Sep '07

Author: wmb Date: 2007-09-19 04:57:04 +0200 (Wed, 19 Sep 2007) New Revision: 619 Modified: cpu/x86/pc/olpc/nandstat.fth Log: copy-nand - fixed display glitch introduces by a recent checkin. Modified: cpu/x86/pc/olpc/nandstat.fth =================================================================== --- cpu/x86/pc/olpc/nandstat.fth 2007-09-19 02:56:12 UTC (rev 618) +++ cpu/x86/pc/olpc/nandstat.fth 2007-09-19 02:57:04 UTC (rev 619) @@ -65,7 +65,7 @@ : gshow-writing ( #eblocks -- ) ." Writing " - 0 rot 0 ?do ( eblock# ) + 0 swap 0 ?do ( eblock# ) dup nand-pages/block * " block-bad?" $call-nand 0= if ( eblock# ) dup show-pending ( eblock# ) 1 ( eblock# increment )

1 0

r618 - cpu/x86/pc/olpc
by svn＠openbios.org 19 Sep '07

19 Sep '07

Author: wmb Date: 2007-09-19 04:56:12 +0200 (Wed, 19 Sep 2007) New Revision: 618 Modified: cpu/x86/pc/olpc/crypto.bth Log: OLPC crypto - The build was pulling down the wrong lease and developer key files. Modified: cpu/x86/pc/olpc/crypto.bth =================================================================== --- cpu/x86/pc/olpc/crypto.bth 2007-09-19 02:55:36 UTC (rev 617) +++ cpu/x86/pc/olpc/crypto.bth 2007-09-19 02:56:12 UTC (rev 618) @@ -6,10 +6,10 @@ fload ${BP}/cpu/x86/pc/olpc/versions.fth " wget http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img -O verify.img" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/testkeys/os.public -O os.public" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/testkeys/fw.public -O fw.public" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/testkeys/os.public -O lease.public" expand$ $sh -" wget http://dev.laptop.org/pub/firmware/crypto/testkeys/fw.public -O developer.public" expand$ $sh +" wget http://dev.laptop.org/pub/firmware/crypto/testkeys/os.public -O os.public" expand$ $sh +" wget http://dev.laptop.org/pub/firmware/crypto/testkeys/fw.public -O fw.public" expand$ $sh +" wget http://dev.laptop.org/pub/firmware/crypto/testkeys/lease.public -O lease.public" expand$ $sh +" wget http://dev.laptop.org/pub/firmware/crypto/testkeys/developer.public -O developer.public" expand$ $sh \ This forces the creation of an crypto.log file, so we don't re-fetch writing crypto.version

1 0

r617 - cpu/x86
by svn＠openbios.org 19 Sep '07

19 Sep '07

Author: wmb Date: 2007-09-19 04:55:36 +0200 (Wed, 19 Sep 2007) New Revision: 617 Modified: cpu/x86/adpcm.fth Log: WAV handler - Fixed some bugs with raw WAV handling so the new OLPC startup sound will work. Modified: cpu/x86/adpcm.fth =================================================================== --- cpu/x86/adpcm.fth 2007-09-19 02:27:06 UTC (rev 616) +++ cpu/x86/adpcm.fth 2007-09-19 02:55:36 UTC (rev 617) @@ -214,10 +214,10 @@ \ Collapse a sample array with "#output-ch" channels/sample into a smaller \ array with "wav-in-#ch" channels/sample, discarding the excess channels. -: condense-pcm ( adr -- ) - wav-in-#ch #output-ch - /w* to in-skip - #output-ch /w* to out-move - dup dup 4 - le-l@ bounds ?do ( out ) +: condense-pcm ( adr in-len -- ) + wav-in-#ch #output-ch - /w* to in-skip ( adr in-len ) + #output-ch /w* to out-move ( adr in-len ) + over swap bounds ?do ( out ) i over out-move move ( out ) out-move + ( out' ) in-skip +loop drop ( ) @@ -226,10 +226,9 @@ \ Spread a sample array with "wav-in-#ch" channels/sample into a larger \ array with "#output-ch" channels/sample, zeroing the new channels. -: expand-pcm ( adr -- ) - #output-ch wav-in-#ch - /w* to out-skip ( adr ) - wav-in-#ch /w* to out-move ( adr ) - dup /l - le-l@ ( adr in-len ) +: expand-pcm ( adr in-len -- ) + #output-ch wav-in-#ch - /w* to out-skip ( adr in-len ) + wav-in-#ch /w* to out-move ( adr in-len ) 2dup wav-in-#ch / #output-ch * ( adr in-len adr out-len ) + -rot ( out-adr in-start in-len ) over + out-move - do ( out-adr ) @@ -266,12 +265,14 @@ wav-data-adr 4 - le-l@ ( adr in-len ) dup wav-in-#ch / #output-ch * to /pcm-output ( adr in-len ) /pcm-output " dma-alloc" $call-audio to pcm-base ( adr in-len ) - - pcm-base swap move ( ) - #output-ch wav-in-#ch < if pcm-base condense-pcm then \ Skip extra channel data - #output-ch wav-in-#ch > if pcm-base expand-pcm then \ Convert mono to stereo + tuck pcm-base swap move ( in-len ) + #output-ch wav-in-#ch < if pcm-base over condense-pcm then \ Skip extra channel data + #output-ch wav-in-#ch > if pcm-base over expand-pcm then \ Spread out channel data + #output-ch 2 = wav-in-#ch 1 = and if pcm-base over 2* mono16>stereo16 then \ Stereo from mono + drop + pcm-base /pcm-output (play-pcm) false ; @@ -300,8 +301,10 @@ then parse-wav-ok? not if ." Not a .wav file" cr true exit then - " /audio" open-dev ?dup 0= if ." Cannot open audio device" cr true exit then - to audio-ih + audio-ih 0= if + " /audio" open-dev ?dup 0= if ." Cannot open audio device" cr true exit then + to audio-ih + then playback-volume set-volume set-sample-rate @@ -311,7 +314,7 @@ h# 11 of wav-data-adr play-ima-adpcm endof ( default ) ." Cannot play .wav format type: " dup .wav-cc true swap cr endcase - audio-ih close-dev + \ audio-ih close-dev ; : ($play-wav) ( file-str -- )

1 0

r616 - ofw/fs/jffs2
by svn＠openbios.org 19 Sep '07

19 Sep '07

Author: wmb Date: 2007-09-19 04:27:06 +0200 (Wed, 19 Sep 2007) New Revision: 616 Modified: ofw/fs/jffs2/jffs2.fth Log: JFFS2 - OLPC trac #2818 - give up quickly when non-JFFS2-node data is found. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2007-09-18 01:23:25 UTC (rev 615) +++ ofw/fs/jffs2/jffs2.fth 2007-09-19 02:27:06 UTC (rev 616) @@ -633,7 +633,8 @@ \ This assumes that the entire erase block is in memory : another-node? ( adr -- false | adr' true ) - eb-end swap ?do + dup h# 100 + eb-end umin ( adr end-adr ) + swap ?do i w@ jffs2-magic = if i header-crc? if i +raw-node eb-end u<= if

1 0

r615 - dev/olpc/keyboard
by svn＠openbios.org 18 Sep '07

18 Sep '07

Author: wmb Date: 2007-09-18 03:23:25 +0200 (Tue, 18 Sep 2007) New Revision: 615 Modified: dev/olpc/keyboard/selftest.fth Log: OLPC keyboard selftest - fixed bug with test-all introduced by rev 611. Modified: dev/olpc/keyboard/selftest.fth =================================================================== --- dev/olpc/keyboard/selftest.fth 2007-09-17 23:40:58 UTC (rev 614) +++ dev/olpc/keyboard/selftest.fth 2007-09-18 01:23:25 UTC (rev 615) @@ -197,7 +197,6 @@ toss-keys " translation-off" $call-parent selftest-keys " translation-on" $call-parent toss-keys cursor-on - iunselect screen-ih iselect erase-screen iunselect page close

1 0