August 2010 - openfirmware - mail.coreboot.org

[commit] r1946 - cpu/x86/pc/olpc/via
by repository service Aug. 31, 2010

Aug. 31, 2010

Author: wmb Date: Tue Aug 31 21:21:20 2010 New Revision: 1946 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1946 Log: Q3A51 Modified: cpu/x86/pc/olpc/via/fw-version.fth Modified: cpu/x86/pc/olpc/via/fw-version.fth ============================================================================== --- cpu/x86/pc/olpc/via/fw-version.fth Tue Aug 31 21:15:48 2010 (r1945) +++ cpu/x86/pc/olpc/via/fw-version.fth Tue Aug 31 21:21:20 2010 (r1946) @@ -1,3 +1,3 @@ \ The overall firmware revision macro: FW_MAJOR A -macro: FW_MINOR 50 +macro: FW_MINOR 51

1 0

[commit] r1945 - in cpu/x86/pc/olpc: . via
by repository service Aug. 31, 2010

Aug. 31, 2010

Author: wmb Date: Tue Aug 31 21:15:48 2010 New Revision: 1945 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1945 Log: OLPC XO-1.5 - Added keyjector script for XO-1.5, also tweaked XO-1 keyject.bth to reflect the latest olpc.bth . Added: cpu/x86/pc/olpc/via/keyject.bth cpu/x86/pc/olpc/via/keyject.fth Modified: cpu/x86/pc/olpc/keyject.bth Modified: cpu/x86/pc/olpc/keyject.bth ============================================================================== --- cpu/x86/pc/olpc/keyject.bth Mon Aug 30 20:31:04 2010 (r1944) +++ cpu/x86/pc/olpc/keyject.bth Tue Aug 31 21:15:48 2010 (r1945) @@ -14,6 +14,7 @@ in: ${BP}/dev/usb2/hcd/ohci/build/ohci.fc in: ${BP}/dev/usb2/hcd/ehci/build/ehci.fc in: ${BP}/dev/usb2/device/hub/build/hub.fc +in: ${BP}/dev/usb2/device/generic/build/generic.fc in: ${BP}/dev/usb2/device/net/build/usbnet.fc in: ${BP}/dev/usb2/device/serial/build/usbserial.fc in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc @@ -21,7 +22,7 @@ in: ${BP}/dev/usb2/device/wlan/build/usb8388.fc in: ${BP}/dev/olpc/cafenand/build/cafenand.fc in: ${BP}/dev/olpc/cafecamera/build/cafecamera.fc -in: ${BP}/clients/memtest86/memtest +in: memtest in: ${BP}/clients/emacs/x86/emacs in: ${BP}/cpu/x86/pc/olpc/build/verify.img in: ${BP}/cpu/x86/pc/olpc/build/usb8388.bin @@ -68,7 +69,7 @@ fload ${BP}/cpu/x86/pc/olpc/loaddropins.fth " sourceurl" " sourceurl" $add-dropin - " ${BP}/clients/memtest86/memtest" " memtest" $add-deflated-dropin + " memtest" " memtest" $add-deflated-dropin \ " ${BP}/cpu/x86/pc/olpc/images/olpc16EQima.wav" " splash" $add-deflated-dropin \ " ${BP}/cpu/x86/pc/olpc/images/Edge1-16k-EQ-Comp-Amp-ima.wav" " splash" $add-deflated-dropin " ${BP}/cpu/x86/pc/olpc/images/Edge1-8k-EQ-Comp-Amp-Short.wav" " splash" $add-deflated-dropin Added: cpu/x86/pc/olpc/via/keyject.bth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/olpc/via/keyject.bth Tue Aug 31 21:15:48 2010 (r1945) @@ -0,0 +1,258 @@ +purpose: Construct the Open Firmware module collection + +command: &builder &this +in: ${BP}/cpu/x86/pc/olpc/via/build/ec.img +in: ${BP}/cpu/x86/pc/olpc/via/build/romreset.di +in: ${BP}/cpu/x86/pc/olpc/via/build/romstart.di +in: ${BP}/cpu/x86/pc/olpc/via/build/resume.di +in: ${BP}/cpu/x86/pc/olpc/via/build/rmstart.img +in: ${BP}/cpu/x86/pc/olpc/via/build/paging.di +in: ${BP}/cpu/x86/pc/olpc/via/build/fw.dic +in: ${BP}/dev/mmc/sdhci/build/sdhci2.fc +in: ${BP}/dev/mmc/sdhci/build/sdhcixo.fc +in: ${BP}/dev/mmc/sdhci/build/sdmmc.fc +in: ${BP}/dev/mmc/sdhci/mv8686/build/mv8686.fc +in: ${BP}/dev/usb2/hcd/uhci/build/uhci.fc +in: ${BP}/dev/usb2/hcd/ehci/build/ehci.fc +in: ${BP}/dev/usb2/device/hub/build/hub.fc +in: ${BP}/dev/usb2/device/generic/build/generic.fc +in: ${BP}/dev/usb2/device/net/build/usbnet.fc +in: ${BP}/dev/usb2/device/serial/build/usbserial.fc +in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc +in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc +in: ${BP}/clients/memtest86/memtest +in: ${BP}/clients/emacs/x86/emacs +in: ${BP}/cpu/x86/pc/olpc/via/build/verify.img +in: ${BP}/dev/pci/build/pcibridg.fc +in: ${BP}/dev/ide/build/idehier.fc +\ in: ${BP}/dev/ide/build/leghier.fc +\ in: ${BP}/cpu/x86/pc/olpc/via/build/camera.fc +in: ${BP}/cpu/x86/pc/olpc/via/build/dsdt.aml +in: ${BP}/cpu/x86/pc/olpc/via/build/mcastnand.bin +in: ${BP}/dev/hdaudio/build/hdaudio.fc +in: sd8686.bin +in: testicons.bin +in: ${BP}/cpu/x86/pc/olpc/images/bigx.di +in: ${BP}/cpu/x86/pc/olpc/images/bigcheck.di +in: ${BP}/cpu/x86/pc/olpc/images/leds.di +in: ${BP}/cpu/x86/pc/olpc/images/ebook.di + +build-now + +fload ${BP}/cpu/x86/pc/olpc/via/fw-version.fth +macro: FW_MINOR 49z + +" macro: FW_VERSION Q3${FW_MAJOR}${FW_MINOR}" expand$ eval + +fload ${BP}/cpu/x86/pc/olpc/via/config.fth + +\ Always re-create the builton.fth file when we make a new rom.img +fload ${BP}/cpu/x86/pc/builton.bth +fload ${BP}/cpu/x86/pc/olpc/via/sourceurl.fth + +fload ${BP}/forth/lib/crc32.fth + +hex + +: pad-file ( location -- ) + ofd @ fsize + 2dup u< abort" The ROM image is too large" + ?do h# ff ofd @ fputc loop +; + +.( --- Saving as ) +" ${FW_VERSION}.rom" expand$ 2dup lower ( adr len ) +2dup type cr ( adr len ) +$new-file +[ifdef] xo-board + " ec.img" $add-file +[then] + + dropin-base rom-pa - pad-file + +[ifdef] coreboot-loaded + " romstart.di" $add-file +[else] + " romreset.di" $add-file +[then] + + " resume.di" $add-file + +\ Loads the set of drivers that is common to different output formats + + " paging.di" $add-file + " ${BP}/cpu/x86/build/inflate.bin" " inflate" $add-dropin + " fw.img" " firmware" $add-deflated-dropin +\ " fw.img" " firmware" $add-dropin + + " ${BP}/dev/usb2/hcd/uhci/build/uhci.fc" " class0c0300" $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/generic/build/generic.fc" " usbdevice" $add-deflated-dropin + " ${BP}/dev/usb2/device/net/build/usbnet.fc" " usbnet" $add-deflated-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 +\ " mrv8686.bin" " mrv8686.bin" $add-deflated-dropin + +[ifdef] notdef + " ${BP}/dev/pci/build/pcibridg.fc" " class060400" $add-deflated-dropin +\ " ${BP}/dev/ide/build/leghier.fc" " class01018a" $add-deflated-dropin + " ${BP}/dev/ide/build/idehier.fc" " class01018f" $add-deflated-dropin +[then] +[ifdef] xo-board + " ${BP}/dev/mmc/sdhci/build/sdhcixo.fc" " class080501" $add-deflated-dropin +[then] +[ifdef] demo-board + " ${BP}/dev/mmc/sdhci/build/sdhci2.fc" " class080501" $add-deflated-dropin +[then] + " ${BP}/dev/mmc/sdhci/build/sdmmc.fc" " sdmmc" $add-deflated-dropin + " ${BP}/dev/mmc/sdhci/mv8686/build/mv8686.fc" " mv8686" $add-deflated-dropin + " sd8686_helper.bin" " helper_sd.bin" $add-deflated-dropin + " sd8686.bin" " sd8686.bin" $add-deflated-dropin + + " builton.fth" " probe-" $add-dropin + + " ${BP}/clients/emacs/x86/emacs" " emacs" $add-deflated-dropin + " ${BP}/clients/emacs/x86/emacs.rc" " emacs.rc" $add-deflated-dropin + " ${BP}/clients/emacs/emacs.hlp" " emacs.hlp" $add-deflated-dropin + + " ${BP}/ofw/fcode/memtest.fth" " memtest.fth" $add-deflated-dropin + + " ${BP}/dev/hdaudio/build/hdaudio.fc" " class040300" $add-deflated-dropin + + " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin + +\ " ${BP}/cpu/x86/pc/olpc/images/warnings.565" " warnings.565" $add-deflated-dropin + " ${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/bigdot.565" " bigdot.565" $add-deflated-dropin + + " ${BP}/cpu/x86/pc/olpc/images/check.565" " check.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/xogray.565" " xogray.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" " disk.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/wireless.565" " wlan.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/laptop.565" " int.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/sd.565" " ext.565" $add-deflated-dropin + + " ${BP}/cpu/x86/pc/olpc/DisplayEDID.raw" " edid" $add-deflated-dropin + + " ${BP}/ofw/termemu/15x30pc.psf" " font" $add-deflated-dropin +[ifdef] use-ega + " ${BP}/ofw/termemu/cp881-16.obf" " pcfont" $add-deflated-dropin +[then] + + " memtest" " memtest" $add-deflated-dropin + + " 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 + " sourceurl" " sourceurl" $add-dropin + + " ${BP}/cpu/x86/pc/olpc/images/Edge1-8k-EQ-Comp-Amp-Short.wav" " splash" $add-deflated-dropin + + " ${BP}/cpu/x86/pc/olpc/via/build/dsdt.aml" " dsdt" $add-deflated-dropin +\ " ${BP}/cpu/x86/pc/olpc/via/build/ssdt.aml" " ssdt" $add-deflated-dropin + + \ icons for mfg test gui + " testicons/play.565" " play.565" $add-deflated-dropin + " testicons/quit.565" " quit.565" $add-deflated-dropin + " testicons/cpu.565" " cpu.565" $add-deflated-dropin + " testicons/spi.565" " spi.565" $add-deflated-dropin + " testicons/ram.565" " ram.565" $add-deflated-dropin + " testicons/sdcard.565" " sdcard.565" $add-deflated-dropin + " testicons/keyboard.565" " keyboard.565" $add-deflated-dropin + " testicons/display.565" " display.565" $add-deflated-dropin + " testicons/touchpad.565" " touchpad.565" $add-deflated-dropin + " testicons/audio.565" " audio.565" $add-deflated-dropin + " testicons/usb.565" " usb.565" $add-deflated-dropin + " testicons/battery.565" " battery.565" $add-deflated-dropin + " testicons/camera.565" " camera.565" $add-deflated-dropin + " testicons/wifi.565" " wifi.565" $add-deflated-dropin + " testicons/clock.565" " clock.565" $add-deflated-dropin + " testicons/timer.565" " timer.565" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/images/bigx.di" $add-file + " ${BP}/cpu/x86/pc/olpc/images/bigcheck.di" $add-file + " ${BP}/cpu/x86/pc/olpc/images/leds.di" $add-file + " ${BP}/cpu/x86/pc/olpc/images/ebook.di" $add-file + + " ${BP}/cpu/x86/pc/olpc/via/build/nandblaster15_rx.bin" " nb15_rx" $add-deflated-dropin + " ${BP}/cpu/x86/pc/olpc/via/build/nandblaster_tx.bin" " nb_tx" $add-deflated-dropin + + " ${BP}/cpu/x86/pc/olpc/keyject.fth" " probe+" $add-deflated-dropin + " /space/bios-crypto/build/k2.public" " o1" $add-dropin \ Incompressible + " /space/bios-crypto/build/k2.public" " s1" $add-dropin + " /space/bios-crypto/build/k2.public" " d1" $add-dropin + " /space/bios-crypto/build/k2.public" " w1" $add-dropin + " /space/bios-crypto/build/k2.public" " a1" $add-dropin + +.( Dropin top is ) ofd @ fsize .x cr + +[ifdef] coreboot-loaded + /rom h# 10000 - pad-file \ coreboot init image must be in last FLASH block + " coreboot.img" $add-file +[else] + /rom h# 10000 - pad-file \ coreboot init image must be in last FLASH block +\ " cforth.img" $add-file \ Small Forth that runs from cache + + /rom h# 400 - pad-file \ rmstart image must start 0x400 from end + " rmstart.img" $add-file + +\ Insert the revision signature +/rom h# 40 - ofd @ fseek +h# 10 buffer: signature +signature h# 10 blank +" CL1" signature swap move +" ${FW_VERSION}" expand$ signature 6 + swap move +" Q3${FW_MAJOR}" expand$ signature d# 13 + swap move +signature h# 10 ofd @ fputs + +create sipbuf + cc c, 66 c, aa c, 55 c, 54 c, 24 c, 01 c, 88 c, + 77 c, 77 c, 10 c, 77 c, 14 c, 08 c, 77 c, 00 c, + 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, + 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, +here sipbuf - constant /sipbuf + +/l buffer: crcbuf +/rom buffer: filebuf + +\ Via SIP ROM pointer +\ The address "-30" is fixed by the VX855 hardware. +\ We get to choose the address ffffffa0 +h# ffffff80 crcbuf l! +/rom h# 30 - ofd @ fseek +crcbuf /l ofd @ fputs + +/rom h# 80 - ofd @ fseek +sipbuf /sipbuf ofd @ fputs + +\ Read the entire image, compute the CRC, and store it h# 30 from the end +0 ofd @ fseek +filebuf /rom ofd @ fgets /rom <> abort" Can't read back image" +0 crctab filebuf /rom ($crc) crcbuf ! + +/rom h# 2c - ofd @ fseek +crcbuf /l ofd @ fputs +[then] + +ofd @ fclose + +\ Creating olpc.version serves two purposes: +\ a) It reports the firmware revision for use by external scripts +\ b) It provides an olpc.* artifact for the builder dependency management. + +writing keyject.version +" ${FW_VERSION}" expand$ 2dup lower ofd @ fputs +ofd @ fclose Added: cpu/x86/pc/olpc/via/keyject.fth ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/x86/pc/olpc/via/keyject.fth Tue Aug 31 21:15:48 2010 (r1945) @@ -0,0 +1,265 @@ +purpose: Inject additional keys into manufacturing data +\ See license at end of file + +\ Search for !!! for things that may need to change for different deployments + +\ See HowItWorks near end of file for a description of the overall procedure + +\ !!! Re-implement this for each different deployment +: wrong-sku? ( -- flag ) + " P#" find-tag 0= if true exit then ( pn$ ) + + -null ( pn$' ) + 2dup " 1CL11ZP0KD6" $= if 2drop false exit then ( pn$ ) \ UY BYD LiFePO4 + 2dup " 1CL11ZP0KD7" $= if 2drop false exit then ( pn$ ) \ UY GP NiMH + 2dup " 1CL11ZP0KD9" $= if 2drop false exit then ( pn$ ) \ UY GP LiFePO4 +[ifdef] test-me + 2dup " 1CL11ZU0KDB" $= if 2drop false exit then ( pn$ ) \ US for testing +[then] + 2drop + + true +; + +\ !!! Change the date for each different deployment +: keyject-expired? ( -- flag ) " 20090401T000000Z" expired? ; + +\ !!! Change the key list for each different deployment +: new-key-list$ ( -- ) " o1 s1 d1 w1 a1" ; + +\ True if the all the requested tags are already present. +\ This prevents endless looping. +: already-injected? ( -- flag ) + new-key-list$ begin dup while ( $ ) + bl left-parse-string ( $' name$ ) + find-tag if ( $ value$ ) + 2drop ( $ ) + else ( $ ) + 2drop false exit + then ( $ ) + repeat ( $ ) + 2drop true +; + +: inject-key ( keyname$ -- ) + 2dup find-drop-in if ( keyname$ value$ ) + 2over ram-find-tag if ( keyname$ value$ oldvalue$ ) + 2 pick <> if ( keyname$ value$ oldvalue$ ) + 3drop ( keyname$ ) + ." Warning: inconsistent old tag length for " type cr ( ) + exit + then ( keyname$ value$ oldvalue-adr ) + >r 2tuck r> swap move ( valu$ keyname$ ) + green-letters + ." Replaced " type cr ( value$ ) + black-letters + else ( keyname$ value$ ) + 2swap ( value$ keyname$ ) + 2over 2over ( value$ keyname$ value$ keyname$ ) + ($add-tag) ( value$ keyname$ ) + green-letters + ." Added " type cr ( value$ ) + black-letters + then ( value$ ) + free-mem ( ) + else ( keyname$ ) + ." Warning: Can't find a dropin module for " type cr ( ) + then ( ) +; + +: inject-keys ( -- ) + get-mfg-data + new-key-list$ begin dup while ( $ ) + bl left-parse-string ( $' name$ ) + inject-key ( $ ) + repeat ( $ ) + 2drop ( ) + (put-mfg-data) ( ) +; + +: keyject-error ( msg$ -- ) + cr + red-letters ." Not injecting because: " type cr black-letters + cr + ." Will update firmware in 20 seconds" cr + d# 20,000 ms +; + +: do-keyject? ( -- flag ) + wrong-sku? if + " Wrong SKU" keyject-error + false exit + then + keyject-expired? if + " Date Expired" keyject-error + false exit + then + already-injected? if + " Keys Already Present" keyject-error + false exit + then + true +; + +false value new-firmware? +: got-firmware? ( dev$ -- flag ) + 2dup ." Looking for new bootfw2.zip on " type cr ( dev$ ) + dn-buf place ( ) + " \boot" pn-buf place ( ) + filesystem-present? 0= if false exit then ( ) + null$ cn-buf place ( ) + " bootfw2" bundle-present? 0= if false exit then ( ) + ." Found" cr ( ) + secure? if ( ) + load-crypto if ( ) + ." Crypto load failed" cr false exit ( ) + then ( ) + fwkey$ to pubkey$ ( ) + img$ sig$ fw-valid? 0= if ( ) + ." Bad signature" cr ( ) + false exit + then ( ) + then ( ) + img$ tuck flash-buf swap /flash min move ( len ) + ['] ?image-valid catch if ( x ) + ." Bad firmware image" cr ( x ) + drop false exit + then ( ) + ." Good image" cr ( ) + + true to new-firmware? ( ) + true ( true ) +; + +: get-new-firmware ( -- ) + all-devices$ begin dup while ( $ ) + bl left-parse-string ( $' dev$ ) + got-firmware? if 2drop exit then ( $ ) + repeat ( $ ) + 2drop +; + +: ac-connected? ( -- flag ) bat-status@ h# 10 and 0<> ; + +\ Empirically, a weak-but-present battery can present the "trickle charge" (80) +\ but not present the "present" bit (01). +: battery-present? ( -- flag ) bat-status@ h# 81 and 0<> ; + +\ Similarly, a weak-but-present battery can present the "trickle charge" (80) +\ but not present the "battery low" bit (04). +: battery-strong? ( -- flag ) bat-status@ h# 84 and 0= ; + +: wait-enough-power ( -- ) + ac-connected? 0= if + ." Please connect the AC adapter to continue..." + begin d# 100 ms ac-connected? until + cr + then + battery-present? 0= if + ." Please insert a well-charged battery to continue..." + begin d# 100 ms battery-present? until + cr + then + battery-strong? 0= if + ." The battery is low. Please insert a charged one to continue..." + begin d# 100 ms battery-present? battery-strong? and until + then +; + +\ Firmware is in flash-buf +: update-firmware ( -- ) + write-firmware + + ['] verify-firmware catch if + ." Verify failed. Retrying once" cr + spi-identify + write-firmware + verify-firmware + then +; + +: ?keyject ( -- ) + visible + green-letters cr ." Security Key Injector" cr cr black-letters + \ Get the new firmware first, so any security checks use the old keys + get-new-firmware + do-keyject? if + wait-enough-power + flash-write-enable + inject-keys + new-firmware? if update-firmware then + flash-write-disable \ Should reboot + else + \ If we can't update the firmware, don't touch the SPI FLASH, lest + \ we get into an infinite reboot cycle. + new-firmware? if + ." Updating firmware ..." cr + wait-enough-power + flash-write-enable + update-firmware + flash-write-disable \ Should reboot + then + then +; + +?keyject + +[ifdef] HowItWorks +OLPC signs bootfw.zip containing OFW image A and bootfw2.zip containing OFW image B. +* A is an OFW with additional keyjector functionality +* B is an ordinary OFW +Version number B > version number A. + +bootfw.zip and bootfw2.zip are presented to a deployment machine in the usual manner, +either on a USB key or as part of a signed OS image. + +On a deployment machine with firmware X (version X < version A): + +The deployment machine (with old firmware version X < A) +auto-reflashes itself with firmware A via the existing secure +reflash mechanism. + +1) Firmware A starts and chacks that: + + The SKU is for the intended deployment + + the date is before the keyjector expiration date + + The override keys are not already present +so it + ! Injects the new keys +then it + ! Reads bootfw2.zip, checks its signature, and reflashes with firmware B (version > A) + ! Reboots + +2) Firmware B starts, performs the normal fw update attempt step, +noticing that data.img (firmware A) is downrev, and proceeds to +boot normally. + +In step (1), on a non-UY SKU, or after the expiration date, +firmware A skips the keyjection step and instead goes straight +to the "reflash firmware B" step. + +In either case, the machine ends up with (normal) firmware B. +[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

1 0

[commit] r1944 - cpu/x86/pc/olpc/via
by repository service Aug. 30, 2010

Aug. 30, 2010

Author: wmb Date: Mon Aug 30 20:31:04 2010 New Revision: 1944 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1944 Log: OLPC XO-1.5 - trac 10344 - Fixed the kb-suspend command to freeze the screen properly, so it doesn't fade out between keystrokes. Modified: cpu/x86/pc/olpc/via/suspend.fth Modified: cpu/x86/pc/olpc/via/suspend.fth ============================================================================== --- cpu/x86/pc/olpc/via/suspend.fth Mon Aug 30 20:15:35 2010 (r1943) +++ cpu/x86/pc/olpc/via/suspend.fth Mon Aug 30 20:31:04 2010 (r1944) @@ -38,13 +38,6 @@ d# 10 set-tick-limit ]unlock ; -: kb-suspend ( -- ) - sci-wakeup - begin - begin 1 ms key? while key dup [char] q = abort" Quit" emit repeat - s3 - again -; : s3-no-usb ( -- ) audio-ih if audio-ih close-dev 0 to audio-ih then " video-save" screen-ih $call-method \ Freeze display @@ -58,6 +51,13 @@ resume-usb ; alias s s3-suspend +: kb-suspend ( -- ) + sci-wakeup + begin + begin 1 ms key? while key dup [char] q = abort" Quit" emit repeat + s3-no-usb + again +; \ LICENSE_BEGIN \ Copyright (c) 2007 FirmWorks

1 0

[commit] r1943 - cpu/x86/pc/olpc/via
by repository service Aug. 30, 2010

Aug. 30, 2010

Author: wmb Date: Mon Aug 30 20:15:35 2010 New Revision: 1943 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1943 Log: OLPC XO-1.5 - Changed some of the port 80 callouts in romreset.bth to better delineate major substeps including init-codec. Modified: cpu/x86/pc/olpc/via/romreset.bth Modified: cpu/x86/pc/olpc/via/romreset.bth ============================================================================== --- cpu/x86/pc/olpc/via/romreset.bth Mon Aug 30 20:12:57 2010 (r1942) +++ cpu/x86/pc/olpc/via/romreset.bth Mon Aug 30 20:15:35 2010 (r1943) @@ -112,8 +112,6 @@ \ acpi-io-base 1 + 8888 config-ww \ Set ACPI base address \ 8c 8881 config-wb \ Enable ACPI regs, 32-bit PM timer, guard RTC against power glitches - h# 1d port80 - \ This is a device ID backdoor to fake out the ID so Ubuntu will install \ 8879 config-rb h# 40 # al or al dx out \ I don't know what this is, but coreboot does it @@ -214,6 +212,8 @@ long-offsets off [then] + h# 18 port80 + fload ${BP}/cpu/x86/pc/olpc/via/startmtrrinit.fth fload ${BP}/cpu/x86/pc/olpc/via/ioinit.fth @@ -228,8 +228,12 @@ \ Setup a small stack for subroutine calls h# 10.0000 # esp mov + h# 19 port80 + init-codec #) call + h# 1a port80 + long-offsets on acpi-io-base 4 + port-rw \ Get APCI Status register ax bx mov

1 0

[commit] r1942 - ofw/core
by repository service Aug. 30, 2010

Aug. 30, 2010

Author: wmb Date: Mon Aug 30 20:12:57 2010 New Revision: 1942 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1942 Log: Fixed stack pile-up problem in $copy-all (pack should have been place) and added running stack comments to the affected source code. Modified: ofw/core/filecmds.fth Modified: ofw/core/filecmds.fth ============================================================================== --- ofw/core/filecmds.fth Mon Aug 23 02:47:34 2010 (r1941) +++ ofw/core/filecmds.fth Mon Aug 30 20:12:57 2010 (r1942) @@ -590,20 +590,21 @@ first-match if 2drop dir? else false then ; d# 128 buffer: search-dir -: $copy-all ( pattern$ dir-path$ -- ) - 2>r +: $copy-all ( pattern$ dir$ -- ) + 2>r ( pattern$ r: dir$ ) 2r@ is-dir? 0= abort" The destination for pattern copies must be a directory" - 2dup canonical-path file&dir 2nip search-dir place - begin-search begin another-match? while ( 8attributes name$ ) - 2>r dir? if ( ) - ." Not copying the directory: " 2r> type cr - else - search-dir count source$ pack - 2r> source$ $cat - source$ count 2r@ $copy-to-dir - then - repeat - 2r> 2drop + 2dup canonical-path ( pattern$ canonical$ r: dir$ ) + file&dir 2nip search-dir place \ note source dir ( pattern$ r: dir$ ) + begin-search begin another-match? while ( 8attributes name$ r: dir$ ) + 2>r dir? if ( r: dir$ name$ ) + ." Not copying the directory: " 2r> type cr ( r: dir$ ) + else ( r: dir$ name$ ) + search-dir count source$ place ( r: dir$ name$ ) + 2r> source$ $cat ( r: dir$ ) + source$ count 2r@ $copy-to-dir ( r: dir$ ) + then ( r: dir$ ) + repeat ( r: dir$ ) + 2r> 2drop ( ) ; : $copy2 ( path$1 path$2 -- )

1 0

[commit] r1941 - in cpu/x86/pc/olpc: . via
by repository service Aug. 22, 2010

Aug. 22, 2010

Author: wmb Date: Mon Aug 23 02:47:34 2010 New Revision: 1941 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1941 Log: OLPC - setup BIOS Data Area when booting Linux, because recent Linux versions now use the "lowmem size" BDA field. Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/via/fw.bth Modified: cpu/x86/pc/olpc/fw.bth ============================================================================== --- cpu/x86/pc/olpc/fw.bth Wed Aug 18 19:58:11 2010 (r1940) +++ cpu/x86/pc/olpc/fw.bth Mon Aug 23 02:47:34 2010 (r1941) @@ -141,10 +141,6 @@ support-package: zip-file-system fload ${BP}/ofw/fs/zipfs.fth \ Zip file system end-support-package - -support-package: dropin-file-system - fload ${BP}/ofw/fs/dropinfs.fth \ Dropin file system -end-support-package [then] support-package: minix-file-system @@ -645,6 +641,7 @@ report-disk report-keyboard + make-bda setup-smbios \ Must be done after build-date is defined via do-drop-in interpreter-init Modified: cpu/x86/pc/olpc/via/fw.bth ============================================================================== --- cpu/x86/pc/olpc/via/fw.bth Wed Aug 18 19:58:11 2010 (r1940) +++ cpu/x86/pc/olpc/via/fw.bth Mon Aug 23 02:47:34 2010 (r1941) @@ -154,10 +154,6 @@ support-package: zip-file-system fload ${BP}/ofw/fs/zipfs.fth \ Zip file system end-support-package - -support-package: dropin-file-system - fload ${BP}/ofw/fs/dropinfs.fth \ Dropin file system -end-support-package [then] support-package: minix-file-system @@ -691,6 +687,7 @@ probe-usb " probe+" do-drop-in + make-bda setup-smbios \ Must be done after build-date is defined via do-drop-in interpreter-init

1 0

[commit] r1940 - cpu/x86/pc/olpc/via
by repository service Aug. 18, 2010

Aug. 18, 2010

Author: wmb Date: Wed Aug 18 19:58:11 2010 New Revision: 1940 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1940 Log: OLPC XO-1.5 - added commentary describing the address bit layout for the SDRAM Mode Register Set cycle. Modified: cpu/x86/pc/olpc/via/dramtiming.fth cpu/x86/pc/olpc/via/startdraminit.fth Modified: cpu/x86/pc/olpc/via/dramtiming.fth ============================================================================== --- cpu/x86/pc/olpc/via/dramtiming.fth Tue Aug 17 21:27:32 2010 (r1939) +++ cpu/x86/pc/olpc/via/dramtiming.fth Wed Aug 18 19:58:11 2010 (r1940) @@ -105,7 +105,8 @@ TCL 4 lshift or \ CAS Latency 0 7 lshift or \ Normal mode, not test mode 0 8 lshift or \ Not DLL reset - Twr Tck / 1- scramble-mrs or \ Twr cycles minus 1 - 3 lshift + Twr Tck / 1- or \ Twr cycles minus 1 + 1 d# 17 lshift or \ Slow exit from power down + 3 lshift \ Push past byte-select bits (8-byte-wide memory bus) ; [then] Modified: cpu/x86/pc/olpc/via/startdraminit.fth ============================================================================== --- cpu/x86/pc/olpc/via/startdraminit.fth Tue Aug 17 21:27:32 2010 (r1939) +++ cpu/x86/pc/olpc/via/startdraminit.fth Wed Aug 18 19:58:11 2010 (r1940) @@ -25,10 +25,33 @@ 13 36b config-wb \ SDRAM MRS Enable \ 101258 #) ax mov \ Depends on Twr, CL, and Burst Length + \ The address in the mov below sends setup information to the DDR2 SDRAM chips + \ The address bits are: + \ P .... .www DmCC CtBB B___ + \ + \ ___ are the low-order address bits that don't go directly to the RAM chips + \ because the DRAM data bus from the processor is 8 bytes wide. + \ + \ BBB is Burst Length - 010=BL4, 011=BL8 + \ t is Burst Type - 0=sequential, 1=interleaved + \ CCC is CAS Latency - 010=CL2, 011=CL3, 100=CL4, 101=CL5, 110=CL6 + \ m is test mode - 0=normal, 1=test + \ D is DLL reset - 0=no reset, 1=reset + \ www is Write Recovery - 001=WR2, 010=WR3, 011=WR4, 100=WR5, 101=WR6 + \ P is Power Down Exit - 0=fast, 1=slow + + \ At this point, the address multiplexing is set for 12 column addresses, i.e MA type 111, + \ per the preceding setting of D0F3 Rx50 in demodram.fth (50 ee ee mreg). + \ That keep the 12-bit group "www DmCC CtBB B" together as a contiguous set. + \ I'm not sure how the P bit gets routed from processor A20 to SDRAM A12. In fact + \ I'm just assuming that that leading 1 in the addresses below is the P bit. + \ It can't be a bank address bit, because BA0, BA1, and BA2 are suppose to be all 0 + \ for MRS (Mode Register Set) + acpi-io-base 48 + port-rl h# 0008.0000 # ax and 0<> if \ Memory ID0 bit - set for CL4 SDRAM - 102258 #) ax mov \ Depends on Twr, CL, and Burst Length - CL4 + 102258 #) ax mov \ Depends on Twr, CL, and Burst Length - WR3, CL4, BL8 else - 1021d8 #) ax mov \ Depends on Twr, CL, and Burst Length - CL3 + 1021d8 #) ax mov \ Depends on Twr, CL, and Burst Length - WR3, CL3, BL8 then 0 [if]

1 0

[commit] r1939 - clients/memtest86
by repository service Aug. 17, 2010

Aug. 17, 2010

Author: wmb Date: Tue Aug 17 21:27:32 2010 New Revision: 1939 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1939 Log: x86 - memtest86 - Completed the process begun by svn 1938 by reverted the change in svn 1937 and going back to -Os . I verified that -Os now works with both GCC 4.2.1 and GCC 4.4.3 (-O1 also works with both). Modified: clients/memtest86/Makefile Modified: clients/memtest86/Makefile ============================================================================== --- clients/memtest86/Makefile Tue Aug 17 21:10:51 2010 (r1938) +++ clients/memtest86/Makefile Tue Aug 17 21:27:32 2010 (r1939) @@ -28,9 +28,8 @@ CC=gcc # # gcc compiler options, these settings should suffice -# (It is tempting to use -Os, but that causes runtime failures when compiled with GCC >4.2) # -CCFLAGS=-Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding +CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding CCFLAGS += -fno-stack-protector CCFLAGS += $(DEFINES)

1 0

[commit] r1938 - clients/memtest86
by repository service Aug. 17, 2010

Aug. 17, 2010

Author: wmb Date: Tue Aug 17 21:10:51 2010 New Revision: 1938 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1938 Log: x86 - memtest86 - Fixed the problem cited in the previous commit in a different way, performing the overflow checks using integer arithmetic that is immune to pointer overflow optimizations, thus allowing the use of -Os again. The intention is that it should now work when compiled with either -O1 or -Os, with all versions of GCC. The change is consistent with the 4.0 version of memtest86 from memtest.org . (Also fixed some whitespace problems.) Modified: clients/memtest86/test.c Modified: clients/memtest86/test.c ============================================================================== --- clients/memtest86/test.c Tue Aug 17 19:22:56 2010 (r1937) +++ clients/memtest86/test.c Tue Aug 17 21:10:51 2010 (r1938) @@ -6,6 +6,7 @@ #include "test.h" #include "config.h" #include "ega.h" +#include <inttypes.h> extern int segs, bail; extern volatile ulong *p; @@ -35,12 +36,12 @@ /* Test the global address bits */ for (p1=0, j=0; j<2; j++) { - hprint(LINE_PAT, COL_PAT, p1); + hprint(LINE_PAT, COL_PAT, p1); /* Set pattern in our lowest multiple of 0x20000 */ p = (ulong *)roundup((ulong)v->map[0].start, 0x1ffff); *p = p1; - + /* Now write pattern compliment */ p1 = ~p1; end = v->map[segs-1].end; @@ -48,15 +49,15 @@ mask = 4; do { pt = (ulong *)((ulong)p | mask); - if (pt == p) { + if ((uintptr_t)pt == (uintptr_t)p) { mask = mask << 1; continue; } - if (pt >= end) { + if ((uintptr_t)pt >= (uintptr_t)end) { break; } *pt = p1; - if ((bad = *p) != ~p1) { + if ((uintptr_t)(bad = *p) != (uintptr_t)~p1) { ad_err1((ulong *)p, (ulong *)mask, bad, ~p1); i = 1000; @@ -77,14 +78,14 @@ bank = 0x40000; } for (p1=0, k=0; k<2; k++) { - hprint(LINE_PAT, COL_PAT, p1); + hprint(LINE_PAT, COL_PAT, p1); for (j=0; j<segs; j++) { p = v->map[j].start; /* Force start address to be a multiple of 256k */ p = (ulong *)roundup((ulong)p, bank - 1); end = v->map[j].end; - while (p < end) { + while ((uintptr_t)p < (uintptr_t)end) { *p = p1; p1 = ~p1; @@ -93,24 +94,24 @@ do { pt = (ulong *) ((ulong)p | mask); - if (pt == p) { + if ((uintptr_t)pt == (uintptr_t)p) { mask = mask << 1; continue; } - if (pt >= end) { + if ((uintptr_t)pt >= (uintptr_t)end) { break; } *pt = p1; - if ((bad = *p) != ~p1) { + if ((uintptr_t)(bad = *p) != (uintptr_t)~p1) { ad_err1((ulong *)p, - (ulong *)mask, - bad,~p1); + (ulong *)mask, + bad,~p1); i = 200; } mask = mask << 1; } while(mask); } - if (p + bank > p) { + if ((uintptr_t)(p + bank) > (uintptr_t)p) { p += bank; } else { p = end; @@ -133,7 +134,7 @@ volatile ulong *pe; volatile ulong *end, *start; - cprint(LINE_PAT, COL_PAT, " "); + cprint(LINE_PAT, COL_PAT, " "); /* Write each address with it's own address */ for (j=0; j<segs; j++) { @@ -144,16 +145,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } @@ -188,16 +189,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe ) { break; } /* Original C code replaced with hand tuned assembly code @@ -220,7 +221,7 @@ "cmpl %%edx,%%edi\n\t" "jb L91\n\t" "jmp L94\n\t" - + "L93:\n\t" "pushl %%edx\n\t" "pushl %%ecx\n\t" @@ -264,7 +265,7 @@ } /* Display the current seed */ - hprint(LINE_PAT, COL_PAT, seed1); + hprint(LINE_PAT, COL_PAT, seed1); rand_seed(seed1, seed2); for (j=0; j<segs; j++) { start = v->map[j].start; @@ -274,16 +275,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code */ @@ -293,19 +294,19 @@ } */ - asm __volatile__ ( - "jmp L200\n\t" - ".p2align 4,,7\n\t" - "L200:\n\t" - "call rand\n\t" + asm __volatile__ ( + "jmp L200\n\t" + ".p2align 4,,7\n\t" + "L200:\n\t" + "call rand\n\t" "movl %%eax,(%%edi)\n\t" - "addl $4,%%edi\n\t" - "cmpl %%ebx,%%edi\n\t" - "jb L200\n\t" - : "=D" (p) - : "D" (p), "b" (pe) + "addl $4,%%edi\n\t" + "cmpl %%ebx,%%edi\n\t" + "jb L200\n\t" + : "=D" (p) + : "D" (p), "b" (pe) : "eax" - ); + ); do_tick(); BAILR @@ -325,16 +326,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code */ @@ -410,7 +411,7 @@ volatile ulong *start,*end; /* Display the current pattern */ - hprint(LINE_PAT, COL_PAT, p1); + hprint(LINE_PAT, COL_PAT, p1); /* Initialize memory with the initial pattern. */ for (j=0; j<segs; j++) { @@ -421,17 +422,17 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } len = pe - p; - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code @@ -462,16 +463,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code @@ -528,16 +529,16 @@ done = 0; do { /* Check for underflow */ - if (pe - SPINSZ < pe) { + if ((uintptr_t)(pe - SPINSZ) < (uintptr_t)pe) { pe -= SPINSZ; } else { pe = start; } - if (pe <= start) { + if ((uintptr_t)pe <= (uintptr_t)start) { pe = start; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code @@ -612,16 +613,16 @@ pat = p1; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Do a SPINSZ section of memory */ @@ -674,16 +675,16 @@ pat = p1; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code @@ -787,16 +788,16 @@ done = 0; do { /* Check for underflow */ - if (pe - SPINSZ < pe) { + if ((uintptr_t)(pe - SPINSZ) < (uintptr_t)pe) { pe -= SPINSZ; } else { pe = start; } - if (pe <= start) { + if ((uintptr_t)pe <= (uintptr_t)start) { pe = start; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code @@ -882,9 +883,9 @@ volatile ulong *start, *end; /* Display the current pattern */ - hprint(LINE_PAT, COL_PAT-2, p1); + hprint(LINE_PAT, COL_PAT-2, p1); cprint(LINE_PAT, COL_PAT+6, "-"); - dprint(LINE_PAT, COL_PAT+7, offset, 2, 1); + dprint(LINE_PAT, COL_PAT+7, offset, 2, 1); /* Write every nth location with pattern */ for (j=0; j<segs; j++) { @@ -895,16 +896,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code @@ -940,16 +941,16 @@ k = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code @@ -998,16 +999,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code @@ -1052,11 +1053,11 @@ BAILR } while (!done); } - cprint(LINE_PAT, COL_PAT, " "); + cprint(LINE_PAT, COL_PAT, " "); } /* - * Test memory using block moves + * Test memory using block moves * Adapted from Robert Redelmeier's burnBX test */ void block_move(int iter) @@ -1066,7 +1067,7 @@ volatile ulong p, pe, pp; volatile ulong start, end; - cprint(LINE_PAT, COL_PAT-2, " "); + cprint(LINE_PAT, COL_PAT-2, " "); /* Initialize memory with the initial pattern. */ for (j=0; j<segs; j++) { @@ -1085,16 +1086,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ*4 > pe) { + if ((uintptr_t)(pe + SPINSZ*4) > (uintptr_t)pe) { pe += SPINSZ*4; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } len = ((ulong)pe - (ulong)p) / 64; @@ -1134,7 +1135,7 @@ } while (!done); } - /* Now move the data around + /* Now move the data around * First move the data up half of the segment size we are testing * Then move the data to the original location + 32 bytes */ @@ -1154,16 +1155,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ*4 > pe) { + if ((uintptr_t)(pe + SPINSZ*4) > (uintptr_t)pe) { pe += SPINSZ*4; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } pp = p + ((pe - p) / 2); @@ -1201,7 +1202,7 @@ } while (!done); } - /* Now check the data + /* Now check the data * The error checking is rather crude. We just check that the * adjacent words are the same. */ @@ -1221,16 +1222,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ*4 > pe) { + if ((uintptr_t)(pe + SPINSZ*4) > (uintptr_t)pe) { pe += SPINSZ*4; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } asm __volatile__ ( @@ -1296,7 +1297,7 @@ end = v->map[j].end; pe = start; p = start; - for (p=end; p<end; p++) { + for (p=start; p<end; p++) { *p = p1; } do_tick(); @@ -1311,8 +1312,8 @@ end = v->map[j].end; pe = start; p = start; - for (p=end; p<end; p++) { - if ((bad=*p) != p1) { + for (p=start; p<end; p++) { + if ((bad=*p) != p1) { error((ulong*)p, p1, bad); } }

1 0

[commit] r1937 - clients/memtest86
by repository service Aug. 17, 2010

Aug. 17, 2010

Author: wmb Date: Tue Aug 17 19:22:56 2010 New Revision: 1937 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1937 Log: x86 - memtest86 - changed -Os to -O1 in Makefile to fix runtime errors that occurred when compiling with GCC 4.4.3 (-Os worked well with GCC 4.2). The specific symptom was that Test #2 would report lots of errors in the 0xfffxx range - which wasn't supposed to be tested at all. Modified: clients/memtest86/Makefile Modified: clients/memtest86/Makefile ============================================================================== --- clients/memtest86/Makefile Wed Aug 11 20:30:05 2010 (r1936) +++ clients/memtest86/Makefile Tue Aug 17 19:22:56 2010 (r1937) @@ -28,8 +28,9 @@ CC=gcc # # gcc compiler options, these settings should suffice +# (It is tempting to use -Os, but that causes runtime failures when compiled with GCC >4.2) # -CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding +CCFLAGS=-Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding CCFLAGS += -fno-stack-protector CCFLAGS += $(DEFINES)

1 0