OpenBIOS January 2009

openbios@openbios.org

14 participants
148 discussions

r407 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 15 Jan '09

15 Jan '09

Author: laurent Date: 2009-01-15 00:25:41 +0100 (Thu, 15 Jan 2009) New Revision: 407 Modified: openbios-devel/arch/ppc/qemu/methods.c Log: PowerPC: Fix milliseconds prom call The current implementation of the milliseconds prom call on PowerPC is totally buggy: - The timer frequency returned by get_timer_freq() does not correspond to the timer which is read. - The dividend and the divisor of the division are swapped - If called very often, this function is not precise - Depending on the timer frequency and of the frequency of the calls, the variable overflow after a few dozen of seconds. Please find in this patch a totally new implementation. This fixes the problem observed with the quik when a timeout is defined. The timer frequency is defined using #define, I wonder if there is a better place to put it. It reads both low and high part of the timer to make sure there is no overflow. It also removes the function that returns 0 on the first call as this is not needed according to IEEE 1275-1994. Finally it computes the real value of the timer each time, instead of adding a small value to a variable at each function calls, in order to get a correct precision if this method is call very often. (Aurelien Jarno) Modified: openbios-devel/arch/ppc/qemu/methods.c =================================================================== --- openbios-devel/arch/ppc/qemu/methods.c 2009-01-13 20:24:52 UTC (rev 406) +++ openbios-devel/arch/ppc/qemu/methods.c 2009-01-14 23:25:41 UTC (rev 407) @@ -122,19 +122,28 @@ } /* ( -- ms ) */ +#define TIMER_FREQUENCY 16600000ULL + static void ciface_milliseconds( ulong args[], ulong ret[] ) { - extern unsigned long get_timer_freq(void); - static ulong mticks=0, usecs=0; - ulong t; + ulong tbu, tbl, temp; + ullong ticks, msecs; - asm volatile("mftb %0" : "=r" (t) : ); - if( mticks ) - usecs += get_timer_freq() / 1000000 * ( t-mticks ); - mticks = t; + asm volatile( + "1:\n" + "mftbu %2\n" + "mftb %0\n" + "mftbu %1\n" + "cmpw %2,%1\n" + "bne 1b\n" + : "=r"(tbl), "=r"(tbu), "=r"(temp) + : + : "cc"); - PUSH( usecs/1000 ); + ticks = (((ullong)tbu) << 32) | (ullong)tbl; + msecs = (1000 * ticks) / TIMER_FREQUENCY; + PUSH( msecs ); }

1 0

Re: [OpenBIOS] sparc64's get_physical_address_code should not fault on TTE's with V=0
by Jakub Jermar 14 Jan '09

14 Jan '09

Blue Swirl wrote: > On 1/12/09, Jakub Jermar <jakub(a)jermar.eu> wrote: >> Hi, >> >> when I make the following change to helper.c, get_physical_address_code: >> >> - // ctx match, vaddr match? >> + // ctx match, vaddr match, valid? >> if (env->dmmuregs[1] == (env->itlb_tag[i] & 0x1fff) && >> - (address & mask) == (env->itlb_tag[i] & ~0x1fffULL)) { >> - // valid, access ok? >> - if ((env->itlb_tte[i] & 0x8000000000000000ULL) == 0 || >> - ((env->itlb_tte[i] & 0x4) && is_user)) { >> + (address & mask) == (env->itlb_tag[i] & ~0x1fffULL) && >> + env->itlb_tte[i] & 0x8000000000000000ULL) { >> + // access ok? >> + if ((env->itlb_tte[i] & 0x4) && is_user) { >> >> HelenOS gets a little bit further than without this change and seems >> to panic more or less gracefully later. >> >> In short, non-valid entries should be skipped by the loop in >> get_physical_address_code instead of causing TFAULT, because >> the ITLB can contain a valid entry for the same address. The >> same is true for DTLB. >> >> Can you confirm this? > > Yes, this looks correct. I'll apply a fix. Thanks! With this fix in place, HelenOS most of the time panics on: Kernel panic: Cannot find property 'screen'. I.e. it searches property 'screen' in /aliases and doesn't find any. If it is not there already, could you please add it (together with keyboard) to openbios? Thanks, Jakub

2 3

r406 - in openbios-devel: arch/ppc/qemu drivers
by svn＠openbios.org 13 Jan '09

13 Jan '09

Author: laurent Date: 2009-01-13 21:24:52 +0100 (Tue, 13 Jan 2009) New Revision: 406 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/drivers/escc.c Log: CONFIG_SERIAL_PORT to 0 select ch-a (0x20 offset), other value select ch-b (0x00 offset). Idea from Blue Swirl Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2009-01-13 20:07:43 UTC (rev 405) +++ openbios-devel/arch/ppc/qemu/init.c 2009-01-13 20:24:52 UTC (rev 406) @@ -148,7 +148,7 @@ isa_io_base = arch->io_base; - uart_init(0x80013000ULL + CONFIG_SERIAL_PORT * 0x20, + uart_init(0x80013000ULL + (CONFIG_SERIAL_PORT ? 0 : 0x20), CONFIG_SERIAL_SPEED); printk("\n"); Modified: openbios-devel/drivers/escc.c =================================================================== --- openbios-devel/drivers/escc.c 2009-01-13 20:07:43 UTC (rev 405) +++ openbios-devel/drivers/escc.c 2009-01-13 20:24:52 UTC (rev 406) @@ -443,6 +443,6 @@ escc_add_channel(buf, "b", addr, 0); serial_dev = (unsigned char *)addr + IO_ESCC_OFFSET + - 0x20 * CONFIG_SERIAL_PORT; + (CONFIG_SERIAL_PORT ? 0 : 0x20); } #endif

1 0

Re: [OpenBIOS] [PATCH] Don't try to start Quik from hard disk ifbooting from theCD-ROM
by laurent＠lvivier.info 13 Jan '09

13 Jan '09

>Index: arch/ppc/qemu/main.c >=================================================================== >--- arch/ppc/qemu/main.c (révision 396) >+++ arch/ppc/qemu/main.c (copie de travail) >@@ -266,6 +266,10 @@ > } u; > phandle_t ph; > >+ /* Quik can only boot from a hard-disk */ >+ if (nvram_read(0x34) == 'd') >+ return; >+ Could you put this outside of the quik_startup() function ? I'd like to have only quik code inside (no nvram access). Regards, Laurent

3 2

r405 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 13 Jan '09

13 Jan '09

Author: laurent Date: 2009-01-13 21:07:43 +0100 (Tue, 13 Jan 2009) New Revision: 405 Modified: openbios-devel/arch/ppc/qemu/main.c Log: Don't try to start Quik from hard disk if booting from the CD-ROM (Aurelien Jarno) Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2009-01-13 20:02:40 UTC (rev 404) +++ openbios-devel/arch/ppc/qemu/main.c 2009-01-13 20:07:43 UTC (rev 405) @@ -393,8 +393,13 @@ void boot( void ) { + char boot_device = nvram_read(0x34); fword("update-chosen"); - check_preloaded_kernel(); - quik_startup(); + if (boot_device == 'm') { + check_preloaded_kernel(); + } + if (boot_device == 'c') { + quik_startup(); + } yaboot_startup(); }

1 0

Re: [OpenBIOS] [PATCH v2] use the kernel arguments when using -kernel-append
by laurent＠lvivier.info 13 Jan '09

13 Jan '09

>Please find a new version of the patch below, that verifies that a >command line has been given by qemu before defining the bootargs >property. > >Index: arch/ppc/qemu/main.c >=================================================================== >--- arch/ppc/qemu/main.c (révision 398) >+++ arch/ppc/qemu/main.c (copie de travail) >@@ -364,18 +368,24 @@ > > static void check_preloaded_kernel(void) > { >- unsigned long kernel_image, kernel_size, cmdline; >+ unsigned long kernel_image, kernel_size; > unsigned long initrd_image, initrd_size; >+ unsigned long cmdline, cmdline_len; > > kernel_size = nvram_read_be32(0x3c); > if (kernel_size) { > kernel_image = nvram_read_be32(0x38); > cmdline = nvram_read_be32(0x40); >+ cmdline_len = nvram_read_be32(0x44); > initrd_image = nvram_read_be32(0x48); > initrd_size = nvram_read_be32(0x4c); > printk("[ppc] Kernel already loaded (0x%8.8lx + 0x%8.8lx) " > "(initrd 0x%8.8lx + 0x%8.8lx)\n", > kernel_image, kernel_size, initrd_image, initrd_size); >+ if (cmdline_len > 0) { >+ phandle_t ph = find_dev("/chosen"); >+ set_property(ph, "bootargs", cmdline, cmdline_len + 1); Could you check "warnings" in your build.log ? Regards, Laurent

3 2

r404 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 13 Jan '09

13 Jan '09

Author: laurent Date: 2009-01-13 21:02:40 +0100 (Tue, 13 Jan 2009) New Revision: 404 Modified: openbios-devel/arch/ppc/qemu/main.c Log: use the kernel arguments when using -kernel-append (Aurelien Jarno) Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2009-01-13 19:54:29 UTC (rev 403) +++ openbios-devel/arch/ppc/qemu/main.c 2009-01-13 20:02:40 UTC (rev 404) @@ -364,18 +364,24 @@ static void check_preloaded_kernel(void) { - unsigned long kernel_image, kernel_size, cmdline; + unsigned long kernel_image, kernel_size; unsigned long initrd_image, initrd_size; + unsigned long cmdline, cmdline_len; kernel_size = nvram_read_be32(0x3c); if (kernel_size) { kernel_image = nvram_read_be32(0x38); cmdline = nvram_read_be32(0x40); + cmdline_len = nvram_read_be32(0x44); initrd_image = nvram_read_be32(0x48); initrd_size = nvram_read_be32(0x4c); printk("[ppc] Kernel already loaded (0x%8.8lx + 0x%8.8lx) " "(initrd 0x%8.8lx + 0x%8.8lx)\n", kernel_image, kernel_size, initrd_image, initrd_size); + if (cmdline_len > 0) { + phandle_t ph = find_dev("/chosen"); + set_property(ph, "bootargs", strdup((char *)cmdline), cmdline_len + 1); + } call_elf(initrd_image, initrd_size, kernel_image); } }

1 0

r403 - in openbios-devel: include/openbios modules
by svn＠openbios.org 13 Jan '09

13 Jan '09

Author: blueswirl Date: 2009-01-13 20:54:29 +0100 (Tue, 13 Jan 2009) New Revision: 403 Modified: openbios-devel/include/openbios/bindings.h openbios-devel/modules/bindings.c Log: Fix warning about shadowing Modified: openbios-devel/include/openbios/bindings.h =================================================================== --- openbios-devel/include/openbios/bindings.h 2009-01-13 19:31:14 UTC (rev 402) +++ openbios-devel/include/openbios/bindings.h 2009-01-13 19:54:29 UTC (rev 403) @@ -69,8 +69,9 @@ /* device tree iteration */ extern phandle_t dt_iter_begin( void ); -extern phandle_t dt_iterate( phandle_t last ); -extern phandle_t dt_iterate_type( phandle_t last, const char *type ); +extern phandle_t dt_iterate( phandle_t last_tree ); +extern phandle_t dt_iterate_type( phandle_t last_tree, + const char *type ); static inline phandle_t dt_find_type( const char *type ) { return dt_iterate_type( 0, type ); } Modified: openbios-devel/modules/bindings.c =================================================================== --- openbios-devel/modules/bindings.c 2009-01-13 19:31:14 UTC (rev 402) +++ openbios-devel/modules/bindings.c 2009-01-13 19:54:29 UTC (rev 403) @@ -374,29 +374,29 @@ } phandle_t -dt_iterate( phandle_t last ) +dt_iterate( phandle_t last_tree ) { - if( !last ) + if( !last_tree ) return dt_iter_begin(); - PUSH_ph( last ); + PUSH_ph( last_tree ); fword("iterate-tree"); return POP_ph(); } phandle_t -dt_iterate_type( phandle_t last, const char *type ) +dt_iterate_type( phandle_t last_tree, const char *type ) { - if( !last ) - last = dt_iter_begin(); + if( !last_tree ) + last_tree = dt_iter_begin(); /* root node is never matched but we don't care about that */ - while( (last=dt_iterate(last)) ) { - char *s = get_property( last, "device_type", NULL ); + while( (last_tree = dt_iterate(last_tree)) ) { + char *s = get_property( last_tree, "device_type", NULL ); if( s && !strcmp(type, s) ) break; } - return last; + return last_tree; }

1 0

r402 - openbios-devel/arch/unix
by svn＠openbios.org 13 Jan '09

13 Jan '09

Author: blueswirl Date: 2009-01-13 20:31:14 +0100 (Tue, 13 Jan 2009) New Revision: 402 Modified: openbios-devel/arch/unix/unix.c Log: Fix Sparc64 native unix build Modified: openbios-devel/arch/unix/unix.c =================================================================== --- openbios-devel/arch/unix/unix.c 2009-01-13 17:40:00 UTC (rev 401) +++ openbios-devel/arch/unix/unix.c 2009-01-13 19:31:14 UTC (rev 402) @@ -61,6 +61,8 @@ #ifdef CONFIG_PPC uint32_t isa_io_base; +#elif defined(CONFIG_SPARC64) +unsigned long isa_io_base; #endif int errno_int; /* implement for fs drivers, needed to build on Mac OS X */

1 0

[PATCH] fix ppc native build
by Aurelien Jarno 13 Jan '09

13 Jan '09

The patch belows changes ppc/io.h the same way as sparc32/io.h to correctly define in* and out* functions for the unix build. Without it gcc outputs the following error messages and bails out: arch/unix/unix.c:156: error: no previous prototype for ‘inb’ arch/unix/unix.c:168: error: no previous prototype for ‘inw’ arch/unix/unix.c:180: error: no previous prototype for ‘inl’ arch/unix/unix.c:192: error: no previous prototype for ‘outb’ arch/unix/unix.c:205: error: no previous prototype for ‘outw’ arch/unix/unix.c:217: error: no previous prototype for ‘outl’ Index: include/ppc/io.h =================================================================== --- include/ppc/io.h (révision 399) +++ include/ppc/io.h (copie de travail) @@ -141,6 +141,23 @@ ns--; } } +#else /* BOOTSTRAP */ +#ifdef FCOMPILER +#define inb(reg) ((u8)0xff) +#define inw(reg) ((u16)0xffff) +#define inl(reg) ((u32)0xffffffff) +#define outb(reg, val) do{} while(0) +#define outw(reg, val) do{} while(0) +#define outl(reg, val) do{} while(0) +#else +extern u8 inb(u32 reg); +extern u16 inw(u32 reg); +extern u32 inl(u32 reg); +extern void insw(u32 reg, void *addr, unsigned long count); +extern void outb(u32 reg, u8 val); +extern void outw(u32 reg, u16 val); +extern void outl(u32 reg, u32 val); +extern void outsw(u32 reg, const void *addr, unsigned long count); #endif - +#endif #endif /* _ASM_IO_H */ -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32(a)debian.org | aurelien(a)aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net

2 1

← Newer
1
2
3
4
5
6
7
8
9
...
15
Older →

Jump to page: