openfirmware

openfirmware@openfirmware.info

3007 discussions

r1076 - cpu/x86/pc/olpc
by svn＠openfirmware.info 23 Jan '09

23 Jan '09

Author: wmb Date: 2009-01-23 20:45:08 +0100 (Fri, 23 Jan 2009) New Revision: 1076 Added: cpu/x86/pc/olpc/iflash.fth cpu/x86/pc/olpc/usbpwr.fth Log: Biosload build - Checked in olpc/iflash.fth and olpc/usbpwr.fth, needed by "biosload/config-olpc.fth" build version. Added: cpu/x86/pc/olpc/iflash.fth =================================================================== --- cpu/x86/pc/olpc/iflash.fth (rev 0) +++ cpu/x86/pc/olpc/iflash.fth 2009-01-23 19:45:08 UTC (rev 1076) @@ -0,0 +1,71 @@ +\ Reflasher that merges Insyde BIOS with manufacturing data + +h# 300 constant /mfg-data-merge +mfg-data-end-offset /mfg-data-merge - constant mfg-data-merge-offset + +: $get-insyde ( filename$ -- ) + $read-open + flash-buf /flash ifd @ fgets ( len ) + ifd @ fclose + + /flash <> abort" Image file is the wrong length" + + flash-buf mfg-data-merge-offset + /mfg-data-merge 0 bskip ( residue ) + abort" Firmware image has data in the manufacturing data block" + + true to file-loaded? +; + +: merge-mfg-data ( -- ) + flash-base mfg-data-merge-offset + + flash-buf mfg-data-merge-offset + + /mfg-data-merge move +; + +: get-insyde ( ["filename"] -- ) + parse-word ( adr len ) + dup 0= if 2drop " u:\insyde.rom" then ( adr len ) + ." Reading " 2dup type cr ( adr len ) + $get-insyde +; + +: write-insyde ( -- ) + flash-buf /flash 0 write-flash-range +; + +: ireflash ( -- ) \ Flash from data already in memory + ?file + flash-write-enable + + merge-mfg-data + + write-insyde + + spi-us d# 20 < if + ['] verify catch if + ." Verify failed. Retrying once" cr + spi-identify + write-insyde + verify + then + flash-write-disable + else + .verify-msg + then +; + +: iflash ( ["filename"] -- ) get-insyde ?enough-power ireflash ; + +: save-insyde ( -- ) + " u:\insyde.rom" $write-open + + \ Get the FLASH data into a buffer, slowly to avoid locking out the EC + slow-flash-read + + \ Zap the manufacturing data + flash-buf mfg-data-merge-offset + /mfg-data-merge 0 fill + + flash-buf /flash ofd @ fputs + + ofd @ fclose +; Added: cpu/x86/pc/olpc/usbpwr.fth =================================================================== --- cpu/x86/pc/olpc/usbpwr.fth (rev 0) +++ cpu/x86/pc/olpc/usbpwr.fth 2009-01-23 19:45:08 UTC (rev 1076) @@ -0,0 +1,27 @@ +purpose: Bounce USB power to reset devices + +\ This is used by the biosload build for OLPC to reset USB +\ devices. Insyde BIOS / GeodeROM leaves some USB sticks in +\ funny state in which reads fail. Power cycling fixes them. + +: power-cycle-usb ( -- ) + " /pci/usb@f,4" open-dev >r \ OHCI controller + + \ Configure the OHCI controller for global power switching + " hc-rh-desa@" r@ $call-method ( desA ) + h# 300 invert and ( desA' ) + " hc-rh-desa!" r@ $call-method ( desA ) + + \ Turn off the power from the OHCI point of view, leaving the + \ EHCI in control (the power switches are the logical OR + \ of the OHCI and EHCI controls) + 1 " hc-rh-stat!" r@ $call-method + r> close-dev + d# 100 ms + + " /pci/usb@f,5" open-dev ( ih ) \ EHCI controller + 4 0 do 0 i " portsc!" 4 pick $call-method loop ( ih ) + d# 100 ms + 4 0 do i " power-port" 3 pick $call-method loop ( ih ) + close-dev +;

1 0

r1075 - cpu/x86/pc/biosload
by svn＠openfirmware.info 23 Jan '09

23 Jan '09

Author: wmb Date: 2009-01-23 20:28:08 +0100 (Fri, 23 Jan 2009) New Revision: 1075 Added: cpu/x86/pc/biosload/syslinux.cfg Log: Biosload build - Check in "syslinux.cfg" file. Added: cpu/x86/pc/biosload/syslinux.cfg =================================================================== --- cpu/x86/pc/biosload/syslinux.cfg (rev 0) +++ cpu/x86/pc/biosload/syslinux.cfg 2009-01-23 19:28:08 UTC (rev 1075) @@ -0,0 +1,7 @@ +# This syslinux.cfg is for booting Open Firmware from a conventional BIOS +# See HOWTO_USB_boot.txt +default ofw +timeout 20 +say Booting Open Firmware +label ofw + kernel ofw.c32

1 0

r1074 - cpu/x86/pc/biosload
by svn＠openfirmware.info 23 Jan '09

23 Jan '09

Author: wmb Date: 2009-01-23 20:26:25 +0100 (Fri, 23 Jan 2009) New Revision: 1074 Added: cpu/x86/pc/biosload/HOWTO_USB_boot.txt cpu/x86/pc/biosload/config-olpc.fth Modified: cpu/x86/pc/biosload/addrs.fth cpu/x86/pc/biosload/devices.fth cpu/x86/pc/biosload/fw.bth cpu/x86/pc/biosload/ofw.bth Log: Biosload build - Added OLPC build variant for use as a recovery tool (in case of XOs that have been reflashed with Insyde BIOS), and added instructions for how to prepare a generic USB-bootable version. Added: cpu/x86/pc/biosload/HOWTO_USB_boot.txt =================================================================== --- cpu/x86/pc/biosload/HOWTO_USB_boot.txt (rev 0) +++ cpu/x86/pc/biosload/HOWTO_USB_boot.txt 2009-01-23 19:26:25 UTC (rev 1074) @@ -0,0 +1,61 @@ +== Booting OFW from BIOS via a USB Drive == + +You need a USB drive (hard disk, FLASH stick, pendrive) that is formatted with a FAT filesystem +(they come that way from the factory). + +These instructions assume that you know the basics of mounting USB drives and copying files to and from them. + +=== Build OFW === + +On a Linux system with gcc and Subversion installed: + + $ svn co svn://openbios.org/openfirmware + $ cd openfirmware/cpu/x86/pc/biosload + $ cp config-usbkey.fth config.fth + $ cd build + $ make + +The output file is ofw.c32 . It is in "COM32" format, as used by SYSLINUX. + +* Copy ofw.c32 to the USB drive's root directory + +* Copy openfirmware/cpu/x86/biosload/syslinux.cfg to the USB drive's root directory + +=== Make the USB Key Bootable ... === + +==== ... On Linux ==== + +* Install the "syslinux" package (e.g. "apt-get install syslinux" or "yum install syslinux" or get the whole distribution from http://www.kernel.org/pub/linux/utils/boot/syslinux/ and use linux/syslinux therein). + +* Unmount any filesystems that are currently mounted on the USB drive + +* Find the USB drive's device name. It will probably be something like /dev/sda . You want the name of the whole drive (just sda), NOT a subordinate partition (NOT sda1). + +* Run this command, replacing "/dev/sda" with the appropriate device name for your USB drive: + + $ syslinux /dev/sda + + +==== ... On Windows ==== + +* Open My Computer and find the drive corresponding to the USB key. The following instructions assume that it is "F". + +* Download and extract the following onto your host machine: http://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.72.zip + +* Open a cmd window + +* cd to the directory where you unzipped the syslinux files + +* cd to the win32 subdirectory + +* Run this command line, replacing "f" with the drive letter for your USB key: + + syslinux f: + +* Use the "Safely Remove Hardware" icon in the system tray to stop the USB key device, then remove that device + +=== Setup Your BIOS to Boot From USB === + +... depends on your particular BIOS, but in general, you must set the +boot order so something like "USB HDD" is the first choice. You do not +want "USB ZIP drive" or "USB floppy". Modified: cpu/x86/pc/biosload/addrs.fth =================================================================== --- cpu/x86/pc/biosload/addrs.fth 2009-01-16 09:06:43 UTC (rev 1073) +++ cpu/x86/pc/biosload/addrs.fth 2009-01-23 19:26:25 UTC (rev 1074) @@ -34,6 +34,21 @@ h# 08.0000 constant dropin-size [then] +[ifdef] olpc +\ System has limited memory (256M for most versions, 128M for a few) +\needs fw-pa h# e00.0000 constant fw-pa \ OFW dictionary location +\needs /fw-ram h# 20.0000 constant /fw-ram + +\needs heap-base h# e20.0000 constant heap-base \ Dynamic allocation heap +\needs heap-size h# 20.0000 constant heap-size + +\needs dma-base h# e40.0000 constant dma-base \ DMA heap +\needs dma-size h# 20.0000 constant dma-size + + h# e60.0000 constant dropin-base \ Location of payload in RAM + 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/config-olpc.fth =================================================================== --- cpu/x86/pc/biosload/config-olpc.fth (rev 0) +++ cpu/x86/pc/biosload/config-olpc.fth 2009-01-23 19:26:25 UTC (rev 1074) @@ -0,0 +1,55 @@ +\ See license at end of file +purpose: Configuration for loading from a USB key via Syslinux on OLPC + +create olpc \ OLPC-specific SPI FLASH programming + +\ --- The environment that "boots" OFW --- +\ - Image Format - Example Media - previous stage bootloader + +\ - (Syslinux) COM32 format - USB Key w/ FAT FS - Syslinux +create syslinux-loaded + +\ create serial-console +create pc + +\ create pseudo-nvram +create debug-startup +create resident-packages +create addresses-assigned \ Don't reassign PCI addresses +\ create virtual-mode +\ create use-root-isa +create use-timestamp-counter +create use-pci-isa +create use-isa-ide +create use-ega +create use-elf +\ create use-ne2000 +create use-watch-all +create use-null-nvram +create no-floppy-node + +fload ${BP}/cpu/x86/pc/biosload/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 Modified: cpu/x86/pc/biosload/devices.fth =================================================================== --- cpu/x86/pc/biosload/devices.fth 2009-01-16 09:06:43 UTC (rev 1073) +++ cpu/x86/pc/biosload/devices.fth 2009-01-23 19:26:25 UTC (rev 1074) @@ -82,6 +82,19 @@ fload ${BP}/dev/pc87317.fth \ National PC87317 superIO [then] +[ifdef] olpc +\ Create the top-level device node to access the entire boot FLASH device +0 0 " fff00000" " /" begin-package + " flash" device-name + + h# 10.0000 value /device + h# 10.0000 constant /device-phys + my-address my-space /device-phys reg + fload ${BP}/dev/flashpkg.fth + fload ${BP}/dev/flashwrite.fth +end-package +[then] + 0 0 dropin-base <# u#s u#> " /" begin-package " flash" device-name @@ -176,7 +189,8 @@ [then] fload ${BP}/ofw/core/countdwn.fth \ Startup countdown -fload ${BP}/forth/lib/pattern.fth \ Text string pattern matching +fload ${BP}/forth/lib/pattern.fth \ Text string pattern matching +fload ${BP}/forth/lib/tofile.fth \ to-file and append-to-file \ XXX remove the OS file commands from tools.dic fload ${BP}/ofw/core/filecmds.fth \ File commands: dir, del, ren, etc. @@ -302,6 +316,34 @@ fload ${BP}/cpu/x86/pc/egauart.fth \ Output also to EGA fload ${BP}/cpu/x86/pc/reset.fth \ reset-all + +[ifdef] olpc +\ true constant lx? \ +h# fff0.0000 constant rom-pa \ Physical address of boot ROM +fload ${BP}/dev/geode/acpi.fth \ Power management +fload ${BP}/dev/olpc/kb3700/ecspi.fth \ EC chip SPI FLASH access + +warning @ warning off +: stand-init-io stand-init-io 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}/cpu/x86/pc/olpc/mfgtree.fth \ Manufacturing data in device tree +fload ${BP}/dev/olpc/kb3700/battery.fth \ Battery status reports + +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 +fload ${BP}/cpu/x86/pc/olpc/iflash.fth \ Insyde BIOS replacement tools +: ofw-fw-filename$ " u:\olpcofw.rom" ; +' ofw-fw-filename$ to fw-filename$ +[then] + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: cpu/x86/pc/biosload/fw.bth =================================================================== --- cpu/x86/pc/biosload/fw.bth 2009-01-16 09:06:43 UTC (rev 1073) +++ cpu/x86/pc/biosload/fw.bth 2009-01-23 19:26:25 UTC (rev 1074) @@ -49,6 +49,7 @@ \ XXX should be loaded by basefw.bth fload ${BP}/cpu/x86/initpgm.fth \ Basic boot handler +fload ${BP}/cpu/x86/msr.fth \ Access to machine specific registers : (cpu-arch ( -- adr len ) " architecture" ['] root-node get-package-property drop @@ -61,7 +62,7 @@ dev / 1 encode-int " #address-cells" property - +1 encode-int " #size-cells" property " Generic PC" model " PC" encode-string " architecture" property @@ -79,6 +80,7 @@ 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}/ofw/core/allocmor.fth \ Secondary allocator fload ${BP}/cpu/x86/pc/rootnode.fth \ Platform-specific root node changes @@ -114,6 +116,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 @@ -145,10 +148,10 @@ [ifdef] virtual-mode \ Depends on the assumption that physical memory is mapped 1:1 already : (elf-map-in) ( va size -- ) 0 mem-claim drop ; -' (elf-map-in) is elf-map-in [else] -' 2drop is elf-map-in +: (elf-map-in) ( va size -- ) 2drop ; [then] +' (elf-map-in) is elf-map-in [then] \ Reboot and re-entry code @@ -166,7 +169,16 @@ [ifdef] virtual-mode fload ${BP}/cpu/x86/pc/mmusetup.fth \ Initial values for MMU lists +[ifdef] olpc +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] +[then] fload ${BP}/cpu/x86/pc/biosload/devices.fth @@ -265,6 +277,11 @@ " penguin.txt" find-drop-in if page type then ; +[ifdef] olpc +fload ${BP}/cpu/x86/pc/olpc/usbpwr.fth +devalias net /wlan +[then] + : probe-all ( -- ) " probe-" do-drop-in ." probe-pci" cr @@ -273,9 +290,14 @@ [ifdef] probe-isa-modem probe-isa-modem [then] +[ifdef] olpc + power-cycle-usb probe-usb +[else] + probe-usb + report-net +[then] report-disk - report-net report-pci-fb ; Modified: cpu/x86/pc/biosload/ofw.bth =================================================================== --- cpu/x86/pc/biosload/ofw.bth 2009-01-16 09:06:43 UTC (rev 1073) +++ cpu/x86/pc/biosload/ofw.bth 2009-01-23 19:26:25 UTC (rev 1074) @@ -96,6 +96,10 @@ " ${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 +[ifdef] olpc + " ${BP}/dev/usb2/device/wlan/build/usb8388.fc" " usb1286,2001" $add-deflated-dropin + " ../../olpc/build/usb8388.bin" " usb8388.bin" $add-deflated-dropin +[then] " builton.fth" " probe-" $add-dropin [ifndef] resident-packages

1 0

Re: [openfirmware] r1039 - in cpu: . arm arm/Linux arm/build
by Segher Boessenkool 23 Jan '09

23 Jan '09

> Added: cpu/arm/Linux/Makefile > =================================================================== > --- cpu/arm/Linux/Makefile (rev 0) > +++ cpu/arm/Linux/Makefile 2008-12-20 07:55:35 UTC (rev 1039) > @@ -0,0 +1,36 @@ > +# Wrapper makefile for ARM Linux > +# Copyright 2008 FirmWorks. All rights reserved. > +# Hi Mitch, I think you forgot to edit the copyright here? I didn't check the other files, just skimmed the lot, this checkin is a bit big ;-) Segher

1 0

r1073 - in cpu/arm: . build versatilepb versatilepb/build
by svn＠openfirmware.info 16 Jan '09

16 Jan '09

Author: wmb Date: 2009-01-16 10:06:43 +0100 (Fri, 16 Jan 2009) New Revision: 1073 Modified: cpu/arm/basefw.bth cpu/arm/build/ cpu/arm/pl011-diaguart.fth cpu/arm/tools.bth cpu/arm/versatilepb/build/ cpu/arm/versatilepb/build/Makefile cpu/arm/versatilepb/qemubase.bth Log: ARM - improved the build scaffolding by adding tag file generation and fixing a bug in the .bth files that caused build failures in some environments, and added UART initialization code for the PL011 diagnostic UART driver. Modified: cpu/arm/basefw.bth =================================================================== --- cpu/arm/basefw.bth 2009-01-14 09:28:37 UTC (rev 1072) +++ cpu/arm/basefw.bth 2009-01-16 09:06:43 UTC (rev 1073) @@ -5,8 +5,10 @@ command: &armforth &dictionary &this build-now -\ ' $report-name is include-hook +" basefw.tag" r/w create-file drop tag-file ! +\ ' $report-name is include-hook + create include-help \ Include help facility alias cfill fill @@ -79,6 +81,10 @@ [then] [ifndef] no-heads +resident dispose 0 0 set-transize \ true is suppress-transient + +tag-file @ fclose tag-file off + .( --- Saving basefw.dic --- ) cr " basefw.dic" $save-forth [then] Property changes on: cpu/arm/build ___________________________________________________________________ Modified: svn:ignore - armbuild build + armbuild build *.tag Modified: cpu/arm/pl011-diaguart.fth =================================================================== --- cpu/arm/pl011-diaguart.fth 2009-01-14 09:28:37 UTC (rev 1072) +++ cpu/arm/pl011-diaguart.fth 2009-01-16 09:06:43 UTC (rev 1073) @@ -1,12 +1,68 @@ +purpose: Diagnostic console driver for ARM PL011 PrimeCell UART -: inituarts ( -- ) ; +\ The following value is correct for UART0 on the VersatilePB board +\ Override the value after loading this file for different boards +h# 101f1000 value pl011-base -: ukey? ( -- flag ) uart-base h# 18 + l@ h# 10 and 0= ; +d# 7372800 value uartclk \ Override as necessary +d# 115200 value diaguart-baud + +: pl011@ ( offset -- value ) pl011-base + l@ ; +: pl011! ( value offset -- ) pl011-base + l! ; + +: pl011-set-baud ( baud -- ) + d# 16 * ( 16xbaud ) + + uartclk over /mod ( 16xbaud rem quot ) + h# 24 pl011! ( rem r: 16xbaud ) + + \ The fractional divisor goes from 0 to 63. We rescale the + \ remainder so the implied denominator is 64, with rounding. + d# 128 rot */ 1+ 2/ ( frac r: 16xbaud ) + h# 28 pl011! ( ) +; +: init-pl011 ( -- ) + h# 0 h# 30 pl011! \ Disable while programming + 0 4 pl011! \ Clear errors + 0 h# 48 pl011! \ Disable DMA + 0 h# 38 pl011! \ Clear interrupt mask bits + h# 7ff h# 44 pl011! \ Clear pending interrupts + diaguart-baud pl011-set-baud + h# 70 h# 2c pl011! \ 8 bits, FIFOs enabled, no parity + h# f01 h# 30 pl011! \ RTS, DTR, RXE, TXE, UARTEN (re-enable) +; + +: ukey? ( -- flag ) h# 18 pl011@ h# 10 and 0= ; : ukey ( -- char ) begin ukey? until - uart-base l@ h# ff and + 0 pl011@ h# ff and ; : uemit ( char -- ) - begin uart-base h# 18 + l@ h# 20 and 0= until - uart-base l! + begin h# 18 pl011@ h# 20 and 0= until + 0 pl011! ; + + +\ LICENSE_BEGIN +\ Copyright (c) 2009 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Modified: cpu/arm/tools.bth =================================================================== --- cpu/arm/tools.bth 2009-01-14 09:28:37 UTC (rev 1072) +++ cpu/arm/tools.bth 2009-01-16 09:06:43 UTC (rev 1073) @@ -9,6 +9,8 @@ \ ' noop is include-hook \ : rn (cr 2dup type 15 spaces ; ' rn is include-hook +" tools.tag" r/w create-file drop tag-file ! + fload ${BP}/forth/lib/fwsetup.fth transient @@ -19,6 +21,10 @@ fload ${BP}/cpu/arm/loadmach.fth \ CPU and OS-specific extensions [ifndef] no-heads +resident dispose 0 0 set-transize \ true is suppress-transient + +tag-file @ fclose tag-file off + .( --- Saving tools.dic --- ) " tools.dic" $save-forth cr [then] Property changes on: cpu/arm/versatilepb/build ___________________________________________________________________ Added: svn:ignore + *.rom *.tag tags core build Modified: cpu/arm/versatilepb/build/Makefile =================================================================== --- cpu/arm/versatilepb/build/Makefile 2009-01-14 09:28:37 UTC (rev 1072) +++ cpu/arm/versatilepb/build/Makefile 2009-01-16 09:06:43 UTC (rev 1073) @@ -1,11 +1,17 @@ OS := $(shell uname) BASEDIR= `(cd ../../../..; pwd;)` +TAGFILES= ../../build/*.tag *.tag CLIENTDIR=../../../../clients CLIENTPROGS= -all: qemubase.rom +all: qemubase.rom tags +qemubase.tag: qemubase.rom + +tags: qemubase.tag + @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES} + qemubase.rom: FORCE build ${CLIENTPROGS} ./build $@ Modified: cpu/arm/versatilepb/qemubase.bth =================================================================== --- cpu/arm/versatilepb/qemubase.bth 2009-01-14 09:28:37 UTC (rev 1072) +++ cpu/arm/versatilepb/qemubase.bth 2009-01-16 09:06:43 UTC (rev 1073) @@ -10,39 +10,25 @@ command: &armforth &dictionary &this build-now +" qemubase.tag" r/w create-file drop tag-file ! + \ ' $report-name is include-hook - h# 8.0000 constant initial-heap-size : (initial-heap) ( -- adr len ) limit initial-heap-size ; ' (initial-heap) to initial-heap -h# 101f1000 constant uart-base \ UART0 base address on VersatilePB board - fload ${BP}/cpu/arm/pl011-diaguart.fth \ PL011 UART +h# 101f1000 to pl011-base \ UART0 base address on VersatilePB board -\ Setup the console I/O vectors for a simple UART -: install-uart-io ( -- ) - inituarts +fload ${BP}/forth/lib/sysuart.fth \ Set console I/O vectors to UART - ['] lf-pstr is newline-pstring - ['] ukey? is key? - ['] ukey is (key - ['] uemit is (emit - ['] default-type is (type - ['] emit1 is emit - ['] type1 is type - ['] crlf is cr - ['] true is (interactive? - ['] cancel is light -; - \ Install the simple UART driver from the standalone I/O init chain : stand-init-io ( -- ) stand-init-io - install-uart-io + init-pl011 install-uart-io ; \ This is some glue code to convert the machine setup that QEMU gives us @@ -65,6 +51,8 @@ end-code +tag-file @ fclose tag-file off + fload ${BP}/cpu/arm/saverom.fth \ Save the dictionary for standalone startup .( --- Saving qemubase.rom --- ) cr " qemubase.rom" $save-rom

1 0

r1072 - in cpu/arm: . versatilepb versatilepb/build
by svn＠openfirmware.info 14 Jan '09

14 Jan '09

Author: wmb Date: 2009-01-14 10:28:37 +0100 (Wed, 14 Jan 2009) New Revision: 1072 Added: cpu/arm/pl011-diaguart.fth cpu/arm/versatilepb/ cpu/arm/versatilepb/build/ cpu/arm/versatilepb/build/Makefile cpu/arm/versatilepb/qemubase.bth Modified: cpu/arm/saverom.fth Log: ARM - Added rudimentary OFW build for QEMU emulation of ARM VersatilePB board. Added: cpu/arm/pl011-diaguart.fth =================================================================== --- cpu/arm/pl011-diaguart.fth (rev 0) +++ cpu/arm/pl011-diaguart.fth 2009-01-14 09:28:37 UTC (rev 1072) @@ -0,0 +1,12 @@ + +: inituarts ( -- ) ; + +: ukey? ( -- flag ) uart-base h# 18 + l@ h# 10 and 0= ; +: ukey ( -- char ) + begin ukey? until + uart-base l@ h# ff and +; +: uemit ( char -- ) + begin uart-base h# 18 + l@ h# 20 and 0= until + uart-base l! +; Modified: cpu/arm/saverom.fth =================================================================== --- cpu/arm/saverom.fth 2009-01-13 20:16:46 UTC (rev 1071) +++ cpu/arm/saverom.fth 2009-01-14 09:28:37 UTC (rev 1072) @@ -2,8 +2,8 @@ \ See license at end of file \ Save an image of the target system in a file. -: save-rom ( str -- ) - >r +: $save-rom ( filename$ -- ) + 2>r make-arm-header \ Turn off the relocation bitmap maintainer @@ -14,7 +14,7 @@ " stand-init-io" $find-name is init-io " stand-init" init-save - aif-header h# 80 r> save-image + aif-header h# 80 2r> $save-image ; \ LICENSE_BEGIN Added: cpu/arm/versatilepb/build/Makefile =================================================================== --- cpu/arm/versatilepb/build/Makefile (rev 0) +++ cpu/arm/versatilepb/build/Makefile 2009-01-14 09:28:37 UTC (rev 1072) @@ -0,0 +1,28 @@ +OS := $(shell uname) + +BASEDIR= `(cd ../../../..; pwd;)` +CLIENTDIR=../../../../clients +CLIENTPROGS= + +all: qemubase.rom + +qemubase.rom: FORCE build ${CLIENTPROGS} + ./build $@ + +../../${OS}/forth: + @make -C ../../${OS} forth + +../../build/inflate.bin: + @make -C ../../build inflate.bin + +build: ../../${OS}/forth + @ln -sf ../../${OS}/forth build + +clean: + rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version + +clean-all: clean + @make -C ../../build clean + @make -C ../../${OS} clean + +.PHONY: FORCE clean all clean-all Added: cpu/arm/versatilepb/qemubase.bth =================================================================== --- cpu/arm/versatilepb/qemubase.bth (rev 0) +++ cpu/arm/versatilepb/qemubase.bth 2009-01-14 09:28:37 UTC (rev 1072) @@ -0,0 +1,94 @@ +purpose: Load file for OFW on ARM VersatilePB as emulated by QEMU +\ See license at end of file + +\ Example QEMU command line: +\ qemu-system-arm -M versatilepb -m 32 -kernel qemubase.rom -serial vc +\ Then type "Ctrl-Alt 3" in the QEMU popup window to get the serial console +\ The memory size (32 shown above) is not critical - 16 or greater works. + +dictionary: ${BP}/cpu/arm/build/basefw.dic +command: &armforth &dictionary &this +build-now + +\ ' $report-name is include-hook + + +h# 8.0000 constant initial-heap-size + +: (initial-heap) ( -- adr len ) limit initial-heap-size ; +' (initial-heap) to initial-heap + + +h# 101f1000 constant uart-base \ UART0 base address on VersatilePB board + +fload ${BP}/cpu/arm/pl011-diaguart.fth \ PL011 UART + +\ Setup the console I/O vectors for a simple UART +: install-uart-io ( -- ) + inituarts + + ['] lf-pstr is newline-pstring + ['] ukey? is key? + ['] ukey is (key + ['] uemit is (emit + ['] default-type is (type + ['] emit1 is emit + ['] type1 is type + ['] crlf is cr + ['] true is (interactive? + ['] cancel is light +; + +\ Install the simple UART driver from the standalone I/O init chain +: stand-init-io ( -- ) + stand-init-io + install-uart-io +; + +\ This is some glue code to convert the machine setup that QEMU gives us +\ to the setup that start-forth (see arm/boot.fth) wants. +\ We get here via a call instruction at origin+8, which is inserted below + +code stand-cold-code ( r0: 0 r1: board-id r2: &kernel-args lr: &aif_header+8c ) + here origin 8 + put-call \ Insert call instruction + + \ Put the arguments in safe registers + sub r6,lr,#0x8c \ r6 points to header (lr set by code at origin) + mov r7,#0 \ r7: functions + ldr r8,[r2,#0x1c] \ r8: memtop - From Linux kernel args set by QEMU + \ r9 is up + mov r10,#0 \ r10: argc + mov r11,r2 \ r11: argv (kernel args) + mov r12,`initial-heap-size` \ r12: initial-heap-size + + b 'code start-forth \ Branch to the generic startup code +end-code + + +fload ${BP}/cpu/arm/saverom.fth \ Save the dictionary for standalone startup + +.( --- Saving qemubase.rom --- ) cr " qemubase.rom" $save-rom + +\ LICENSE_BEGIN +\ Copyright (c) 2009 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0

r1071 - ofw/inet/iscsi
by svn＠openfirmware.info 13 Jan '09

13 Jan '09

Author: wmb Date: 2009-01-13 21:16:46 +0100 (Tue, 13 Jan 2009) New Revision: 1071 Added: ofw/inet/iscsi/README Log: Added README file in iscsi directory Added: ofw/inet/iscsi/README =================================================================== --- ofw/inet/iscsi/README (rev 0) +++ ofw/inet/iscsi/README 2009-01-13 20:16:46 UTC (rev 1071) @@ -0,0 +1,255 @@ += iSCSI for OFW = + +== Introduction == + +The purpose of this code is to allow a system to boot from +an iSCSI target device. It acts as an iSCSI initiator, performing +target discovery, normal login, and SCSI reads. + +This is a minimal implementation. Many features of the iSCSI protocol +are not supported, including multiple connections and failover, +encrypted connections, and header digests. + +== Usage == + +Normal boot syntax is + + boot iscsi:server//disk:,\filename + +e.g. + + boot iscsi:10.0.0.100//disk:,\system.img + +If the target requires CHAP authentcation, two environment variables +must be set: + + iscsi-user + iscsi-password + +e.g. + + setenv iscsi-user testy + setenv iscsi-password rudeword + +The usual OFW methods are supported, so it is possible to select +a dvice for reading and writing. For example, + + select iscsi:10.0.0.100//disk:0 + load-base 0 20 read-blocks . + + +== Limitations == + +Targets with multiple LUNs have not been tried, and may not work +correctly. + +Most negotiated parameters are ignored. + +Targets that require DataDigest or HeaderDigest set to CRC32 are +not supported. Support for digests would probably not be difficult +to add. + +SCSI writes are implemented, but have had minimal testing. + +The ISID is hard-coded to that of Sun Microsystems. It might be +better to set it dynamically somehow. + +== Parameter Negotiation == + +All negotiable parameters, or "keys", in RFC3270 are supported. +If a target sets an unknown key login will fail. +In most cases the values that have been negotiated are not used. + +This initiator specifies certain values during login, then accepts +whatever values the target requests. + +In particular, MaxRecvDataSegmentLength is set to the actual length +of the input buffer that has been allocated. The SCSI code limits +data sizes to max-transfer, which will be the smaller of the buffer +size and MaxRecvDataSegmentLength. + +SCSI writes should also be limited by FirstBurstLength if it happens +to be smaller. That has not been implemented as writes are not likely +to be used. + +== A walk through the code == + +The ofw iSCSI package is optionally included in cpu/x86/pc/biosload/fw.bth +as follows. + + support-package: iscsi + fload ${BP}/ofw/inet/loadiscsi.fth \ iSCSI client + end-support-package + +The file loadiscsi.fth declares a devalias, loads the rest of +the iscsi files, and creates a disk node in packages. + + devalias iscsi tcp//iscsi + +We make heavy use of the interposer mechanism. + + load iscsi:10.0.0.100//disk:,\README + +becomes + + load net//obp-tftp:last//tcp//iscsi:10.0.0.100//disk:,\README + +This allows iscsi access to tcp methods using $call-parent, +and allows the disk node access to iscsi using $call-parent. + +Two debug flags are defined. + +Set debug? true for general diganostic messages, including +a brief description of each iSCSI Protocol Data Unit (PDU) +that is sent or received. + +Set verbose? true to see a hex dump of each PDU, + + +=== Files in /iscsi/ === + +low.fth contains calls to the parent tcp node. They are used to +select a target server, connect to a remote port, disconnect, +and to read and write tcp packets. + + wait-read ( adr len -- actual ) + +uses tcp-read to get up to len bytes into the buffer at adr. +it returns the number actually read, or -1 if the connection +has been disconnected. wait-read will retry tcp-reads until +it times out, currently after 60 seconds. + +low.fth also contains some minor words used elsewhere. + +buffer.fth defines the data structure variations for the PDUs, +naming the fields that are used, and allocates input and output +buffers. It defines words to read and write various fields, and +words to send and receive PDUs. + +The output buffer is small, as any large writes will send the data +segment from whatever address it happens to occupy. + +The input buffer is large, as writes are first accepted into it +then moved to their destination. + +It is assumed the there are no Additional Header Segments. + +send-pdu and get-pdu are deferred to allow using the debug +versions of each. The default values are (send-pdu) and (get-pdu). + +There are actually two words for sending a PDU. +send-pdu sends everything from the output buffer. +send-pdu+data sends the header from the output buffer, and specified +data. In retrospect it might have been better to combine them into +a single routine. + +get-pdu first reads the header using read-all, determines the +length of the remaining data (if any) from the header, and +reads the rest with read-all. + + read-all ( adr total -- ) + +retries until it reads exactly total bytes into the buffer at adr. + + init-pdu + +initializes an outgoing PDU. + +During parameter negotiation, various strings are concatenated +onto the output buffer, each terminated with a null. +append, append0, and addnull are used in that process. + +debug.fth may be omitted out to save space. +(That has not been tested recently.) +It defines variants of the PDU send and receive words which +display the PDUs. + +keys.fth handles the details of parameter negotiation. +All known keys are defined in a set of vocabularies grouped +by behavior. + +bkeys has keys with boolean values (Yes or No). + +dkeys has keys with digest values (CRC32C ot None). + +nkeys has keys with numeric values. + +tkeys has keys with text values. + + get-key ( $key -- $value ) + +takes a key and returns a string with its value. + + set-key ( $value $key -- ) + +assigns a value to a key. + + set-iname ( -- ) + +sets InitiatorAlias to iqn.1986-03.com.sun:boot plus +the mac-address. + +get-hex is used to the CHAP challenge CHAP_C + +put-hex is used for the CHAP response CHAP_R + +append-key builds on the earlier append methods for parameter negotiation. + +parse-keys handles incoming parameters. during negotiation. + +inet/random.fth is included to set the low 15 bits of the isid +to a random value at the start of each session. This is done +to ensure uniqueness, as a target will reject duplicate session +ids. + +ppp/md5.fth is used for CHAP authentication. + +chap.fth contains the actual calculation of a CHA response. + +ipackets,fth handles incoming PDUs. +get-response is deffered to allow using the debug version. +(get-response) gets an incoming PDU and dispatches it to a handler +based on its opcode. + +nop-in must send a nop-out if the nop-in was unsolicited. + +Targets may choose to respond to a read request with a series +of scsi-data-in PDUs. +scsi-data-in moves incoming data to its destination, and +recursively calls get-response if the PDU was not final. + + +opackets.fth defines and handles outgoing PDUs. +send-cmd sends the PDU in the output buffer, and calls get-response. + +opackets.fth also defines execute-command, on which the SCSI depends. + +The bulk of opackets.fth is concerned with login. +login-discovery sets the keys to default values, then +sends a PDU to initiates a discovery login (with login-d). +If the target set AuthMethod to CHAP, auth-login performs +CHAP authentication using the environment variable iscsi-user +and iscsi-password. Otherwise it does login-none which ensure that +the target is past the authentication stage. + +login-discovery then uses login-dp to negotiate parameters, +and login-st to send a "SendTargets" request. The repsonse +should set TargetAddress, which is used during normal login. + +login-discovery then logs out (possibly not necessary) and +disconnects. + +login-normal goes through a similar process using login-n and login-np. + +methods.fth defines the usual OFW device words open-hardware and such. +The bulk of the work is in mount, which sets the target address, +connects to its ISCSI port, and does login-discovery and login-normal. + +scsi.fth defines stubs for some routines that the SCSI code wants, +though they are not useful here. +Note: that might change when support for targets with multiple LUNs +is added. + +scsi.fth also defines max-transfer which the SCSI code uses to limit +the size of data transfers. It is set to the minimum of our input +buffer size and MaxRecvDataSegmentLength.

1 0

iscsi package
by mahesh mv 13 Jan '09

13 Jan '09

Hello All, I am trying to develop a iscsi plugin driver using Fcode.I just observed that the iscsi package is checked in to openfirmware tree.I would like to know if there is any sample driver or some documentation how to use this package to develop a iscsi plugin driver with iscsi offload support or non offload version.Do we have need to do any special handling for non offloaded/offloaded version in the driver ?? I would really appreciate any help regarding this. Thanks and Regards, Mahesh

1 0

iSCSI Package Documentation
by john jose 13 Jan '09

13 Jan '09

Hi All Is there any README/Documentation on how to use/invoke the iSCSI package methods, or is there any sample driver which uses the iSCSI package methods to do an iSCSI Boot. Thanks Sony Add more friends to your messenger and enjoy! Go to http://messenger.yahoo.com/invite/

1 0

r1070 - cpu/arm
by svn＠openfirmware.info 12 Jan '09

12 Jan '09

Author: wmb Date: 2009-01-12 22:07:19 +0100 (Mon, 12 Jan 2009) New Revision: 1070 Added: cpu/arm/saverom.fth Log: Checked in cpu/arm/saverom.fth Added: cpu/arm/saverom.fth =================================================================== --- cpu/arm/saverom.fth (rev 0) +++ cpu/arm/saverom.fth 2009-01-12 21:07:19 UTC (rev 1070) @@ -0,0 +1,42 @@ +purpose: Save the Forth dictionary image in a ROM-bootable format +\ See license at end of file + +\ Save an image of the target system in a file. +: save-rom ( str -- ) + >r + make-arm-header + + \ Turn off the relocation bitmap maintainer + ['] noop is set-relocation-bit + ['] 2drop is clear-relocation-bits + + + " stand-init-io" $find-name is init-io + " stand-init" init-save + + aif-header h# 80 r> save-image +; + +\ LICENSE_BEGIN +\ Copyright (c) 1997 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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware