openfirmware November 2009

openfirmware@openfirmware.info

4 participants
78 discussions

r1507 - cpu/x86
by svn＠openfirmware.info 25 Nov '09

25 Nov '09

Author: wmb Date: 2009-11-25 22:16:45 +0100 (Wed, 25 Nov 2009) New Revision: 1507 Modified: cpu/x86/kernel.bth Log: Added a build option to the x86 Forth kernel to omit file support, useful for a small special-purpose kernel. Modified: cpu/x86/kernel.bth =================================================================== --- cpu/x86/kernel.bth 2009-11-25 20:56:15 UTC (rev 1506) +++ cpu/x86/kernel.bth 2009-11-25 21:16:45 UTC (rev 1507) @@ -15,11 +15,17 @@ \ [then] \ [then] +\ create omit-files + +[ifdef] omit-files +create dic-file-name ," kernelnofiles.dic" +[else] [ifdef] big-endian-t create dic-file-name ," kernelbe.dic" [else] create dic-file-name ," kernel.dic" [then] +[then] : \Tags [compile] \ ; immediate : \NotTags ; immediate @@ -92,15 +98,34 @@ \ fload ${BP}/forth/kernel/dmuldiv.fth fload ${BP}/forth/lib/bitops.fth +[ifdef] omit-files +defer set-relocation-bit +defer clear-relocation-bits +' noop is set-relocation-bit +' 2drop is clear-relocation-bits +[else] fload ${BP}/cpu/x86/kernrel.fth +[then] fload ${BP}/forth/lib/struct.fth fload ${BP}/forth/kernel/kernel.fth +[ifdef] omit-files +fload ${BP}/forth/lib/dumballo.fth +false value flat? +: uart-init-io ( -- ) + install-uart-io +; +' uart-init-io is init-io +' noop is init-environment +: stand-init ; + +[else] fload ${BP}/forth/kernel/sysio.fth fload ${BP}/forth/lib/dumballo.fth fload ${BP}/cpu/x86/syscall.fth +[then] fload ${BP}/forth/kernel/nswapmap.fth @@ -113,16 +138,26 @@ meta-tag-file @ fclose meta-tag-file off +[ifdef] omit-files +: crcgen drop ; +: patchboot ; +fload ${BP}/cpu/x86/pc/saveabs.fth +[else] fload ${BP}/cpu/x86/saveexp.fth fload ${BP}/cpu/x86/savemeta.fth +[then] warning on \ Turn ON the warning messages hex +[ifdef] omit-files +dic-file-name count h# ffff.0000 save-abs-rom cr +[else] \Tags close-tag-file \NotTags .( --- Saving ) dic-file-name ". .( ---) dic-file-name count $save-meta cr +[then] \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks

1 0

r1506 - cpu/x86/pc/emu
by svn＠openfirmware.info 25 Nov '09

25 Nov '09

Author: wmb Date: 2009-11-25 21:56:15 +0100 (Wed, 25 Nov 2009) New Revision: 1506 Added: cpu/x86/pc/emu/makefs.sh Log: Checked in script for creating a filesystem image for use with QEMU. Added: cpu/x86/pc/emu/makefs.sh =================================================================== --- cpu/x86/pc/emu/makefs.sh (rev 0) +++ cpu/x86/pc/emu/makefs.sh 2009-11-25 20:56:15 UTC (rev 1506) @@ -0,0 +1,12 @@ +#!/bin/sh +dd if=/dev/zero of=filesystem.img bs=512 seek=20K count=1 +/sbin/mke2fs -F filesystem.img +dd if=filesystem.img of=fs.img bs=512 seek=1 +rm filesystem.img +/sbin/sfdisk -L -uS -C 5 -H 128 -S 32 fs.img <<EOF +,,L,* +; +; +; +EOF +sudo mount -o loop,offset=512 fs.img mnt

1 0

r1505 - cpu/x86/pc/biosload
by svn＠openfirmware.info 25 Nov '09

25 Nov '09

Author: wmb Date: 2009-11-25 21:53:26 +0100 (Wed, 25 Nov 2009) New Revision: 1505 Added: cpu/x86/pc/biosload/makeusbboot.fth Log: Checked in rarely-used tool for creating a bootable image that can be dd'ed onto a USB key. Added: cpu/x86/pc/biosload/makeusbboot.fth =================================================================== --- cpu/x86/pc/biosload/makeusbboot.fth (rev 0) +++ cpu/x86/pc/biosload/makeusbboot.fth 2009-11-25 20:53:26 UTC (rev 1505) @@ -0,0 +1,55 @@ +\ This program creates a bootable disk image with an +\ initially-empty FAT16 filesystem. +\ The FATs begin at sector 2. Sectors 0 and 1 contain a simple +\ FAT filesystem reader that uses INT 13 to load the file "\OFW.IMG" +\ into memory, then jumps to it. + +hex + +d# 512 constant /sector +/sector buffer: sector-buf + +create ofw-boot-sectors + " ${BP}/cpu/x86/pc/biosload/build/bootsec.img" $file, +here ofw-boot-sectors - constant /ofw-boot-sectors + +: make-fat16-image ( -- ) + " usb.img" $new-file + + \ Write boot sectors + ofw-boot-sectors /ofw-boot-sectors ofd @ fputs + + \ Init FATs + sector-buf /sector erase + + \ BPB offset h#10.b is NumFATCopies + ofw-boot-sectors h# 10 + c@ 0 ?do \ Loop over number of FATs + h# fffffff8 sector-buf le-l! \ First FAT16 entry + sector-buf /sector ofd @ fputs + 0 sector-buf le-l! + + \ BPB offset h#16.w is SectorsPerFAT + ofw-boot-sectors h# 16 + le-w@ 1- 0 ?do \ Remainder of FAT + sector-buf /sector ofd @ fputs + loop + loop + + \ Init root directory + \ BPB offset h#11.w is RootDirEntries. Each entry is h#20 bytes. + ofw-boot-sectors h# 11 + le-w@ ( #root-dir-entries ) + h# 20 * ( root-dir-bytes ) + /sector / 0 ?do \ Loop over root dir sectors + sector-buf /sector ofd @ fputs + loop + + \ Zero the rest of the floppy image + ofw-boot-sectors h# 13 + le-w@ ( total#sectors ) + /sector * ofd @ fsize ?do + sector-buf /sector ofd @ fputs + /sector +loop + + ofd @ fclose + ." Open Firmware bootable floppy image created as usb.img ." cr + ." Loopback-mount it and copy OFW.IMG to it." cr +; +make-fat16-image

1 0

r1504 - cpu/x86/pc/biosload
by svn＠openfirmware.info 25 Nov '09

25 Nov '09

Author: wmb Date: 2009-11-25 21:51:01 +0100 (Wed, 25 Nov 2009) New Revision: 1504 Modified: cpu/x86/pc/biosload/config-via.fth cpu/x86/pc/biosload/devices.fth cpu/x86/pc/biosload/fw.bth Log: Some minor fixes in the biosload build. Modified: cpu/x86/pc/biosload/config-via.fth =================================================================== --- cpu/x86/pc/biosload/config-via.fth 2009-11-25 20:45:24 UTC (rev 1503) +++ cpu/x86/pc/biosload/config-via.fth 2009-11-25 20:51:01 UTC (rev 1504) @@ -17,6 +17,17 @@ \ create use-usb-debug-port create pc +\ The disadvantage of the timestamp counter is that it changes speed with +\ CPU throttling. The advantage is that it is 64 bits, so no rollover. +create use-timestamp-counter \ Use CPU's timestamp counter for "ms" +create use-tsc-timing \ Use timestamp counter for t( .. )t + +\ The advantage of the ACPI counter is that its speed is independent of +\ CPU throttling. The disadvantage is that it is 32 bits, so it rolls +\ over every 20 minutes or so, unless you extend it with an SMI handler. +\ create use-acpi-timing +\ create use-acpi-delays + \ create pseudo-nvram create resident-packages create addresses-assigned \ Don't reassign PCI addresses Modified: cpu/x86/pc/biosload/devices.fth =================================================================== --- cpu/x86/pc/biosload/devices.fth 2009-11-25 20:45:24 UTC (rev 1503) +++ cpu/x86/pc/biosload/devices.fth 2009-11-25 20:51:01 UTC (rev 1504) @@ -335,7 +335,9 @@ [ifdef] olpc \ true constant lx? \ h# fff0.0000 constant rom-pa \ Physical address of boot ROM +[ifdef] geode fload ${BP}/dev/geode/acpi.fth \ Power management +[then] fload ${BP}/dev/olpc/kb3700/ecspi.fth \ EC chip SPI FLASH access warning @ warning off Modified: cpu/x86/pc/biosload/fw.bth =================================================================== --- cpu/x86/pc/biosload/fw.bth 2009-11-25 20:45:24 UTC (rev 1503) +++ cpu/x86/pc/biosload/fw.bth 2009-11-25 20:51:01 UTC (rev 1504) @@ -298,9 +298,11 @@ ; [ifdef] olpc +[ifdef] geode fload ${BP}/cpu/x86/pc/olpc/usbpwr.fth devalias net /wlan [then] +[then] [ifdef] via-demo devalias net /wlan [then] @@ -318,7 +320,9 @@ probe-isa-modem [then] [ifdef] olpc +[ifdef] geode power-cycle-usb +[then] probe-usb [else] probe-usb @@ -337,8 +341,8 @@ : startup ( -- ) standalone? 0= if exit then -\ ." calibrate-ms" cr -\ calibrate-ms + ." calibrate-ms" cr + calibrate-ms ." nvramrc" cr use-nvramrc? if nvramrc safe-evaluate then

1 0

r1503 - cpu/x86/Linux forth/wrapper
by svn＠openfirmware.info 25 Nov '09

25 Nov '09

Author: wmb Date: 2009-11-25 21:45:24 +0100 (Wed, 25 Nov 2009) New Revision: 1503 Added: forth/wrapper/xcbifce.c Modified: cpu/x86/Linux/Makefile Log: Fixed the "libxcb" compilation options section of the x86 Linus wrapper Makefile. Modified: cpu/x86/Linux/Makefile =================================================================== --- cpu/x86/Linux/Makefile 2009-11-25 20:31:53 UTC (rev 1502) +++ cpu/x86/Linux/Makefile 2009-11-25 20:45:24 UTC (rev 1503) @@ -3,9 +3,14 @@ BP=../../.. CFLAGS = -O -g -m32 -DTARGET_X86 -CFLAGS += -DUSE_XCB -LIBS += -lxcb +# Uncomment these lines to include X windows support to the wrapper +# via libxcb. The libxcb development package (headers, etc) must be +# present on your compilation machine for this to work. +# CFLAGS += -DUSE_XCB +# LIBS += -lxcb +# OBJS += xcbifce.o + WRTAIL = forth/wrapper WRDIR = ${BP}/${WRTAIL} ZIPTAIL = ${WRTAIL}/zip @@ -13,7 +18,7 @@ ZIPOBJS = zipmem.o deflate.o trees.o bits.o util.o inflate.o -OBJS = wrapper.o logger.o ${ZIPOBJS} xcbifce.o +OBJS += wrapper.o logger.o ${ZIPOBJS} all: forth x86forth ../build/inflate.bin Added: forth/wrapper/xcbifce.c =================================================================== --- forth/wrapper/xcbifce.c (rev 0) +++ forth/wrapper/xcbifce.c 2009-11-25 20:45:24 UTC (rev 1503) @@ -0,0 +1,166 @@ +// See license at end of file + +/* Simple XCB application drawing a box in a window */ + +#include <xcb/xcb.h> +#include <stdlib.h> + +xcb_connection_t *c; +xcb_screen_t *s; +xcb_window_t w; +xcb_gcontext_t g; +xcb_colormap_t colormap; + +uint32_t rgbcolor(uint16_t b, uint16_t g, uint16_t r) +{ + xcb_alloc_color_reply_t *rep; + + rep = xcb_alloc_color_reply (c, xcb_alloc_color (c, colormap, r<<8, g<<8, b<<8), NULL); + + return rep->pixel; +} + +uint32_t color565(uint32_t color) +{ + uint16_t r, g, b; + xcb_alloc_color_reply_t *rep; + +#if 0 + r = (color>>11) << 11; + g = ((color>>5) & 0x3f) << 10; + b = (color & 0x1f) << 11; + + rep = xcb_alloc_color_reply (c, xcb_alloc_color (c, colormap, r, g, b), NULL); + + return rep->pixel; +#else + r = (color>>11) << 3; + g = ((color>>5) & 0x3f) << 2; + b = (color & 0x1f) << 3; + + return (r<<16) | (g<<8) | b; +#endif +} + +void fill_rectangle(uint32_t height, uint32_t width, uint32_t y, uint32_t x, uint32_t color) +{ + uint32_t value[1]; + xcb_rectangle_t r; + + value[0] = color; + xcb_change_gc (c, g, XCB_GC_FOREGROUND, value); + + r.x = x; r.y = y; r.width = width; r.height = height; + + xcb_poly_fill_rectangle(c, w, g, 1, &r); + xcb_flush(c); +} + +int open_window(uint32_t height, uint32_t width) { + uint32_t mask; + uint32_t values[2]; + + /* open connection with the server */ + c = xcb_connect(NULL,NULL); + if (xcb_connection_has_error(c)) { + return -1; + } + + /* get the first screen */ + s = xcb_setup_roots_iterator( xcb_get_setup(c) ).data; + + colormap = s->default_colormap; + + /* create black graphics context */ + g = xcb_generate_id(c); + w = s->root; + mask = XCB_GC_FOREGROUND | XCB_GC_GRAPHICS_EXPOSURES; + values[0] = s->black_pixel; + values[1] = 0; + xcb_create_gc(c, g, w, mask, values); + + /* create window */ + w = xcb_generate_id(c); +/* + mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK; + values[0] = s->white_pixel; + values[1] = XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_KEY_PRESS; +*/ + mask = XCB_CW_BACK_PIXEL; + values[0] = s->white_pixel; + xcb_create_window(c, s->root_depth, w, s->root, + 0, 0, width, height, 1, + XCB_WINDOW_CLASS_INPUT_OUTPUT, s->root_visual, + mask, values); + + /* map (show) the window */ + xcb_map_window(c, w); + xcb_flush(c); + return 0; +} + +long close_window() +{ + xcb_disconnect(c); + return 0; +} + +#if 0 + +int main() +{ +#if 0 + xcb_generic_event_t *e; + + int done = 0; +#endif + + (void)open_window(900, 1200); + + fill_rectangle(60, 60, 20, 20, rgbcolor(0xff, 0, 0xff)); +#if 0 + /* event loop */ + while (!done && (e = xcb_wait_for_event(c))) { + switch (e->response_type & ~0x80) { + case XCB_EXPOSE: /* draw or redraw the window */ + fill_rectangle(60, 60, 20, 20, rgbcolor(0xff, 0, 0xff)); + break; + case XCB_KEY_PRESS: /* exit on key press */ + done = 1; + break; + } + free(e); + } +#endif + + sleep(10); + /* close connection to server */ + close_window(); + + return 0; +} +#endif + +// 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

r1502 - in cpu: ppc/Linux ppc/build x86/Linux
by svn＠openfirmware.info 25 Nov '09

25 Nov '09

Author: wmb Date: 2009-11-25 21:31:53 +0100 (Wed, 25 Nov 2009) New Revision: 1502 Modified: cpu/ppc/Linux/ cpu/ppc/build/ cpu/x86/Linux/ cpu/x86/Linux/Makefile cpu/x86/Linux/graphdev.fth Log: svn ignores Property changes on: cpu/ppc/Linux ___________________________________________________________________ Modified: svn:ignore - ppcforth.trace ppcforth + ppcforth.trace ppcforth forth Property changes on: cpu/ppc/build ___________________________________________________________________ Modified: svn:ignore - ppcforth build + ppcforth build *.tag Property changes on: cpu/x86/Linux ___________________________________________________________________ Modified: svn:ignore - forth x86forth ppcforth + forth x86forth ppcforth *.tag Modified: cpu/x86/Linux/Makefile =================================================================== --- cpu/x86/Linux/Makefile 2009-11-25 20:27:12 UTC (rev 1501) +++ cpu/x86/Linux/Makefile 2009-11-25 20:31:53 UTC (rev 1502) @@ -3,7 +3,8 @@ BP=../../.. CFLAGS = -O -g -m32 -DTARGET_X86 -# CFLAGS += -DUSE_XCB +CFLAGS += -DUSE_XCB +LIBS += -lxcb WRTAIL = forth/wrapper WRDIR = ${BP}/${WRTAIL} @@ -12,7 +13,7 @@ ZIPOBJS = zipmem.o deflate.o trees.o bits.o util.o inflate.o -OBJS = wrapper.o logger.o ${ZIPOBJS} +OBJS = wrapper.o logger.o ${ZIPOBJS} xcbifce.o all: forth x86forth ../build/inflate.bin @@ -21,7 +22,7 @@ # Use x86forth when you need to compile new dictionaries that will # run on x86 systems. forth: ${OBJS} - ${CC} -m32 -o $@ ${OBJS} + ${CC} -m32 -o $@ ${OBJS} ${LIBS} @ln -sf forth x86forth # Compile with -O0 because with GCC4, higher optimization levels cause the Modified: cpu/x86/Linux/graphdev.fth =================================================================== --- cpu/x86/Linux/graphdev.fth 2009-11-25 20:27:12 UTC (rev 1501) +++ cpu/x86/Linux/graphdev.fth 2009-11-25 20:31:53 UTC (rev 1502) @@ -1,8 +1,16 @@ purpose: Simulation of OFW graphics using X +[ifndef] screen-ih +dev / : open true ; : close ; dend +0 value screen-ih +: $call-screen screen-ih $call-method ; +[then] +[ifndef] show-state : show-state 2drop ; [then] + dev / new-device " xgraphics" device-name : open ( -- okay? ) d# 1200 d# 900 d# 392 syscall 2drop retval 0= ; +debug open : close ( -- ) d# 396 syscall ; : fill-rectangle ( color565 x y w h -- ) d# 404 syscall 4drop drop ;

1 0

r1501 - cpu/x86
by svn＠openfirmware.info 25 Nov '09

25 Nov '09

Author: wmb Date: 2009-11-25 21:27:12 +0100 (Wed, 25 Nov 2009) New Revision: 1501 Added: cpu/x86/adler32.fth Log: Added Adler32 checksum routine to source tree; unused at present. Added: cpu/x86/adler32.fth =================================================================== --- cpu/x86/adler32.fth (rev 0) +++ cpu/x86/adler32.fth 2009-11-25 20:27:12 UTC (rev 1501) @@ -0,0 +1,57 @@ +\ See license at end of file +purpose: Adler-32 checksum (used in zlib compression) + +code adler32 ( adr len -- adler ) + 0 [sp] bp xchg \ bp: len and save bp + 4 [sp] si xchg \ si: adr and save si + bp cx mov \ cx: len + di push \ Save di + d# 65521 # di mov \ MOD_ADLER + + bx bx xor \ A + bx inc \ bx: A=1 + bp bp xor \ bp: B=0 + begin + ax ax xor + al lods \ ax: data[index] + bx ax add \ ax: A + data[index] + dx dx xor \ Clear high word of dividend + di div \ Remainder in dx + dx bx mov \ bx: A = (A + data[index]) % MOD_ADLER + bx bp add \ bp: B + A + dx dx xor \ Clear high word of dividend + bp ax mov \ ax: low word of dividend + di div \ Remainder in dx + dx bp mov \ bp: B = (B + A) % MOD_ADLER + loopa + d# 16 # bp shl \ bp: (B << 16) + bp bx or \ bx: (B << 16) | A + di pop \ Restore di + bp pop \ Restore bp + si pop \ Restore si + bx push \ Return result +c; + +\ 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

r1500 - dev/hdaudio
by svn＠openfirmware.info 23 Nov '09

23 Nov '09

Author: wmb Date: 2009-11-23 05:06:06 +0100 (Mon, 23 Nov 2009) New Revision: 1500 Modified: dev/hdaudio/conexant.fth Log: OLPC trac 9701 - turn off speaker if headphones attached Modified: dev/hdaudio/conexant.fth =================================================================== --- dev/hdaudio/conexant.fth 2009-11-22 00:21:26 UTC (rev 1499) +++ dev/hdaudio/conexant.fth 2009-11-23 04:06:06 UTC (rev 1500) @@ -43,6 +43,11 @@ ; : cx2058x-enable-playback ( -- ) + h# 19 to node pin-sense? if \ headphones attached + h# 1f to node power-off \ turn off speaker + else \ no headphones + h# 1f to node power-on \ turn on speaker + then h# 10 to node h# 70640 cmd h# 20000 stream-format or cmd ; : cx2058x-disable-playback ( -- ) ;

1 0

r1499 - cpu/x86/build ofw/fcode
by svn＠openfirmware.info 22 Nov '09

22 Nov '09

Author: wmb Date: 2009-11-22 01:21:26 +0100 (Sun, 22 Nov 2009) New Revision: 1499 Modified: cpu/x86/build/builder.dic ofw/fcode/sysprims.fth Log: Added new FCode token "debug-me" for debugging FCode drivers. Modified: cpu/x86/build/builder.dic =================================================================== (Binary files differ) Modified: ofw/fcode/sysprims.fth =================================================================== --- ofw/fcode/sysprims.fth 2009-11-22 00:17:27 UTC (rev 1498) +++ ofw/fcode/sysprims.fth 2009-11-22 00:21:26 UTC (rev 1499) @@ -369,3 +369,5 @@ \ --- parsing argument strings v2 040 2 byte-code: left-parse-string ( adr len char -- adrR lenR adrL lenL ) + +v3 041 2 byte-code: debug-me

1 0

r1498 - dev/mmc/sdhci
by svn＠openfirmware.info 22 Nov '09

22 Nov '09

Author: wmb Date: 2009-11-22 01:17:27 +0100 (Sun, 22 Nov 2009) New Revision: 1498 Modified: dev/mmc/sdhci/sdhci.fth Log: OLPC trac 9729 - fixed race condition in SDHCI interrupt-wait logic. Modified: dev/mmc/sdhci/sdhci.fth =================================================================== --- dev/mmc/sdhci/sdhci.fth 2009-11-21 23:50:51 UTC (rev 1497) +++ dev/mmc/sdhci/sdhci.fth 2009-11-22 00:17:27 UTC (rev 1498) @@ -321,13 +321,22 @@ : wait ( mask -- ) h# 8000 or ( mask' ) begin ( mask ) - isr@ dup isr! ( mask isr ) - 2dup and 0= while ( mask isr ) + isr@ 2dup and ( mask isr mask&isr ) + 0= while ( mask isr ) \ key? if key drop debug-me then ( mask isr ) \ DMA interrupt - the transfer crossed an address boundary - 8 and if 0 cl@ 0 cl! then ( mask ) + 8 and if 0 cl@ 0 cl! 8 isr! then ( mask ) repeat ( mask isr ) - nip ( isr ) + + \ Only clear the bits we will handle this time. + \ If additional ISR bits are set, leave them set because + \ later code will be waiting for them. In practice, the + \ only such additional bit is the "data transfer complete" + \ bit - mask 2 - which "2 wait" will handle. + \ But we do go ahead and clear card removal/insertion + \ events, because we don't handle them elsewhere. + swap h# c0 or over and isr! ( isr ) + dup h# 8000 and if .sderror else drop then ( ) ; @@ -419,7 +428,14 @@ ; : deselect-card ( -- ) 0 h# 0700 0 cmd ; \ CMD7 - with null RCA -: select-card ( -- ) rca h# 071b 0 cmd ; \ CMD7 R1b +: select-card ( -- ) \ CMD7 R1b + rca h# 071b 0 cmd + \ In principle this shouldn't be necessary, but the Via VX855's SD + \ host controller incorrectly sets the "data transfer complete" bit + \ during CMD7 with nonzero RCA, and if you don't clear it, subsequent + \ commands sometimes fail with either Command Timeout or CRC error. + isr@ isr! +; : send-if-cond ( -- ) h# 1aa h# 081a 0 cmd ( response h# 1aa <> if ." Error" then ) ; \ CMD8 R7 (SD)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware November 2009