openfirmware

openfirmware@openfirmware.info

3007 discussions

r919 - in cpu/x86/pc: . olpc
by svn＠openfirmware.info 03 Sep '08

03 Sep '08

Author: wmb Date: 2008-09-03 06:52:06 +0200 (Wed, 03 Sep 2008) New Revision: 919 Added: cpu/x86/pc/olpc/help.fth Modified: cpu/x86/pc/linux.fth cpu/x86/pc/olpc/fw.bth Log: OLPC trac 8280 - set lines/page based on the number of lines on the screen. Modified: cpu/x86/pc/linux.fth =================================================================== --- cpu/x86/pc/linux.fth 2008-09-02 22:45:08 UTC (rev 918) +++ cpu/x86/pc/linux.fth 2008-09-03 04:52:06 UTC (rev 919) @@ -283,47 +283,6 @@ ." More information: http://firmworks.com/QuickRef.html" cr ; -d# 34 to default-#lines - -warning @ warning off -: help ( -- ) - blue-letters ." UPDATES:" black-letters mcr - ." flash u:\q2c18.rom Rewrite the firmware from USB key" mcr - ." flash nand:\q2c18.rom Rewrite the firmware from NAND file" mcr - ." copy-nand u:\boot\nand290.img Rewrite the OS on NAND from USB key" mcr - mcr - blue-letters ." DIRECTORY LISTING:" black-letters mcr - ." dir u:\ List USB key root directory" mcr - ." dir u:\boot\ List USB key /boot directory" mcr - ." dir nand:\boot\ List NAND FLASH /boot directory" mcr - ." dir nand:\boot\*.rom List .rom files in NAND FLASH /boot directory" mcr - mcr - blue-letters ." BOOTING:" black-letters mcr - ." boot Load the OS from list of default locations" mcr - ." 'printenv boot-device' shows the list" mcr - ." boot <cmdline> Load the OS, passing <cmdline> to kernel" mcr - ." boot u:\boot\vmlinuz Load the OS from a specific location" mcr - mcr - blue-letters ." CONFIGURATION VARIABLES FOR BOOTING:" black-letters mcr - ." boot-device Kernel or boot script path. Example: nand:\boot\olpc.fth" mcr - ." boot-file Default cmdline. Example: console=ttyS0,115200" mcr - ." ramdisk initrd pathname. Example: disk:\boot\initrd.imz" mcr - mcr - blue-letters ." MANAGING CONFIGURATION VARIABLES:" black-letters mcr - ." printenv [ <name> ] Show configuration variables" mcr - ." setenv <name> <value> Set configuration variable" mcr - ." editenv <name> Edit configuration variable" mcr - mcr - blue-letters ." DIAGNOSTICS:" black-letters mcr - ." test <device-name> Test device. Example: test mouse" mcr - ." test-all Test all devices that have test routines" mcr - mcr - ." More information: " - green-letters ." http://wiki.laptop.org/go/OFW_FAQ" black-letters cr -; -warning ! - - \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-09-02 22:45:08 UTC (rev 918) +++ cpu/x86/pc/olpc/fw.bth 2008-09-03 04:52:06 UTC (rev 919) @@ -314,7 +314,13 @@ vpci-devices-on \ Do this after quieting USB ; ' setup-for-linux to linux-hook +: screen-#lines ( -- n ) + screen-ih 0= if default-#lines exit then + screen-ih package( #lines )package +; +' screen-#lines to lines/page +fload ${BP}/cpu/x86/pc/olpc/help.fth fload ${BP}/cpu/x86/pc/olpc/gui.fth fload ${BP}/cpu/x86/pc/olpc/suspend.fth \ Suspend/resume setup fload ${BP}/dev/olpc/keyboard/selftest.fth \ Keyboard diagnostic Added: cpu/x86/pc/olpc/help.fth =================================================================== --- cpu/x86/pc/olpc/help.fth (rev 0) +++ cpu/x86/pc/olpc/help.fth 2008-09-03 04:52:06 UTC (rev 919) @@ -0,0 +1,32 @@ +purpose: Basic help for OLPC OFW + +warning @ warning off +: help ( -- ) + blue-letters ." UPDATES:" black-letters mcr + ." flash u:\q2c18.rom Rewrite the firmware from USB key" mcr + ." flash nand:\q2c18.rom Rewrite the firmware from NAND file" mcr + ." copy-nand u:\boot\nand290.img Rewrite the OS on NAND from USB key" mcr + blue-letters ." DIRECTORY LISTING:" black-letters mcr + ." dir u:\ List USB key root directory" mcr + ." dir u:\boot\ List USB key /boot directory" mcr + ." dir nand:\boot\*.rom List .rom files in NAND FLASH /boot directory" mcr + blue-letters ." BOOTING:" black-letters mcr + ." boot Load the OS from list of default locations" mcr + ." 'printenv boot-device' shows the list" mcr + ." boot <cmdline> Load the OS, passing <cmdline> to kernel" mcr + ." boot u:\boot\vmlinuz Load the OS from a specific location" mcr + blue-letters ." CONFIGURATION VARIABLES FOR BOOTING:" black-letters mcr + ." boot-device Kernel or boot script path. Example: nand:\boot\olpc.fth" mcr + ." boot-file Default cmdline. Example: console=ttyS0,115200" mcr + ." ramdisk initrd pathname. Example: disk:\boot\initrd.imz" mcr + blue-letters ." MANAGING CONFIGURATION VARIABLES:" black-letters mcr + ." printenv [ <name> ] Show configuration variables" mcr + ." setenv <name> <value> Set configuration variable" mcr + ." editenv <name> Edit configuration variable" mcr + blue-letters ." DIAGNOSTICS:" black-letters mcr + ." test <device-name> Test device. Example: test mouse" mcr + ." test-all Test all devices that have test routines" mcr + blue-letters ." More information: " black-letters mcr + green-letters ." http://wiki.laptop.org/go/OFW_FAQ" black-letters cr +; +warning !

1 0

r918 - cpu/x86/pc/neptune dev/geode
by svn＠openfirmware.info 02 Sep '08

02 Sep '08

Author: wmb Date: 2008-09-03 00:45:08 +0200 (Wed, 03 Sep 2008) New Revision: 918 Modified: cpu/x86/pc/neptune/banner.fth cpu/x86/pc/neptune/devices.fth dev/geode/msr.fth Log: Neptune - auto-detect PCI, CPU, and memory speeds in stand-init. Modified: cpu/x86/pc/neptune/banner.fth =================================================================== --- cpu/x86/pc/neptune/banner.fth 2008-09-02 21:20:06 UTC (rev 917) +++ cpu/x86/pc/neptune/banner.fth 2008-09-02 22:45:08 UTC (rev 918) @@ -3,25 +3,13 @@ headerless -: geode-print-pll ( -- ) - ." Geode CPU Speed " - h# 4c00.0014 rdmsr swap drop - h# 3E and 2/ - 1 + d# 66 * 2/ decimal . cr - - ." GeodeLink Speed " - h# 4c00.0014 rdmsr swap drop - h# FFF and 7 >> - 1 + d# 66 * 2/ decimal . cr - - ." PCI Speed " - h# 4c00.0014 rdmsr drop - 1 7 << and - 0= if d# 33 . else d# 66 . then cr - - hex +: show-speeds ( -- ) + \ Round so the numbers come out the way they are conventionally cited + ." CPU " cpu-speed d# 1,000,000 rounded-/ .d ." MHz, " + ." Memory " gl-speed d# 1,000,000 / .d ." MHz, " + ." PCI " pci-speed d# 1,000,000 / .d ." MHz" cr ; -' geode-print-pll to banner-extras +' show-speeds to banner-extras : .rom ( -- ) ." OpenFirmware " @@ -34,8 +22,7 @@ ; : (xbanner-basics) ( -- ) - ?spaces cpu-model type ." , " .memory cr - ?spaces .rom cr + ?spaces cpu-model type ." , " .memory ." , " .rom cr ; ' (xbanner-basics) to banner-basics Modified: cpu/x86/pc/neptune/devices.fth =================================================================== --- cpu/x86/pc/neptune/devices.fth 2008-09-02 21:20:06 UTC (rev 917) +++ cpu/x86/pc/neptune/devices.fth 2008-09-02 22:45:08 UTC (rev 918) @@ -26,11 +26,9 @@ \ Use the CPU chip's Time Stamp Counter for timing; it does just what we want fload ${BP}/cpu/x86/tsc.fth -\ d# 366,666 to ms-factor \ XXX is this right???? -\ d# 367 to us-factor stand-init: - d# 366,666,667 " AMD,Geode LX" + cpu-speed " AMD,Geode LX" " /cpu" find-device ( cpu-clock-hz model$ ) " model" string-property ( cpu-clock-hz ) @@ -300,7 +298,7 @@ stand-init: PCI properties " /pci" find-device - d# 66,666,667 " clock-frequency" integer-property + pci-speed " clock-frequency" integer-property dend ; @@ -339,6 +337,7 @@ \ XXX perhaps report subordinate version info? " Neptune" model " Dave Neptune" " banner-name" string-property + gl-speed " clock-frequency" integer-property dend " /openprom" find-device Modified: dev/geode/msr.fth =================================================================== --- dev/geode/msr.fth 2008-09-02 21:20:06 UTC (rev 917) +++ dev/geode/msr.fth 2008-09-02 22:45:08 UTC (rev 918) @@ -81,6 +81,23 @@ : usb-base-off ( msr# -- ) 0. rot msr! ; : usb-kel-off ( msr# -- ) 0. rot msr! ; +: pci-speed ( -- hz ) + h# 4c00.0014 rdmsr drop ( low ) + 1 7 << and if d# 66,666,667 else d# 33,333,333 then +; +: gl-speed ( -- hz ) + pci-speed ( hz ) + h# 4c00.0014 rdmsr nip >r ( hz r: high ) + r@ 6 rshift 1 and if 2/ then ( hz' r: high ) + r> 7 rshift h# 1f and 1+ * ( hz' ) +; +: cpu-speed ( -- hz ) + pci-speed ( hz ) + h# 4c00.0014 rdmsr nip >r ( hz r: high ) + r@ 1 and if 2/ then ( hz' r: high ) + r> 1 rshift h# 1f and 1+ * ( hz' ) +; + \ LICENSE_BEGIN \ Copyright (c) 2008 FirmWorks \

1 0

r917 - cpu/x86/pc/neptune
by svn＠openfirmware.info 02 Sep '08

02 Sep '08

Author: wmb Date: 2008-09-02 23:20:06 +0200 (Tue, 02 Sep 2008) New Revision: 917 Modified: cpu/x86/pc/neptune/devices.fth Log: Neptune - open RTC node at startup. Modified: cpu/x86/pc/neptune/devices.fth =================================================================== --- cpu/x86/pc/neptune/devices.fth 2008-09-02 21:18:48 UTC (rev 916) +++ cpu/x86/pc/neptune/devices.fth 2008-09-02 21:20:06 UTC (rev 917) @@ -186,11 +186,9 @@ 8 encode-int 0 encode-int encode+ " interrupts" property 2 encode-int " device#" property end-package -0 [if] \ XXX check me stand-init: RTC " /rtc" open-dev clock-node ! ; -[then] fload ${BP}/cpu/x86/pc/cpunode.fth fload ${BP}/cpu/x86/k6cputest.fth \ Burnin test for K6 CPU

1 0

r916 - clients/lib
by svn＠openfirmware.info 02 Sep '08

02 Sep '08

Author: wmb Date: 2008-09-02 23:18:48 +0200 (Tue, 02 Sep 2008) New Revision: 916 Modified: clients/lib/printf.c Log: Client library - support printf field width specifiers. Modified: clients/lib/printf.c =================================================================== --- clients/lib/printf.c 2008-09-02 21:18:01 UTC (rev 915) +++ clients/lib/printf.c 2008-09-02 21:18:48 UTC (rev 916) @@ -40,30 +40,39 @@ } STATIC int -printbase(ULONG x, int base) +printbase(ULONG x, int base, int fieldlen, char padchar, int upcase) { - static char itoa[] = "0123456789abcdef"; + static char lc_digits[] = "0123456789abcdef"; + static char uc_digits[] = "0123456789ABCDEF"; ULONG j; - char buf[16], *s = buf; + char buf[32], *s = buf; int n = 0; - if (x == 0) { - putchar('0'); - n++; - return (n); + memset(buf, 32, 0); + + if (base == 10 && (LONG) x < 0) { + *s++ = '-'; + x = -x; } - memset(buf, 16, 0); - while (x) { + + do { j = x % base; - *s++ = itoa[j]; + *s++ = upcase ? uc_digits[j] : lc_digits[j]; x -= j; x /= base; + } while (x); + +cvtdone: + for (fieldlen -= (s-buf); fieldlen > 0; --fieldlen) { + putchar(padchar); + n++; } for (--s; s >= buf; --s) { putchar(*s); n++; } + return (n); } @@ -73,6 +82,8 @@ ULONG x; char c, *s; int n = 0; + int fieldlen; + char padchar; while (c = *fmt++) { if (c != '%') { @@ -80,23 +91,43 @@ n++; continue; } - switch (c = *fmt++) { + if ((c = *fmt++) == '\0') + goto out; + + if (c == '.') // Ignore the numeric grouping flag + if ((c = *fmt++) == '\0') + goto out; + + padchar = ' '; + if (c == '0') { + padchar = c; + if ((c = *fmt++) == '\0') + goto out; + } + + fieldlen = 0; + while (c >= '0' && c <= '9') { + fieldlen = (fieldlen * 10) + (c - '0'); + if ((c = *fmt++) == '\0') + goto out; + } + + switch (c) { case 'x': x = va_arg(args, ULONG); - n += printbase(x, 16); + n += printbase(x, 16, fieldlen, padchar, 0); break; + case 'X': + x = va_arg(args, ULONG); + n += printbase(x, 16, fieldlen, padchar, 1); + break; case 'o': x = va_arg(args, ULONG); - n += printbase(x, 8); + n += printbase(x, 8, fieldlen, padchar, 0); break; case 'd': x = va_arg(args, ULONG); - if ((LONG) x < 0) { - putchar('-'); - n++; - x = -x; - } - n += printbase(x, 10); + n += printbase(x, 10, fieldlen, padchar, 0); break; case 'c': c = va_arg(args, int); @@ -116,6 +147,7 @@ break; } } +out: return(n); }

1 0

r915 - clients/lib
by svn＠openfirmware.info 02 Sep '08

02 Sep '08

Author: wmb Date: 2008-09-02 23:18:01 +0200 (Tue, 02 Sep 2008) New Revision: 915 Modified: clients/lib/lib.c clients/lib/stdio.h Log: Client library stdio - pay attention to "read only" open mode, and don't flush the buffer if it's not dirty. Modified: clients/lib/lib.c =================================================================== --- clients/lib/lib.c 2008-09-02 05:46:14 UTC (rev 914) +++ clients/lib/lib.c 2008-09-02 21:18:01 UTC (rev 915) @@ -111,6 +111,8 @@ } good: + fp->dirty = 0; + fp->readonly = (strcmp(mode, "r") == 0) || (strcmp(mode, "rb") == 0); fp->bufc = 0; return(fp); } @@ -121,26 +123,33 @@ return(0); /* Implement me */ } -void +int fputc(char c, FILE *fp) { + if (fp->readonly) + return -1; // EOF + if (fp == stdout && c == '\n') - fputc('\r', fp); + (void) fputc('\r', fp); fp->buf[fp->bufc++] = c; + fp->dirty = 1; if ((fp->bufc == 127) || (fp == stdout && c == '\n')) { OFWrite(fp->id, fp->buf, fp->bufc); fp->bufc = 0; + fp->dirty = 0; } + return (int)c; } void fflush (FILE *fp) { - if (fp->bufc != 0) { + if (fp->dirty && fp->bufc != 0) { OFWrite(fp->id, fp->buf, fp->bufc); fp->bufc = 0; + fp->dirty = 0; } } Modified: clients/lib/stdio.h =================================================================== --- clients/lib/stdio.h 2008-09-02 05:46:14 UTC (rev 914) +++ clients/lib/stdio.h 2008-09-02 21:18:01 UTC (rev 915) @@ -3,6 +3,8 @@ typedef struct _file { long id; int bufc; + int readonly; + int dirty; char *inbufp; char buf[128]; } FILE;

1 0

r914 - cpu/x86/pc/neptune/build
by svn＠openfirmware.info 02 Sep '08

02 Sep '08

Author: wmb Date: 2008-09-02 07:46:14 +0200 (Tue, 02 Sep 2008) New Revision: 914 Modified: cpu/x86/pc/neptune/build/ Log: svn-ignore some object files in neptune/build Property changes on: cpu/x86/pc/neptune/build ___________________________________________________________________ Modified: svn:ignore - build ofw.elf builton.fth *.rom *.bin *.version forth sourceurl + build ofw.elf builton.fth *.rom *.bin *.version forth sourceurl *.tag tags *.elf

1 0

r913 - clients/lib clients/lib/x86 cpu/x86/pc cpu/x86/pc/neptune
by svn＠openfirmware.info 02 Sep '08

02 Sep '08

Author: wmb Date: 2008-09-02 07:42:53 +0200 (Tue, 02 Sep 2008) New Revision: 913 Modified: clients/lib/callofw.c clients/lib/x86/makefile cpu/x86/pc/neptune/fw.bth cpu/x86/pc/reenter.fth Log: Neptune - allow rerunning ispVME without rebooting. Modified: clients/lib/callofw.c =================================================================== --- clients/lib/callofw.c 2008-09-02 02:45:16 UTC (rev 912) +++ clients/lib/callofw.c 2008-09-02 05:42:53 UTC (rev 913) @@ -6,14 +6,10 @@ */ #include <stdarg.h> -#include <asm/callofw.h> -#include <linux/types.h> -#include <linux/spinlock.h> +typedef unsigned long u32; -u32 (*call_firmware)(u32 *); +extern u32 call_firmware(u32 *); -static DEFINE_SPINLOCK(prom_lock); - #define MAXARGS 20 int callofw(char *name, int numargs, int numres, ...) { @@ -24,9 +20,6 @@ int *intp; unsigned long flags; - if (call_firmware == NULL) - return -1; - argarray[0] = (u32)name; argarray[1] = numargs; argarray[2] = numres; @@ -38,9 +31,7 @@ while (numargs--) argarray[argnum++] = va_arg(ap, int); - spin_lock_irqsave(&prom_lock, flags); retval = call_firmware(argarray); - spin_unlock_irqrestore(&prom_lock, flags); if (retval == 0) { while (numres--) { Modified: clients/lib/x86/makefile =================================================================== --- clients/lib/x86/makefile 2008-09-02 02:45:16 UTC (rev 912) +++ clients/lib/x86/makefile 2008-09-02 05:42:53 UTC (rev 913) @@ -3,51 +3,23 @@ # -fno-builtin has the effect of suppressing some warnings about # functions that conflict with gcc builtins CC=gcc -CFLAGS=-g -m32 -fno-builtin -fno-stack-protector +CFLAGS=-g -m32 -fno-builtin -fno-stack-limit -fno-stack-protector all: libobp.a hello hello.elf start.o # Create a library file containing all the library routines -libobp.a: lib.o printf.o wrappers.o malloc.o strings.o printf.o debug.o main.o intprop.o regprop.o strprop.o mem.o - ar rcv libobp.a lib.o malloc.o wrappers.o strings.o printf.o debug.o main.o intprop.o regprop.o strprop.o mem.o +OBJS=lib.o printf.o wrappers.o malloc.o strings.o printf.o debug.o main.o intprop.o regprop.o strprop.o mem.o callofw.o + +libobp.a: ${OBJS} + ar rcv libobp.a ${OBJS} ranlib libobp.a # Build machine-independent library routines -main.o: ../main.c - ${CC} ${CFLAGS} -c ../main.c +%.o: ../%.c + ${CC} ${CFLAGS} -c $< -lib.o: ../lib.c - ${CC} ${CFLAGS} -c ../lib.c - -printf.o: ../printf.c - ${CC} ${CFLAGS} -c ../printf.c - -debug.o: ../debug.c - ${CC} ${CFLAGS} -c ../debug.c - -strings.o: ../strings.c - ${CC} ${CFLAGS} -c ../strings.c - -mem.o: ../mem.c - ${CC} ${CFLAGS} -c ../mem.c - -intprop.o: ../intprop.c - ${CC} ${CFLAGS} -c ../intprop.c - -regprop.o: ../regprop.c - ${CC} ${CFLAGS} -c ../regprop.c - -strprop.o: ../strprop.c - ${CC} ${CFLAGS} -c ../strprop.c - -wrappers.o: ../wrappers.c - ${CC} ${CFLAGS} -c ../wrappers.c - -malloc.o: ../malloc.c - ${CC} ${CFLAGS} -c ../malloc.c - # Build processor-specific startup code and call gateway start.o: start.s Modified: cpu/x86/pc/neptune/fw.bth =================================================================== --- cpu/x86/pc/neptune/fw.bth 2008-09-02 02:45:16 UTC (rev 912) +++ cpu/x86/pc/neptune/fw.bth 2008-09-02 05:42:53 UTC (rev 913) @@ -165,10 +165,11 @@ fload ${BP}/ofw/elf/elf.fth fload ${BP}/ofw/elf/elfdebug.fth [ifdef] virtual-mode -: (elf-map-in) ( va size -- ) swap 1 -rot allocate-aligned drop ; -\ 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 +\ This version dynamically allocates physical memory +\ : (elf-map-in) ( va size -- ) swap 1 -rot allocate-aligned drop ; + +\ This version depends on the assumption that physical memory is mapped 1:1 already +: (elf-map-in) ( va size -- ) 2drop ; [else] : (elf-map-in) ( va size -- ) 2drop ; [then] @@ -178,6 +179,7 @@ \ Reboot and re-entry code fload ${BP}/cpu/x86/pc/reboot.fth \ Restart the client program fload ${BP}/cpu/x86/pc/reenter.fth \ Various entries into Forth +true to client-rerun? headerless [ifdef] virtual-mode @@ -198,8 +200,9 @@ \ The LPC FLASH chips decode several addresses below the FLASH "memory" array, \ for "registers" used for programming and access to general purpose inputs. -\ The FPGA programming program wants to access the GPI register at virtual -\ address = physical address, so we pre-claim that range of virtual addresses. +\ We pre-claim that range of virtual addresses just in case someone needs to +\ access the LPC device with virtual-address = physical address. (OFW and +\ ispVME both use dynamically-mapped virtual addresses for that region.) : claim-lpc ( -- ) (initial-claim) @@ -404,13 +407,8 @@ lpc-gpi0-pa value lpc-gpi-pa : vme ( -- ) - ." Running Lattice programmer " - - lpc-gpi-pa lpc-gpi-pa h# 100 -1 mmu-map \ verbose-cif " rom:\isp u:\neptune.vme" $boot - - lpc-gpi-pa h# 100 mmu-unmap ; fload ${BP}/cpu/x86/pc/neptune/versions.fth Modified: cpu/x86/pc/reenter.fth =================================================================== --- cpu/x86/pc/reenter.fth 2008-09-02 02:45:16 UTC (rev 912) +++ cpu/x86/pc/reenter.fth 2008-09-02 05:42:53 UTC (rev 913) @@ -28,6 +28,8 @@ \ Temporary hacks until we implement these functions correctly +0 value client-rerun? + defer user-interface ' quit to user-interface also client-services definitions \ " reenter.fth: Implement 'exit' client service correctly" ?reminder @@ -38,6 +40,7 @@ " restore" stdout @ ['] $call-method catch if 3drop then " restore" stdin @ ['] $call-method catch if 3drop then + client-rerun? 0= to already-go? user-interface ; : enter ( -- ) interact ;

1 0

r912 - in cpu/x86/pc/neptune: . build
by svn＠openfirmware.info 02 Sep '08

02 Sep '08

Author: wmb Date: 2008-09-02 04:45:16 +0200 (Tue, 02 Sep 2008) New Revision: 912 Modified: cpu/x86/pc/neptune/addrs.fth cpu/x86/pc/neptune/banner.fth cpu/x86/pc/neptune/build/Makefile cpu/x86/pc/neptune/devices.fth cpu/x86/pc/neptune/fw.bth cpu/x86/pc/neptune/neptune.bth Log: Neptune - fixes to support FPGA programming; also big cleanup of "startup" to eliminate OLPC-centric UI stuff, aligning the Neptune startup sequence with the conventional OFW "probe-all,install-console,banner" sequence. Modified: cpu/x86/pc/neptune/addrs.fth =================================================================== --- cpu/x86/pc/neptune/addrs.fth 2008-09-02 02:34:47 UTC (rev 911) +++ cpu/x86/pc/neptune/addrs.fth 2008-09-02 02:45:16 UTC (rev 912) @@ -11,6 +11,14 @@ dropin-base h# 20 + constant ResetBase \ Location of "reset" dropin in ROM +h# ffe0.0000 constant rom1-pa \ Secondary ROM (FLASH) on dongle + +h# ff80.0000 constant lpc-pa \ Extra stuff decoded by LPC FLASH chips +h# 60.0000 constant /lpc \ Space to reserve for LPC stuff + +h# ffbc.0100 constant lpc-gpi0-pa \ GPI port for LPC FLASH 0 +h# ffac.0100 constant lpc-gpi1-pa \ GPI port for LPC FLASH 1 + \ Firmware reflash parameters h# 8.0000 constant fw-offset \ Where to start reflashing h# 8.0000 constant /fw-reflash \ Expected size of a reflash image @@ -40,10 +48,6 @@ h# 80.0000 constant fb-size -\ If you change these, also change {g/l}xmsrs.fth and {g/l}xearly.fth -h# fd00.0000 constant fw-map-base -h# ffc0.0000 constant fw-map-limit - h# fd00.0000 constant fb-pci-base h# fe00.0000 constant gp-pci-base h# fe00.4000 constant dc-pci-base @@ -57,11 +61,19 @@ h# fe02.8000 constant camera-pci-base h# fe02.c000 constant uoc-pci-base +\ These two are used when running in physical mode, to delimit +\ a set of v=p mappings that we create just before invoking Linux. +h# fd00.0000 constant fw-map-base +h# ffc0.0000 constant fw-map-limit + fload ${BP}/cpu/x86/pc/virtaddr.fth -[ifndef] virtual-mode -h# fec0.0000 to fw-virt-base \ Override the usual setting; we use an MSR to double-map some memory up high + +\ Override the usual fw-virt-base setting. +\ There's some LPC stuff in the way of the normal OFW virtual address ff80.0000 +\ And if we are running in physical mode, we use an MSR to double-map some memory up high + +h# ff40.0000 to fw-virt-base h# 40.0000 to fw-virt-size -[then] \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks Modified: cpu/x86/pc/neptune/banner.fth =================================================================== --- cpu/x86/pc/neptune/banner.fth 2008-09-02 02:34:47 UTC (rev 911) +++ cpu/x86/pc/neptune/banner.fth 2008-09-02 02:45:16 UTC (rev 912) @@ -3,6 +3,26 @@ headerless +: geode-print-pll ( -- ) + ." Geode CPU Speed " + h# 4c00.0014 rdmsr swap drop + h# 3E and 2/ + 1 + d# 66 * 2/ decimal . cr + + ." GeodeLink Speed " + h# 4c00.0014 rdmsr swap drop + h# FFF and 7 >> + 1 + d# 66 * 2/ decimal . cr + + ." PCI Speed " + h# 4c00.0014 rdmsr drop + 1 7 << and + 0= if d# 33 . else d# 66 . then cr + + hex +; +' geode-print-pll to banner-extras + : .rom ( -- ) ." OpenFirmware " push-decimal @@ -14,22 +34,14 @@ ; : (xbanner-basics) ( -- ) - ?spaces cpu-model type ." , " .memory - ?spaces .rom + ?spaces cpu-model type ." , " .memory cr + ?spaces .rom cr ; ' (xbanner-basics) to banner-basics ' (banner-warnings) to banner-warnings -: stop-auto? ( -- flag ) idprom-valid? 0= auto-boot? and ; -defer gui-banner ' true to gui-banner -: ?gui-banner ( -- ) - stop-auto? if suppress-auto-boot then - - gui-banner drop -; - headers \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks Modified: cpu/x86/pc/neptune/build/Makefile =================================================================== --- cpu/x86/pc/neptune/build/Makefile 2008-09-02 02:34:47 UTC (rev 911) +++ cpu/x86/pc/neptune/build/Makefile 2008-09-02 02:45:16 UTC (rev 912) @@ -1,8 +1,17 @@ OS := $(shell uname) +BASEDIR= `(cd ../../../../..; pwd;)` +TAGFILES= ../../../build/*.tag *.tag +CLIENTDIR=../../../../../clients +CLIENTPROGS=${CLIENTDIR}/memtest86/memtest -all: neptune.rom +all: neptune.rom tags -neptune.rom: FORCE build ../../../build/inflate.bin ../../../../../clients/memtest86/memtest +fw.tag: neptune.rom + +tags: fw.tag + @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES} + +neptune.rom: FORCE build ../../../build/inflate.bin ${CLIENTPROGS} ./build $@ ../../../${OS}/forth: @@ -11,8 +20,8 @@ ../../../build/inflate.bin: @make -C ../../../build inflate.bin -../../../../../clients/memtest86/memtest: - @make -C ../../../../../clients/memtest86 memtest +${CLIENTDIR}/memtest86/memtest: + @make -C ${CLIENTDIR}/memtest86 memtest build: ../../../${OS}/forth @ln -sf ../../../${OS}/forth build @@ -24,5 +33,6 @@ @make -C ../../../build clean @make -C ../../../${OS} clean @make -C ../../../../../clients/memtest86 clean + @make -C ../../../../../clients/ispvme clean .PHONY: FORCE clean all clean-all Modified: cpu/x86/pc/neptune/devices.fth =================================================================== --- cpu/x86/pc/neptune/devices.fth 2008-09-02 02:34:47 UTC (rev 911) +++ cpu/x86/pc/neptune/devices.fth 2008-09-02 02:45:16 UTC (rev 912) @@ -340,7 +340,7 @@ root-device \ XXX perhaps report subordinate version info? " Neptune" model - " Neptune" " banner-name" string-property + " Dave Neptune" " banner-name" string-property dend " /openprom" find-device Modified: cpu/x86/pc/neptune/fw.bth =================================================================== --- cpu/x86/pc/neptune/fw.bth 2008-09-02 02:34:47 UTC (rev 911) +++ cpu/x86/pc/neptune/fw.bth 2008-09-02 02:45:16 UTC (rev 912) @@ -6,6 +6,7 @@ in: builton.fth build-now +" fw.tag" r/w create-file drop tag-file ! hex \ ' $report-name is include-hook @@ -193,14 +194,19 @@ [ifdef] virtual-mode fload ${BP}/cpu/x86/pc/mmusetup.fth \ Initial values for MMU lists -\ XXX check me -\ 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 +dev /mmu + +\ The LPC FLASH chips decode several addresses below the FLASH "memory" array, +\ for "registers" used for programming and access to general purpose inputs. +\ The FPGA programming program wants to access the GPI register at virtual +\ address = physical address, so we pre-claim that range of virtual addresses. + +: claim-lpc ( -- ) + (initial-claim) + lpc-pa /lpc claim-virtual drop \ Space for 1-1 mapping LPC GPIO stuff +; +' claim-lpc to initial-claim +dend [then] : background-rgb ( -- r g b ) h# ff h# ff h# ff ; @@ -226,7 +232,7 @@ h# 3ea constant usb-port-power-map \ USB4:PWR2 USB3:PWR1 USB2:PWR1 USB1:PWR1 fload ${BP}/dev/geode/usb.fth -\ ' noop to go-hook \ this is required for accessing USB device from client program (e.g. VME) +' noop to go-hook \ this is required for accessing USB device from client program (e.g. VME) \ false to stand-init-debug? true to stand-init-debug? @@ -274,24 +280,20 @@ ' (.firmware) to .firmware : probe-all ( -- ) - probe-pci - probe-usb + ." Probe PCI" cr probe-pci + ." Probe USB" cr probe-usb ; -fload ${BP}/ofw/gui/bmptools.fth fload ${BP}/dev/null.fth fload ${BP}/ofw/core/bailout.fth fload ${BP}/cpu/x86/pc/neptune/banner.fth -fload ${BP}/ofw/gui/loadmenu.fth -\ fload ${BP}/ofw/gui/insticon.fth - \ Use values like these if you want to boot directly instead of through an intermediate script " u:\boot\bzImage" ' boot-device set-config-string-default \ " console=uart,io,0x3f8,115200" ' boot-file set-config-string-default \ " console=uart,io,0x3f8,115200 root=/dev/nfs rw nfsroot=192.168.42.100:/usr/local/rfs_x86,proto=tcp,hard ip=192.168.42.99:192.168.42.100::255.255.255.0:neptune:eth0:off init=/bin/sh" ' boot-file set-config-string-default - " console=uart,io,0x3f8,115200 console=tty0 root=/dev/nfs rw nfsroot=192.168.0.23:/home/shared/devel/neptune/sw/rfs/x86_32_rfs,proto=tcp,hard ip=192.168.0.77:192.168.0.23::255.255.255.0:neptune:eth0:off video=1027x768M@60m init=/bin/bash" ' boot-file set-config-string-default + " console=uart,io,0x3f8,115200 root=/dev/nfs rw nfsroot=192.168.0.23:/home/shared/devel/neptune/sw/rfs/x86_32_rfs,proto=tcp,hard ip=192.168.0.78:192.168.0.23::255.255.255.0:neptune:eth0:off video=1027x768M@60m ethaddr=00:50:C2:1E:AF:B0 init=/bin/sh" ' boot-file set-config-string-default \ \needs ramdisk " u:\boot\initrd.img" d# 128 config-string ramdisk \needs ramdisk " " d# 128 config-string ramdisk \ " " ' boot-file set-config-string-default \ Let the boot script set the cmdline @@ -349,16 +351,6 @@ \ fload ${BP}/cpu/x86/pc/report.fth fload ${BP}/ofw/core/dualconsole.fth -true constant user-switch? ( -- flag ) -: fast-boot? ( -- flag ) -[ifdef] rom-loaded -false exit - user-switch? 0= -[else] - false -[then] -; - : interpreter-init ( -- ) hex warning on @@ -376,49 +368,14 @@ [ifdef] rom-loaded video-map cr [then] - " screen" open-dev ?dup if - set-stdout -\ logo-banner drop -\ close-dev -\ 0 stdout ! - then - + install-console +\ ?usb-keyboard install-dual-console - ?gui-banner - " probe-" do-drop-in -\ ." nvramrc" cr -\ use-nvramrc? if nvramrc safe-evaluate then + " nvramrc-" do-drop-in + use-nvramrc? if nvramrc safe-evaluate then ; -: debug-interact ( -- ) - early-interact? if - " Interrupting startup sequence prior to probing" .because - ." Type 'resume' to resume normal startup sequence." cr - \ fallback-device io console-io - ( help-msg ) interact - then -; -: geode-print-pll ( -- ) - ." Geode CPU Speed " - h# 4c00.0014 rdmsr swap drop - h# 3E and 2/ - 1 + d# 66 * 2/ decimal . cr - - ." GeodeLink Speed " - h# 4c00.0014 rdmsr swap drop - h# FFF and 7 >> - 1 + d# 66 * 2/ decimal . cr - - ." PCI Speed " - h# 4c00.0014 rdmsr drop - 1 7 << and - 0= if d# 33 . else d# 66 . then cr - - hex - -; - fload ${BP}/dev/flashui.fth \ Copies internal flash to external - everything, including config vars @@ -443,49 +400,37 @@ " devalias flash /flash@fff00000" evaluate ; +\ Change this to lpc-gpi1-pa to use the dongle LPC FLASH +lpc-gpi0-pa value lpc-gpi-pa + : vme ( -- ) - ." Running Lattice programmer " - com1 io - verbose-cif - " u:\neptune.vme" to boot-file - " u:\vme.elf" $boot + ." Running Lattice programmer " + + lpc-gpi-pa lpc-gpi-pa h# 100 -1 mmu-map + \ verbose-cif + " rom:\isp u:\neptune.vme" $boot + + lpc-gpi-pa h# 100 mmu-unmap ; fload ${BP}/cpu/x86/pc/neptune/versions.fth -: optional-startup ( -- ) - probe-usb - ?usb-keyboard -; +0 to major-release +9 to minor-release +: subrel " .3" ; ' subrel to sub-release : startup ( -- ) standalone? 0= if exit then \ ?bailout - no-page - + probe-all console-start - ." Welcome to Dave Neptune (OFW 0.9.3)" cr - geode-print-pll + banner - fast-boot? if - probe-pci - ['] false to interrupt-auto-boot? - interpreter-init - auto-boot - optional-startup - else - ." Interactive boot" cr + interpreter-init + auto-boot - ." PCI Probe" cr - probe-pci - ." USB probe" cr - optional-startup - interpreter-init - auto-boot - then - blue-letters ." Type 'help' for more information." black-letters cr cr @@ -499,6 +444,8 @@ warning ! previous previous definitions +tag-file @ fclose tag-file off + .( --- Saving fw.dic ...) " fw.dic" $save-forth cr Modified: cpu/x86/pc/neptune/neptune.bth =================================================================== --- cpu/x86/pc/neptune/neptune.bth 2008-09-02 02:34:47 UTC (rev 911) +++ cpu/x86/pc/neptune/neptune.bth 2008-09-02 02:45:16 UTC (rev 912) @@ -18,6 +18,7 @@ in: ${BP}/dev/pci/build/pcibridg.fc in: ${BP}/dev/dnet/build/dnet.fc \ in: ${BP}/clients/memtest86/memtest +in: vme.elf build-now @@ -72,6 +73,7 @@ " ${BP}/clients/memtest86/memtest" " memtest" $add-deflated-dropin [then] " ${BP}/dev/pci/build/pcibridg.fc" " class060400" $add-deflated-dropin + " vme.elf" " isp" $add-deflated-dropin dropin-size h# 400 - pad-file \ rmstart image must start 0x400 from end " rmstart.img" $add-file

1 0

r911 - in cpu/x86/pc: . lxdevel neptune olpc
by svn＠openfirmware.info 02 Sep '08

02 Sep '08

Author: wmb Date: 2008-09-02 04:34:47 +0200 (Tue, 02 Sep 2008) New Revision: 911 Added: cpu/x86/pc/lxdevel/paging.bth cpu/x86/pc/neptune/paging.bth cpu/x86/pc/olpc/paging.bth cpu/x86/pc/paging.fth Log: Removed OLPC dependency from common code by splitting paging.bth into common paging.fth and separate paging.bth's in the platform subdirectories. Added: cpu/x86/pc/lxdevel/paging.bth =================================================================== --- cpu/x86/pc/lxdevel/paging.bth (rev 0) +++ cpu/x86/pc/lxdevel/paging.bth 2008-09-02 02:34:47 UTC (rev 911) @@ -0,0 +1,7 @@ +purpose: Build script for paging.di + +command: &builder &this +build-now + +fload ${BP}/cpu/x86/pc/lxdevel/config.fth +fload ${BP}/cpu/x86/pc/paging.fth Added: cpu/x86/pc/neptune/paging.bth =================================================================== --- cpu/x86/pc/neptune/paging.bth (rev 0) +++ cpu/x86/pc/neptune/paging.bth 2008-09-02 02:34:47 UTC (rev 911) @@ -0,0 +1,7 @@ +purpose: Build script for paging.di + +command: &builder &this +build-now + +fload ${BP}/cpu/x86/pc/neptune/config.fth +fload ${BP}/cpu/x86/pc/paging.fth Added: cpu/x86/pc/olpc/paging.bth =================================================================== --- cpu/x86/pc/olpc/paging.bth (rev 0) +++ cpu/x86/pc/olpc/paging.bth 2008-09-02 02:34:47 UTC (rev 911) @@ -0,0 +1,7 @@ +purpose: Build script for paging.di + +command: &builder &this +build-now + +fload ${BP}/cpu/x86/pc/olpc/config.fth +fload ${BP}/cpu/x86/pc/paging.fth Added: cpu/x86/pc/paging.fth =================================================================== --- cpu/x86/pc/paging.fth (rev 0) +++ cpu/x86/pc/paging.fth 2008-09-02 02:34:47 UTC (rev 911) @@ -0,0 +1,209 @@ +\ See license at end of file +purpose: Set up page tables and turn on paging + +\needs start-assembling fload ${BP}/cpu/x86/asmtools.fth +\needs write-dropin fload ${BP}/forth/lib/mkdropin.fth + +fload ${BP}/cpu/x86/mmuparam.fth + +hex + +fload ${BP}/cpu/x86/pc/report.fth \ Startup reports + +start-assembling +protected-mode + +\ RAM is on and mem-info-pa tells the memory layout +label entry + \ Initialize virtual page table + \ Initialize linear=physical page table (redundant page table entries) + \ Enable paging (note that page fault handler is not in place yet) + +[ifdef] notdef + \ clear page tables + ax ax xor + /ptab /l / # cx mov + pt-pa # di mov + rep ax stos +[then] + +ascii 1 report + \ create PDEs + +\ Create a mapping for the firmware + + \ In the following code, we use ESI as a physical memory allocation pointer + mem-info-pa 4 + #) si mov \ Top of memory available to software + /page 1- invert # si and \ Page-align just in case + + /fw-ram # si sub \ Base address of firmware area + si dx mov \ Firmware physical address in EDX + + \ Allocate Page Directory + /ptab # si sub + si bx mov \ Page directory PA in EBX + + \ Clear Page Directory + ax ax xor \ value to store + /ptab /l / # cx mov \ #words to clear + bx di mov \ Base address + rep ax stos + + /ptab # si sub + si bp mov \ Page table PA in EBP + + bp ax mov + pte-control # ax or \ Page table PDE in EAX + ax fw-virt-base d# 22 rshift /l* [bx] mov \ Set page directory entry + + \ Fill page table with entries for the firmware + bp di mov + dx ax mov + pte-control # ax or \ Firmware PTE in EAX + /fw-ram /page / # cx mov \ Number of entries + begin + ax stos \ Set PTE + /page # ax add + loopa + + \ Clear the rest of the table + ax ax xor \ Invalid page + /section /fw-ram - /page / # cx mov \ Number of entries + rep ax stos + +\ Linearly-map low addresses to cover physical memory +\ This code could be simplified by using 4M pages, at the expense +\ of requiring a modern processor variant and additional complexity +\ in later MMU management code. + + \ /section is the amount of memory that can be mapped with one page table + mem-info-pa 4 + #) dx mov \ Top of memory available to software + /section 1- # dx add \ Round up to a multiple of /section + d# 22 # dx shr \ Number of ptabs needed + + cr4 ax mov \ Try to turn on Page Size Extension Bit + h# 10 # ax or + ax cr4 mov + + cr4 ax mov \ See if it worked + h# 10 # ax and 0= if + + \ Processor does not support 4M pages, so use page tables + dx ax mov \ Copy of #ptabs + d# 12 # ax shl \ Number of bytes for page tables + ax si sub \ Get memory for page tables + + \ Page Directory Entries + si ax mov + pte-control # ax or \ PDE contents + bx di mov \ Base address + dx cx mov \ Loop count (#ptabs) + begin + ax stos \ pde for linear=physical page table + /ptab # ax add \ Point to next page table + loopa + + \ Page Table Entries + mem-info-pa 4 + #) cx mov \ Top of memory available to software + /page 1- # cx add \ Round to a multiple of /page + d# 12 # cx shr \ #pages + + pte-control # ax mov \ First PTE value (physical 0) + si di mov \ Base address of first page table + begin + ax stos \ Set PTE + /page # ax add + loopa + + d# 10 # dx shl \ #pages mapped by ptabs + dx cx mov \ Move into cx + + mem-info-pa 4 + #) dx mov \ Top of memory available to software + /page 1- # dx add \ Round to a multiple of /page + d# 12 # dx shr \ #pages + + dx cx sub \ #ptes to zero + ax ax xor \ Clear ax to make invalid PTE + rep ax stos \ Fill the leftovers + + + else + \ Use 4M pages. + + \ Page Directory Entries + pte-control h# 80 + # ax mov \ PDE for 4M page at 0 + bx di mov \ Base address + dx cx mov \ Loop count (#ptabs) + begin + ax stos \ pde for linear=physical page table + /section # ax add \ Point to next 4M section + loopa + then + +[ifdef] rom-pa + \ Page Directory Entry + /ptab # si sub + si bp mov \ Page table PA in EBP + bp ax mov + pte-control # ax or \ Page table PDE in EAX + ax rom-pa d# 22 rshift /l* [bx] mov \ Set PDE for ROM page tables + + \ Page Table Entries + + \ create PTEs for the ROM version OFW + rom-pa /page 1- invert land pte-control + # ax mov + bp di mov + rom-pa pte-mask land /page / /l* # di add + + /rom /page / # cx mov + + begin + ax stos + /page # ax add + loopa +[then] + +[ifdef] mem-info-pa + si mem-info-pa 1 la+ #) mov \ Report top of page table area +[then] + +ascii P report + \ enable paging + bx cr3 mov \ Set Page Directory Base Register + cr0 ax mov + 8000.0000 # ax or + ax cr0 mov \ Turn on Paging Enable bit +ascii O report + + ret +end-code + +end-assembling + +writing paging.di +asm-base here over - 0 " paging" write-dropin +ofd @ fclose + +\ LICENSE_BEGIN +\ Copyright (c) 2006 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0

r910 - ofw/fs
by svn＠openfirmware.info 01 Sep '08

01 Sep '08

Author: wmb Date: 2008-09-01 23:44:08 +0200 (Mon, 01 Sep 2008) New Revision: 910 Modified: ofw/fs/dropinfs.fth Log: dropinfs.fth - fixed the open method so "dir rom:" will work. Modified: ofw/fs/dropinfs.fth =================================================================== --- ofw/fs/dropinfs.fth 2008-09-01 21:05:49 UTC (rev 909) +++ ofw/fs/dropinfs.fth 2008-09-01 21:44:08 UTC (rev 910) @@ -32,7 +32,9 @@ 0 to base-adr 0 to seek-ptr ( ) my-args dup if ( adr len ) - 2dup " \" $= 0= if ( adr len ) + 2dup " \" $= if ( adr len ) + 2drop true exit + else ( adr len ) over c@ [char] \ = if 1 /string then ( adr' len' ) find-drop-in dup if ( di-adr di-len true ) -rot to image-size to base-adr ( true )

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware