OpenBIOS October 2007

openbios@openbios.org

11 participants
63 discussions

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