OpenBIOS September 2006

openbios@openbios.org

10 participants
22 discussions

More realistic serial init for Sparc32
by Blue Swirl 14 Sep '06

14 Sep '06

Hi, This patch makes the serial port initialisation more realistic. In addition to speed, set also the number of stop bits, size of character, and baud rate generator divisor. Also enable RTS and DTR. _________________________________________________________________ Express yourself instantly with MSN Messenger! Download today it's FREE! http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/

2 1

r84 - in openbios-devel: arch/sparc32 config/examples
by svn＠openbios.org 14 Sep '06

14 Sep '06

Author: stepan Date: 2006-09-14 17:08:45 +0200 (Thu, 14 Sep 2006) New Revision: 84 Modified: openbios-devel/arch/sparc32/console.c openbios-devel/config/examples/cross-sparc32_config.xml openbios-devel/config/examples/sparc32_config.xml Log: Blueswirl's serial patch Modified: openbios-devel/arch/sparc32/console.c =================================================================== --- openbios-devel/arch/sparc32/console.c 2006-09-14 15:06:38 UTC (rev 83) +++ openbios-devel/arch/sparc32/console.c 2006-09-14 15:08:45 UTC (rev 84) @@ -33,9 +33,17 @@ /* Write Register 3 */ #define RxENAB 0x1 /* Rx Enable */ +#define Rx8 0xc0 /* Rx 8 Bits/Character */ +/* Write Register 4 */ +#define SB1 0x4 /* 1 stop bit/char */ +#define X16CLK 0x40 /* x16 clock mode */ + /* Write Register 5 */ +#define RTS 0x2 /* RTS */ #define TxENAB 0x8 /* Tx Enable */ +#define Tx8 0x60 /* Tx 8 bits/character */ +#define DTR 0x80 /* DTR */ /* Write Register 14 (Misc control bits) */ #define BRENAB 1 /* Baud rate generator enable */ @@ -65,12 +73,10 @@ static void uart_init_line(int port, unsigned long baud) { - outb(3, CTRL(port)); // reg 3 - outb(RxENAB, CTRL(port)); // enable rx + outb(4, CTRL(port)); // reg 4 + outb(SB1 | X16CLK, CTRL(port)); // no parity, async, 1 stop + // bit, 16x clock - outb(5, CTRL(port)); // reg 5 - outb(TxENAB, CTRL(port)); // enable tx - baud = BPS_TO_BRG(baud, ZS_CLOCK / ZS_CLOCK_DIVISOR); outb(12, CTRL(port)); // reg 12 @@ -79,6 +85,15 @@ outb((baud >> 8) & 0xff, CTRL(port)); outb(14, CTRL(port)); // reg 14 outb(BRSRC | BRENAB, CTRL(port)); + + outb(3, CTRL(port)); // reg 3 + outb(RxENAB | Rx8, CTRL(port)); // enable rx, 8 bits/char + + outb(5, CTRL(port)); // reg 5 + outb(RTS | TxENAB | Tx8 | DTR, CTRL(port)); // enable tx, 8 + // bits/char, set + // RTS & DTR + } int uart_init(int port, unsigned long speed) Modified: openbios-devel/config/examples/cross-sparc32_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_config.xml 2006-09-14 15:06:38 UTC (rev 83) +++ openbios-devel/config/examples/cross-sparc32_config.xml 2006-09-14 15:08:45 UTC (rev 84) @@ -32,7 +32,7 @@ <option name="CONFIG_DEBUG_OBP" type="boolean" value="false"/> <option name="CONFIG_DEBUG_IOMMU" type="boolean" value="false"/> <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> - <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> + <option name="CONFIG_SERIAL_SPEED" type="integer" value="9600"/>  Modified: openbios-devel/config/examples/sparc32_config.xml =================================================================== --- openbios-devel/config/examples/sparc32_config.xml 2006-09-14 15:06:38 UTC (rev 83) +++ openbios-devel/config/examples/sparc32_config.xml 2006-09-14 15:08:45 UTC (rev 84) @@ -32,7 +32,7 @@ <option name="CONFIG_DEBUG_OBP" type="boolean" value="false"/> <option name="CONFIG_DEBUG_IOMMU" type="boolean" value="false"/> <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> - <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> + <option name="CONFIG_SERIAL_SPEED" type="integer" value="9600"/>

1 0

Fixes for 'int' use
by Blue Swirl 14 Sep '06

14 Sep '06

Hi, This patch contains some fixes to use of 'int' instead of cell types. I'm not totally confident about all changes, but at least Sparc32 works as before and Sparc64 unix version actually works! No disk found. No cdrom found Welcome to OpenBIOS v1.0RC1 built on Sep 9 2006 07:50 Type 'help' for detailed information [unix] Booting default not supported. 0 > show-devs fffff80000039cd0 / fffff80000039ea8 /aliases fffff80000039fd0 /openprom (BootROM) fffff8000003a288 /openprom/client-services fffff8000003a3b8 /options fffff8000003a498 /chosen fffff8000003a638 /builtin fffff8000003a760 /builtin/console fffff800000433a8 /packages fffff800000438e0 /packages/client-iface fffff80000044f90 /packages/disk-label fffff80000045750 /packages/cmdline fffff80000047408 /packages/deblocker fffff80000047a10 /packages/misc-files fffff80000047f40 /packages/sun-parts fffff80000045ad8 /pci (pci) fffff80000045e18 /pci/isa (isa) fffff800000465e8 /memory fffff80000046710 /cpus fffff80000046eb0 /unix fffff80000047048 /unix/block (unix-block) fffff80000048198 /unix/block/disk ok 0 > _________________________________________________________________ Express yourself instantly with MSN Messenger! Download today it's FREE! http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/

2 1

r83 - in openbios-devel: include/libc include/openbios kernel modules
by svn＠openbios.org 14 Sep '06

14 Sep '06

Author: stepan Date: 2006-09-14 17:06:38 +0200 (Thu, 14 Sep 2006) New Revision: 83 Modified: openbios-devel/include/libc/byteorder.h openbios-devel/include/openbios/bindings.h openbios-devel/kernel/cross.h openbios-devel/kernel/internal.c openbios-devel/modules/bindings.c openbios-devel/modules/deblocker.c openbios-devel/modules/disk-label.c openbios-devel/modules/filesystems.c Log: 64bit fixes from blueswirl Modified: openbios-devel/include/libc/byteorder.h =================================================================== --- openbios-devel/include/libc/byteorder.h 2006-09-05 19:46:20 UTC (rev 82) +++ openbios-devel/include/libc/byteorder.h 2006-09-14 15:06:38 UTC (rev 83) @@ -18,27 +18,45 @@ (__bswap32((x) & 0xffffffff) << 32) ) #ifdef CONFIG_LITTLE_ENDIAN +#define __cpu_to_le64(x) ((u64) (x)) +#define __le64_to_cpu(x) ((u64) (x)) #define __cpu_to_le32(x) ((u32) (x)) #define __le32_to_cpu(x) ((u32) (x)) #define __cpu_to_le16(x) ((u16) (x)) #define __le16_to_cpu(x) ((u16) (x)) +#define __cpu_to_be64(x) (__bswap64((u64) (x))) +#define __be64_to_cpu(x) (__bswap64((u64) (x))) #define __cpu_to_be32(x) (__bswap32((u32) (x))) #define __be32_to_cpu(x) (__bswap32((u32) (x))) #define __cpu_to_be16(x) (__bswap16((u16) (x))) #define __be16_to_cpu(x) (__bswap16((u16) (x))) #endif #ifdef CONFIG_BIG_ENDIAN +#define __cpu_to_le64(x) (__bswap64((u64) (x))) +#define __le64_to_cpu(x) (__bswap64((u64) (x))) #define __cpu_to_le32(x) (__bswap32((u32) (x))) #define __le32_to_cpu(x) (__bswap32((u32) (x))) #define __cpu_to_le16(x) (__bswap16((u16) (x))) #define __le16_to_cpu(x) (__bswap16((u16) (x))) +#define __cpu_to_be64(x) ((u64) (x)) +#define __be64_to_cpu(x) ((u64) (x)) #define __cpu_to_be32(x) ((u32) (x)) #define __be32_to_cpu(x) ((u32) (x)) #define __cpu_to_be16(x) ((u16) (x)) #define __be16_to_cpu(x) ((u16) (x)) #endif +#if BITS==32 +#define __becell_to_cpu(x) (__be32_to_cpu(x)) +#define __lecell_to_cpu(x) (__le32_to_cpu(x)) +#define __cpu_to_becell(x) (__cpu_to_be32(x)) +#define __cpu_to_lecell(x) (__cpu_to_le32(x)) +#else +#define __becell_to_cpu(x) (__be64_to_cpu(x)) +#define __lecell_to_cpu(x) (__le64_to_cpu(x)) +#define __cpu_to_becell(x) (__cpu_to_be64(x)) +#define __cpu_to_lecell(x) (__cpu_to_le64(x)) +#endif - #endif Modified: openbios-devel/include/openbios/bindings.h =================================================================== --- openbios-devel/include/openbios/bindings.h 2006-09-05 19:46:20 UTC (rev 82) +++ openbios-devel/include/openbios/bindings.h 2006-09-14 15:06:38 UTC (rev 83) @@ -61,8 +61,8 @@ extern void set_property( phandle_t ph, const char *name, const char *buf, int len ); extern void set_int_property( phandle_t ph, const char *name, - int val ); -extern int get_int_property( phandle_t ph, const char *name, + cell val ); +extern cell get_int_property( phandle_t ph, const char *name, int *retlen ); extern char *get_property( phandle_t ph, const char *name, int *retlen ); @@ -76,7 +76,7 @@ } /* forth bindings */ -extern int feval( const char *str ); +extern cell feval( const char *str ); extern void bind_xtfunc( const char *name, xt_t xt, ucell arg, void (*func)(void) ); extern void bind_func( const char *name, void (*func)(void) ); @@ -85,7 +85,7 @@ extern char *pop_fstr_copy( void ); extern int _fword( const char *word, xt_t *cache_xt ); -extern int _eword( const char *word, xt_t *cache_xt, int nargs ); +extern cell _eword( const char *word, xt_t *cache_xt, int nargs ); extern int _selfword( const char *method, xt_t *cache_xt ); extern int _parword( const char *method, xt_t *cache_xt ); Modified: openbios-devel/kernel/cross.h =================================================================== --- openbios-devel/kernel/cross.h 2006-09-05 19:46:20 UTC (rev 82) +++ openbios-devel/kernel/cross.h 2006-09-14 15:06:38 UTC (rev 83) @@ -84,7 +84,7 @@ #define unaligned_write_long(addr, value) \ unaligned_write_word(addr, value & 0xffff); \ - unaligned_write_word(addr, value >> 16) + unaligned_write_word(addr + 2, value >> 16) #endif @@ -100,7 +100,7 @@ #define unaligned_write_long(addr, value) \ unaligned_write_word(addr, value >> 16); \ - unaligned_write_word(addr, value & 0xffff) + unaligned_write_word(addr + 2, value & 0xffff) #endif /* bit width handling */ Modified: openbios-devel/kernel/internal.c =================================================================== --- openbios-devel/kernel/internal.c 2006-09-05 19:46:20 UTC (rev 82) +++ openbios-devel/kernel/internal.c 2006-09-14 15:06:38 UTC (rev 83) @@ -115,14 +115,14 @@ static void docon(void) { /* DOCON */ - ucell tmp = read_cell(cell2pointer(read_ucell(cell2pointer(PC)) + sizeof(ucell))); + ucell tmp = read_ucell(cell2pointer(read_ucell(cell2pointer(PC)) + sizeof(ucell))); PUSH(tmp); dbg_interp_printk("docon: PC=%x, value=%x\n", PC, tmp); } static void dovar(void) { /* DOVAR */ - ucell tmp = read_cell(cell2pointer(PC)) + sizeof(ucell); + ucell tmp = read_ucell(cell2pointer(PC)) + sizeof(ucell); PUSH(tmp); /* returns address to variable */ dbg_interp_printk("dovar: PC: %x, %x\n", PC, tmp); } Modified: openbios-devel/modules/bindings.c =================================================================== --- openbios-devel/modules/bindings.c 2006-09-05 19:46:20 UTC (rev 82) +++ openbios-devel/modules/bindings.c 2006-09-14 15:06:38 UTC (rev 83) @@ -33,18 +33,18 @@ } /* WARNING: sloooow - AVOID */ -int +cell feval( const char *str ) { push_str( str ); return eword("evaluate", 2); } -int +cell _eword( const char *word, xt_t *cache_xt, int nargs ) { static xt_t catch_xt = 0; - int ret = -1; + cell ret = -1; if( !catch_xt ) catch_xt = findword("catch"); @@ -285,10 +285,10 @@ } void -set_int_property( phandle_t ph, const char *name, int val ) +set_int_property( phandle_t ph, const char *name, cell val ) { - int swapped=__cpu_to_be32(val); - set_property( ph, name, (char*)&swapped, 4 ); + cell swapped=__cpu_to_becell(val); + set_property( ph, name, (char*)&swapped, sizeof(cell) ); } char * @@ -310,14 +310,14 @@ return (char*)POP(); } -int +cell get_int_property( phandle_t ph, const char *name, int *retlen ) { - int *p; + cell *p; - if( !(p=(int*)get_property(ph, name, retlen)) ) + if( !(p=(cell *)get_property(ph, name, retlen)) ) return 0; - return *p; + return __becell_to_cpu(*p); } @@ -423,7 +423,7 @@ static void call1_func( void ) { - void (*func)(int v); + void (*func)(cell v); func = (void*)POP(); (*func)( POP() ); Modified: openbios-devel/modules/deblocker.c =================================================================== --- openbios-devel/modules/deblocker.c 2006-09-05 19:46:20 UTC (rev 82) +++ openbios-devel/modules/deblocker.c 2006-09-14 15:06:38 UTC (rev 83) @@ -20,7 +20,7 @@ #include "modules.h" typedef struct { - ullong mark; + ducell mark; xt_t read_xt; xt_t write_xt; @@ -70,14 +70,14 @@ static void deblk_seek( deblk_info_t *di ) { - uint pos_hi = POP(); - uint pos_lo = POP(); - ullong mark = ((ullong)pos_hi << 32) | pos_lo; + ucell pos_hi = POP(); + ucell pos_lo = POP(); + ducell mark = ((ducell)pos_hi << BITS) | pos_lo; /* printk("deblk_seek %x %08x\n", pos_hi, pos_lo ); */ /* -1 means seek to EOF (at least in our implementation) */ - if( (llong)mark == -1 ) + if( (dcell)mark == -1 ) RET(-1); di->mark = mark; @@ -102,7 +102,7 @@ int nblks; /* byte operation */ - int offs; + cell offs; int len; char *data; /* start of data */ } work_t; Modified: openbios-devel/modules/disk-label.c =================================================================== --- openbios-devel/modules/disk-label.c 2006-09-05 19:46:20 UTC (rev 82) +++ openbios-devel/modules/disk-label.c 2006-09-14 15:06:38 UTC (rev 83) @@ -22,8 +22,8 @@ typedef struct { int fd; - ullong offs; - ullong size; + ducell offs; + ducell size; int type; /* partition type or -1 */ ihandle_t part_ih; Modified: openbios-devel/modules/filesystems.c =================================================================== --- openbios-devel/modules/filesystems.c 2006-09-05 19:46:20 UTC (rev 82) +++ openbios-devel/modules/filesystems.c 2006-09-14 15:06:38 UTC (rev 83) @@ -203,7 +203,7 @@ files_seek( files_info_t *mi ) { llong pos = DPOP(); - int ret; + cell ret; if( mi->file ) { int offs = (int)pos;

1 0

Re: [OpenBIOS] Update: Tokenizer Version 1.00.01 is on its way!
by Stefan Reinauer 14 Sep '06

14 Sep '06

* David L Paktor <dlpaktor(a)us.ibm.com> [060909 01:01]: > I changed the Test Suite to fill those gaps (there are now 167 tests, as > counted by the AutoExec script) and removed the dead routines (except for one I > believe should remain for possible future use -- read the top of the Data Stack > without popping it off). I also fine-tuned some error detection in > "User-defined command-line compilation-control symbols" (when attempting to > access a defined value, distinguish between the case where no value is assigned > to the symbol versus where the symbol is altogether undefined; and identify > multiple definitions of the same symbol). Can you please send me this new test suite? I received a bunch of files for a new tokenizer, which I put online, but not the test suite. > And, as we spoke, I bumped the version number to 1.0.01 Lets stick with 1.0.1, but I'll change that in the internal tree. Please, for future submissions, use the current version of the fcode utilities from subversion. This greatly reduces the file fiddling work for merges and allows to include and publish the code a lot quicker. Stefan -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/

1 0

Update: Tokenizer Version 1.00.01 is on its way!
by David L Paktor 09 Sep '06

09 Sep '06

Stefan Reinauer <stepan(a)coresystems.de> wrote on Fri Aug 18 17:43:44 CEST 2006 > * Stefan Reinauer <stepan(a)coresystems.de> [060818 17:06]: > . . . . . > > For a quick test I ran a coverage test with our new and shiny test suite > and here's the results: > > Code covered: 95.9 % > > That is pretty damn good for a first run. Even if it was a safety > critical applications. > > The whole coverage report can be checked here: > http://openbios.org/~stepan/toke/coverage/fcode-utils/toke/index.html > > As you can clearly see most of the files only have their panic code > uncovered. Which is pretty normal. Only whats wrong with strsubvocab.c > ;-) > > David, thank you very much for this high quality contribution. > > Stefan > > -- > coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. > Tel.: +49 761 7668825 • Fax: +49 761 7664613 > Email: info(a)coresystems.de • http://www.coresystems.de/ Stefan Reinauer <stepan(a)coresystems.de> wrote on 09/05/2006 12:04:09 PM: > Dear David, > > thank you for the conference call and the nice conversation. > > Please go ahead and send the next round of toke files with a > bumped version number, so that people can see the progress being made. > > I will merge the changes into the new tree. > > Stefan I have completed the changes we discussed and will be sending them to you separately. The coverage report identified several areas of "dead code" (most notably in strsubvocab.c ) as well as a few cases that weren't covered in the Test Suite. I changed the Test Suite to fill those gaps (there are now 167 tests, as counted by the AutoExec script) and removed the dead routines (except for one I believe should remain for possible future use -- read the top of the Data Stack without popping it off). I also fine-tuned some error detection in "User-defined command-line compilation-control symbols" (when attempting to access a defined value, distinguish between the case where no value is assigned to the symbol versus where the symbol is altogether undefined; and identify multiple definitions of the same symbol). And, as we spoke, I bumped the version number to 1.0.01 I then ran my own coverage test; it showed a satisfactory improvement. I will not be sending you my results; your independent confirmation would be preferable. One other thing I'd like to request. I think the Coverage Report is a Very Good Thing: it deserves to be displayed prominently, not just mentioned in an item in the Mail Archives. When you complete your coverage test, could you open up an additional section -- like the sections for "Unit-Test Suite" and "Unit-Test Suite Logs" -- for it, at the end of the "OpenBIOS - FCode suite" page? Thanks. ----- David L. Paktor System Firmware Developer System and Technology Group Global Firmware Division dlpaktor(a)us.ibm.com David L Paktor/Almaden/IBM@IBMUS 18880 Homestead Rd. Building 9945 Cupertino CA 95014 Room 1026 408-342-6110 T/L 560-6110 "The Bug Stops Here"

1 0

Sparc32 SMP fix
by Blue Swirl 06 Sep '06

06 Sep '06

Hi, This patch fixes SMP booting: Entering SMP Mode... Starting CPU 1 at f01e46e4 Calibrating delay loop... 180.63 BogoMIPS Starting CPU 2 at f01e46f0 Calibrating delay loop... 181.86 BogoMIPS Starting CPU 3 at f01e46fc Calibrating delay loop... 182.68 BogoMIPS Total of 4 Processors activated (721.71 BogoMIPS). Though depending on version Linux usually hangs later. Please apply. _________________________________________________________________ FREE pop-up blocking with the new MSN Toolbar - get it now! http://toolbar.msn.click-url.com/go/onm00200415ave/direct/01/

2 2

Re: [OpenBIOS] USB bootloader
by Stefan Reinauer 05 Sep '06

05 Sep '06

* Al Boldi <a1426z(a)gawab.com> [060904 20:58]: > FILO version 0.5 .... > Can't get memory map from firmware. Using hardcoded default. > Press ... > boot: uda1:/vmlinuz > LinuxLabs USB bootloader > New USB device, setting address 2 (repeats 1-4 times) > boot: uda1:/vmlinuz > LinuxLabs USB bootloader > Out of heap space Please try increasing the heap space in i386/ldscript by changing the following lines: /* 16KB heap and stack */ HEAP_SIZE = 16384; to /* 32KB heap and 16K stack */ HEAP_SIZE = 32768; > And, how can filo 0.5 be fixed to boot USB? If the message stays, try all the way up to 262144. Regards, Stefan -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/

1 0

[RFC] FCode suite
by Stefan Reinauer 05 Sep '06

05 Sep '06

Dear OpenBIOS community, its been a while now since the last update of the OpenBIOS FCode suite containing the FCode utilities Toke and Detok. Since we want to permanently improve the tool chain to make it usable for your needs, we are looking for folks out there who have used toke and detok. Please contact me, on this list or privately, so we can find out how to improve the tools further. As a reminder: check out the latest FCode suite source code with: svn co svn://openbios.org/openbios/fcode-utils Thank you. Stefan -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/

1 0

r82 - openbios-devel/drivers
by svn＠openbios.org 05 Sep '06

05 Sep '06

Author: stepan Date: 2006-09-05 21:46:20 +0200 (Tue, 05 Sep 2006) New Revision: 82 Modified: openbios-devel/drivers/obio.c Log: From: Blue Swirl <blueswir1(a)hotmail.com> This patch fixes SMP booting: Entering SMP Mode... Starting CPU 1 at f01e46e4 Calibrating delay loop... 180.63 BogoMIPS Starting CPU 2 at f01e46f0 Calibrating delay loop... 181.86 BogoMIPS Starting CPU 3 at f01e46fc Calibrating delay loop... 182.68 BogoMIPS Total of 4 Processors activated (721.71 BogoMIPS). Though depending on version Linux usually hangs later. Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2006-09-05 19:44:40 UTC (rev 81) +++ openbios-devel/drivers/obio.c 2006-09-05 19:46:20 UTC (rev 82) @@ -450,7 +450,7 @@ push_str("mask_rev"); fword("property"); - PUSH(i << 3); + PUSH(i); fword("encode-int"); push_str("mid"); fword("property"); @@ -625,9 +625,9 @@ if (!cpu) return -1; - nvram[0x38] = pc; - nvram[0x3c] = context_ptr; - nvram[0x40] = context; + *(uint32_t *)&nvram[0x38] = pc; + *(uint32_t *)&nvram[0x3c] = context_ptr; + *(uint32_t *)&nvram[0x40] = context; nvram[0x2e] = cpu & 0xff; intregs->cpu_intregs[cpu].set = SUN4M_SOFT_INT(14);

1 0