- OpenBIOS - mail.coreboot.org

r282 - in openbios-devel: drivers modules
by svn＠openbios.org 05 Dec '08

05 Dec '08

Author: blueswirl Date: 2008-12-05 19:32:39 +0100 (Fri, 05 Dec 2008) New Revision: 282 Modified: openbios-devel/drivers/build.xml openbios-devel/drivers/pci.c openbios-devel/modules/video.c Log: Misc VGA fixes (Laurent Vivier) Modified: openbios-devel/drivers/build.xml =================================================================== --- openbios-devel/drivers/build.xml 2008-12-05 18:31:27 UTC (rev 281) +++ openbios-devel/drivers/build.xml 2008-12-05 18:32:39 UTC (rev 282) @@ -14,6 +14,7 @@ <object source="obio.c" condition="DRIVER_OBIO"/> <object source="vga_load_regs.c" condition="DRIVER_VGA"/> <object source="vga_set_mode.c" condition="DRIVER_VGA"/> + <object source="vga_vbe.c" condition="DRIVER_VGA"/> </library> <dictionary name="openbios" target="forth"> Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-12-05 18:31:27 UTC (rev 281) +++ openbios-devel/drivers/pci.c 2008-12-05 18:32:39 UTC (rev 282) @@ -305,11 +305,9 @@ static int vga_config_cb (const pci_config_t *config) { -#if 0 if (config->regions[0] != 0x00000000) vga_vbe_init(config->path, config->regions[0], config->sizes[0], config->regions[1], config->sizes[1]); -#endif return 0; } Modified: openbios-devel/modules/video.c =================================================================== --- openbios-devel/modules/video.c 2008-12-05 18:31:27 UTC (rev 281) +++ openbios-devel/modules/video.c 2008-12-05 18:32:39 UTC (rev 282) @@ -148,7 +148,7 @@ while( ww-- ) *p++ = col; } else { - char *p = (char*)pp + x; + char *p = (ushort*)pp + x; while( ww-- ) *p++ = col; } @@ -181,6 +181,10 @@ dac[1] = ((color >> 8) & 0xff) << 24; // Green dac[1] = (color & 0xff) << 24; // Blue } +#else + vga_set_color(ind, ((color >> 16) & 0xff), + ((color >> 8) & 0xff), + (color & 0xff)); #endif } @@ -278,14 +282,7 @@ PUSH(len); } -static void -video_open(void) -{ - RET(-1); -} - NODE_METHODS( video ) = { - {"open", video_open }, {"dimensions", video_dimensions }, {"set-colors", video_set_colors }, {"fill-rectangle", video_fill_rect },

1 0

r281 - in openbios-devel: arch/ppc/qemu arch/sparc32 arch/x86 arch/x86/xbox include/openbios modules
by svn＠openbios.org 05 Dec '08

05 Dec '08

Author: blueswirl Date: 2008-12-05 19:31:27 +0100 (Fri, 05 Dec 2008) New Revision: 281 Modified: openbios-devel/arch/ppc/qemu/console.c openbios-devel/arch/sparc32/console.c openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/sparc32/openbios.h openbios-devel/arch/x86/openbios.c openbios-devel/arch/x86/xbox/console.c openbios-devel/include/openbios/drivers.h openbios-devel/modules/console.c openbios-devel/modules/video.c Log: Initialize VGA from PCI configuration (Laurent Vivier) Modified: openbios-devel/arch/ppc/qemu/console.c =================================================================== --- openbios-devel/arch/ppc/qemu/console.c 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/arch/ppc/qemu/console.c 2008-12-05 18:31:27 UTC (rev 281) @@ -138,20 +138,6 @@ #include "../../../modules/video.c" #include "../../../modules/console.c" -static uint32_t vga_phys_mem; -static int vga_width, vga_height, vga_depth; - -int Qemu_GetFBInfo( osi_fb_info_t *fb ) -{ - fb->mphys = vga_phys_mem; - fb->w = vga_width; - fb->h = vga_height; - fb->depth = vga_depth; - fb->rb = fb->w * ((fb->depth + 7) / 8); - - return 0; -} - /* ****************************************************************** * common functions, implementing simple concurrent console * ****************************************************************** */ Modified: openbios-devel/arch/sparc32/console.c =================================================================== --- openbios-devel/arch/sparc32/console.c 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/arch/sparc32/console.c 2008-12-05 18:31:27 UTC (rev 281) @@ -141,7 +141,7 @@ #define DAC_BASE 0x00200000ULL #define DAC_SIZE 16 -static unsigned char *vmem; +unsigned char *vmem; static volatile uint32_t *dac; typedef struct osi_fb_info { @@ -149,19 +149,6 @@ int rb, w, h, depth; } osi_fb_info_t; -static int TCX_GetFBInfo( osi_fb_info_t *fb ) -{ - fb->w = 1024; - fb->h = 768; - fb->depth = 8; - fb->rb = 1024; - fb->mphys = (unsigned long)vmem; - - return 0; -} - -#define openbios_GetFBInfo(x) TCX_GetFBInfo(x) - #include "../../modules/video.c" #include "../../modules/console.c" Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/arch/sparc32/openbios.c 2008-12-05 18:31:27 UTC (rev 281) @@ -122,7 +122,7 @@ #endif #ifdef CONFIG_DRIVER_SBUS #ifdef CONFIG_DEBUG_CONSOLE_VIDEO - init_video(); + init_video((unsigned long)vmem, 1024, 768, 8, 1024); #endif ob_sbus_init(hwdef->iommu_base + 0x1000ULL, qemu_machine_type); #endif Modified: openbios-devel/arch/sparc32/openbios.h =================================================================== --- openbios-devel/arch/sparc32/openbios.h 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/arch/sparc32/openbios.h 2008-12-05 18:31:27 UTC (rev 281) @@ -20,6 +20,7 @@ int openbios(void); /* console.c */ +extern unsigned char *vmem; extern void cls(void); #ifdef CONFIG_DEBUG_CONSOLE extern int uart_init(uint64_t port, unsigned long speed); Modified: openbios-devel/arch/x86/openbios.c =================================================================== --- openbios-devel/arch/x86/openbios.c 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/arch/x86/openbios.c 2008-12-05 18:31:27 UTC (rev 281) @@ -51,7 +51,7 @@ ob_floppy_init(); #endif #ifdef CONFIG_XBOX - init_video(); + init_video(phys_to_virt(0x3C00000), 640, 480, 32, 2560); node_methods_init(); #endif device_end(); Modified: openbios-devel/arch/x86/xbox/console.c =================================================================== --- openbios-devel/arch/x86/xbox/console.c 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/arch/x86/xbox/console.c 2008-12-05 18:31:27 UTC (rev 281) @@ -19,19 +19,6 @@ int rb, w, h, depth; } osi_fb_info_t; -int Xbox_GetFBInfo (osi_fb_info_t *fb) -{ - fb->w = 640; - fb->h = 480; - fb->depth = 32; - fb->rb = fb->w * 4; /* rgb + alpha */ - fb->mphys = phys_to_virt(0x3C00000); /* 60M - 64M */ - - return 0; -} - -#define openbios_GetFBInfo(x) Xbox_GetFBInfo(x) - #include "../../../modules/video.c" #include "../../../modules/console.c" Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/include/openbios/drivers.h 2008-12-05 18:31:27 UTC (rev 281) @@ -22,7 +22,7 @@ int keyboard_dataready(void); unsigned char keyboard_readdata(void); #ifdef CONFIG_DEBUG_CONSOLE_VIDEO -void init_video(void); +void init_video(unsigned long fb, int width, int height, int depth, int rb); #endif #endif #ifdef CONFIG_DRIVER_IDE Modified: openbios-devel/modules/console.c =================================================================== --- openbios-devel/modules/console.c 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/modules/console.c 2008-12-05 18:31:27 UTC (rev 281) @@ -150,24 +150,10 @@ static void scroll1( void ) { - osi_fb_info_t fb; - int i, x, offs, size, *dest, *src; - - openbios_GetFBInfo( &fb ); + int x; - offs = fb.rb * FONT_ADJ_HEIGHT; - size = (fb.h * fb.rb - offs)/16; - dest = (int*)fb.mphys; - src = (int*)(fb.mphys + offs); + video_scroll( FONT_ADJ_HEIGHT ); - for( i=0; i<size; i++ ) { - dest[0] = src[0]; - dest[1] = src[1]; - dest[2] = src[2]; - dest[3] = src[3]; - dest += 4; - src += 4; - } for( x=0; x<cons.w; x++ ) cons.buf[(cons.h-1)*cons.w + x] = 0; draw_line(cons.h-1); Modified: openbios-devel/modules/video.c =================================================================== --- openbios-devel/modules/video.c 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/modules/video.c 2008-12-05 18:31:27 UTC (rev 281) @@ -184,7 +184,26 @@ #endif } +void +video_scroll( int height ) +{ + int i, offs, size, *dest, *src; + offs = video.fb.rb * height; + size = (video.fb.h * video.fb.rb - offs)/16; + dest = (int*)video.fb.mphys; + src = (int*)(video.fb.mphys + offs); + + for( i=0; i<size; i++ ) { + dest[0] = src[0]; + dest[1] = src[1]; + dest[2] = src[2]; + dest[3] = src[3]; + dest += 4; + src += 4; + } +} + /************************************************************************/ /* OF methods */ /************************************************************************/ @@ -280,15 +299,16 @@ /************************************************************************/ void -init_video( void ) +init_video( unsigned long fb, int width, int height, int depth, int rb ) { int i, s, size; phandle_t ph=0; - - if( openbios_GetFBInfo(&video.fb) ) { - printk("init_video: No video display\n"); - return; - } + + video.fb.mphys = fb; + video.fb.w = width; + video.fb.h = height; + video.fb.depth = depth; + video.fb.rb = rb; while( (ph=dt_iterate_type(ph, "display")) ) { set_property( ph, "width", (char*)&video.fb.w, 4 ); set_property( ph, "height", (char*)&video.fb.h, 4 ); @@ -308,7 +328,7 @@ ofmem_claim_virt( video.fb.mphys, size, 0 ); ofmem_map( video.fb.mphys, video.fb.mphys, size, -1 ); #endif - + for( i=0; i<256; i++ ) set_color( i, i * 0x010101 );

1 0

r280 - openbios-devel/config/examples
by svn＠openbios.org 04 Dec '08

04 Dec '08

Author: blueswirl Date: 2008-12-04 21:14:23 +0100 (Thu, 04 Dec 2008) New Revision: 280 Modified: openbios-devel/config/examples/amd64_rules.xml openbios-devel/config/examples/cross-ppc_rules.xml openbios-devel/config/examples/cross-sparc32_rules.xml openbios-devel/config/examples/cross-sparc64_rules.xml openbios-devel/config/examples/sparc32_rules.xml openbios-devel/config/examples/sparc64_rules.xml openbios-devel/config/examples/x86_rules.xml Log: Evaluate date using C locale and UTC timezone, original patch by Laurent Vivier Modified: openbios-devel/config/examples/amd64_rules.xml =================================================================== --- openbios-devel/config/examples/amd64_rules.xml 2008-12-01 19:08:33 UTC (rev 279) +++ openbios-devel/config/examples/amd64_rules.xml 2008-12-04 20:14:23 UTC (rev 280) @@ -34,7 +34,7 @@ $(ODIR)/forth/version.fs: @test -d $(dir $@) || $(INSTALL) -d $(dir $@) - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs Modified: openbios-devel/config/examples/cross-ppc_rules.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_rules.xml 2008-12-01 19:08:33 UTC (rev 279) +++ openbios-devel/config/examples/cross-ppc_rules.xml 2008-12-04 20:14:23 UTC (rev 280) @@ -40,13 +40,13 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs $(ODIR)/forth/version.fs: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \ Modified: openbios-devel/config/examples/cross-sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_rules.xml 2008-12-01 19:08:33 UTC (rev 279) +++ openbios-devel/config/examples/cross-sparc32_rules.xml 2008-12-04 20:14:23 UTC (rev 280) @@ -38,13 +38,13 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs $(ODIR)/forth/version.fs: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \ Modified: openbios-devel/config/examples/cross-sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_rules.xml 2008-12-01 19:08:33 UTC (rev 279) +++ openbios-devel/config/examples/cross-sparc64_rules.xml 2008-12-04 20:14:23 UTC (rev 280) @@ -39,13 +39,13 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs $(ODIR)/forth/version.fs: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \ Modified: openbios-devel/config/examples/sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/sparc32_rules.xml 2008-12-01 19:08:33 UTC (rev 279) +++ openbios-devel/config/examples/sparc32_rules.xml 2008-12-04 20:14:23 UTC (rev 280) @@ -43,13 +43,13 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs $(ODIR)/forth/version.fs: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \ Modified: openbios-devel/config/examples/sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/sparc64_rules.xml 2008-12-01 19:08:33 UTC (rev 279) +++ openbios-devel/config/examples/sparc64_rules.xml 2008-12-04 20:14:23 UTC (rev 280) @@ -50,13 +50,13 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs $(ODIR)/forth/version.fs: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \ Modified: openbios-devel/config/examples/x86_rules.xml =================================================================== --- openbios-devel/config/examples/x86_rules.xml 2008-12-01 19:08:33 UTC (rev 279) +++ openbios-devel/config/examples/x86_rules.xml 2008-12-04 20:14:23 UTC (rev 280) @@ -38,7 +38,7 @@ $(ODIR)/forth/version.fs: @test -d $(dir $@) || $(INSTALL) -d $(dir $@) - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs

1 0

Re: [OpenBIOS] [PATCH] Evaluate date using C locale
by laurent＠lvivier.info 04 Dec '08

04 Dec '08

>> This patch uses C locale to compute date for version.fs and >> openbios-version.h instead of current locale. > >You should use LC_ALL=C, not LANG=C; LANG provides a default for >all the separate locale settings that aren't otherwise set, while >LC_ALL overrides everything. Yes, you're right, but in fact LC_TIME should be enough. Laurent

3 2

[PATCH] Evaluate date using C locale
by Laurent Vivier 04 Dec '08

04 Dec '08

This patch uses C locale to compute date for version.fs and openbios- version.h instead of current locale. This avoids to have some dates like "déc 3 2008" instead of "dec 3 2008" Laurent -------------------- laurent(a)lvivier.info -------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

2 1

r279 - openbios-devel/forth/admin
by svn＠openbios.org 01 Dec '08

01 Dec '08

Author: blueswirl Date: 2008-12-01 20:08:33 +0100 (Mon, 01 Dec 2008) New Revision: 279 Modified: openbios-devel/forth/admin/nvram.fs Log: Fix NetBSD 4.0 booting Modified: openbios-devel/forth/admin/nvram.fs =================================================================== --- openbios-devel/forth/admin/nvram.fs 2008-12-01 18:04:16 UTC (rev 278) +++ openbios-devel/forth/admin/nvram.fs 2008-12-01 19:08:33 UTC (rev 279) @@ -305,8 +305,8 @@ " boot" " boot-command" str-config \ 7.4.3.5 " " " boot-file" str-config \ 7.4.3.5 " false" " diag-switch?" bool-config \ 7.4.3.5 -" net" " diag-device" str-config \ 7.4.3.5 -" diag" " diag-file" str-config \ 7.4.3.5 +no-conf-def " diag-device" str-config \ 7.4.3.5 +no-conf-def " diag-file" str-config \ 7.4.3.5 " false" " fcode-debug?" bool-config \ 7.7 " " " nvramrc" str-config \ 7.4.4.2 " false" " oem-banner?" bool-config

1 0

r278 - openbios-devel/arch/sparc32
by svn＠openbios.org 01 Dec '08

01 Dec '08

Author: blueswirl Date: 2008-12-01 19:04:16 +0100 (Mon, 01 Dec 2008) New Revision: 278 Modified: openbios-devel/arch/sparc32/aoutload.c openbios-devel/arch/sparc32/boot.c openbios-devel/arch/sparc32/boot.h openbios-devel/arch/sparc32/romvec.c Log: Fix NetBSD booting Modified: openbios-devel/arch/sparc32/aoutload.c =================================================================== --- openbios-devel/arch/sparc32/aoutload.c 2008-11-30 13:44:38 UTC (rev 277) +++ openbios-devel/arch/sparc32/aoutload.c 2008-12-01 18:04:16 UTC (rev 278) @@ -57,22 +57,19 @@ int image_retval; struct exec ehdr; unsigned long start, size; - unsigned int offset; + unsigned int offset = 512; image_name = image_version = NULL; if (!file_open(filename)) goto out; - for (offset = 0; offset < 16 * 512; offset += 512) { - file_seek(offset); - if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { - debug("Can't read a.out header\n"); - retval = LOADER_NOT_SUPPORT; - goto out; - } - if (!N_BADMAG(ehdr)) - break; + file_seek(offset); + + if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { + debug("Can't read a.out header\n"); + retval = LOADER_NOT_SUPPORT; + goto out; } if (N_BADMAG(ehdr)) { Modified: openbios-devel/arch/sparc32/boot.c =================================================================== --- openbios-devel/arch/sparc32/boot.c 2008-11-30 13:44:38 UTC (rev 277) +++ openbios-devel/arch/sparc32/boot.c 2008-12-01 18:04:16 UTC (rev 278) @@ -20,6 +20,18 @@ uint32_t cmdline_size; char boot_device; +static void try_path(const char *path, char *param, const void *romvec) +{ + push_str(path); + fword("pathres-resolve-aliases"); + bootpath = pop_fstr_copy(); + printk("Trying %s (%s)\n", path, bootpath); + + elf_load(&sys_info, path, param, romvec); + linux_load(&sys_info, path, param); + aout_load(&sys_info, path, romvec); +} + void boot(void) { char *path = pop_fstr_copy(), *param, *oldpath = path; @@ -87,7 +99,7 @@ obp_arg.argv[1] = param; } - romvec = init_openprom(qemu_mem_size, path); + romvec = init_openprom(qemu_mem_size); if (kernel_size) { int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); @@ -103,20 +115,17 @@ else printk("without parameters.\n"); - if (elf_load(&sys_info, path, param, romvec) == LOADER_NOT_SUPPORT) - if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) - if (aout_load(&sys_info, path, romvec) == LOADER_NOT_SUPPORT) { + try_path(path, param, romvec); - snprintf(altpath, sizeof(altpath), "%s:d", path); + push_str(path); + PUSH(':'); + fword("left-split"); + snprintf(altpath, sizeof(altpath), "%s:d", pop_fstr_copy()); + POP(); + POP(); - if (elf_load(&sys_info, altpath, param, romvec) - == LOADER_NOT_SUPPORT) - if (linux_load(&sys_info, altpath, param) - == LOADER_NOT_SUPPORT) - if (aout_load(&sys_info, altpath, romvec) - == LOADER_NOT_SUPPORT) - printk("Unsupported image format\n"); - } + try_path(altpath, param, romvec); + printk("Unsupported image format\n"); free(path); } Modified: openbios-devel/arch/sparc32/boot.h =================================================================== --- openbios-devel/arch/sparc32/boot.h 2008-11-30 13:44:38 UTC (rev 277) +++ openbios-devel/arch/sparc32/boot.h 2008-12-01 18:04:16 UTC (rev 278) @@ -24,10 +24,11 @@ unsigned int start_elf(unsigned long entry_point, unsigned long param); // romvec.c -void *init_openprom(unsigned long memsize, const char *path); +void *init_openprom(unsigned long memsize); // boot.c extern struct sys_info sys_info; +extern const char *bootpath; void boot(void); // sys_info.c Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2008-11-30 13:44:38 UTC (rev 277) +++ openbios-devel/arch/sparc32/romvec.c 2008-12-01 18:04:16 UTC (rev 278) @@ -49,7 +49,7 @@ static int obp_devseek(int dev_desc, int hi, int lo); struct linux_arguments_v0 obp_arg; -static const char *bootpath; +const char *bootpath; static const struct linux_arguments_v0 * const obp_argp = &obp_arg; static void (*sync_hook)(void); @@ -501,7 +501,7 @@ } void * -init_openprom(unsigned long memsize, const char *path) +init_openprom(unsigned long memsize) { ptphys = totphys; ptmap = totmap; @@ -559,9 +559,6 @@ romvec0.pv_v2devops.v2_dev_write = obp_devwrite; romvec0.pv_v2devops.v2_dev_seek = obp_devseek; - push_str(path); - fword("pathres-resolve-aliases"); - bootpath = pop_fstr_copy(); romvec0.pv_v2bootargs.bootpath = &bootpath; romvec0.pv_v2bootargs.bootargs = &obp_arg.argv[1];

1 0

r277 - in openbios-devel: arch/amd64 arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu arch/sparc32 arch/sparc64 arch/x86 drivers
by svn＠openbios.org 30 Nov '08

30 Nov '08

Author: blueswirl Date: 2008-11-30 14:44:38 +0100 (Sun, 30 Nov 2008) New Revision: 277 Modified: openbios-devel/arch/amd64/lib.c openbios-devel/arch/ppc/briq/briq.c openbios-devel/arch/ppc/mol/main.c openbios-devel/arch/ppc/mol/mol.c openbios-devel/arch/ppc/pearpc/pearpc.c openbios-devel/arch/ppc/qemu/qemu.c openbios-devel/arch/sparc32/boot.c openbios-devel/arch/sparc32/lib.c openbios-devel/arch/sparc64/boot.c openbios-devel/arch/sparc64/lib.c openbios-devel/arch/sparc64/openbios.c openbios-devel/arch/x86/lib.c openbios-devel/drivers/adb.c openbios-devel/drivers/cuda.c openbios-devel/drivers/esp.c openbios-devel/drivers/ide.c openbios-devel/drivers/obio.c openbios-devel/drivers/pci.c Log: Change uses of sprintf to snprintf Modified: openbios-devel/arch/amd64/lib.c =================================================================== --- openbios-devel/arch/amd64/lib.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/arch/amd64/lib.c 2008-11-30 13:44:38 UTC (rev 277) @@ -19,12 +19,12 @@ */ int printk( const char *fmt, ... ) { - char *p, buf[512]; /* XXX: no buffer overflow protection... */ + char *p, buf[512]; va_list args; int i; va_start(args, fmt); - i=vsprintf(buf,fmt,args); + i = vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); for( p=buf; *p; p++ ) Modified: openbios-devel/arch/ppc/briq/briq.c =================================================================== --- openbios-devel/arch/ppc/briq/briq.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/arch/ppc/briq/briq.c 2008-11-30 13:44:38 UTC (rev 277) @@ -62,12 +62,12 @@ int printk( const char *fmt, ... ) { - char *p, buf[1024]; /* XXX: no buffer overflow protection... */ + char *p, buf[1024]; va_list args; int i; va_start(args, fmt); - i=vsprintf(buf,fmt,args); + i = vnsprintf(buf, sizeof(buf), fmt, args); va_end(args); for( p=buf; *p; p++ ) { Modified: openbios-devel/arch/ppc/mol/main.c =================================================================== --- openbios-devel/arch/ppc/mol/main.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/arch/ppc/mol/main.c 2008-11-30 13:44:38 UTC (rev 277) @@ -300,7 +300,8 @@ continue; for( j=0; !entry && j<32; j++ ) { - sprintf( spec, "%s/disk@%x:%d", path, i, j ); + snprintf( spec, sizeof(spec), "%s/disk@%x:%d", + path, i, j ); entry = newworld_load( path, spec, (!type || type==2) ); } if( entry ) { Modified: openbios-devel/arch/ppc/mol/mol.c =================================================================== --- openbios-devel/arch/ppc/mol/mol.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/arch/ppc/mol/mol.c 2008-11-30 13:44:38 UTC (rev 277) @@ -57,12 +57,12 @@ int printk( const char *fmt, ... ) { - char *p, buf[1024]; /* XXX: no buffer overflow protection... */ + char *p, buf[1024]; va_list args; int i; va_start(args, fmt); - i=vsprintf(buf,fmt,args); + i = vnsprintf(buf, sizeof(buf), fmt, args); va_end(args); for( p=buf; *p; p++ ) { Modified: openbios-devel/arch/ppc/pearpc/pearpc.c =================================================================== --- openbios-devel/arch/ppc/pearpc/pearpc.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/arch/ppc/pearpc/pearpc.c 2008-11-30 13:44:38 UTC (rev 277) @@ -64,12 +64,12 @@ int printk( const char *fmt, ... ) { - char *p, buf[1024]; /* XXX: no buffer overflow protection... */ + char *p, buf[1024]; va_list args; int i; va_start(args, fmt); - i=vsprintf(buf,fmt,args); + i = vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); for( p=buf; *p; p++ ) { Modified: openbios-devel/arch/ppc/qemu/qemu.c =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/arch/ppc/qemu/qemu.c 2008-11-30 13:44:38 UTC (rev 277) @@ -62,12 +62,12 @@ int printk( const char *fmt, ... ) { - char *p, buf[1024]; /* XXX: no buffer overflow protection... */ + char *p, buf[1024]; va_list args; int i; va_start(args, fmt); - i=vsprintf(buf,fmt,args); + i = vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); for( p=buf; *p; p++ ) { @@ -105,7 +105,7 @@ char buf[64]; nvram = (char*)addr + IO_NVRAM_OFFSET; - sprintf(buf, "%s/nvram", path); + snprintf(buf, sizeof(buf), "%s/nvram", path); nvram_init(buf); dnode = find_dev(buf); set_int_property(dnode, "#bytes", IO_NVRAM_SIZE >> 4); Modified: openbios-devel/arch/sparc32/boot.c =================================================================== --- openbios-devel/arch/sparc32/boot.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/arch/sparc32/boot.c 2008-11-30 13:44:38 UTC (rev 277) @@ -107,7 +107,7 @@ if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) if (aout_load(&sys_info, path, romvec) == LOADER_NOT_SUPPORT) { - sprintf(altpath, "%s:d", path); + snprintf(altpath, sizeof(altpath), "%s:d", path); if (elf_load(&sys_info, altpath, param, romvec) == LOADER_NOT_SUPPORT) Modified: openbios-devel/arch/sparc32/lib.c =================================================================== --- openbios-devel/arch/sparc32/lib.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/arch/sparc32/lib.c 2008-11-30 13:44:38 UTC (rev 277) @@ -19,12 +19,12 @@ */ int printk( const char *fmt, ... ) { - char *p, buf[512]; /* XXX: no buffer overflow protection... */ + char *p, buf[512]; va_list args; int i; va_start(args, fmt); - i=vsprintf(buf,fmt,args); + i = vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); for( p=buf; *p; p++ ) Modified: openbios-devel/arch/sparc64/boot.c =================================================================== --- openbios-devel/arch/sparc64/boot.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/arch/sparc64/boot.c 2008-11-30 13:44:38 UTC (rev 277) @@ -88,7 +88,7 @@ if (aout_load(&sys_info, path) == LOADER_NOT_SUPPORT) if (fcode_load(path) == LOADER_NOT_SUPPORT) { - sprintf(altpath, "%s:d", path); + snprintf(altpath, sizeof(altpath), "%s:d", path); if (elf_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT) Modified: openbios-devel/arch/sparc64/lib.c =================================================================== --- openbios-devel/arch/sparc64/lib.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/arch/sparc64/lib.c 2008-11-30 13:44:38 UTC (rev 277) @@ -19,12 +19,12 @@ */ int printk( const char *fmt, ... ) { - char *p, buf[512]; /* XXX: no buffer overflow protection... */ + char *p, buf[512]; va_list args; int i; va_start(args, fmt); - i=vsprintf(buf,fmt,args); + i = vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); for( p=buf; *p; p++ ) Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/arch/sparc64/openbios.c 2008-11-30 13:44:38 UTC (rev 277) @@ -432,7 +432,7 @@ fword("finish-device"); // MMU node - sprintf(nodebuff, "/%s", cpu->name); + snprintf(nodebuff, sizeof(nodebuff), "/%s", cpu->name); push_str(nodebuff); fword("find-device"); @@ -443,7 +443,7 @@ fword("finish-device"); - sprintf(nodebuff, "/%s/mmu", cpu->name); + snprintf(nodebuff, sizeof(nodebuff), "/%s/mmu", cpu->name); REGISTER_NODE_METHODS(mmu, nodebuff); Modified: openbios-devel/arch/x86/lib.c =================================================================== --- openbios-devel/arch/x86/lib.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/arch/x86/lib.c 2008-11-30 13:44:38 UTC (rev 277) @@ -19,12 +19,12 @@ */ int printk( const char *fmt, ... ) { - char *p, buf[512]; /* XXX: no buffer overflow protection... */ + char *p, buf[512]; va_list args; int i; va_start(args, fmt); - i=vsprintf(buf,fmt,args); + i = vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); for( p=buf; *p; p++ ) Modified: openbios-devel/drivers/adb.c =================================================================== --- openbios-devel/drivers/adb.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/drivers/adb.c 2008-11-30 13:44:38 UTC (rev 277) @@ -494,7 +494,7 @@ my_adb_dev = dev; } - sprintf(buf, "%s/keyboard", path); + snprintf(buf, sizeof(buf), "%s/keyboard", path); REGISTER_NAMED_NODE( keyboard, buf); ph = find_dev(buf); @@ -551,7 +551,7 @@ phandle_t ph, aliases; adb_dev_t *dev = private; - sprintf(buf, "%s/mouse", path); + snprintf(buf, sizeof(buf), "%s/mouse", path); REGISTER_NAMED_NODE( mouse, buf); ph = find_dev(buf); Modified: openbios-devel/drivers/cuda.c =================================================================== --- openbios-devel/drivers/cuda.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/drivers/cuda.c 2008-11-30 13:44:38 UTC (rev 277) @@ -227,7 +227,7 @@ phandle_t ph, aliases; char buf[64]; - sprintf(buf, "%s/rtc", path); + snprintf(buf, sizeof(buf), "%s/rtc", path); REGISTER_NAMED_NODE(rtc, buf); ph = find_dev(buf); @@ -250,7 +250,7 @@ if (cuda == NULL) return NULL; - sprintf(buf, "%s/via-cuda", path); + snprintf(buf, sizeof(buf), "%s/via-cuda", path); REGISTER_NAMED_NODE(ob_cuda, buf); cuda->base = base; @@ -323,7 +323,7 @@ * */ int adb_bus_init (char *path, adb_bus_t *bus) { - char buf[64]; + char buf[64]; uint8_t buffer[ADB_BUF_SIZE]; uint8_t adb_addresses[16] = { 8, 9, 10, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1, -1, 0, }; @@ -332,7 +332,7 @@ int reloc = 0, next_free = 7; int keep; - sprintf(buf, "%s/adb", path); + snprintf(buf, sizeof(buf), "%s/adb", path); REGISTER_NAMED_NODE( adb, buf); /* Reset the bus */ // ADB_DPRINTF("\n"); Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/drivers/esp.c 2008-11-30 13:44:38 UTC (rev 277) @@ -507,7 +507,8 @@ push_str("reg"); fword("property"); fword("finish-device"); - sprintf(nodebuff, "/iommu/sbus/espdma/esp/sd@%d,0", id); + snprintf(nodebuff, sizeof(nodebuff), "/iommu/sbus/espdma/esp/sd@%d,0", + id); REGISTER_NODE_METHODS(ob_sd, nodebuff); if (esp->sd[id].media == TYPE_ROM) { counter_ptr = &cdcount; @@ -517,11 +518,12 @@ if (*counter_ptr == 0) { add_alias(nodebuff, esp->sd[id].media_str); } - sprintf(aliasbuff, "%s%d", esp->sd[id].media_str, *counter_ptr); + snprintf(aliasbuff, sizeof(aliasbuff), "%s%d", esp->sd[id].media_str, + *counter_ptr); add_alias(nodebuff, aliasbuff); - sprintf(aliasbuff, "sd(0,%d,0)", id); + snprintf(aliasbuff, sizeof(aliasbuff), "sd(0,%d,0)", id); add_alias(nodebuff, aliasbuff); - sprintf(aliasbuff, "sd(0,%d,0)@0,0", id); + snprintf(aliasbuff, sizeof(aliasbuff), "sd(0,%d,0)@0,0", id); add_alias(nodebuff, aliasbuff); (*counter_ptr)++; } Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/drivers/ide.c 2008-11-30 13:44:38 UTC (rev 277) @@ -1330,7 +1330,7 @@ ob_ide_identify_drives(chan); - sprintf(nodebuff, nodetemp_chan, i); + snprintf(nodebuff, sizeof(nodebuff), nodetemp_chan, i); REGISTER_NAMED_NODE(ob_ide_ctrl, nodebuff); printk("ide%d: [io ports 0x%x-0x%x,0x%x]\n", i, chan->io_regs[0], chan->io_regs[0] + 7, chan->io_regs[8]); @@ -1357,7 +1357,8 @@ break; } printk("%s]: %s\n", media, drive->model); - sprintf(nodebuff, nodetemp, i, media); + snprintf(nodebuff, sizeof(nodebuff), nodetemp, i, + media); REGISTER_NAMED_NODE(ob_ide, nodebuff); dnode=find_dev(nodebuff); set_int_property(dnode, "reg", j); Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/drivers/obio.c 2008-11-30 13:44:38 UTC (rev 277) @@ -275,7 +275,8 @@ fword("finish-device"); - sprintf(nodebuff, "/obio/zs@0,%x", (int)offset & 0xffffffff); + snprintf(nodebuff, sizeof(nodebuff), "/obio/zs@0,%x", + (int)offset & 0xffffffff); if (keyboard) { REGISTER_NODE_METHODS(zs_keyboard, nodebuff); } else { Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-11-30 13:43:27 UTC (rev 276) +++ openbios-devel/drivers/pci.c 2008-11-30 13:44:38 UTC (rev 277) @@ -1098,7 +1098,7 @@ phandle_t ph; cell props[2]; - sprintf(buf, "%s/interrupt-controller", config->path); + snprintf(buf, sizeof(buf), "%s/interrupt-controller", config->path); REGISTER_NAMED_NODE(ob_pci_node, buf); ph = find_dev(buf); @@ -1505,9 +1505,11 @@ dbus=get_cur_dev(); if (pci_dev == NULL || pci_dev->name == NULL) - sprintf(config.path, "%s/pci%x,%x", path, vid, did); + snprintf(config.path, sizeof(config.path), + "%s/pci%x,%x", path, vid, did); else - sprintf(config.path, "%s/%s", path, pci_dev->name); + snprintf(config.path, sizeof(config.path), + "%s/%s", path, pci_dev->name); #ifdef CONFIG_DEBUG_PCI printk("%s - ", config.path); #endif

1 0

r276 - openbios-devel/config/examples
by svn＠openbios.org 30 Nov '08

30 Nov '08

Author: blueswirl Date: 2008-11-30 14:43:27 +0100 (Sun, 30 Nov 2008) New Revision: 276 Modified: openbios-devel/config/examples/cross-sparc32_rules.xml openbios-devel/config/examples/cross-sparc64_rules.xml Log: Use a cross compiler prefix like PPC Modified: openbios-devel/config/examples/cross-sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_rules.xml 2008-11-30 13:42:11 UTC (rev 275) +++ openbios-devel/config/examples/cross-sparc32_rules.xml 2008-11-30 13:43:27 UTC (rev 276) @@ -12,13 +12,14 @@ HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include -CC := sparc-linux-gcc -AS := sparc-linux-as -AR := sparc-linux-ar -LD := sparc-linux-ld -NM := sparc-linux-nm -STRIP := sparc-linux-strip -RANLIB := sparc-linux-ranlib +TARGET=sparc-elf- +CC := $(TARGET)gcc +AS := $(TARGET)as +AR := $(TARGET)ar +LD := $(TARGET)ld +NM := $(TARGET)nm +STRIP := $(TARGET)strip +RANLIB := $(TARGET)ranlib CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g CFLAGS+= -Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations Modified: openbios-devel/config/examples/cross-sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_rules.xml 2008-11-30 13:42:11 UTC (rev 275) +++ openbios-devel/config/examples/cross-sparc64_rules.xml 2008-11-30 13:43:27 UTC (rev 276) @@ -12,13 +12,14 @@ HOSTCFLAGS := -O2 -g -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include -CC := sparc64-linux-gcc -AS := sparc64-linux-as -AR := sparc64-linux-ar -LD := sparc64-linux-ld -NM := sparc64-linux-nm -STRIP := sparc64-linux-strip -RANLIB := sparc64-linux-ranlib +TARGET=sparc64-elf- +CC := $(TARGET)gcc +AS := $(TARGET)as +AR := $(TARGET)ar +LD := $(TARGET)ld +NM := $(TARGET)nm +STRIP := $(TARGET)strip +RANLIB := $(TARGET)ranlib CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -g CFLAGS+= -Wa,-xarch=v9b -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany CFLAGS+= -fno-builtin -nostdlib -ffreestanding

1 0

r275 - in openbios-devel: include include/openbios kernel
by svn＠openbios.org 30 Nov '08

30 Nov '08

Author: blueswirl Date: 2008-11-30 14:42:11 +0100 (Sun, 30 Nov 2008) New Revision: 275 Modified: openbios-devel/include/a.out.h openbios-devel/include/openbios/kernel.h openbios-devel/kernel/bootstrap.c Log: Fix some more warnings Modified: openbios-devel/include/a.out.h =================================================================== --- openbios-devel/include/a.out.h 2008-11-30 11:54:01 UTC (rev 274) +++ openbios-devel/include/a.out.h 2008-11-30 13:42:11 UTC (rev 275) @@ -127,17 +127,19 @@ #define SEGMENT_SIZE PAGE_SIZE #endif +#if !defined(SEGMENT_SIZE) #ifdef linux #if defined(__i386__) || defined(__mc68000__) #define SEGMENT_SIZE 1024 #elif defined(__sparc__) -#define SEGMENT_SIZE 4096 +#define SEGMENT_SIZE 0x2000 #else -#ifndef SEGMENT_SIZE +#if defined(PAGE_SIZE) #define SEGMENT_SIZE PAGE_SIZE #endif #endif #endif +#endif #define _N_SEGMENT_ROUND(x) (((x) + SEGMENT_SIZE - 1) & ~(SEGMENT_SIZE - 1)) Modified: openbios-devel/include/openbios/kernel.h =================================================================== --- openbios-devel/include/openbios/kernel.h 2008-11-30 11:54:01 UTC (rev 274) +++ openbios-devel/include/openbios/kernel.h 2008-11-30 13:42:11 UTC (rev 275) @@ -37,11 +37,14 @@ extern int get_inputbyte( void ); #endif +#ifndef BOOTSTRAP #undef putchar #undef getchar extern int putchar( int ch ); -extern int availchar( void ); extern int getchar( void ); +#endif +extern int availchar( void ); + #endif /* _H_KERNEL */ Modified: openbios-devel/kernel/bootstrap.c =================================================================== --- openbios-devel/kernel/bootstrap.c 2008-11-30 11:54:01 UTC (rev 274) +++ openbios-devel/kernel/bootstrap.c 2008-11-30 13:42:11 UTC (rev 275) @@ -80,7 +80,7 @@ "$include", "$encode-file" }; -void init_trampoline(void) +static void init_trampoline(void) { if (!trampoline) { /* We're using side effects which is to some extent nasty */

1 0

r274 - in openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 drivers fs/grubfs fs/hfsplus fs/hfsplus/include include include/libc include/openbios kernel libc modules
by svn＠openbios.org 30 Nov '08

30 Nov '08

Author: blueswirl Date: 2008-11-30 12:54:01 +0100 (Sun, 30 Nov 2008) New Revision: 274 Modified: openbios-devel/arch/ppc/qemu/console.c openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/qemu.c openbios-devel/arch/ppc/qemu/qemu.h openbios-devel/arch/ppc/qemu/tree.c openbios-devel/arch/sparc32/aoutload.c openbios-devel/arch/sparc32/boot.c openbios-devel/arch/sparc32/boot.h openbios-devel/arch/sparc32/context.c openbios-devel/arch/sparc32/elfload.c openbios-devel/arch/sparc32/forthload.c openbios-devel/arch/sparc32/linux_load.c openbios-devel/arch/sparc32/romvec.c openbios-devel/arch/sparc32/sys_info.c openbios-devel/arch/sparc64/aoutload.c openbios-devel/arch/sparc64/boot.c openbios-devel/arch/sparc64/boot.h openbios-devel/arch/sparc64/context.c openbios-devel/arch/sparc64/elfload.c openbios-devel/arch/sparc64/fcodeload.c openbios-devel/arch/sparc64/forthload.c openbios-devel/arch/sparc64/linux_load.c openbios-devel/arch/sparc64/sys_info.c openbios-devel/drivers/adb.c openbios-devel/drivers/adb.h openbios-devel/drivers/cuda.c openbios-devel/drivers/esp.c openbios-devel/drivers/iommu.c openbios-devel/drivers/obio.c openbios-devel/drivers/timer.c openbios-devel/drivers/vga.h openbios-devel/fs/grubfs/fsys_affs.c openbios-devel/fs/grubfs/fsys_ext2fs.c openbios-devel/fs/grubfs/fsys_jfs.c openbios-devel/fs/grubfs/fsys_reiserfs.c openbios-devel/fs/grubfs/fsys_ufs.c openbios-devel/fs/grubfs/fsys_vstafs.c openbios-devel/fs/grubfs/grubfs_fs.c openbios-devel/fs/hfsplus/btree.c openbios-devel/fs/hfsplus/include/libhfsp.h openbios-devel/fs/hfsplus/volume.c openbios-devel/include/elf_boot.h openbios-devel/include/libc/string.h openbios-devel/include/openbios/drivers.h openbios-devel/kernel/dict.c openbios-devel/kernel/internal.c openbios-devel/libc/misc.c openbios-devel/libc/string.c openbios-devel/libc/vsprintf.c openbios-devel/modules/cmdline.c openbios-devel/modules/video.c Log: Fix most warnings from Sparse Modified: openbios-devel/arch/ppc/qemu/console.c =================================================================== --- openbios-devel/arch/ppc/qemu/console.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/ppc/qemu/console.c 2008-11-30 11:54:01 UTC (rev 274) @@ -58,7 +58,7 @@ static void uart_putchar(int port, unsigned char c) { if (!port) - return -1; + return; while (!(inb(LSR(port)) & 0x20)); outb(c, THR(port)); } @@ -134,6 +134,7 @@ #define openbios_GetFBInfo(x) Qemu_GetFBInfo(x) #include "../../../modules/font_8x16.c" +#undef FONTDATAMAX #include "../../../modules/video.c" #include "../../../modules/console.c" Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/ppc/qemu/init.c 2008-11-30 11:54:01 UTC (rev 274) @@ -47,7 +47,7 @@ ARCH_HEATHROW, }; -pci_arch_t known_arch[] = { +static pci_arch_t known_arch[] = { [ARCH_PREP] = { "PREP", 0x1057, 0x4801, 0x80800000, 0x800c0000, 0x80000000, 0x00100000, 0xf0000000, 0x10000000, 0x80000000, 0x00010000, 0x00000000, 0x00400000, Modified: openbios-devel/arch/ppc/qemu/qemu.c =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/ppc/qemu/qemu.c 2008-11-30 11:54:01 UTC (rev 274) @@ -20,6 +20,7 @@ #include "openbios/kernel.h" #include "openbios/nvram.h" #include "openbios/bindings.h" +#include "openbios/drivers.h" #include "libc/vsprintf.h" #include "libc/string.h" #include "libc/byteorder.h" @@ -111,7 +112,7 @@ set_property(dnode, "compatible", "nvram,flash", 12); props[0] = __cpu_to_be32(IO_NVRAM_OFFSET); props[1] = __cpu_to_be32(IO_NVRAM_SIZE); - set_property(dnode, "reg", &props, sizeof(props)); + set_property(dnode, "reg", (char *)&props, sizeof(props)); set_property(dnode, "device_type", "nvram", 6); chosen = find_dev("/chosen"); Modified: openbios-devel/arch/ppc/qemu/qemu.h =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.h 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/ppc/qemu/qemu.h 2008-11-30 11:54:01 UTC (rev 274) @@ -21,6 +21,9 @@ extern int console_draw_str( const char *str ); +/* console.c */ +int serial_init(void); + #include "kernel.h" #endif /* _H_QEMU */ Modified: openbios-devel/arch/ppc/qemu/tree.c =================================================================== --- openbios-devel/arch/ppc/qemu/tree.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/ppc/qemu/tree.c 2008-11-30 11:54:01 UTC (rev 274) @@ -16,6 +16,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" +#include "qemu.h" void devtree_init( void ) { Modified: openbios-devel/arch/sparc32/aoutload.c =================================================================== --- openbios-devel/arch/sparc32/aoutload.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc32/aoutload.c 2008-11-30 11:54:01 UTC (rev 274) @@ -51,8 +51,7 @@ return 0; } -int aout_load(struct sys_info *info, const char *filename, const char *cmdline, - const void *romvec) +int aout_load(struct sys_info *info, const char *filename, const void *romvec) { int retval = -1; int image_retval; @@ -60,7 +59,7 @@ unsigned long start, size; unsigned int offset; - image_name = image_version = 0; + image_name = image_version = NULL; if (!file_open(filename)) goto out; Modified: openbios-devel/arch/sparc32/boot.c =================================================================== --- openbios-devel/arch/sparc32/boot.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc32/boot.c 2008-11-30 11:54:01 UTC (rev 274) @@ -6,6 +6,7 @@ #include "openbios/bindings.h" #include "openbios/elfload.h" #include "openbios/nvram.h" +#include "openbios/drivers.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "sys_info.h" @@ -103,14 +104,17 @@ printk("without parameters.\n"); if (elf_load(&sys_info, path, param, romvec) == LOADER_NOT_SUPPORT) - if (linux_load(&sys_info, path, param, romvec) == LOADER_NOT_SUPPORT) - if (aout_load(&sys_info, path, param, romvec) == LOADER_NOT_SUPPORT) { + if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) + if (aout_load(&sys_info, path, romvec) == LOADER_NOT_SUPPORT) { sprintf(altpath, "%s:d", path); - if (elf_load(&sys_info, altpath, param, romvec) == LOADER_NOT_SUPPORT) - if (linux_load(&sys_info, altpath, param, romvec) == LOADER_NOT_SUPPORT) - if (aout_load(&sys_info, altpath, param, romvec) == LOADER_NOT_SUPPORT) + if (elf_load(&sys_info, altpath, param, romvec) + == LOADER_NOT_SUPPORT) + if (linux_load(&sys_info, altpath, param) + == LOADER_NOT_SUPPORT) + if (aout_load(&sys_info, altpath, romvec) + == LOADER_NOT_SUPPORT) printk("Unsupported image format\n"); } Modified: openbios-devel/arch/sparc32/boot.h =================================================================== --- openbios-devel/arch/sparc32/boot.h 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc32/boot.h 2008-11-30 11:54:01 UTC (rev 274) @@ -6,25 +6,35 @@ * the copyright and warranty status of this work. */ -int forth_load(struct sys_info *info, const char *filename, const char *cmdline); +// forthload.c +int forth_load(const char *filename); + +// elfload.c int elf_load(struct sys_info *, const char *filename, const char *cmdline, const void *romvec); -int aout_load(struct sys_info *, const char *filename, const char *cmdline, - const void *romvec); -int linux_load(struct sys_info *, const char *filename, const char *cmdline, - const void *romvec); +// aout_load.c +int aout_load(struct sys_info *info, const char *filename, const void *romvec); + +// linux_load.c +int linux_load(struct sys_info *info, const char *file, const char *cmdline); + +// context.c +extern struct context *__context; unsigned int start_elf(unsigned long entry_point, unsigned long param); +// romvec.c void *init_openprom(unsigned long memsize, const char *path); + +// boot.c +extern struct sys_info sys_info; void boot(void); -extern struct sys_info sys_info; -extern uint32_t kernel_image; -extern uint32_t kernel_size; -extern uint32_t qemu_cmdline; -extern uint32_t cmdline_size; -extern char boot_device; +// sys_info.c extern unsigned int qemu_mem_size; + +// romvec.c extern struct linux_arguments_v0 obp_arg; + +// openbios.c extern int qemu_machine_type; Modified: openbios-devel/arch/sparc32/context.c =================================================================== --- openbios-devel/arch/sparc32/context.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc32/context.c 2008-11-30 11:54:01 UTC (rev 274) @@ -22,7 +22,7 @@ * It is placed at the bottom of our stack, and loaded by assembly routine * to start us up. */ -struct context main_ctx = { +static struct context main_ctx = { .regs[REG_SP] = (uint32_t) &_estack - 96, .pc = (uint32_t) start_main, .npc = (uint32_t) start_main + 4, Modified: openbios-devel/arch/sparc32/elfload.c =================================================================== --- openbios-devel/arch/sparc32/elfload.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc32/elfload.c 2008-11-30 11:54:01 UTC (rev 274) @@ -26,7 +26,7 @@ if (alloc_size < nmemb || alloc_size < size) { printf("calloc overflow: %u, %u\n", nmemb, size); - return 0; + return NULL; } mem = malloc(alloc_size); @@ -314,7 +314,7 @@ int image_retval; unsigned int offset; - image_name = image_version = 0; + image_name = image_version = NULL; if (!file_open(filename)) goto out; Modified: openbios-devel/arch/sparc32/forthload.c =================================================================== --- openbios-devel/arch/sparc32/forthload.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc32/forthload.c 2008-11-30 11:54:01 UTC (rev 274) @@ -16,7 +16,8 @@ #define debug printk static char *forthtext=NULL; -int forth_load(struct sys_info *info, const char *filename, const char *cmdline) + +int forth_load(const char *filename) { char magic[2]; unsigned long forthsize; Modified: openbios-devel/arch/sparc32/linux_load.c =================================================================== --- openbios-devel/arch/sparc32/linux_load.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc32/linux_load.c 2008-11-30 11:54:01 UTC (rev 274) @@ -156,7 +156,7 @@ uint8_t reserved17[1792]; /* 0x900 - 0x1000 */ }; -uint64_t forced_memsize; +static uint64_t forced_memsize; /* Load the first part the file and check if it's Linux */ static uint32_t load_linux_header(struct linux_header *hdr) @@ -293,14 +293,14 @@ unsigned long len; int k_len; int to_kern; - char *initrd = 0; + char *initrd = NULL; int toolong = 0; forced_memsize = 0; if (!orig_cmdline) { - *kern_cmdline = 0; - return 0; + *kern_cmdline = '\0'; + return NULL; } k_len = 0; @@ -327,7 +327,7 @@ val = sep + 1; len = end - val; } else { - val = 0; + val = NULL; len = 0; } @@ -434,8 +434,8 @@ return kern_size; } -static int load_initrd(struct linux_header *hdr, struct sys_info *info, - uint32_t kern_end, struct linux_params *params, const char *initrd_file) +static int load_initrd(struct linux_header *hdr, uint32_t kern_end, + struct linux_params *params, const char *initrd_file) { uint32_t max; uint32_t start, end, size; @@ -549,7 +549,7 @@ } /* Start Linux */ -static int start_linux(uint32_t kern_addr, struct linux_params *params) +static int start_linux(uint32_t kern_addr) { struct context *ctx; //extern int cursor_x, cursor_y; @@ -579,13 +579,12 @@ return ctx->regs[REG_O0]; } -int linux_load(struct sys_info *info, const char *file, const char *cmdline, - const void *romvec) +int linux_load(struct sys_info *info, const char *file, const char *cmdline) { struct linux_header hdr; struct linux_params *params; uint32_t kern_addr, kern_size; - char *initrd_file = 0; + char *initrd_file = NULL; if (!file_open(file)) return -1; @@ -610,7 +609,7 @@ } if (initrd_file) { - if (load_initrd(&hdr, info, kern_addr+kern_size, params, initrd_file) + if (load_initrd(&hdr, kern_addr+kern_size, params, initrd_file) != 0) { free(initrd_file); return -1; @@ -620,6 +619,6 @@ hardware_setup(); - start_linux(kern_addr, params); + start_linux(kern_addr); return 0; } Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc32/romvec.c 2008-11-30 11:54:01 UTC (rev 274) @@ -257,18 +257,14 @@ static void obp_reboot(char *str) { - extern volatile unsigned int *reset_reg; - printk("rebooting (%s)\n", str); *reset_reg = 1; printk("reboot failed\n"); for (;;) {} } -extern volatile unsigned char *power_reg; static void obp_abort(void) { - printk("abort, power off\n"); *power_reg = 1; printk("power off failed\n"); Modified: openbios-devel/arch/sparc32/sys_info.c =================================================================== --- openbios-devel/arch/sparc32/sys_info.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc32/sys_info.c 2008-11-30 11:54:01 UTC (rev 274) @@ -3,6 +3,7 @@ #include "elf_boot.h" #include "sys_info.h" #include "context.h" +#include "boot.h" #define printf printk #ifdef CONFIG_DEBUG_BOOT @@ -20,7 +21,6 @@ int i; unsigned long long total = 0; struct memrange *mmap; - extern struct elf_image_note elf_image_notes; /* Pick up paramters given by bootloader to us */ //info->boot_type = boot_ctx->eax; Modified: openbios-devel/arch/sparc64/aoutload.c =================================================================== --- openbios-devel/arch/sparc64/aoutload.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc64/aoutload.c 2008-11-30 11:54:01 UTC (rev 274) @@ -52,7 +52,7 @@ return 0; } -int aout_load(struct sys_info *info, const char *filename, const char *cmdline) +int aout_load(struct sys_info *info, const char *filename) { int retval = -1; int image_retval; @@ -60,7 +60,7 @@ unsigned long start, size; unsigned int offset; - image_name = image_version = 0; + image_name = image_version = NULL; if (!file_open(filename)) goto out; Modified: openbios-devel/arch/sparc64/boot.c =================================================================== --- openbios-devel/arch/sparc64/boot.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc64/boot.c 2008-11-30 11:54:01 UTC (rev 274) @@ -85,9 +85,8 @@ if (elf_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) - if (aout_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) - if (fcode_load(&sys_info, path, param) - == LOADER_NOT_SUPPORT) { + if (aout_load(&sys_info, path) == LOADER_NOT_SUPPORT) + if (fcode_load(path) == LOADER_NOT_SUPPORT) { sprintf(altpath, "%s:d", path); @@ -95,9 +94,9 @@ == LOADER_NOT_SUPPORT) if (linux_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT) - if (aout_load(&sys_info, altpath, param) + if (aout_load(&sys_info, altpath) == LOADER_NOT_SUPPORT) - if (fcode_load(&sys_info, path, param) + if (fcode_load(altpath) == LOADER_NOT_SUPPORT) printk("Unsupported image format\n"); } Modified: openbios-devel/arch/sparc64/boot.h =================================================================== --- openbios-devel/arch/sparc64/boot.h 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc64/boot.h 2008-11-30 11:54:01 UTC (rev 274) @@ -6,21 +6,32 @@ * the copyright and warranty status of this work. */ -int forth_load(struct sys_info *info, const char *filename, const char *cmdline); +// forthload.c +int forth_load(const char *filename); + +// elfload.c int elf_load(struct sys_info *info, const char *filename, const char *cmdline); + +// aout_load.c +int aout_load(struct sys_info *info, const char *filename); + +// linux_load.c int linux_load(struct sys_info *info, const char *file, const char *cmdline); -int aout_load(struct sys_info *info, const char *filename, const char *cmdline); -int fcode_load(struct sys_info *info, const char *filename, - const char *cmdline); +// fcodeload.c +int fcode_load(const char *filename); + +// context.c uint64_t start_elf(uint64_t entry_point, uint64_t param); -void boot(void); - +// boot.c +extern struct sys_info sys_info; extern uint64_t kernel_image; extern uint64_t kernel_size; extern uint64_t qemu_cmdline; extern uint64_t cmdline_size; extern char boot_device; -extern struct sys_info sys_info; +void boot(void); + +// console.c void ob_su_init(uint64_t base, uint64_t offset, int intr); Modified: openbios-devel/arch/sparc64/context.c =================================================================== --- openbios-devel/arch/sparc64/context.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc64/context.c 2008-11-30 11:54:01 UTC (rev 274) @@ -22,7 +22,7 @@ * It is placed at the bottom of our stack, and loaded by assembly routine * to start us up. */ -struct context main_ctx = { +static struct context main_ctx = { .regs[REG_SP] = (uint64_t) &_estack - 2047 - 96, .pc = (uint64_t) start_main, .npc = (uint64_t) start_main + 4, Modified: openbios-devel/arch/sparc64/elfload.c =================================================================== --- openbios-devel/arch/sparc64/elfload.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc64/elfload.c 2008-11-30 11:54:01 UTC (rev 274) @@ -26,7 +26,7 @@ if (alloc_size < nmemb || alloc_size < size) { printf("calloc overflow: %u, %u\n", nmemb, size); - return 0; + return NULL; } mem = malloc(alloc_size); @@ -313,7 +313,7 @@ int image_retval; unsigned int offset; - image_name = image_version = 0; + image_name = image_version = NULL; if (!file_open(filename)) goto out; Modified: openbios-devel/arch/sparc64/fcodeload.c =================================================================== --- openbios-devel/arch/sparc64/fcodeload.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc64/fcodeload.c 2008-11-30 11:54:01 UTC (rev 274) @@ -11,8 +11,7 @@ #define printf printk #define debug printk -int fcode_load(struct sys_info *info, const char *filename, - const char *cmdline) +int fcode_load(const char *filename) { int retval = -1; uint8_t fcode_header[8]; Modified: openbios-devel/arch/sparc64/forthload.c =================================================================== --- openbios-devel/arch/sparc64/forthload.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc64/forthload.c 2008-11-30 11:54:01 UTC (rev 274) @@ -16,7 +16,7 @@ #define debug printk static char *forthtext=NULL; -int forth_load(struct sys_info *info, const char *filename, const char *cmdline) +int forth_load(const char *filename) { char magic[2]; unsigned long forthsize; Modified: openbios-devel/arch/sparc64/linux_load.c =================================================================== --- openbios-devel/arch/sparc64/linux_load.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc64/linux_load.c 2008-11-30 11:54:01 UTC (rev 274) @@ -156,7 +156,7 @@ uint8_t reserved17[1792]; /* 0x900 - 0x1000 */ }; -uint64_t forced_memsize; +static uint64_t forced_memsize; /* Load the first part the file and check if it's Linux */ static uint32_t load_linux_header(struct linux_header *hdr) @@ -293,14 +293,14 @@ unsigned long len; int k_len; int to_kern; - char *initrd = 0; + char *initrd = NULL; int toolong = 0; forced_memsize = 0; if (!orig_cmdline) { - *kern_cmdline = 0; - return 0; + *kern_cmdline = '\0'; + return NULL; } k_len = 0; @@ -327,7 +327,7 @@ val = sep + 1; len = end - val; } else { - val = 0; + val = NULL; len = 0; } @@ -584,7 +584,7 @@ struct linux_header hdr; struct linux_params *params; uint32_t kern_addr, kern_size; - char *initrd_file = 0; + char *initrd_file = NULL; if (!file_open(file)) return -1; Modified: openbios-devel/arch/sparc64/sys_info.c =================================================================== --- openbios-devel/arch/sparc64/sys_info.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/arch/sparc64/sys_info.c 2008-11-30 11:54:01 UTC (rev 274) @@ -21,7 +21,6 @@ int i; unsigned long long total = 0; struct memrange *mmap; - extern struct elf_image_note elf_image_notes; /* Pick up paramters given by bootloader to us */ //info->boot_type = boot_ctx->eax; Modified: openbios-devel/drivers/adb.c =================================================================== --- openbios-devel/drivers/adb.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/drivers/adb.c 2008-11-30 11:54:01 UTC (rev 274) @@ -39,8 +39,6 @@ #define ADB_DPRINTF(fmt, args...) do { } while (0) #endif -static void adb_read(void); - DECLARE_UNNAMED_NODE( keyboard, INSTALL_OPEN, sizeof(int)); static void @@ -447,7 +445,6 @@ int next_key; }; -static adb_kbd_t *my_adb_kbd = NULL; static adb_dev_t *my_adb_dev = NULL; static int adb_kbd_read (void *private) @@ -504,7 +501,7 @@ set_property(ph, "device_type", "keyboard", 9); props[0] = __cpu_to_be32(dev->addr); - set_property(ph, "reg", &props, sizeof(props)); + set_property(ph, "reg", (char *)&props, sizeof(props)); aliases = find_dev("/aliases"); set_property(aliases, "adb-keyboard", buf, strlen(buf) + 1); @@ -542,14 +539,12 @@ { } -static void mouse_read(void); - NODE_METHODS( mouse ) = { { "open", mouse_open }, { "close", mouse_close }, }; -void *adb_mouse_new (char *path, void *private) +void adb_mouse_new (char *path, void *private) { char buf[64]; int props[1]; @@ -563,7 +558,7 @@ set_property(ph, "device_type", "mouse", 6); props[0] = __cpu_to_be32(dev->addr); - set_property(ph, "reg", &props, sizeof(props)); + set_property(ph, "reg", (char *)&props, sizeof(props)); set_int_property(ph, "#buttons", 3); aliases = find_dev("/aliases"); Modified: openbios-devel/drivers/adb.h =================================================================== --- openbios-devel/drivers/adb.h 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/drivers/adb.h 2008-11-30 11:54:01 UTC (rev 274) @@ -101,5 +101,6 @@ void *adb_kbd_new (char *path, void *private); +void adb_mouse_new (char *path, void *private); #endif /* !defined(__OHW_ADB_H__) */ Modified: openbios-devel/drivers/cuda.c =================================================================== --- openbios-devel/drivers/cuda.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/drivers/cuda.c 2008-11-30 11:54:01 UTC (rev 274) @@ -171,7 +171,7 @@ props[0] = __cpu_to_be32(IO_CUDA_OFFSET); props[1] = __cpu_to_be32(IO_CUDA_SIZE); - set_property(ph, "reg", &props, sizeof(props)); + set_property(ph, "reg", (char *)&props, sizeof(props)); set_int_property(ph, "interrupt-parent", pic_handle); // HEATHROW set_int_property(ph, "interrupts", 0x12); Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/drivers/esp.c 2008-11-30 11:54:01 UTC (rev 274) @@ -62,7 +62,7 @@ sd_private_t sd[8]; } esp_private_t; -esp_private_t *global_esp; +static esp_private_t *global_esp; /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE(ob_sd, INSTALL_OPEN, sizeof(sd_private_t *)); @@ -304,7 +304,7 @@ { espdma->regs = (void *)map_io(base + (uint64_t)offset, 0x10); - if (espdma->regs == 0) { + if (espdma->regs == NULL) { DPRINTF("espdma_init: cannot map registers\n"); return -1; } @@ -437,7 +437,7 @@ /* Get the IO region */ esp->ll = (void *)map_io(base + (uint64_t)espoffset, sizeof(struct esp_regs)); - if (esp->ll == 0) { + if (esp->ll == NULL) { DPRINTF("Can't map ESP registers\n"); return -1; } Modified: openbios-devel/drivers/iommu.c =================================================================== --- openbios-devel/drivers/iommu.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/drivers/iommu.c 2008-11-30 11:54:01 UTC (rev 274) @@ -41,7 +41,7 @@ }; struct mem cmem; /* Current memory, virtual */ -struct mem cio; /* Current I/O space */ +static struct mem cio; /* Current I/O space */ unsigned int va_shift; @@ -59,7 +59,7 @@ struct mem bmap; }; -struct iommu ciommu; +static struct iommu ciommu; static struct iommu_regs *regs; static void iommu_init(struct iommu *t, uint64_t base); @@ -95,7 +95,7 @@ if ((unsigned long)p >= (unsigned long)t->uplim || (unsigned long)p + size > (unsigned long)t->uplim) - return 0; + return NULL; t->curp = p + size; return p; @@ -106,7 +106,7 @@ { char *p; - if ((p = mem_alloc(t, size, align)) != 0) + if ((p = mem_alloc(t, size, align)) != NULL) memset(p, 0, size); return p; @@ -124,7 +124,7 @@ if (alloc) { p = mem_zalloc(&cmem, SRMMU_PTRS_PER_PMD * sizeof(int), SRMMU_PTRS_PER_PMD * sizeof(int)); - if (p == 0) + if (p == NULL) return -1; pte = SRMMU_ET_PTD | ((va2pa((unsigned long)p)) >> 4); l1[(va >> SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD - 1)] = pte; @@ -141,7 +141,7 @@ if (alloc) { p = mem_zalloc(&cmem, SRMMU_PTRS_PER_PTE * sizeof(void *), SRMMU_PTRS_PER_PTE * sizeof(void *)); - if (p == 0) + if (p == NULL) return -2; pte = SRMMU_ET_PTD | ((va2pa((unsigned int)p)) >> 4); *(uint32_t *)pa2va(pa) = pte; @@ -199,7 +199,7 @@ pa &= ~(PAGE_SIZE - 1); va = mem_alloc(&cio, npages * PAGE_SIZE, PAGE_SIZE); - if (va == 0) + if (va == NULL) return va; mva = (unsigned int) va; @@ -435,12 +435,12 @@ npages = (size + (PAGE_SIZE-1)) / PAGE_SIZE; va = mem_alloc(&cmem, npages * PAGE_SIZE, PAGE_SIZE); - if (va == 0) - return 0; + if (va == NULL) + return NULL; ba = (unsigned int)mem_alloc(&t->bmap, npages * PAGE_SIZE, PAGE_SIZE); if (ba == 0) - return 0; + return NULL; pa = (unsigned int)va2pa((unsigned long)va); @@ -484,7 +484,7 @@ unsigned int tmp; regs = map_io(base, IOMMU_REGS); - if (regs == 0) { + if (regs == NULL) { DPRINTF("Cannot map IOMMU\n"); for (;;) { } } @@ -505,7 +505,7 @@ /* Allocate IOMMU page table */ /* Thremendous alignment causes great waste... */ ptsize = (t->vasize/PAGE_SIZE) * sizeof(int); - if ((ptab = mem_zalloc(&cmem, ptsize, ptsize)) == 0) { + if ((ptab = mem_zalloc(&cmem, ptsize, ptsize)) == NULL) { DPRINTF("Cannot allocate IOMMU table [0x%x]\n", ptsize); for (;;) { } } Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/drivers/obio.c 2008-11-30 11:54:01 UTC (rev 274) @@ -325,7 +325,7 @@ } static unsigned char *nvram; -ohwcfg_v3_t nv_info; +static ohwcfg_v3_t nv_info; #define NVRAM_OB_START (sizeof(ohwcfg_v3_t) + sizeof(struct sparc_arch_cfg)) #define NVRAM_OB_SIZE ((NVRAM_IDPROM - NVRAM_OB_START) & ~15) @@ -807,15 +807,6 @@ static void ob_nvram_init(uint64_t base, uint64_t offset) { - extern uint32_t kernel_image; - extern uint32_t kernel_size; - extern uint32_t qemu_cmdline; - extern uint32_t cmdline_size; - extern char boot_device; - extern char obp_stdin, obp_stdout; - extern const char *obp_stdin_path, *obp_stdout_path; - extern uint16_t graphic_depth; - const char *stdin, *stdout; unsigned int i; char nographic; Modified: openbios-devel/drivers/timer.c =================================================================== --- openbios-devel/drivers/timer.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/drivers/timer.c 2008-11-30 11:54:01 UTC (rev 274) @@ -79,7 +79,7 @@ * TODO: pass via lb table */ -unsigned long get_timer_freq() +unsigned long get_timer_freq(void) { return 100000000 / 4; } Modified: openbios-devel/drivers/vga.h =================================================================== --- openbios-devel/drivers/vga.h 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/drivers/vga.h 2008-11-30 11:54:01 UTC (rev 274) @@ -14,6 +14,8 @@ #ifndef VGA_H_INCL #define VGA_H_INCL 1 +#include "video_subr.h" + //#include <cpu/p5/io.h> #define u8 unsigned char @@ -226,9 +228,4 @@ __u32 vmode; /* interlaced etc */ __u32 reserved[6]; /* Reserved for future compatibility */ }; - -void vga_set_gmode (void); -void vga_set_amode (void); -void vga_font_load(unsigned char *vidmem, const unsigned char *font, int height, - int num_chars); #endif Modified: openbios-devel/fs/grubfs/fsys_affs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_affs.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/fs/grubfs/fsys_affs.c 2008-11-30 11:54:01 UTC (rev 274) @@ -235,10 +235,10 @@ #define rdsk(x) ((struct RigidDiskBlock *)(x)->blockbuffer) #define part(x) ((struct PartitionBlock *)(x)->blockbuffer) -struct FSysBuffer *fsysb; -int blockoffset; /* offset if there is an embedded RDB partition */ -int rootb; /* block number of root block */ -int rdbb; /* block number of rdb block */ +static struct FSysBuffer *fsysb; +static int blockoffset; /* offset if there is an embedded RDB partition */ +static int rootb; /* block number of root block */ +static int rdbb; /* block number of rdb block */ static void initCache(void) { @@ -357,7 +357,7 @@ { disk_read_func = disk_read_hook; cblock = getBlock(block); - disk_read_func = 0; + disk_read_func = NULL; block = AROS_BE2LONG(extensionBlock(cblock)->extension); togo--; } @@ -383,7 +383,7 @@ len=fsysb->file.filesize-fsysb->file.current.offset; disk_read_func = disk_read_hook; cblock = getBlock(fsysb->file.current.block); - disk_read_func = 0; + disk_read_func = NULL; while (len) { disk_read_func = disk_read_hook; @@ -427,7 +427,7 @@ fsysb->file.current.byte = 0; fsysb->file.current.filekey--; } - disk_read_func = 0; + disk_read_func = NULL; len -= size; readbytes += size; } @@ -580,10 +580,9 @@ return 0; } +#ifndef STAGE1_5 static void checkPossibility(char *filename, char *bstr) { - -#ifndef STAGE1_5 char cstr[32]; if (noCaseStrCmp(filename, bstr, 1)<=0) @@ -594,8 +593,10 @@ cstr[bstr[0]]=0; print_a_completion(cstr); } +} +#else +#define checkPossibility(a, b) do { } while(0) #endif -} int affs_dir(char *dirname) { Modified: openbios-devel/fs/grubfs/fsys_ext2fs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_ext2fs.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/fs/grubfs/fsys_ext2fs.c 2008-11-30 11:54:01 UTC (rev 274) @@ -468,7 +468,7 @@ devread (map * (EXT2_BLOCK_SIZE (SUPERBLOCK) / DEV_BSIZE), offset, size, buf); - disk_read_func = 0; + disk_read_func = NULL; buf += size; len -= size; Modified: openbios-devel/fs/grubfs/fsys_jfs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_jfs.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/fs/grubfs/fsys_jfs.c 2008-11-30 11:54:01 UTC (rev 274) @@ -53,8 +53,8 @@ #define dtroot ((dtroot_t *)(&inode->di_btroot)) static ldtentry_t de_always[2] = { - {1, -1, 2, {'.', '.'}}, - {1, -1, 1, {'.'}} + {1, -1, 2, {'.', '.'}, 0}, + {1, -1, 1, {'.'}, 0} }; static int Modified: openbios-devel/fs/grubfs/fsys_reiserfs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_reiserfs.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/fs/grubfs/fsys_reiserfs.c 2008-11-30 11:54:01 UTC (rev 274) @@ -691,12 +691,12 @@ blockNr, depth); #endif /* REISERDEBUG */ if (! block_read (blockNr, 0, INFO->blocksize, cache)) - return 0; + return NULL; /* Make sure it has the right node level */ if (BLOCKHEAD (cache)->blk_level != depth) { errnum = ERR_FSYS_CORRUPT; - return 0; + return NULL; } INFO->blocks[depth] = blockNr; Modified: openbios-devel/fs/grubfs/fsys_ufs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_ufs.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/fs/grubfs/fsys_ufs.c 2008-11-30 11:54:01 UTC (rev 274) @@ -94,7 +94,7 @@ char sbbuf[SBLOCKSIZE]; /* superblock */ char secbuf[DEV_BSIZE]; /* for MBR/disklabel */ }; -struct dmadat *dmadat = (struct dmadat*)FSYS_BUF; +static struct dmadat *dmadat = (struct dmadat*)FSYS_BUF; #define SUPERBLOCK ((struct fs*)dmadat->sbbuf) Modified: openbios-devel/fs/grubfs/fsys_vstafs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_vstafs.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/fs/grubfs/fsys_vstafs.c 2008-11-30 11:54:01 UTC (rev 274) @@ -74,7 +74,7 @@ if (FILE_INFO->type != 2) { errnum = ERR_FILE_NOT_FOUND; - return 0; + return NULL; } a1 = FILE_INFO->blocks; @@ -105,8 +105,8 @@ } else { - /* errnum =ERR_FILE_NOT_FOUND; */ - return 0; + /* errnum =ERR_FILE_NOT_FOUND; */ + return NULL; } } Modified: openbios-devel/fs/grubfs/grubfs_fs.c =================================================================== --- openbios-devel/fs/grubfs/grubfs_fs.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/fs/grubfs/grubfs_fs.c 2008-11-30 11:54:01 UTC (rev 274) @@ -57,34 +57,34 @@ static const struct fsys_entry fsys_table[] = { # ifdef CONFIG_FSYS_FAT - {"fat", fat_mount, fat_read, fat_dir, 0, 0}, + {"fat", fat_mount, fat_read, fat_dir, NULL, NULL}, # endif # ifdef CONFIG_FSYS_EXT2FS - {"ext2fs", ext2fs_mount, ext2fs_read, ext2fs_dir, 0, 0}, + {"ext2fs", ext2fs_mount, ext2fs_read, ext2fs_dir, NULL, NULL}, # endif # ifdef CONFIG_FSYS_MINIX - {"minix", minix_mount, minix_read, minix_dir, 0, 0}, + {"minix", minix_mount, minix_read, minix_dir, NULL, NULL}, # endif # ifdef CONFIG_FSYS_REISERFS - {"reiserfs", reiserfs_mount, reiserfs_read, reiserfs_dir, 0, reiserfs_embed}, + {"reiserfs", reiserfs_mount, reiserfs_read, reiserfs_dir, NULL, reiserfs_embed}, # endif # ifdef CONFIG_FSYS_JFS - {"jfs", jfs_mount, jfs_read, jfs_dir, 0, jfs_embed}, + {"jfs", jfs_mount, jfs_read, jfs_dir, NULL, jfs_embed}, # endif # ifdef CONFIG_FSYS_XFS - {"xfs", xfs_mount, xfs_read, xfs_dir, 0, 0}, + {"xfs", xfs_mount, xfs_read, xfs_dir, NULL, NULL}, # endif # ifdef CONFIG_FSYS_UFS - {"ufs", ufs_mount, ufs_read, ufs_dir, 0, ufs_embed}, + {"ufs", ufs_mount, ufs_read, ufs_dir, NULL, ufs_embed}, # endif # ifdef CONFIG_FSYS_ISO9660 - {"iso9660", iso9660_mount, iso9660_read, iso9660_dir, 0, 0}, + {"iso9660", iso9660_mount, iso9660_read, iso9660_dir, NULL, NULL}, # endif # ifdef CONFIG_FSYS_NTFS - {"ntfs", ntfs_mount, ntfs_read, ntfs_dir, 0, 0}, + {"ntfs", ntfs_mount, ntfs_read, ntfs_dir, NULL, NULL}, # endif # ifdef CONFIG_FSYS_AFFS - {"affs", affs_mount, affs_read, affs_dir, 0, 0}, + {"affs", affs_mount, affs_read, affs_dir, NULL, NULL}, # endif }; @@ -157,9 +157,10 @@ grubfs_file_read( file_desc_t *fd, void *buf, size_t count ) { grubfile_t *file = (grubfile_t*)fd; - curfs = (grubfs_t *)file->fs->fs_data; - int ret; + int ret; + curfs = (grubfs_t *)file->fs->fs_data; + filepos=file->pos; filemax=file->len; @@ -186,8 +187,9 @@ open_path( fs_ops_t *fs, const char *path ) { grubfile_t *ret = NULL; + char *s = (char *)path; + curfs = (grubfs_t *)fs->fs_data; - char *s=(char *)path; while(*s) { if(*s=='\\') *s='/'; Modified: openbios-devel/fs/hfsplus/btree.c =================================================================== --- openbios-devel/fs/hfsplus/btree.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/fs/hfsplus/btree.c 2008-11-30 11:54:01 UTC (rev 274) @@ -114,12 +114,6 @@ { return (node_buf*) (cache->buffers + (i * cache->nodebufsize)); } - -/* flush the cache NYI */ -static void node_cache_flush(node_cache* cache) -{ - // NYI -} /* flush the node at index */ static void node_cache_flush_node(node_cache* cache, int index) @@ -132,7 +126,6 @@ { if (!cache->entries) // not (fully) intialized ? return; - node_cache_flush(cache); free(cache->entries); } Modified: openbios-devel/fs/hfsplus/include/libhfsp.h =================================================================== --- openbios-devel/fs/hfsplus/include/libhfsp.h 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/fs/hfsplus/include/libhfsp.h 2008-11-30 11:54:01 UTC (rev 274) @@ -27,7 +27,6 @@ # include "hfs.h" # include "hfsp.h" -extern int errno; /* Last error is eventually found here */ extern const char *hfsp_error; Modified: openbios-devel/fs/hfsplus/volume.c =================================================================== --- openbios-devel/fs/hfsplus/volume.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/fs/hfsplus/volume.c 2008-11-30 11:54:01 UTC (rev 274) @@ -114,8 +114,8 @@ * * ToDo: add more consitency checks. */ -static int -volume_readbuf(volume * vol, hfsp_vh* vh, char * p) +static int +volume_readbuf(hfsp_vh* vh, char * p) { if( (vh->signature = bswabU16_inc(p)) != HFSP_VOLHEAD_SIG) HFSP_ERROR(-1, "This is not a HFS+ volume"); @@ -159,7 +159,7 @@ if( volume_readinbuf(vol, buf, block)) return -1; - return volume_readbuf(vol, vh, buf); + return volume_readbuf(vh, buf); } /* Find out wether the volume is wrapped and unwrap it eventually */ @@ -200,7 +200,7 @@ } else if( signature == HFSP_VOLHEAD_SIG) { /* Native HFS+ volume */ p = buf; // Restore to begin of block - return volume_readbuf(vol, vh, p); + return volume_readbuf(vh, p); } else HFSP_ERROR(-1, "Neither Wrapper nor native HFS+ volume header found"); fail: Modified: openbios-devel/include/elf_boot.h =================================================================== --- openbios-devel/include/elf_boot.h 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/include/elf_boot.h 2008-11-30 11:54:01 UTC (rev 274) @@ -100,5 +100,6 @@ #define EB_IA64_IMAGE_HANDLE 0x00000007 #define EB_I386_MEMMAP 0x00000008 +extern const struct elf_image_note elf_image_notes; #endif /* ELF_BOOT_H */ Modified: openbios-devel/include/libc/string.h =================================================================== --- openbios-devel/include/libc/string.h 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/include/libc/string.h 2008-11-30 11:54:01 UTC (rev 274) @@ -17,6 +17,8 @@ #ifndef _H_STRING #define _H_STRING +#include "openbios/config.h" + #define bzero(s,n) memset( s, 0, n ) #define atol(nptr) strtol(nptr, NULL, 10 ) @@ -95,5 +97,6 @@ #define tolower(c) __tolower(c) #define toupper(c) __toupper(c) +extern int errno_int; #endif /* _H_STRING */ Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/include/openbios/drivers.h 2008-11-30 11:54:01 UTC (rev 274) @@ -13,6 +13,7 @@ #ifdef CONFIG_DRIVER_PCI int ob_pci_init(void); +void macio_nvram_init(char *path, uint32_t addr); #endif #ifdef CONFIG_DRIVER_SBUS int ob_sbus_init(uint64_t base, int machine_id); @@ -38,6 +39,17 @@ int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, int cpu); extern struct mem cmem; +extern uint16_t graphic_depth; +extern volatile unsigned char *power_reg; +extern volatile unsigned int *reset_reg; +extern const char *obp_stdin_path, *obp_stdout_path; +extern char obp_stdin, obp_stdout; +extern volatile struct sun4m_timer_regs *counter_regs; +extern uint32_t kernel_image; +extern uint32_t kernel_size; +extern uint32_t qemu_cmdline; +extern uint32_t cmdline_size; +extern char boot_device; #endif #ifdef CONFIG_DRIVER_FLOPPY int ob_floppy_init(void); Modified: openbios-devel/kernel/dict.c =================================================================== --- openbios-devel/kernel/dict.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/kernel/dict.c 2008-11-30 11:54:01 UTC (rev 274) @@ -18,7 +18,7 @@ #include "cross.h" -unsigned char *dict = 0; +unsigned char *dict = NULL; ucell *last; cell dicthead = 0; Modified: openbios-devel/kernel/internal.c =================================================================== --- openbios-devel/kernel/internal.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/kernel/internal.c 2008-11-30 11:54:01 UTC (rev 274) @@ -24,7 +24,7 @@ * point behind the pointer. */ static ucell t[] = { DOCOL, 0, (ucell)(t+3), 0 }; -ucell *trampoline = t; +static ucell *trampoline = t; #endif #ifndef CONFIG_DEBUG_INTERPRETER @@ -287,7 +287,7 @@ #ifndef FCOMPILER static ucell get_myself(void) { - static ucell **myself = 0; + static ucell **myself = NULL; if( !myself ) myself = (ucell**)findword("my-self") + 1; return (*myself && **myself) ? (ucell)**myself : 0; Modified: openbios-devel/libc/misc.c =================================================================== --- openbios-devel/libc/misc.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/libc/misc.c 2008-11-30 11:54:01 UTC (rev 274) @@ -17,7 +17,7 @@ #include "openbios/config.h" #include "libc/string.h" -int errno; +int errno_int; void qsort( void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void*) ) Modified: openbios-devel/libc/string.c =================================================================== --- openbios-devel/libc/string.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/libc/string.c 2008-11-30 11:54:01 UTC (rev 274) @@ -50,7 +50,7 @@ return (int)c1 - (int)c2; } -char * ___strtok; +static char * ___strtok; /** * strcpy - Copy a %NUL terminated string Modified: openbios-devel/libc/vsprintf.c =================================================================== --- openbios-devel/libc/vsprintf.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/libc/vsprintf.c 2008-11-30 11:54:01 UTC (rev 274) @@ -63,7 +63,7 @@ if (type & LEFT) type &= ~ZEROPAD; if (base < 2 || base > 36) - return 0; + return NULL; c = (type & ZEROPAD) ? '0' : ' '; sign = 0; if (type & SIGN) { Modified: openbios-devel/modules/cmdline.c =================================================================== --- openbios-devel/modules/cmdline.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/modules/cmdline.c 2008-11-30 11:54:01 UTC (rev 274) @@ -120,7 +120,7 @@ ci->buf[0] = 0; if( !p ) - return 0; + return NULL; for( len=0; len <= ci->ncol && p[len] != '\n' && p[len] ; len++ ) ; Modified: openbios-devel/modules/video.c =================================================================== --- openbios-devel/modules/video.c 2008-11-29 19:31:28 UTC (rev 273) +++ openbios-devel/modules/video.c 2008-11-30 11:54:01 UTC (rev 274) @@ -41,11 +41,13 @@ static void startup_splash( void ) { +#ifdef CONFIG_MOL int fd, s, i, y, x, dx, dy; int width, height; char *pp, *p; char buf[64]; - +#endif + /* only draw logo in 24-bit mode (for now) */ if( video.fb.depth < 15 ) return; @@ -247,7 +249,7 @@ video_write(void) { char *addr; - int i, len; + int len; len = GETTOS(); addr = pop_fstr_copy();

1 0

r273 - in openbios-devel: arch/sparc32 arch/sparc64 drivers fs/grubfs fs/hfsplus include include/openbios libc
by svn＠openbios.org 29 Nov '08

29 Nov '08

Author: blueswirl Date: 2008-11-29 20:31:28 +0100 (Sat, 29 Nov 2008) New Revision: 273 Modified: openbios-devel/arch/sparc32/elfload.c openbios-devel/arch/sparc32/romvec.c openbios-devel/arch/sparc64/elfload.c openbios-devel/arch/sparc64/openbios.c openbios-devel/drivers/floppy.c openbios-devel/drivers/obio.c openbios-devel/drivers/vga.h openbios-devel/fs/grubfs/dir.h openbios-devel/fs/grubfs/fsys_affs.c openbios-devel/fs/grubfs/fsys_ext2fs.c openbios-devel/fs/grubfs/fsys_vstafs.c openbios-devel/fs/grubfs/fsys_xfs.c openbios-devel/fs/hfsplus/btree.c openbios-devel/fs/hfsplus/hfsp_fs.c openbios-devel/fs/hfsplus/unicode.c openbios-devel/fs/hfsplus/volume.c openbios-devel/include/ofmem.h openbios-devel/include/openbios/firmware_abi.h openbios-devel/libc/diskio.c Log: Reduce warnings by 29% Modified: openbios-devel/arch/sparc32/elfload.c =================================================================== --- openbios-devel/arch/sparc32/elfload.c 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/arch/sparc32/elfload.c 2008-11-29 19:31:28 UTC (rev 273) @@ -308,7 +308,7 @@ Elf_phdr *phdr = NULL; unsigned long phdr_size; unsigned long checksum_offset; - unsigned short checksum; + unsigned short checksum = 0; Elf_Bhdr *boot_notes = NULL; int retval = -1; int image_retval; Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/arch/sparc32/romvec.c 2008-11-29 19:31:28 UTC (rev 273) @@ -265,9 +265,9 @@ for (;;) {} } +extern volatile unsigned char *power_reg; static void obp_abort(void) { - extern volatile unsigned char *power_reg; printk("abort, power off\n"); *power_reg = 1; @@ -277,8 +277,6 @@ static void obp_halt(void) { - extern volatile unsigned char *power_reg; - printk("halt, power off\n"); *power_reg = 1; printk("power off failed\n"); Modified: openbios-devel/arch/sparc64/elfload.c =================================================================== --- openbios-devel/arch/sparc64/elfload.c 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/arch/sparc64/elfload.c 2008-11-29 19:31:28 UTC (rev 273) @@ -307,7 +307,7 @@ Elf_phdr *phdr = NULL; unsigned long phdr_size; unsigned long checksum_offset; - unsigned short checksum; + unsigned short checksum = 0; Elf_Bhdr *boot_notes = NULL; int retval = -1; int image_retval; Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/arch/sparc64/openbios.c 2008-11-29 19:31:28 UTC (rev 273) @@ -58,14 +58,12 @@ static const struct hwdef hwdefs[] = { { - .pci.cfg_addr = PCI_CONFIG, - .pci.cfg_data = 0, - .pci.cfg_base = 0x80000000ULL, - .pci.cfg_len = 0, - .pci.mem_base = 0, - .pci.mem_len = 0, - .pci.io_base = 0, - .pci.io_len = 0, + .pci = { + .cfg_addr = PCI_CONFIG, + .cfg_data = 0, + .cfg_base = 0x80000000ULL, + .cfg_len = 0, + }, .machine_id_low = 0, .machine_id_high = 255, }, Modified: openbios-devel/drivers/floppy.c =================================================================== --- openbios-devel/drivers/floppy.c 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/drivers/floppy.c 2008-11-29 19:31:28 UTC (rev 273) @@ -223,7 +223,7 @@ static void floppy_reset(void); -static int set_dor(int fdc, char mask, char data) +static int set_dor(char mask, char data) { unsigned char newdor,olddor; @@ -236,15 +236,6 @@ return olddor; } - -static void bounce_motor(void) -{ - /* Bounce the drive motor... */ - outb(fdc_state.dor & ~(0x10<<FD_DRIVE), FD_DOR); - outb(fdc_state.dor, FD_DOR); -} - - /* waits until the fdc becomes ready */ static int wait_til_ready(void) { @@ -408,7 +399,7 @@ #endif new_dor |= (1 << (drive + 4)); /* Spinup the selected drive */ new_dor |= drive; /* Select the drive for commands as well */ - set_dor(fdc, 0xc, new_dor); + set_dor(0xc, new_dor); mdelay(DRIVE_H1440_SPINUP); @@ -432,7 +423,7 @@ mask = 0xff; mask &= ~(1 << (drive +4)); /* Now clear the bit in the Digital Output Register */ - set_dor(0, mask, 0); + set_dor(mask, 0); } /* Set the FDC's data transfer rate on behalf of the specified drive. @@ -523,7 +514,6 @@ case 1: dtr = 300; if (fdc_state.version >= FDC_82078) { - unsigned char cmd[3]; /* chose the default rate table, not the one * where 1 = 2 Mbps */ cmd[0] = FD_DRIVESPEC; @@ -553,9 +543,6 @@ if (srt > 0xf) { srt = 0xf; } - if (srt < 0 ) { - srt = 0; - } hlt = (head_load_time*scale_dtr/2 + NOMINAL_DTR - 1)/NOMINAL_DTR; if (hlt < 0x01) @@ -726,7 +713,6 @@ if (success) drive_state[FD_DRIVE].track = track; else { - int i; printk_debug("seek failed\n"); printk_debug("nr = %d\n", nr); printk_debug("ST0 = %02x\n", reply[0]); @@ -906,21 +892,23 @@ return -1; } -int floppy_read(char *dest, unsigned long offset, unsigned long length) +static int floppy_read(char *dest, unsigned long offset, unsigned long length) { - int result, bytes_read;; + int fr_result, bytes_read;; + printk_debug("floppy_read\n"); bytes_read = 0; do { int max_errors = 3; do { - result = __floppy_read(dest + bytes_read, offset, length - bytes_read); + fr_result = __floppy_read(dest + bytes_read, offset, + length - bytes_read); if (max_errors-- == 0) { return (bytes_read)?bytes_read: -1; } - } while (result <= 0); - offset += result; - bytes_read += result; + } while (fr_result <= 0); + offset += fr_result; + bytes_read += fr_result; } while(bytes_read < length); return bytes_read; } @@ -1005,7 +993,7 @@ } /* get_fdc_version */ -int floppy_init(void) +static int floppy_init(void) { printk_debug("floppy_init\n"); fdc_state.in_sync = 0; @@ -1041,13 +1029,6 @@ fdc_state.in_sync = 1; } -void floppy_fini(void) -{ - /* Disable the floppy and the floppy drive controller */ - set_dor(0, 0, 0); -} - - static void ob_floppy_initialize(int *idx) { @@ -1068,7 +1049,7 @@ static void ob_floppy_open(int *idx) { - int ret=1, len; + int ret = 1; phandle_t ph; fword("my-unit"); Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/drivers/obio.c 2008-11-29 19:31:28 UTC (rev 273) @@ -831,7 +831,7 @@ ob_new_obio_device("eeprom", NULL); - nvram = (char *)ob_reg(base, offset, NVRAM_SIZE, 1); + nvram = (unsigned char *)ob_reg(base, offset, NVRAM_SIZE, 1); PUSH((unsigned long)nvram); fword("encode-int"); Modified: openbios-devel/drivers/vga.h =================================================================== --- openbios-devel/drivers/vga.h 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/drivers/vga.h 2008-11-29 19:31:28 UTC (rev 273) @@ -227,4 +227,8 @@ __u32 reserved[6]; /* Reserved for future compatibility */ }; +void vga_set_gmode (void); +void vga_set_amode (void); +void vga_font_load(unsigned char *vidmem, const unsigned char *font, int height, + int num_chars); #endif Modified: openbios-devel/fs/grubfs/dir.h =================================================================== --- openbios-devel/fs/grubfs/dir.h 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/fs/grubfs/dir.h 2008-11-29 19:31:28 UTC (rev 273) @@ -137,11 +137,5 @@ #ifndef NULL #define NULL 0 #endif -extern DIR *opendir (); -extern struct direct *readdir (); -extern int telldir (); -extern void seekdir (); -#define rewinddir(dirp) seekdir((dirp), (long)0) -extern void closedir (); #endif /* not KERNEL */ #endif /* _BOOT_UFS_DIR_H_ */ Modified: openbios-devel/fs/grubfs/fsys_affs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_affs.c 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/fs/grubfs/fsys_affs.c 2008-11-29 19:31:28 UTC (rev 273) @@ -56,7 +56,7 @@ unsigned long pb_Flags; unsigned long pb_Reserved1[2]; unsigned long pb_DevFlags; - unsigned char pb_DriveName[32]; + char pb_DriveName[32]; unsigned long pb_Reserved2[15]; unsigned long pb_Environment[20]; unsigned long pb_EReserved[12]; @@ -201,7 +201,7 @@ unsigned int filesize; }; -#warning "Big vs. little endian for configure needed" +//#warning "Big vs. little endian for configure needed" #define AROS_BE2LONG(l) \ ( \ ((((unsigned long)(l)) >> 24) & 0x000000FFUL) | \ @@ -240,7 +240,8 @@ int rootb; /* block number of root block */ int rdbb; /* block number of rdb block */ -void initCache() { +static void initCache(void) +{ int i; for (i=0;i<MAX_CACHE_BLOCKS;i++) @@ -251,7 +252,8 @@ } } -struct CacheBlock *getBlock(unsigned int block) { +static struct CacheBlock *getBlock(unsigned int block) +{ struct CacheBlock *freeblock; int i; @@ -278,7 +280,8 @@ return freeblock; } -unsigned int calcChkSum(unsigned short SizeBlock, unsigned int *buffer) { +static unsigned int calcChkSum(unsigned short SizeBlock, unsigned int *buffer) +{ unsigned int sum=0,count=0; for (count=0;count<SizeBlock;count++) @@ -337,7 +340,8 @@ return 1; } -int seek(unsigned long offset) { +static int seek(unsigned long offset) +{ struct CacheBlock *cblock; unsigned long block; unsigned long togo; @@ -391,7 +395,7 @@ { cblock = getBlock(fsysb->file.current.block); } -#warning "else shouldn't occour" + //#warning "else shouldn't occour" } size = 512; size -= fsysb->file.current.byte; @@ -405,7 +409,7 @@ extensionBlock(cblock)->filekey_table [fsysb->file.current.filekey] )+blockoffset, - fsysb->file.current.byte, size, (char *)((int)buf+readbytes) + fsysb->file.current.byte, size, (char *)((long)buf+readbytes) ); fsysb->file.current.byte += size; } @@ -418,7 +422,7 @@ extensionBlock(cblock)->filekey_table [fsysb->file.current.filekey] )+blockoffset, - fsysb->file.current.byte, size, (char *)((int)buf+readbytes) + fsysb->file.current.byte, size, (char *)((long)buf+readbytes) ); fsysb->file.current.byte = 0; fsysb->file.current.filekey--; @@ -432,7 +436,8 @@ return readbytes; } -unsigned char capitalch(unsigned char ch, unsigned char flags) { +static unsigned char capitalch(unsigned char ch, unsigned char flags) +{ if ((flags==0) || (flags==1)) return (unsigned char)((ch>='a') && (ch<='z') ? ch-('a'-'A') : ch); @@ -442,7 +447,8 @@ } // str2 is a BCPL string -int noCaseStrCmp(char *str1, char *str2, unsigned char flags) { +static int noCaseStrCmp(char *str1, char *str2, unsigned char flags) +{ unsigned char length; length=str2++[0]; @@ -456,7 +462,8 @@ return (*str1) ? 1 : -1; } -unsigned int getHashKey(char *name,unsigned int tablesize, unsigned char flags) { +static unsigned int getHashKey(char *name,unsigned int tablesize, unsigned char flags) +{ unsigned int length; length=0; @@ -467,7 +474,8 @@ return length%tablesize; } -grub_error_t getHeaderBlock(char *name, struct CacheBlock **dirh) { +static grub_error_t getHeaderBlock(char *name, struct CacheBlock **dirh) +{ int key; key = getHashKey(name, 72, 1); @@ -501,8 +509,8 @@ return 0; } -char *copyPart(char *src, char *dst) { - +static char *copyPart(char *src, char *dst) +{ while ((*src != '/') && (*src)) *dst++ = *src++; if (*src == '/') @@ -514,7 +522,8 @@ return src; } -grub_error_t findBlock(char *name, struct CacheBlock **dirh) { +static grub_error_t findBlock(char *name, struct CacheBlock **dirh) +{ char dname[32]; int block; @@ -571,7 +580,8 @@ return 0; } -void checkPossibility(char *filename, char *bstr) { +static void checkPossibility(char *filename, char *bstr) +{ #ifndef STAGE1_5 char cstr[32]; @@ -668,7 +678,7 @@ fname = filename; while (*fname) *current++ = *fname++; -#warning "TODO: add some more chars until posibilities differ" + //#warning "TODO: add some more chars until possibilities differ" if (print_possibilities>0) errnum = ERR_FILE_NOT_FOUND; return (print_possibilities<0); Modified: openbios-devel/fs/grubfs/fsys_ext2fs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_ext2fs.c 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/fs/grubfs/fsys_ext2fs.c 2008-11-29 19:31:28 UTC (rev 273) @@ -587,7 +587,7 @@ log2 (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode))); printf ("ext2fs_dir: inode table fsblock=%d\n", ino_blk); #endif /* E2DEBUG */ - if (!ext2_rdfsb (ino_blk, INODE)) + if (!ext2_rdfsb (ino_blk, (char *)INODE)) { return 0; } Modified: openbios-devel/fs/grubfs/fsys_vstafs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_vstafs.c 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/fs/grubfs/fsys_vstafs.c 2008-11-29 19:31:28 UTC (rev 273) @@ -30,8 +30,8 @@ #define FIRST_SECTOR ((struct first_sector *) FSYS_BUF) -#define FILE_INFO ((struct fs_file *) (int) FIRST_SECTOR + 8192) -#define DIRECTORY_BUF ((struct dir_entry *) (int) FILE_INFO + 512) +#define FILE_INFO ((struct fs_file *) (long) FIRST_SECTOR + 8192) +#define DIRECTORY_BUF ((struct dir_entry *) (long) FILE_INFO + 512) #define ROOT_SECTOR 1 @@ -39,7 +39,6 @@ * In f_sector we store the sector number in which the information about * the found file is. */ -extern int filepos; static int f_sector; int @@ -63,7 +62,7 @@ } static int curr_ext, current_direntry, current_blockpos; -static struct alloc *a; +static struct alloc *a1; static struct dir_entry * vstafs_readdir (long sector) @@ -78,9 +77,9 @@ return 0; } - a = FILE_INFO->blocks; + a1 = FILE_INFO->blocks; curr_ext = 0; - devread (a[curr_ext].a_start, 0, 512, (char *) DIRECTORY_BUF); + devread (a1[curr_ext].a_start, 0, 512, (char *) DIRECTORY_BUF); current_direntry = 11; current_blockpos = 0; @@ -93,7 +92,7 @@ if (current_direntry > 15) { current_direntry = 0; - if (++current_blockpos > (a[curr_ext].a_len - 1)) + if (++current_blockpos > (a1[curr_ext].a_len - 1)) { current_blockpos = 0; curr_ext++; @@ -101,8 +100,8 @@ if (curr_ext < FILE_INFO->extents) { - devread (a[curr_ext].a_start + current_blockpos, 0, - 512, (char *) DIRECTORY_BUF); + devread (a1[curr_ext].a_start + current_blockpos, 0, + 512, (char *) DIRECTORY_BUF); } else { @@ -188,35 +187,35 @@ int vstafs_read (char *addr, int len) { - struct alloc *a; + struct alloc *a2; int size, ret = 0, offset, curr_len = 0; - int curr_ext; + int curr_ext2; char extent; int ext_size; char *curr_pos; get_file_info (f_sector); size = FILE_INFO->len-VSTAFS_START_DATA; - a = FILE_INFO->blocks; + a2 = FILE_INFO->blocks; if (filepos > 0) { - if (filepos < a[0].a_len * 512 - VSTAFS_START_DATA) + if (filepos < a2[0].a_len * 512 - VSTAFS_START_DATA) { offset = filepos + VSTAFS_START_DATA; extent = 0; - curr_len = a[0].a_len * 512 - offset - filepos; + curr_len = a2[0].a_len * 512 - offset - filepos; } else { - ext_size = a[0].a_len * 512 - VSTAFS_START_DATA; + ext_size = a2[0].a_len * 512 - VSTAFS_START_DATA; offset = filepos - ext_size; extent = 1; do { curr_len -= ext_size; offset -= ext_size; - ext_size = a[extent+1].a_len * 512; + ext_size = a2[extent+1].a_len * 512; } while (extent < FILE_INFO->extents && offset>ext_size); } @@ -225,16 +224,16 @@ { offset = VSTAFS_START_DATA; extent = 0; - curr_len = a[0].a_len * 512 - offset; + curr_len = a2[0].a_len * 512 - offset; } curr_pos = addr; if (curr_len > len) curr_len = len; - for (curr_ext=extent; - curr_ext < FILE_INFO->extents; - curr_len = a[curr_ext].a_len * 512, curr_pos += curr_len, curr_ext++) + for (curr_ext2=extent; + curr_ext2 < FILE_INFO->extents; + curr_len = a2[curr_ext].a_len * 512, curr_pos += curr_len, curr_ext2++) { ret += curr_len; size -= curr_len; @@ -244,7 +243,7 @@ curr_len += size; } - devread (a[curr_ext].a_start,offset, curr_len, curr_pos); + devread (a2[curr_ext2].a_start,offset, curr_len, curr_pos); offset = 0; } Modified: openbios-devel/fs/grubfs/fsys_xfs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_xfs.c 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/fs/grubfs/fsys_xfs.c 2008-11-29 19:31:28 UTC (rev 273) @@ -97,7 +97,7 @@ return ino & XFS_INO_MASK(XFS_INO_OFFSET_BITS); } -static inline __const__ __uint16_t +static inline __uint16_t le16 (__uint16_t x) { #ifdef __i386__ @@ -110,7 +110,7 @@ #endif } -static inline __const__ __uint32_t +static inline __uint32_t le32 (__uint32_t x) { #ifdef __i386__ @@ -130,7 +130,7 @@ #endif } -static inline __const__ __uint64_t +static inline __uint64_t le64 (__uint64_t x) { __uint32_t h = x >> 32; @@ -195,7 +195,7 @@ } #undef offsetof -#define offsetof(t,m) ((int)&(((t *)0)->m)) +#define offsetof(t,m) ((long)&(((t *)0)->m)) static inline int btroot_maxrecs (void) Modified: openbios-devel/fs/hfsplus/btree.c =================================================================== --- openbios-devel/fs/hfsplus/btree.c 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/fs/hfsplus/btree.c 2008-11-29 19:31:28 UTC (rev 273) @@ -38,7 +38,7 @@ * * return pointer after reading the structure */ -static void* btree_readnode(btree* bt, btree_node_desc* node, void *p) +static void* btree_readnode(btree_node_desc* node, void *p) { node->next = bswabU32_inc(p); node->prev = bswabU32_inc(p); @@ -53,7 +53,7 @@ * * return pointer after reading the structure */ -static void* btree_readhead(btree* bt, btree_head* head, void *p) +static void* btree_readhead(btree_head* head, void *p) { UInt32 *q; head->depth = bswabU16_inc(p); @@ -153,7 +153,7 @@ return NULL; // evil ... result->index = node_index; - btree_readnode(bt, &result->desc, p); + btree_readnode(&result->desc, p); e -> priority = result->desc.height * DEPTH_FACTOR; e -> index = node_index; @@ -229,10 +229,10 @@ HFSP_EXTENT_DATA, bt->cnid); if (!p) return -1; - p = btree_readnode(bt, &node, p); + p = btree_readnode(&node, p); if (node.kind != HFSP_NODE_HEAD) return -1; // should not happen ? - p = btree_readhead(bt, &bt->head, p); + p = btree_readhead(&bt->head, p); node_size = bt->head.node_size; bt->blkpernode = node_size / vol->blksize; Modified: openbios-devel/fs/hfsplus/hfsp_fs.c =================================================================== --- openbios-devel/fs/hfsplus/hfsp_fs.c 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/fs/hfsplus/hfsp_fs.c 2008-11-29 19:31:28 UTC (rev 273) @@ -98,7 +98,7 @@ static int match_file( record *r, record *parent, const void *match_data, hfsp_file_t *pt ) { - unsigned char *p = (char*)match_data; + const char *p = (const char*)match_data; char name[256]; int ret=1; @@ -340,7 +340,7 @@ max -= t->pos - curpos; } size = (count-act_count > max)? max : count-act_count; - memcpy( buf + act_count, &buf2[add], size ); + memcpy( (char *)buf + act_count, &buf2[add], size ); curpos += blksize; act_count += size; Modified: openbios-devel/fs/hfsplus/unicode.c =================================================================== --- openbios-devel/fs/hfsplus/unicode.c 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/fs/hfsplus/unicode.c 2008-11-29 19:31:28 UTC (rev 273) @@ -79,8 +79,8 @@ register UInt16 length1 = ustr1->strlen; register UInt16 length2 = ustr2->strlen; register const UInt16* lowerCaseTable = gLowerCaseTable; - register UInt16* str1 = ustr1->name; - register UInt16* str2 = ustr2->name; + register const UInt16* str1 = ustr1->name; + register const UInt16* str2 = ustr2->name; while (1) { // Set default values for c1, c2 in case there are no more valid chars Modified: openbios-devel/fs/hfsplus/volume.c =================================================================== --- openbios-devel/fs/hfsplus/volume.c 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/fs/hfsplus/volume.c 2008-11-29 19:31:28 UTC (rev 273) @@ -115,7 +115,7 @@ * ToDo: add more consitency checks. */ static int -volume_readbuf(volume * vol, hfsp_vh* vh, void* p) +volume_readbuf(volume * vol, hfsp_vh* vh, char * p) { if( (vh->signature = bswabU16_inc(p)) != HFSP_VOLHEAD_SIG) HFSP_ERROR(-1, "This is not a HFS+ volume"); @@ -168,7 +168,7 @@ { UInt16 signature; char buf[vol->blksize]; - void *p = buf; + char *p = buf; if( volume_readinbuf(vol, buf, 2) ) // Wrapper or volume header starts here return -1; Modified: openbios-devel/include/ofmem.h =================================================================== --- openbios-devel/include/ofmem.h 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/include/ofmem.h 2008-11-29 19:31:28 UTC (rev 273) @@ -29,10 +29,4 @@ extern void ofmem_release( ulong virt, ulong size ); extern ulong ofmem_translate( ulong virt, ulong *ret_mode ); -/* allocations from the private pool */ -extern void *malloc( int size ); -extern void free( void *ptr ); -extern void *realloc( void *ptr, size_t size ); - - #endif /* _H_OFMEM */ Modified: openbios-devel/include/openbios/firmware_abi.h =================================================================== --- openbios-devel/include/openbios/firmware_abi.h 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/include/openbios/firmware_abi.h 2008-11-29 19:31:28 UTC (rev 273) @@ -139,7 +139,7 @@ } static inline uint32_t -OpenBIOS_set_var(uint8_t *nvram, uint32_t addr, const unsigned char *str) +OpenBIOS_set_var(uint8_t *nvram, uint32_t addr, const char *str) { uint32_t len; Modified: openbios-devel/libc/diskio.c =================================================================== --- openbios-devel/libc/diskio.c 2008-11-29 16:24:51 UTC (rev 272) +++ openbios-devel/libc/diskio.c 2008-11-29 19:31:28 UTC (rev 273) @@ -108,7 +108,7 @@ push_str( filename ); call_package( fdp->reopen_xt, fdp->ih ); - ret = (POP() == -1)? 0:-1; + ret = (POP() == (ucell)-1)? 0 : -1; return ret; } @@ -121,7 +121,7 @@ if( lookup_xt(fdp->ih, "open-nwrom", &fdp->open_nwrom_xt) ) return -1; call_package( fdp->open_nwrom_xt, fdp->ih ); - return (POP() == -1)? 0:-1; + return (POP() == (ucell)-1)? 0 : -1; } ihandle_t

1 0

r272 - in openbios-devel: arch/sparc64 drivers kernel modules
by svn＠openbios.org 29 Nov '08

29 Nov '08

Author: blueswirl Date: 2008-11-29 17:24:51 +0100 (Sat, 29 Nov 2008) New Revision: 272 Modified: openbios-devel/arch/sparc64/aoutload.c openbios-devel/arch/sparc64/elfload.c openbios-devel/arch/sparc64/linux_load.c openbios-devel/arch/sparc64/openbios.c openbios-devel/drivers/floppy.c openbios-devel/kernel/cross.h openbios-devel/modules/client.c Log: Fix most print format warnings Modified: openbios-devel/arch/sparc64/aoutload.c =================================================================== --- openbios-devel/arch/sparc64/aoutload.c 2008-11-29 13:20:42 UTC (rev 271) +++ openbios-devel/arch/sparc64/aoutload.c 2008-11-29 16:24:51 UTC (rev 272) @@ -106,11 +106,11 @@ if (N_MAGIC(ehdr) == NMAGIC) { if ((unsigned long)lfile_read((void *)start, ehdr.a_text) != ehdr.a_text) { - printf("Can't read program text segment (size 0x%lx)\n", ehdr.a_text); + printf("Can't read program text segment (size 0x%x)\n", ehdr.a_text); goto out; } if ((unsigned long)lfile_read((void *)(start + N_DATADDR(ehdr)), ehdr.a_data) != ehdr.a_data) { - printf("Can't read program data segment (size 0x%lx)\n", ehdr.a_data); + printf("Can't read program data segment (size 0x%x)\n", ehdr.a_data); goto out; } } else { Modified: openbios-devel/arch/sparc64/elfload.c =================================================================== --- openbios-devel/arch/sparc64/elfload.c 2008-11-29 13:20:42 UTC (rev 271) +++ openbios-devel/arch/sparc64/elfload.c 2008-11-29 16:24:51 UTC (rev 272) @@ -145,7 +145,7 @@ for (i = 0; i < phnum; i++) { if (phdr[i].p_type != PT_LOAD) continue; - debug("segment %d addr:%#lx file:%#lx mem:%#lx ", + debug("segment %d addr:%#llx file:%#llx mem:%#llx ", i, addr_fixup(phdr[i].p_paddr), phdr[i].p_filesz, phdr[i].p_memsz); file_seek(offset + phdr[i].p_offset); debug("loading... "); @@ -377,7 +377,7 @@ //debug("current time: %lu\n", currticks()); - debug("entry point is %#lx\n", addr_fixup(ehdr.e_entry)); + debug("entry point is %#llx\n", addr_fixup(ehdr.e_entry)); printf("Jumping to entry point...\n"); #if 0 Modified: openbios-devel/arch/sparc64/linux_load.c =================================================================== --- openbios-devel/arch/sparc64/linux_load.c 2008-11-29 13:20:42 UTC (rev 271) +++ openbios-devel/arch/sparc64/linux_load.c 2008-11-29 16:24:51 UTC (rev 272) @@ -574,7 +574,7 @@ ctx = switch_to(ctx); /* It's impossible but... */ - printf("Returned with o0=%#lx\n", ctx->regs[REG_O0]); + printf("Returned with o0=%#llx\n", ctx->regs[REG_O0]); return ctx->regs[REG_O0]; } Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-11-29 13:20:42 UTC (rev 271) +++ openbios-devel/arch/sparc64/openbios.c 2008-11-29 16:24:51 UTC (rev 272) @@ -598,7 +598,7 @@ cmdline_size = size; boot_device = nv_info.boot_devices[0]; - printk("kernel addr %lx size %lx\n", kernel_image, kernel_size); + printk("kernel addr %llx size %llx\n", kernel_image, kernel_size); if (size) printk("kernel cmdline %s\n", obio_cmdline); Modified: openbios-devel/drivers/floppy.c =================================================================== --- openbios-devel/drivers/floppy.c 2008-11-29 13:20:42 UTC (rev 271) +++ openbios-devel/drivers/floppy.c 2008-11-29 16:24:51 UTC (rev 272) @@ -938,7 +938,7 @@ if ((bytes = result(reply_buffer, MAX_REPLIES)) <= 0x00) return FDC_NONE; /* No FDC present ??? */ if ((bytes==1) && (reply_buffer[0] == 0x80)){ - printk_info("FDC %d is an 8272A\n"); + printk_info("FDC is an 8272A\n"); return FDC_8272A; /* 8272a/765 don't know DUMPREGS */ } if (bytes != 10) { Modified: openbios-devel/kernel/cross.h =================================================================== --- openbios-devel/kernel/cross.h 2008-11-29 13:20:42 UTC (rev 271) +++ openbios-devel/kernel/cross.h 2008-11-29 16:24:51 UTC (rev 272) @@ -43,8 +43,8 @@ #define target_ulong(value) (target_long(value)) #if BITS==32 -#define target_ucell(value) (target_long(value)) -#define target_cell(value) (target_long(value)) +#define target_ucell(value) ((ucell)target_long(value)) +#define target_cell(value) ((cell)target_long(value)) #elif BITS==64 #ifdef NATIVE_BITWIDTH_LARGER_THAN_HOST_BITWIDTH #define target_ucell(value) ( ((ucell)target_long((value)&0xffffffff))<<32 ) @@ -108,9 +108,14 @@ #ifdef NATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH #define pointer2cell(x) ((ucell)(x)) #define cell2pointer(x) ((u8 *)(x)) +#if BITS==32 #define FMT_CELL_x "x" #define FMT_CELL_d "d" +#else +#define FMT_CELL_x "lx" +#define FMT_CELL_d "ld" #endif +#endif #ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH extern unsigned long base_address; Modified: openbios-devel/modules/client.c =================================================================== --- openbios-devel/modules/client.c 2008-11-29 13:20:42 UTC (rev 271) +++ openbios-devel/modules/client.c 2008-11-29 16:24:51 UTC (rev 272) @@ -97,7 +97,7 @@ if( (val=POP()) ) { dstackcnt = dstacksave; if( val == -1 ) - printk("Unimplemented service %s ([%d] -- [%d])\n", + printk("Unimplemented service %s ([%ld] -- [%ld])\n", pb->service, pb->nargs, pb->nret ); return -1; }

1 0

r271 - openbios-devel/drivers
by svn＠openbios.org 29 Nov '08

29 Nov '08

Author: blueswirl Date: 2008-11-29 14:20:42 +0100 (Sat, 29 Nov 2008) New Revision: 271 Modified: openbios-devel/drivers/pci.c Log: Restore r257 (mostly) Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-11-29 13:18:32 UTC (rev 270) +++ openbios-devel/drivers/pci.c 2008-11-29 13:20:42 UTC (rev 271) @@ -16,12 +16,12 @@ #include "openbios/config.h" #include "openbios/bindings.h" #include "openbios/kernel.h" +#include "openbios/pci.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" #include "openbios/drivers.h" #include "timer.h" -#include "openbios/pci.h" #include "pci.h" #define set_bool_property(ph, name) set_property(ph, name, NULL, 0); @@ -56,16 +56,1231 @@ { "close", ob_pci_close }, }; -static int ob_pci_add_properties(pci_addr addr) +/* PCI devices database */ +typedef struct pci_class_t pci_class_t; +typedef struct pci_subclass_t pci_subclass_t; +typedef struct pci_iface_t pci_iface_t; +typedef struct pci_dev_t pci_dev_t; + +typedef struct pci_config_t pci_config_t; + +struct pci_config_t { + char path[64]; + uint32_t regions[7]; + uint32_t sizes[7]; +}; + +struct pci_iface_t { + uint8_t iface; + const char *name; + const char *type; + const pci_dev_t *devices; + int (*config_cb)(const pci_config_t *config); + const void *private; +}; + +struct pci_subclass_t { + uint8_t subclass; + const char *name; + const char *type; + const pci_dev_t *devices; + const pci_iface_t *iface; + int (*config_cb)(const pci_config_t *config); + const void *private; +}; + +struct pci_class_t { + const char *name; + const char *type; + const pci_subclass_t *subc; +}; + +struct pci_dev_t { + uint16_t vendor; + uint16_t product; + const char *type; + const char *name; + const char *model; + const char *compat; + int acells; + int scells; + int icells; + int (*config_cb)(const pci_config_t *config); + const void *private; +}; + +/* Current machine description */ + +typedef struct pci_bridge_t pci_bridge_t; + +/* Low level access helpers */ +struct pci_ops_t { + uint8_t (*config_readb)(pci_bridge_t *bridge, + uint8_t bus, uint8_t devfn, uint8_t offset); + void (*config_writeb)(pci_bridge_t *bridge, + uint8_t bus, uint8_t devfn, + uint8_t offset, uint8_t val); + uint16_t (*config_readw)(pci_bridge_t *bridge, + uint8_t bus, uint8_t devfn, uint8_t offset); + void (*config_writew)(pci_bridge_t *bridge, + uint8_t bus, uint8_t devfn, + uint8_t offset, uint16_t val); + uint32_t (*config_readl)(pci_bridge_t *bridge, + uint8_t bus, uint8_t devfn, uint8_t offset); + void (*config_writel)(pci_bridge_t *bridge, + uint8_t bus, uint8_t devfn, + uint8_t offset, uint32_t val); +}; + +static const pci_subclass_t undef_subclass[] = { +#if 0 + { + 0x00, "misc undefined", NULL, NULL, NULL, + NULL, NULL, + }, +#endif + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static int ide_config_cb2 (const pci_config_t *config) { +#if 0 + ide_init(config->path, + config->regions[0] & ~0x0000000F, + config->regions[1] & ~0x0000000F, + config->regions[2] & ~0x0000000F, + config->regions[3] & ~0x0000000F); +#endif + return 0; +} + +static const pci_dev_t ide_devices[] = { + { + 0x1095, 0x0646, /* CMD646 IDE controller */ + "pci-ide", "pci-ata", NULL, NULL, + 0, 0, 0, + ide_config_cb2, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static const pci_subclass_t mass_subclass[] = { + { + 0x00, "SCSI bus controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "IDE controller", "ide", ide_devices, NULL, + NULL, NULL, + }, + { + 0x02, "Floppy disk controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "IPI bus controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x04, "RAID controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x05, "ATA controller", "ata", NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc mass-storage controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_dev_t eth_devices[] = { + { 0x10EC, 0x8029, + NULL, "NE2000", "NE2000 PCI", NULL, + 0, 0, 0, + NULL, "ethernet", + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static void eth_config_cb (const pci_config_t *config) +{ + phandle_t ph; + cell props[12]; + int i; + + ph = find_dev(config->path); + + set_property(ph, "network-type", "ethernet", 9); + set_property(ph, "removable", "network", 8); + set_property(ph, "category", "net", 4); + + for (i = 0; i < 7; i++) + { + props[i*2] = config->regions[i]; + props[i*2 + 1] = config->sizes[i]; + } + set_property(ph, "reg", props, i * 2 * sizeof(cell)); +} + +static const pci_subclass_t net_subclass[] = { + { + 0x00, "ethernet controller", NULL, eth_devices, NULL, + eth_config_cb, "ethernet", + }, + { + 0x01, "token ring controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "FDDI controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "ATM controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x04, "ISDN controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x05, "WordFip controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x06, "PICMG 2.14 controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc network controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_dev_t vga_devices[] = { + { + 0x1002, 0x5046, + NULL, "ATY", "ATY Rage128", "VGA", + 0, 0, 0, + NULL, NULL, + }, + { + 0x1234, 0x1111, + NULL, "QEMU,VGA", "Qemu VGA", "VGA", + 0, 0, 0, + NULL, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +/* VGA configuration */ + +static int vga_config_cb (const pci_config_t *config) +{ +#if 0 + if (config->regions[0] != 0x00000000) + vga_vbe_init(config->path, config->regions[0], config->sizes[0], + config->regions[1], config->sizes[1]); +#endif + return 0; +} + +static const struct pci_iface_t vga_iface[] = { + { + 0x00, "VGA controller", NULL, + vga_devices, &vga_config_cb, NULL, + }, + { + 0x01, "8514 compatible controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_subclass_t displ_subclass[] = { + { + 0x00, "display controller", NULL, NULL, vga_iface, + NULL, NULL, + }, + { + 0x01, "XGA display controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "3D display controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc display controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t media_subclass[] = { + { + 0x00, "video device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "audio device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "computer telephony device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc multimedia device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t mem_subclass[] = { + { + 0x00, "RAM controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "flash controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_dev_t grackle_fake_bridge = { + 0xFFFF, 0xFFFF, + "pci", "pci-bridge", "DEC,21154", "DEC,21154.pci-bridge", + -1, -1, -1, + NULL, NULL, +}; + +static const pci_dev_t uninorth_agp_fake_bridge = { + 0xFFFF, 0xFFFF, + "uni-north-agp", "uni-north-agp", NULL, "uni-north-agp", + -1, -1, -1, + NULL, NULL, +}; + +static const pci_dev_t uninorth_fake_bridge = { + 0xFFFF, 0xFFFF, + "uni-north", "uni-north", NULL, "uni-north", + -1, -1, -1, + NULL, NULL, +}; + + +static const pci_dev_t hbrg_devices[] = { + { + 0x106B, 0x0020, NULL, + "pci", "AAPL,UniNorth", "uni-north", + 3, 2, 1, + NULL, &uninorth_agp_fake_bridge, + }, + { + 0x106B, 0x001F, NULL, + "pci", "AAPL,UniNorth", "uni-north", + 3, 2, 1, + NULL, &uninorth_fake_bridge, + }, + { + 0x106B, 0x001E, NULL, + "pci", "AAPL,UniNorth", "uni-north", + 3, 2, 1, + NULL, &uninorth_fake_bridge, + }, + { + 0x1057, 0x0002, "pci", + "pci", "MOT,MPC106", "grackle", + 3, 2, 1, + NULL, &grackle_fake_bridge, + }, + { + 0x1057, 0x4801, NULL, + "pci-bridge", "PREP Host PCI Bridge - Motorola Raven", NULL, + 3, 2, 1, + NULL, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static const pci_dev_t PCIbrg_devices[] = { + { + 0x1011, 0x0026, NULL, + "pci-bridge", NULL, NULL, + 3, 2, 1, + NULL, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static const pci_subclass_t bridg_subclass[] = { + { + 0x00, "PCI host bridge", NULL, hbrg_devices, NULL, + NULL, NULL, + }, + { + 0x01, "ISA bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "EISA bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "MCA bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x04, "PCI-to-PCI bridge", NULL, PCIbrg_devices, NULL, + NULL, NULL, + }, + { + 0x05, "PCMCIA bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x06, "NUBUS bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x07, "cardbus bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x08, "raceway bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x09, "semi-transparent PCI-to-PCI bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x0A, "infiniband-to-PCI bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc PCI bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_iface_t serial_iface[] = { + { + 0x00, "XT serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "16450 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "16550 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x03, "16650 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x04, "16750 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x05, "16850 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x06, "16950 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_iface_t par_iface[] = { + { + 0x00, "parallel port", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "bi-directional parallel port", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "ECP 1.x parallel port", NULL, + NULL, NULL, NULL, + }, + { + 0x03, "IEEE 1284 controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFE, "IEEE 1284 device", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_iface_t modem_iface[] = { + { + 0x00, "generic modem", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "Hayes 16450 modem", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "Hayes 16550 modem", NULL, + NULL, NULL, NULL, + }, + { + 0x03, "Hayes 16650 modem", NULL, + NULL, NULL, NULL, + }, + { + 0x04, "Hayes 16750 modem", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_subclass_t comm_subclass[] = { + { + 0x00, "serial controller", NULL, NULL, serial_iface, + NULL, NULL, + }, + { + 0x01, "parallel port", NULL, NULL, par_iface, + NULL, NULL, + }, + { + 0x02, "multiport serial controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "modem", NULL, NULL, modem_iface, + NULL, NULL, + }, + { + 0x04, "GPIB controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x05, "smart card", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc communication device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_iface_t pic_iface[] = { + { + 0x00, "8259 PIC", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "ISA PIC", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "EISA PIC", NULL, + NULL, NULL, NULL, + }, + { + 0x10, "I/O APIC", NULL, + NULL, NULL, NULL, + }, + { + 0x20, "I/O APIC", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_iface_t dma_iface[] = { + { + 0x00, "8237 DMA controller", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "ISA DMA controller", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "EISA DMA controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_iface_t tmr_iface[] = { + { + 0x00, "8254 system timer", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "ISA system timer", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "EISA system timer", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_iface_t rtc_iface[] = { + { + 0x00, "generic RTC controller", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "ISA RTC controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_dev_t sys_devices[] = { + /* IBM MPIC controller */ + { + 0x1014, 0x0002, + "open-pic", "MPIC", NULL, "chrp,open-pic", + 0, 0, 2, + NULL, NULL, + }, + /* IBM MPIC2 controller */ + { + 0x1014, 0xFFFF, + "open-pic", "MPIC2", NULL, "chrp,open-pic", + 0, 0, 2, + NULL, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static const pci_subclass_t sys_subclass[] = { + { + 0x00, "PIC", NULL, NULL, pic_iface, + NULL, NULL, + }, + { + 0x01, "DMA controller", NULL, NULL, dma_iface, + NULL, NULL, + }, + { + 0x02, "system timer", NULL, NULL, tmr_iface, + NULL, NULL, + }, + { + 0x03, "RTC controller", NULL, NULL, rtc_iface, + NULL, NULL, + }, + { + 0x04, "PCI hotplug controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc system peripheral", NULL, sys_devices, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t inp_subclass[] = { + { + 0x00, "keyboard controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "digitizer", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "mouse controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "scanner controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x04, "gameport controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc input device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t dock_subclass[] = { + { + 0x00, "generic docking station", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc docking station", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t cpu_subclass[] = { + { + 0x00, "i386 processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "i486 processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "pentium processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x10, "alpha processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x20, "PowerPC processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x30, "MIPS processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x40, "co-processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_iface_t usb_iface[] = { + { + 0x00, "UHCI USB controller", NULL, + NULL, NULL, NULL, + }, + { + 0x10, "OHCI USB controller", NULL, + NULL, NULL, NULL, + }, + { + 0x20, "EHCI USB controller", NULL, + NULL, NULL, NULL, + }, + { + 0x80, "misc USB controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFE, "USB device", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_iface_t ipmi_iface[] = { + { + 0x00, "IPMI SMIC interface", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "IPMI keyboard interface", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "IPMI block transfer interface", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_subclass_t ser_subclass[] = { + { + 0x00, "Firewire bus controller", "ieee1394", NULL, NULL, + NULL, NULL, + }, + { + 0x01, "ACCESS bus controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "SSA controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "USB controller", "usb", NULL, usb_iface, + NULL, NULL, + }, + { + 0x04, "fibre channel controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x05, "SMBus controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x06, "InfiniBand controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x07, "IPMI interface", NULL, NULL, ipmi_iface, + NULL, NULL, + }, + { + 0x08, "SERCOS controller", NULL, NULL, ipmi_iface, + NULL, NULL, + }, + { + 0x09, "CANbus controller", NULL, NULL, ipmi_iface, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t wrl_subclass[] = { + { + 0x00, "IRDA controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "consumer IR controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x10, "RF controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x11, "bluetooth controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x12, "broadband controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc wireless controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t sat_subclass[] = { + { + 0x01, "satellite TV controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "satellite audio controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "satellite voice controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x04, "satellite data controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t crypt_subclass[] = { + { + 0x00, "cryptographic network controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x10, "cryptographic entertainment controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc cryptographic controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_subclass_t spc_subclass[] = { + { + 0x00, "DPIO module", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "performances counters", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x10, "communication synchronisation", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x20, "management card", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc signal processing controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_class_t pci_classes[] = { + /* 0x00 */ + { "undefined", NULL, undef_subclass, }, + /* 0x01 */ + { "mass-storage controller", NULL, mass_subclass, }, + /* 0x02 */ + { "network controller", "network", net_subclass, }, + /* 0x03 */ + { "display controller", "display", displ_subclass, }, + /* 0x04 */ + { "multimedia device", NULL, media_subclass, }, + /* 0x05 */ + { "memory controller", "memory-controller", mem_subclass, }, + /* 0x06 */ + { "PCI bridge", "pci", bridg_subclass, }, + /* 0x07 */ + { "communication device", NULL, comm_subclass,}, + /* 0x08 */ + { "system peripheral", NULL, sys_subclass, }, + /* 0x09 */ + { "input device", NULL, inp_subclass, }, + /* 0x0A */ + { "docking station", NULL, dock_subclass, }, + /* 0x0B */ + { "processor", NULL, cpu_subclass, }, + /* 0x0C */ + { "serial bus controller", NULL, ser_subclass, }, + /* 0x0D */ + { "wireless controller", NULL, wrl_subclass, }, + /* 0x0E */ + { "intelligent I/O controller", NULL, NULL, }, + /* 0x0F */ + { "satellite communication controller", NULL, sat_subclass, }, + /* 0x10 */ + { "cryptographic controller", NULL, crypt_subclass, }, + /* 0x11 */ + { "signal processing controller", NULL, spc_subclass, }, +}; + +phandle_t pic_handle; +static int macio_config_cb (const pci_config_t *config) +{ + char buf[64]; + phandle_t ph; + cell props[2]; + + sprintf(buf, "%s/interrupt-controller", config->path); + REGISTER_NAMED_NODE(ob_pci_node, buf); + + ph = find_dev(buf); + set_property(ph, "device_type", "interrupt-controller", 21); + set_property(ph, "compatible", "heathrow\0mac-risc", 18); + set_int_property(ph, "#interrupt-cells", 1); + props[0]= 0x10; + props[1]= 0x20; + set_property(ph, "reg", &props, sizeof(props)); + pic_handle = ph; + +#if 0 + cuda_init(config->path, config->regions[0]); + macio_nvram_init(config->path, config->regions[0]); + ide_init(config->path, + config->regions[0] + 0x1f000, + config->regions[0] + 0x1f000 + 0x1000, + config->regions[0] + 0x1f000 + 0x2000, + config->regions[0] + 0x1f000 + 0x3000); +#endif +#if 0 + OF_finalize_pci_macio(device->common.OF_private, + device->regions[0] & ~0x0000000F, device->sizes[0], + private_data); +#endif + return 0; +} + +static const pci_dev_t misc_pci[] = { + /* Paddington Mac I/O */ + { + 0x106B, 0x0017, + "mac-io", "mac-io", "AAPL,343S1211", "paddington\1heathrow", + 1, 1, 1, + &macio_config_cb, NULL, + }, + /* KeyLargo Mac I/O */ + { + 0x106B, 0x0022, + "mac-io", "mac-io", "AAPL,Keylargo", "Keylargo", + 1, 1, 2, + &macio_config_cb, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static const pci_dev_t *pci_find_device (uint8_t class, uint8_t subclass, + uint8_t iface, uint16_t vendor, + uint16_t product) +{ + int (*config_cb)(pci_config_t *config); + const pci_class_t *pclass; + const pci_subclass_t *psubclass; + const pci_iface_t *piface; + const pci_dev_t *dev; + const void *private; + pci_dev_t *new; + const char *name, *type; + + name = "unknown"; + type = "unknown"; + config_cb = NULL; + private = NULL; + + if (class == 0x00 && subclass == 0x01) { + /* Special hack for old style VGA devices */ + class = 0x03; + subclass = 0x00; + } else if (class == 0xFF) { + /* Special case for misc devices */ + dev = misc_pci; + goto find_device; + } + if (class > (sizeof(pci_classes) / sizeof(pci_class_t))) { + name = "invalid PCI device"; + type = "invalid"; + goto bad_device; + } + pclass = &pci_classes[class]; + name = pclass->name; + type = pclass->type; + for (psubclass = pclass->subc; ; psubclass++) { + if (psubclass->subclass == 0xFF) + goto bad_device; + if (psubclass->subclass == subclass) { + if (psubclass->name != NULL) + name = psubclass->name; + if (psubclass->type != NULL) + type = psubclass->type; + if (psubclass->config_cb != NULL) { + config_cb = psubclass->config_cb; + } + if (psubclass->private != NULL) + private = psubclass->private; + if (psubclass->iface != NULL) + break; + dev = psubclass->devices; + goto find_device; + } + } + for (piface = psubclass->iface; ; piface++) { + if (piface->iface == 0xFF) { + dev = psubclass->devices; + break; + } + if (piface->iface == iface) { + if (piface->name != NULL) + name = piface->name; + if (piface->type != NULL) + type = piface->type; + if (piface->config_cb != NULL) { + config_cb = piface->config_cb; + } + if (piface->private != NULL) + private = piface->private; + dev = piface->devices; + break; + } + } + find_device: + for (;; dev++) { + if (dev->vendor == 0xFFFF && dev->product == 0xFFFF) { + goto bad_device; + } + if (dev->vendor == vendor && dev->product == product) { + if (dev->name != NULL) + name = dev->name; + if (dev->type != NULL) + type = dev->type; + if (dev->config_cb != NULL) { + config_cb = dev->config_cb; + } + if (dev->private != NULL) + private = dev->private; + new = malloc(sizeof(pci_dev_t)); + if (new == NULL) + return NULL; + new->vendor = vendor; + new->product = product; + new->type = type; + new->name = name; + new->model = dev->model; + new->compat = dev->compat; + new->config_cb = config_cb; + new->private = private; + + return new; + } + } + bad_device: + printk("Cannot manage '%s' PCI device type '%s':\n %x %x (%x %x %x)\n", + name, type, vendor, product, class, subclass, iface); + + return NULL; +} + +#define set_bool_property(ph, name) set_property(ph, name, NULL, 0); + + +static void ob_pci_add_properties(pci_addr addr, const pci_dev_t *pci_dev, + const pci_config_t *config) +{ phandle_t dev=get_cur_dev(); int status,id; + uint16_t vendor_id, device_id; + uint8_t rev; + vendor_id = pci_config_read16(addr, PCI_VENDOR_ID); + device_id = pci_config_read16(addr, PCI_DEVICE_ID); + rev = pci_config_read8(addr, PCI_REVISION_ID); + /* create properties as described in 2.5 */ - set_int_property(dev, "vendor-id", pci_config_read16(addr, PCI_VENDOR_ID)); - set_int_property(dev, "device-id", pci_config_read16(addr, PCI_DEVICE_ID)); - set_int_property(dev, "revision-id", pci_config_read8(addr, PCI_REVISION_ID)); + printk("%s\n", pci_dev->name); + set_int_property(dev, "vendor-id", vendor_id); + set_int_property(dev, "device-id", device_id); + set_int_property(dev, "revision-id", rev); set_int_property(dev, "interrupts", pci_config_read8(addr, PCI_INTERRUPT_LINE)); @@ -95,14 +1310,32 @@ set_int_property(dev, "cache-line-size", pci_config_read16(addr, PCI_CACHE_LINE_SIZE)); + if (pci_dev->type) { + push_str(pci_dev->type); + fword("encode-string"); + push_str("device_type"); + fword("property"); + } + if (pci_dev->model) { + push_str(pci_dev->model); + fword("encode-string"); + push_str("model"); + fword("property"); + } + push_str(pci_dev->name); + fword("encode-string"); + push_str("class"); + fword("property"); + if (pci_dev->config_cb) + pci_dev->config_cb(config); } -static int ob_pci_add_reg(pci_addr addr) +static void ob_pci_add_reg(pci_addr addr) { PUSH(0); PUSH(0); - PUSH(addr&(~0x80000000u)); + PUSH(addr&(~arch->cfg_base)); fword("pci-addr-encode"); PUSH(0); PUSH(0); @@ -112,118 +1345,6 @@ fword("property"); } -static int ob_pci_add_class(pci_addr addr) -{ - unsigned int class; - char *strc; - - class=pci_config_read16(addr, PCI_CLASS_DEVICE); - switch (class) { - case 0x001: strc="display"; break; - case 0x100: strc="scsi"; break; - case 0x101: strc="ide"; break; - case 0x102: strc="fdc"; break; - case 0x103: strc="ipi"; break; - case 0x104: strc="raid"; break; - case 0x200: strc="ethernet"; break; - case 0x201: strc="token-ring"; break; - case 0x202: strc="fddi"; break; - case 0x203: strc="atm"; break; - case 0x400: strc="video"; break; - case 0x401: strc="sound"; break; - case 0x500: strc="memory"; break; - case 0x501: strc="flash"; break; - case 0x600: strc="host"; break; - case 0x601: strc="isa"; break; - case 0x602: strc="eisa"; break; - case 0x603: strc="mca"; break; - case 0x604: strc="pci"; break; - case 0x605: strc="pcmcia"; break; - case 0x606: strc="nubus"; break; - case 0x607: strc="cardbus"; break; - case 0x680: strc="pmu"; break; /* not in pci binding */ - case 0x700: strc="serial"; break; - case 0x701: strc="parallel"; break; - case 0x703: strc="modem"; break; /* not in pci binding */ - case 0x800: strc="interrupt-controller"; break; - case 0x801: strc="dma-controller"; break; - case 0x802: strc="timer"; break; - case 0x803: strc="rtc"; break; - case 0x900: strc="keyboard"; break; - case 0x901: strc="pen"; break; - case 0x902: strc="mouse"; break; - case 0xC00: strc="firewire"; break; - case 0xC01: strc="access-bus"; break; - case 0xC02: strc="ssa"; break; - case 0xC03: strc="usb"; break; - case 0xC04: strc="fibre-channel"; break; - default: - switch (class>>8) { - case 0x3: strc="display"; break; - case 0xA: strc="dock"; break; - case 0xB: strc="cpu"; break; - default:strc="unknown"; break; - } - } - if ((class>>8) == 0x03) { - push_str(strc); - fword("encode-string"); - push_str("device_type"); - fword("property"); - } - push_str(strc); - fword("encode-string"); - push_str("class"); - fword("property"); - - -#ifdef CONFIG_DEBUG_PCI - printk("%s\n", strc); -#endif -} - -static void -pci_enable_rom(pci_addr dev) -{ - u32 rom_addr; - - rom_addr=pci_config_read32(dev, PCI_ROM_ADDRESS); - rom_addr |= PCI_ROM_ADDRESS_ENABLE; - pci_config_write32(dev, PCI_ROM_ADDRESS, rom_addr); -} - -static void -pci_disable_rom(pci_addr dev) -{ - u32 rom_addr; - - rom_addr=pci_config_read32(dev, PCI_ROM_ADDRESS); - rom_addr &= ~PCI_ROM_ADDRESS_ENABLE; - pci_config_write32(dev, PCI_ROM_ADDRESS, rom_addr); -} - - -static void ob_pci_scan_rom(pci_addr addr) -{ - unsigned long rom_addr=pci_config_read32(addr,PCI_ROM_ADDRESS); - unsigned char *walk; - - rom_addr &= PCI_ROM_ADDRESS_MASK; - if(rom_addr) { - printk(" ROM found at 0x%lx\n",rom_addr); - pci_enable_rom(addr); - walk=phys_to_virt((unsigned char *)rom_addr); - if (walk[0]!=0x55 || walk[1]!=0xaa) { - printk("no pci rom\n"); - goto rom_err; - } - -rom_err: - pci_disable_rom(addr); - } - -} - #ifdef CONFIG_XBOX static char pci_xbox_blacklisted (int bus, int devnum, int fn) { @@ -263,14 +1384,92 @@ } #endif -static void ob_scan_pci_bus(int bus, char *path) +static void +ob_pci_configure(pci_arch_t *addr, pci_config_t *config, uint32_t *mem_base, + uint32_t *io_base) + { + uint32_t smask, omask, amask, size, reloc, min_align; + uint32_t *base; + pci_addr config_addr; + int reg; + + omask = 0x00000000; + for (reg = 0; reg < 7; reg++) { + + config->regions[reg] = 0x00000000; + config->sizes[reg] = 0x00000000; + + if ((omask & 0x0000000f) == 0x4) { + /* 64 bits memory mapping */ + continue; + } + + if (reg == 6) + config_addr = PCI_ROM_ADDRESS; + else + config_addr = PCI_BASE_ADDR_0 + reg * 4; + + /* get region size */ + + pci_config_write32(addr, config_addr, 0xffffffff); + smask = pci_config_read32(addr, config_addr); + if (smask == 0x00000000 || smask == 0xffffffff) + continue; + + if (smask & 0x00000001 && reg != 6) { + /* I/O space */ + base = *io_base; + min_align = 1 << 7; + amask = 0x00000001; + pci_config_write16(addr, PCI_COMMAND, + pci_config_read16(addr, + PCI_COMMAND) | + PCI_COMMAND_IO); + } else { + /* Memory Space */ + base = *mem_base; + min_align = 1 << 16; + amask = 0x0000000F; + if (reg == 6) { + smask |= 1; /* ROM */ + } + pci_config_write16(addr, PCI_COMMAND, + pci_config_read16(addr, + PCI_COMMAND) | + PCI_COMMAND_MEMORY); + } + omask = smask & amask; + smask &= ~amask; + size = (~smask) + 1; + config->sizes[reg] = size; + reloc = base; + if (size < min_align) + size = min_align; + reloc = (reloc + size -1) & ~(size - 1); + if (*io_base == base) { + *io_base = reloc + size; + reloc -= arch->io_base; + } else { + *mem_base = reloc + size; + } + pci_config_write32(addr, config_addr, reloc | omask); + config->regions[reg] = reloc; +printk("region %08x size %08x\n", config->regions[reg], config->sizes[reg]); + } +} + +static void ob_scan_pci_bus(int bus, unsigned long *mem_base, + unsigned long *io_base, const char *path) +{ int devnum, fn, is_multi, vid, did; unsigned int htype; pci_addr addr; - char * nodetemp = "%s/pci%x,%x"; - char nodebuff[32]; phandle_t dnode, dbus; + pci_config_t config; + const pci_dev_t *pci_dev; + uint32_t ccode; + uint8_t class, subclass, iface, rev; for (devnum = 0; devnum < 32; devnum++) { is_multi = 0; @@ -279,13 +1478,21 @@ if (pci_xbox_blacklisted (bus, devnum, fn)) continue; #endif - addr = PCI_ADDR(bus, devnum, fn); vid = pci_config_read16(addr, PCI_VENDOR_ID); did = pci_config_read16(addr, PCI_DEVICE_ID); if (vid==0xffff || vid==0) continue; + + ccode = pci_config_read16(addr, PCI_CLASS_DEVICE); + class = ccode >> 8; + subclass = ccode; + iface = pci_config_read8(addr, PCI_CLASS_PROG); + rev = pci_config_read8(addr, PCI_REVISION_ID); + + pci_dev = pci_find_device(class, subclass, iface, vid, did); + #ifdef CONFIG_DEBUG_PCI printk("%x:%x.%x - %x:%x - ", bus, devnum, fn, vid, did); @@ -297,35 +1504,49 @@ activate_device(path); dbus=get_cur_dev(); - sprintf(nodebuff, nodetemp, path, vid, did); + if (pci_dev == NULL || pci_dev->name == NULL) + sprintf(config.path, "%s/pci%x,%x", path, vid, did); + else + sprintf(config.path, "%s/%s", path, pci_dev->name); #ifdef CONFIG_DEBUG_PCI - printk("%s - ", nodebuff); + printk("%s - ", config.path); #endif - REGISTER_NAMED_NODE(ob_pci_node, nodebuff); - dnode=find_dev(nodebuff); + REGISTER_NAMED_NODE(ob_pci_node, config.path); + dnode=find_dev(config.path); activate_dev( dnode ); - - ob_pci_add_properties(addr); + ob_pci_configure(addr, &config, mem_base, io_base); +{ + int irq_pin, irq_line; + static const uint8_t heathrow_pci_irqs[4] = { 0x15, 0x16, 0x17, 0x18 }; + irq_pin = pci_config_read8(addr, PCI_INTERRUPT_PIN); + if (irq_pin > 0) { + irq_pin = (devnum + irq_pin - 1) & 3; + irq_line = heathrow_pci_irqs[irq_pin]; + } +} + ob_pci_add_properties(addr, pci_dev, &config); ob_pci_add_reg(addr); - ob_pci_add_class(addr); - ob_pci_scan_rom(addr); device_end(); - activate_dev( dbus ); + } } } - int ob_pci_init(void) { - char *path="/pci"; - int bus; + int bus; + unsigned long mem_base, io_base; printk("Initializing PCI devices...\n"); - + /* brute force bus scan */ - for (bus=0; bus<0x100; bus++) { - ob_scan_pci_bus(bus, path); + + /* Find all PCI bridges */ + + mem_base = arch->mem_base; + io_base = arch->io_base; + for (bus = 0; bus<0x100; bus++) { + ob_scan_pci_bus(bus, &mem_base, &io_base, "/pci"); } return 0; }

1 0

r270 - in openbios-devel: arch/ppc/qemu arch/sparc64 drivers include/openbios include/ppc include/sparc64
by svn＠openbios.org 29 Nov '08

29 Nov '08

Author: blueswirl Date: 2008-11-29 14:18:32 +0100 (Sat, 29 Nov 2008) New Revision: 270 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/sparc64/openbios.c openbios-devel/drivers/pci.c openbios-devel/drivers/pci.h openbios-devel/include/openbios/pci.h openbios-devel/include/ppc/pci.h openbios-devel/include/sparc64/pci.h Log: Use pci_arch_t also on Sparc64 (but disable PCI probing for now, hangs) Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-11-29 13:10:17 UTC (rev 269) +++ openbios-devel/arch/ppc/qemu/init.c 2008-11-29 13:18:32 UTC (rev 270) @@ -61,7 +61,6 @@ 0xfe000000, 0x00800000, 0xfd000000, 0x01000000, }, }; -pci_arch_t *arch; uint32_t isa_io_base; void Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-11-29 13:10:17 UTC (rev 269) +++ openbios-devel/arch/sparc64/openbios.c 2008-11-29 13:18:32 UTC (rev 270) @@ -16,6 +16,8 @@ #include "openbios/nvram.h" #include "sys_info.h" #include "openbios.h" +#include "openbios/pci.h" +#include "asm/pci.h" #include "libc/byteorder.h" #define cpu_to_be16(x) __cpu_to_be16(x) #include "openbios/firmware_abi.h" @@ -30,6 +32,10 @@ #define BIOS_CFG_CMD 0x510 #define BIOS_CFG_DATA 0x511 +#define APB_SPECIAL_BASE 0x1fe00000000ULL +#define PCI_CONFIG (APB_SPECIAL_BASE + 0x1000000ULL) +#define APB_MEM_BASE 0x1ff00000000ULL + static unsigned char intdict[256 * 1024]; // XXX @@ -45,6 +51,26 @@ static uint8_t idprom[32]; +struct hwdef { + pci_arch_t pci; + uint8_t machine_id_low, machine_id_high; +}; + +static const struct hwdef hwdefs[] = { + { + .pci.cfg_addr = PCI_CONFIG, + .pci.cfg_data = 0, + .pci.cfg_base = 0x80000000ULL, + .pci.cfg_len = 0, + .pci.mem_base = 0, + .pci.mem_len = 0, + .pci.io_base = 0, + .pci.io_len = 0, + .machine_id_low = 0, + .machine_id_high = 255, + }, +}; + struct cpudef { unsigned long iu_version; const char *name; @@ -818,9 +844,26 @@ static void arch_init( void ) { + unsigned int i; + uint8_t qemu_machine_type; + const struct hwdef *hwdef; + + outw(__cpu_to_le16(FW_CFG_MACHINE_ID), BIOS_CFG_CMD); + qemu_machine_type = inb(BIOS_CFG_DATA); + + for (i = 0; i < sizeof(hwdefs) / sizeof(struct hwdef); i++) { + if (hwdefs[i].machine_id_low <= qemu_machine_type && + hwdefs[i].machine_id_high >= qemu_machine_type) { + hwdef = &hwdefs[i]; + break; + } + } + if (!hwdef) + for(;;); // Internal inconsistency, hang + modules_init(); #ifdef CONFIG_DRIVER_PCI - ob_pci_init(); + //ob_pci_init(); #endif #ifdef CONFIG_DRIVER_IDE setup_timers(); Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-11-29 13:10:17 UTC (rev 269) +++ openbios-devel/drivers/pci.c 2008-11-29 13:18:32 UTC (rev 270) @@ -29,6 +29,8 @@ /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_pci_node, INSTALL_OPEN, 2*sizeof(int) ); +pci_arch_t *arch; + static void ob_pci_open(int *idx) { Modified: openbios-devel/drivers/pci.h =================================================================== --- openbios-devel/drivers/pci.h 2008-11-29 13:10:17 UTC (rev 269) +++ openbios-devel/drivers/pci.h 2008-11-29 13:18:32 UTC (rev 270) @@ -54,8 +54,6 @@ #define PCI_MIN_GNT 0x3e /* 8 bits */ #define PCI_MAX_LAT 0x3f /* 8 bits */ -typedef uint32_t pci_addr; - typedef struct { u16 signature; u8 reserved[0x16]; Modified: openbios-devel/include/openbios/pci.h =================================================================== --- openbios-devel/include/openbios/pci.h 2008-11-29 13:10:17 UTC (rev 269) +++ openbios-devel/include/openbios/pci.h 2008-11-29 13:18:32 UTC (rev 270) @@ -1,22 +1,26 @@ #ifndef _H_PCI #define _H_PCI +typedef uint32_t pci_addr; + typedef struct pci_arch_t pci_arch_t; struct pci_arch_t { - char * name; - uint16_t vendor_id; - uint16_t device_id; - uint32_t cfg_addr; - uint32_t cfg_data; - uint32_t cfg_base; - uint32_t cfg_len; - uint32_t mem_base; - uint32_t mem_len; - uint32_t io_base; - uint32_t io_len; - uint32_t rbase; - uint32_t rlen; + const char * name; + uint16_t vendor_id; + uint16_t device_id; + unsigned long cfg_addr; + unsigned long cfg_data; + unsigned long cfg_base; + unsigned long cfg_len; + unsigned long mem_base; + unsigned long mem_len; + unsigned long io_base; + unsigned long io_len; + unsigned long rbase; + unsigned long rlen; }; +extern pci_arch_t *arch; + #endif /* _H_PCI */ Modified: openbios-devel/include/ppc/pci.h =================================================================== --- openbios-devel/include/ppc/pci.h 2008-11-29 13:10:17 UTC (rev 269) +++ openbios-devel/include/ppc/pci.h 2008-11-29 13:18:32 UTC (rev 270) @@ -3,7 +3,7 @@ #include "asm/io.h" -#if !(PCI_CONFIG_1 || PCI_CONFIG_2) +#if !(defined(PCI_CONFIG_1) || defined(PCI_CONFIG_2)) #define PCI_CONFIG_1 1 /* default */ #endif @@ -11,8 +11,6 @@ /* PCI Configuration Mechanism #1 */ -extern pci_arch_t *arch; - #define PCI_ADDR(bus, dev, fn) \ ((pci_addr) (arch->cfg_base \ | (uint32_t) (bus) << 16 \ Modified: openbios-devel/include/sparc64/pci.h =================================================================== --- openbios-devel/include/sparc64/pci.h 2008-11-29 13:10:17 UTC (rev 269) +++ openbios-devel/include/sparc64/pci.h 2008-11-29 13:18:32 UTC (rev 270) @@ -11,10 +11,8 @@ /* PCI Configuration Mechanism #1 */ -/* Have pci_addr in the same format as the values written to 0xcf8 - * so register accesses can be made easy. */ #define PCI_ADDR(bus, dev, fn) \ - ((pci_addr) (0x80000000u \ + ((pci_addr) (arch->cfg_base \ | (uint32_t) (bus) << 16 \ | (uint32_t) (dev) << 11 \ | (uint32_t) (fn) << 8)) @@ -23,46 +21,47 @@ #define PCI_DEV(pcidev) ((uint8_t) ((pcidev) >> 11) & 0x1f) #define PCI_FN(pcidev) ((uint8_t) ((pcidev) >> 8) & 7) -#define APB_SPECIAL_BASE 0x1fe00000000ULL -#define PCI_CONFIG (APB_SPECIAL_BASE + 0x1000000ULL) -#define APB_MEM_BASE 0x1ff00000000ULL - static inline uint8_t pci_config_read8(pci_addr dev, uint8_t reg) { - out_le32((void *)PCI_CONFIG, dev | (reg & ~3)); - return in_8((void *)(APB_MEM_BASE | (reg & 3))); + uint8_t res; + out_le32((unsigned *)arch->cfg_addr, dev | (reg & ~3)); + res = in_8((unsigned char*)(arch->cfg_data + (reg & 3))); + return res; } static inline uint16_t pci_config_read16(pci_addr dev, uint8_t reg) { - out_le32((void *)PCI_CONFIG, dev | (reg & ~3)); - return in_le16((void *)(APB_MEM_BASE | (reg & 2))); + uint16_t res; + out_le32((unsigned *)arch->cfg_addr, dev | (reg & ~3)); + res = in_le16((unsigned short*)(arch->cfg_data + (reg & 2))); + return res; } static inline uint32_t pci_config_read32(pci_addr dev, uint8_t reg) { - out_le32((void *)PCI_CONFIG, dev | reg); - return in_le32((void *)(APB_MEM_BASE | reg)); + uint32_t res; + out_le32((unsigned *)arch->cfg_addr, dev | reg); + res = in_le32((unsigned *)(arch->cfg_data + reg)); + return res; } static inline void pci_config_write8(pci_addr dev, uint8_t reg, uint8_t val) { - out_le32((void *)PCI_CONFIG, dev | (reg & ~3)); - out_8((void *)(APB_MEM_BASE | (reg & 3)), val); + out_le32((unsigned *)arch->cfg_addr, dev | (reg & ~3)); + out_8((unsigned char*)(arch->cfg_data + (reg & 3)), val); } static inline void pci_config_write16(pci_addr dev, uint8_t reg, uint16_t val) { - out_le32((void *)PCI_CONFIG, dev | (reg & ~3)); - out_le16((void *)(APB_MEM_BASE | (reg & 2)), val); + out_le32((unsigned *)arch->cfg_addr, dev | (reg & ~3)); + out_le16((unsigned short *)(arch->cfg_data + (reg & 2)), val); } static inline void pci_config_write32(pci_addr dev, uint8_t reg, uint32_t val) { - out_le32((void *)PCI_CONFIG, dev | reg); - out_le32((void *)(APB_MEM_BASE | reg), val); + out_le32((unsigned *)arch->cfg_addr, dev | reg); + out_le32((unsigned *)(arch->cfg_data + reg), val); } - #else /* !PCI_CONFIG_1 */ #error PCI Configuration Mechanism is not specified or implemented #endif

1 0

r269 - openbios-devel/kernel
by svn＠openbios.org 29 Nov '08

29 Nov '08

Author: blueswirl Date: 2008-11-29 14:10:17 +0100 (Sat, 29 Nov 2008) New Revision: 269 Modified: openbios-devel/kernel/bootstrap.c Log: Fix some warnings Modified: openbios-devel/kernel/bootstrap.c =================================================================== --- openbios-devel/kernel/bootstrap.c 2008-11-28 20:28:23 UTC (rev 268) +++ openbios-devel/kernel/bootstrap.c 2008-11-29 13:10:17 UTC (rev 269) @@ -411,7 +411,7 @@ static void builddefer(char *name) { fcreate(name, DODFR); /* see dict.h for DODFR and other CFA ids */ - writecell(0); + writecell((ucell)0); writecell((ucell)findword("(semis)")); } @@ -611,7 +611,7 @@ writecell(LIT); writecell(pointer2cell(dict) + loco); writecell(LIT); - writecell(cnt); + writecell((ucell)cnt); writecell(DOBRANCH); loco = cnt + sizeof(cell) - 1; loco &= ~(sizeof(cell) - 1);

1 0

Support for Acer Aspire 3680?
by Daniel Levine 29 Nov '08

29 Nov '08

Are Acer Aspire series laptops such as the 3680 currently supported by OpenBIOS? As the 3680's BIOS is limited in functionality and very buggy, I'm looking for alternatives to it, and Coreboot, which appears largely Linux-centric, isn't looking so great. (I'm trying to get FreeBSD running on the laptop, and being hampered by the buggy BIOS.) As for the laptop's hardware: - Northbridge is Intel 945GM. Is this supported? - Southbridge is Intel ICH7. This I'm more concerned about, as Coreboot support for it seems to be still in development. Is this supported by OpenBIOS, or should I be looking at Coreboot snapshots instead? Thanks, and apologies if I've got the wrong mailing list - this looked as good a place as any to ask end-user questions about OpenBIOS.

3 2

r268 - openbios-devel/kernel
by svn＠openbios.org 28 Nov '08

28 Nov '08

Author: blueswirl Date: 2008-11-28 21:28:23 +0100 (Fri, 28 Nov 2008) New Revision: 268 Modified: openbios-devel/kernel/forth.c Log: Delete unnecessary definition Modified: openbios-devel/kernel/forth.c =================================================================== --- openbios-devel/kernel/forth.c 2008-11-28 20:21:46 UTC (rev 267) +++ openbios-devel/kernel/forth.c 2008-11-28 20:28:23 UTC (rev 268) @@ -6,8 +6,6 @@ * the copyright and warranty status of this work. */ -extern uint32_t isa_io_base; - /* * dup ( x -- x x ) */

1 0

r267 - openbios-devel/drivers
by svn＠openbios.org 28 Nov '08

28 Nov '08

Author: blueswirl Date: 2008-11-28 21:21:46 +0100 (Fri, 28 Nov 2008) New Revision: 267 Modified: openbios-devel/drivers/pci.c Log: Fix PPC compilation Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-11-28 19:40:28 UTC (rev 266) +++ openbios-devel/drivers/pci.c 2008-11-28 20:21:46 UTC (rev 267) @@ -21,6 +21,7 @@ #include "openbios/drivers.h" #include "timer.h" +#include "openbios/pci.h" #include "pci.h" #define set_bool_property(ph, name) set_property(ph, name, NULL, 0);

1 0

r266 - in openbios-devel: arch/ppc include/ppc
by svn＠openbios.org 28 Nov '08

28 Nov '08

Author: blueswirl Date: 2008-11-28 20:40:28 +0100 (Fri, 28 Nov 2008) New Revision: 266 Modified: openbios-devel/arch/ppc/build.xml openbios-devel/arch/ppc/misc.S openbios-devel/arch/ppc/start.S openbios-devel/arch/ppc/timebase.S openbios-devel/include/ppc/asmdefs.h Log: Eliminate M4 macros Modified: openbios-devel/arch/ppc/build.xml =================================================================== --- openbios-devel/arch/ppc/build.xml 2008-11-25 19:54:01 UTC (rev 265) +++ openbios-devel/arch/ppc/build.xml 2008-11-28 19:40:28 UTC (rev 266) @@ -102,9 +102,7 @@ <library name="briq" target="target" type="static" condition="BRIQ"> <object source="misc.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="ofmem.c"/> <object source="briq/briq.c" flags="-Iarch/ppc"/> @@ -119,9 +117,7 @@ <library name="pearpc" target="target" type="static" condition="PEARPC"> <object source="misc.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="ofmem.c"/> <object source="pearpc/pearpc.c" flags="-Iarch/ppc"/> @@ -138,9 +134,7 @@ <library name="qemu" target="target" type="static" condition="QEMU"> <object source="misc.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="ofmem.c"/> <object source="qemu/qemu.c" flags="-Iarch/ppc"/> @@ -157,9 +151,7 @@ <library name="mol" target="target" type="static" condition="MOL"> <object source="misc.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="ofmem.c"/> <object source="mol/init.c" flags="-Iarch/ppc"/> @@ -184,15 +176,11 @@ </rule> <object source="start.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="timebase.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <external-object source="libbriq.a"/> <external-object source="libbootstrap.a"/> @@ -212,15 +200,11 @@ </rule> <object source="start.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="timebase.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <external-object source="libpearpc.a"/> <external-object source="libbootstrap.a"/> @@ -239,15 +223,11 @@ </rule> <object source="start.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="timebase.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <external-object source="libqemu.a"/> <external-object source="libbootstrap.a"/> @@ -270,9 +250,7 @@ </rule> <object source="start.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <external-object source="libmol.a"/> <external-object source="libbootstrap.a"/> Modified: openbios-devel/arch/ppc/misc.S =================================================================== --- openbios-devel/arch/ppc/misc.S 2008-11-25 19:54:01 UTC (rev 265) +++ openbios-devel/arch/ppc/misc.S 2008-11-28 19:40:28 UTC (rev 266) @@ -20,7 +20,6 @@ * */ -changequote([[[[[,]]]]]) [[[[[ /* shield includes from m4-expansion */ #include "asm/asmdefs.h" #include "asm/processor.h" Modified: openbios-devel/arch/ppc/start.S =================================================================== --- openbios-devel/arch/ppc/start.S 2008-11-25 19:54:01 UTC (rev 265) +++ openbios-devel/arch/ppc/start.S 2008-11-28 19:40:28 UTC (rev 266) @@ -14,7 +14,6 @@ * */ -changequote([[[[[,]]]]]) [[[[[ /* shield includes from m4-expansion */ #include "asm/asmdefs.h" #include "asm/processor.h" #include "osi.h" @@ -26,40 +25,39 @@ #define ILLEGAL_VECTOR( v ) .org __vectors + v ; bl trap_error ; #define VECTOR( v, dummystr ) .org __vectors + v ; vector__##v -MACRO(EXCEPTION_PREAMBLE, [ - mtsprg1 r1 // scratch - mfsprg0 r1 // exception stack in sprg0 - addi r1,r1,-80 // push exception frame +#define EXCEPTION_PREAMBLE \ + mtsprg1 r1 ; /* scratch */ \ + mfsprg0 r1 ; /* exception stack in sprg0 */ \ + addi r1,r1,-80 ; /* push exception frame */ \ + \ + stw r0,0(r1) ; /* save r0 */ \ + mfsprg1 r0 ; \ + stw r0,4(r1) ; /* save r1 */ \ + stw r2,8(r1) ; /* save r2 */ \ + stw r3,12(r1) ; /* save r3 */ \ + stw r4,16(r1) ; \ + stw r5,20(r1) ; \ + stw r6,24(r1) ; \ + stw r7,28(r1) ; \ + stw r8,32(r1) ; \ + stw r9,36(r1) ; \ + stw r10,40(r1) ; \ + stw r11,44(r1) ; \ + stw r12,48(r1) ; \ + \ + mflr r0 ; \ + stw r0,52(r1) ; \ + mfcr r0 ; \ + stw r0,56(r1) ; \ + mfctr r0 ; \ + stw r0,60(r1) ; \ + mfxer r0 ; \ + stw r0,64(r1) ; \ + \ + /* 76(r1) unused */ \ + addi r1,r1,-16 ; /* call conventions uses 0(r1) and 4(r1)... */ - stw r0,0(r1) // save r0 - mfsprg1 r0 - stw r0,4(r1) // save r1 - stw r2,8(r1) // save r2 - stw r3,12(r1) // save r3 - stw r4,16(r1) - stw r5,20(r1) - stw r6,24(r1) - stw r7,28(r1) - stw r8,32(r1) - stw r9,36(r1) - stw r10,40(r1) - stw r11,44(r1) - stw r12,48(r1) - mflr r0 - stw r0,52(r1) - mfcr r0 - stw r0,56(r1) - mfctr r0 - stw r0,60(r1) - mfxer r0 - stw r0,64(r1) - - // 76(r1) unused - addi r1,r1,-16 // call conventions uses 0(r1) and 4(r1)... -]) - - /************************************************************************/ /* stack space */ /************************************************************************/ @@ -86,12 +84,15 @@ li r0,0 mtmsr r0 - LOADI r1,estack + lis r1,HA(estack) + addi r1,r1,LO(estack) mtsprg0 r1 // setup exception stack - LOADI r1,stack + lis r1,HA(stack) + addi r1,r1,LO(stack) // copy exception vectors - LOADI r3,__vectors + lis r3,HA(__vectors) + addi r3,r3,LO(__vectors) li r4,0 li r5,__vectors_end - __vectors + 16 rlwinm r5,r5,0,0,28 @@ -136,17 +137,21 @@ stwu r1,-16(r1) stw r0,20(r1) mtlr r3 - LOADI r8,saved_stack // save our stack pointer + lis r8,HA(saved_stack) + addi r8,r8,LO(saved_stack) // save our stack pointer stw r1,0(r8) - LOADI r1,client_stack - LOADI r5,of_client_callback // r5 = callback + lis r1,HA(client_stack) + addi r1,r1,LO(client_stack) + lis r5,HA(of_client_callback) + addi r5,r5,LO(of_client_callback) // r5 = callback li r6,0 // r6 = address of client program arguments (unused) li r7,0 // r7 = length of client program arguments (unused) li r0,MSR_FP | MSR_ME | MSR_DR | MSR_IR mtmsr r0 blrl - LOADI r8,saved_stack // restore stack pointer + lis r8,HA(saved_stack) + addi r8,r8,LO(saved_stack) // restore stack pointer mr r1,r8 lwz r0,20(r1) mtlr r0 @@ -156,7 +161,8 @@ blr GLOBL(of_client_callback): - LOADI r4,saved_stack + lis r4,HA(saved_stack) + addi r4,r4,LO(saved_stack) lwz r4,0(r4) stwu r4,-32(r4) mflr r5 @@ -191,8 +197,10 @@ /* r3 = argument buffer, r4 = of_rtas_start */ /* according to the CHRP standard, cr must be preserved (cr0/cr1 too?) */ mr r6,r3 - LOADI r3,OSI_SC_MAGIC_R3 - LOADI r4,OSI_SC_MAGIC_R4 + lis r3,HA(OSI_SC_MAGIC_R3) + addi r3,r3,LO(OSI_SC_MAGIC_R3) + lis r4,HA(OSI_SC_MAGIC_R4) + addi r4,r4,LO(OSI_SC_MAGIC_R4) li r5,OSI_OF_RTAS sc blr @@ -203,7 +211,8 @@ GLOBL(nw_dec_calibration): .long 0 GLOBL(timer_calib_start): - LOADI r3,nw_dec_calibration + lis r3,HA(nw_dec_calibration) + addi r3,r3,LO(nw_dec_calibration) lwz r3,0(r3) blr GLOBL(timer_calib_end): @@ -254,14 +263,16 @@ VECTOR( 0x300, "DSI" ): EXCEPTION_PREAMBLE - LOADI r3,dsi_exception + lis r3,HA(dsi_exception) + addi r3,r3,LO(dsi_exception) mtctr r3 bctrl b exception_return VECTOR( 0x400, "ISI" ): EXCEPTION_PREAMBLE - LOADI r3,isi_exception + lis r3,HA(isi_exception) + addi r3,r3,LO(isi_exception) mtctr r3 bctrl b exception_return Modified: openbios-devel/arch/ppc/timebase.S =================================================================== --- openbios-devel/arch/ppc/timebase.S 2008-11-25 19:54:01 UTC (rev 265) +++ openbios-devel/arch/ppc/timebase.S 2008-11-28 19:40:28 UTC (rev 266) @@ -1,4 +1,3 @@ -changequote([[[[[,]]]]]) [[[[[ /* shield includes from m4-expansion */ #include "asm/asmdefs.h" #include "asm/processor.h" Modified: openbios-devel/include/ppc/asmdefs.h =================================================================== --- openbios-devel/include/ppc/asmdefs.h 2008-11-25 19:54:01 UTC (rev 265) +++ openbios-devel/include/ppc/asmdefs.h 2008-11-28 19:40:28 UTC (rev 266) @@ -18,13 +18,6 @@ #ifndef _H_ASMDEFS #define _H_ASMDEFS -#include "openbios/asm.m4" - -#ifndef __ASSEMBLY__ -#error This file is only to be included from assembler code! -#endif - - /************************************************************************/ /* High/low halfword compatibility macros */ /************************************************************************/ @@ -38,325 +31,51 @@ #define HI(v) hi16(v) #define LO(v) lo16(v) - -/************************************************************************/ -/* Register name prefix */ -/************************************************************************/ +/* from Linux: include/asm-powerpc/ppc_asm.h */ +/* + * Copyright (C) 1995-1999 Gary Thomas, Paul Mackerras, Cort Dougan. + */ -#ifdef __linux__ -define([rPREFIX], []) -define([fPREFIX], []) -define([srPREFIX], []) -#else -define([rPREFIX], [r]) -define([fPREFIX], [f]) -define([srPREFIX], [sr]) -/* frN -> fN */ -mFORLOOP([i],0,31,[define(fr[]i,f[]i)]) -#endif +/* General Purpose Registers (GPRs) */ -/************************************************************************/ -/* Macros and definitions */ -/************************************************************************/ +#define r0 0 +#define r1 1 +#define r2 2 +#define r3 3 +#define r4 4 +#define r5 5 +#define r6 6 +#define r7 7 +#define r8 8 +#define r9 9 +#define r10 10 +#define r11 11 +#define r12 12 +#define r13 13 +#define r14 14 +#define r15 15 +#define r16 16 +#define r17 17 +#define r18 18 +#define r19 19 +#define r20 20 +#define r21 21 +#define r22 22 +#define r23 23 +#define r24 24 +#define r25 25 +#define r26 26 +#define r27 27 +#define r28 28 +#define r29 29 +#define r30 30 +#define r31 31 -#ifdef __darwin__ -#define balign_4 .align 2,0 -#define balign_8 .align 3,0 -#define balign_16 .align 4,0 -#define balign_32 .align 5,0 -#endif - -#ifdef __linux__ -#define balign_4 .balign 4,0 -#define balign_8 .balign 8,0 -#define balign_16 .balign 16,0 -#define balign_32 .balign 32,0 -#endif - -MACRO(LOADVAR, [dreg, variable], [ - lis _dreg,HA(_variable) - lwz _dreg,LO(_variable)(_dreg) -]) - -MACRO(LOADI, [dreg, addr], [ - lis _dreg,HA(_addr) - addi _dreg,_dreg,LO(_addr) -]) - -MACRO(LOAD_GPR_RANGE, [start, endx, offs, base], [ - mFORLOOP([i],0,31,[ .if (i >= _start) & (i <= _endx) - lwz rPREFIX[]i,_offs+i[]*4(_base) - .endif -])]) - -MACRO(STORE_GPR_RANGE, [start, endx, offs, base], [ - mFORLOOP([i],0,31,[ .if (i >= _start) & (i <= _endx) - stw rPREFIX[]i,_offs+i[]*4(_base) - .endif -])]) - -MACRO(LOAD_FPR_RANGE, [start, endx, offs, base], [ - mFORLOOP([i],0,31,[ .if (i >= _start) & (i <= _endx) - lfd fPREFIX[]i,_offs+i[]*8(_base) - .endif -])]) - -MACRO(STORE_FPR_RANGE, [start, endx, offs, base], [ - mFORLOOP([i],0,31,[ .if (i >= _start) & (i <= _endx) - stfd fPREFIX[]i,_offs+i[]*8(_base) - .endif -])]) - /************************************************************************/ -/* FPU load/save macros */ -/************************************************************************/ - - // The FPU macros are used both in the kernel and in - // mainloop_asm.h. - -MACRO(xFPR_LOAD_RANGE, [from, to, mbase], [ - LOAD_FPR_RANGE _from,_to,xFPR_BASE,_mbase -]) -MACRO(xFPR_SAVE_RANGE, [from, to, mbase], [ - STORE_FPR_RANGE _from,_to,xFPR_BASE,_mbase -]) - // The low half of the fpu is fr0-fr12. I.e. the FPU registers - // that might be overwritten when a function call is taken - // (fr13 and fpscr are treated specially). - -MACRO(xLOAD_LOW_FPU, [mbase], [ - xFPR_LOAD_RANGE 0,12,_mbase -]) - -MACRO(xLOAD_TOPHALF_FPU, [mbase], [ - xFPR_LOAD_RANGE 14,31,_mbase -]) -MACRO(xLOAD_FULL_FPU, [mbase], [ - xLOAD_LOW_FPU _mbase - xLOAD_TOPHALF_FPU _mbase -]) - -MACRO(xSAVE_LOW_FPU, [mbase], [ - xFPR_SAVE_RANGE 0,12,_mbase -]) -MACRO(xSAVE_TOPHALF_FPU, [mbase], [ - xFPR_SAVE_RANGE 14,31,_mbase -]) -MACRO(xSAVE_FULL_FPU, [mbase], [ - xSAVE_LOW_FPU _mbase - xSAVE_TOPHALF_FPU _mbase -]) - - -/************************************************************************/ -/* GPR load/save macros */ -/************************************************************************/ - -MACRO(xGPR_SAVE_RANGE, [from, to, mbase], [ - STORE_GPR_RANGE _from, _to, xGPR0, _mbase -]) - -MACRO(xGPR_LOAD_RANGE, [from, to, mbase], [ - LOAD_GPR_RANGE _from, _to, xGPR0, _mbase -]) - - -/************************************************************************/ -/* AltiVec */ -/************************************************************************/ - -#ifdef __linux__ - -define(vPREFIX,[]) - -#ifndef HAVE_ALTIVEC -#define VEC_OPCODE( op1,op2,A,B,C ) \ - .long (((op1) << (32-6)) | (op2) | ((A) << (32-11)) | ((B) << (32-16)) | ((C) << (32-21))) ; - -#define __stvx( vS,rA,rB ) VEC_OPCODE( 31,0x1ce,vS,rA,rB ) -#define __lvx( vD,rA,rB ) VEC_OPCODE( 31,0xce, vD,rA,rB ) -#define __mfvscr( vD ) VEC_OPCODE( 4,1540,vD,0,0 ) -#define __mtvscr( vB ) VEC_OPCODE( 4,1604,0,0,vB ) -#define __stvewx( vS,rA,rB ) VEC_OPCODE( 31,(199<<1), vS,rA,rB ) - -mFORLOOP([i],0,31,[define(v[]i,[]i)]) -MACRO(stvx, [vS,rA,rB], [ __stvx( _vS,_rA,_rB ) ; ]) -MACRO(lvx, [vD,rA,rB], [ __lvx( _vD,_rA,_rB ) ; ]) -MACRO(mfvscr, [vD], [ __mfvscr( _vD ) ; ]) -MACRO(mtvscr, [vB], [ __mtvscr( _vB ) ; ]) -MACRO(stvewx, [vS,rA,rB], [ __stvewx( _vS,_rA,_rB ) ; ]) -#endif -#else /* __linux__ */ - -define(vPREFIX,[v]) - -#endif /* __linux__ */ - - -// NOTE: Writing to VSCR won't cause exceptions (this -// is different compared to FPSCR). - -MACRO(xVEC_SAVE, [mbase, scr], [ - addi _scr,_mbase,xVEC_BASE - mFORLOOP([i],0,31,[ - stvx vPREFIX[]i,0,_scr - addi _scr,_scr,16 - ]) - addi _scr,_mbase,xVSCR-12 - mfvscr v0 - stvx v0,0,_scr - addi _scr,_mbase,xVEC0 - lvx v0,0,_scr - mfspr _scr,S_VRSAVE - stw _scr,xVRSAVE(_mbase) -]) - -MACRO(xVEC_LOAD, [mbase, scr], [ - addi _scr,_mbase,xVSCR-12 - lvx v0,0,_scr - mtvscr v0 - addi _scr,_mbase,xVEC_BASE - mFORLOOP([i],0,31,[ - lvx vPREFIX[]i,0,_scr - addi _scr,_scr,16 - ]) - lwz _scr,xVRSAVE(_mbase) - mtspr S_VRSAVE,_scr -]) - -/************************************************************************/ -/* Instructions */ -/************************************************************************/ - -#ifdef __darwin__ -MACRO(mtsprg0, [reg], [mtspr SPRG0,_reg] ) -MACRO(mtsprg1, [reg], [mtspr SPRG1,_reg] ) -MACRO(mtsprg2, [reg], [mtspr SPRG2,_reg] ) -MACRO(mtsprg3, [reg], [mtspr SPRG3,_reg] ) -MACRO(mfsprg0, [reg], [mfspr _reg,SPRG0] ) -MACRO(mfsprg1, [reg], [mfspr _reg,SPRG1] ) -MACRO(mfsprg2, [reg], [mfspr _reg,SPRG2] ) -MACRO(mfsprg3, [reg], [mfspr _reg,SPRG3] ) -#endif - -/************************************************************************/ -/* Register names */ -/************************************************************************/ - -#ifdef __darwin__ -/* These symbols are not defined under Darwin */ -#define cr0 0 -#define cr1 1 -#define cr2 2 -#define cr3 3 -#define cr4 4 -#define cr5 5 -#define cr6 6 -#define cr7 7 -#define cr8 8 -#define lt 0 /* Less than */ -#define gt 1 /* Greater than */ -#define eq 2 /* Equal */ -#define so 3 /* Summary Overflow */ -#define un 3 /* Unordered (after floating point) */ -#endif - -/* FPU register names (to be used as macro arguments) */ -#define FR0 0 -#define FR1 1 -#define FR2 2 -#define FR3 3 -#define FR4 4 -#define FR5 5 -#define FR6 6 -#define FR7 7 -#define FR8 8 -#define FR9 9 -#define FR10 10 -#define FR11 11 -#define FR12 12 -#define FR13 13 -#define FR14 14 -#define FR15 15 -#define FR16 16 -#define FR17 17 -#define FR18 18 -#define FR19 19 -#define FR20 20 -#define FR21 21 -#define FR22 22 -#define FR23 23 -#define FR24 24 -#define FR25 25 -#define FR26 26 -#define FR27 27 -#define FR28 28 -#define FR29 29 -#define FR30 30 -#define FR31 31 - -/* GPR register names (to be used as macro arguments) */ -#define R0 0 -#define R1 1 -#define R2 2 -#define R3 3 -#define R4 4 -#define R5 5 -#define R6 6 -#define R7 7 -#define R8 8 -#define R9 9 -#define R10 10 -#define R11 11 -#define R12 12 -#define R13 13 -#define R14 14 -#define R15 15 -#define R16 16 -#define R17 17 -#define R18 18 -#define R19 19 -#define R20 20 -#define R21 21 -#define R22 22 -#define R23 23 -#define R24 24 -#define R25 25 -#define R26 26 -#define R27 27 -#define R28 28 -#define R29 29 -#define R30 30 -#define R31 31 - -#ifndef __darwin__ - -/* GPR register names, rN -> N, frN -> N, vN -> N */ -mFORLOOP([i],0,31,[define(r[]i,[]i)]) -mFORLOOP([i],0,31,[define(fr[]i,[]i)]) -mFORLOOP([i],0,31,[define(v[]i,[]i)]) - -#endif /* __darwin__ */ - - -/************************************************************************/ -/* useful macros */ -/************************************************************************/ - -MACRO(ori_, [reg1, reg2, value], [ - .if (_value & 0xffff) - ori _reg1, _reg2, (_value) & 0xffff - .endif - .if (_value & ~0xffff) - oris _reg1, _reg2, (_value) >> 16 - .endif -]) - -/************************************************************************/ /* MISC */ /************************************************************************/ -#ifdef __linux__ +#ifndef __darwin__ #define GLOBL( name ) .globl name ; name #define EXTERN( name ) name #else

1 0

Re: [OpenBIOS] r255 - in openbios-devel: arch/ppc/qemu include/openbios modules
by Blue Swirl 25 Nov '08

25 Nov '08

On 11/24/08, svn(a)openbios.org <svn(a)openbios.org> wrote: > Author: stepan > Date: 2008-11-24 13:21:36 +0100 (Mon, 24 Nov 2008) > New Revision: 255 > void > -nvram_init( void ) > +nvram_init( char *path ) Bad idea, this breaks Sparc32 build. arch/sparc32/openbios.c: In function 'arch_init': arch/sparc32/openbios.c:121: error: too few arguments to function 'nvram_init' make[1]: *** [obj-sparc32/target/arch/sparc32/openbios.o] Error 1

4 4

[PATCH][macparts] Allow to open partition 0
by Laurent Vivier 25 Nov '08

25 Nov '08

Yaboot needs to be able to open partition 0. Add some traces. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info>

2 1

r265 - in openbios-devel: config/examples modules
by svn＠openbios.org 25 Nov '08

25 Nov '08

Author: blueswirl Date: 2008-11-25 20:54:01 +0100 (Tue, 25 Nov 2008) New Revision: 265 Modified: openbios-devel/config/examples/cross-ppc_config.xml openbios-devel/modules/mac-parts.c Log: Yaboot needs to be able to open partition 0. Add some traces. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2008-11-25 19:50:53 UTC (rev 264) +++ openbios-devel/config/examples/cross-ppc_config.xml 2008-11-25 19:54:01 UTC (rev 265) @@ -38,6 +38,8 @@  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> + <option name="CONFIG_MAC_PARTS" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_MAC_PARTS" type="boolean" value="false"/> <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> Modified: openbios-devel/modules/mac-parts.c =================================================================== --- openbios-devel/modules/mac-parts.c 2008-11-25 19:50:53 UTC (rev 264) +++ openbios-devel/modules/mac-parts.c 2008-11-25 19:54:01 UTC (rev 265) @@ -19,6 +19,13 @@ #include "mac-parts.h" #include "modules.h" +#ifdef CONFIG_DEBUG_MAC_PARTS +#define DPRINTF(fmt, args...) \ +do { printk("MAC-PARTS: " fmt , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) do {} while(0) +#endif + typedef struct { ullong offs; ullong size; @@ -41,8 +48,6 @@ desc_map_t dmap; part_entry_t par; - /* printk("macparts_open '%s'\n", str ); */ - if( str ) { parnum = atol(str); if( !strlen(str) ) @@ -52,6 +57,7 @@ if( parnum < 0 ) parnum = 1; + DPRINTF("macparts_open %d\n", parnum); SEEK( 0 ); if( READ(&dmap, sizeof(dmap)) != sizeof(dmap) ) RET(0); @@ -66,6 +72,12 @@ if( par.pmSig == 0x504d /* 'PM' */ ) bs = 512; } + if (parnum == 0) { + di->offs = (llong)0; + di->size = (llong)dmap.sbBlkCount * bs; + PUSH( -1 ); + return; + } SEEK( bs ); if( READ(&par, sizeof(par)) != sizeof(par) ) RET(0); @@ -89,7 +101,8 @@ macparts_probe( macparts_info_t *dummy ) { desc_map_t *dmap = (desc_map_t*)POP(); - + + DPRINTF("macparts_probe %x ?= %x\n", dmap->sbSig, DESC_MAP_SIGNATURE); if( dmap->sbSig != DESC_MAP_SIGNATURE ) RET(0); RET(-1); @@ -102,6 +115,7 @@ PUSH( -1 ); /* no type */ DPUSH( di->offs ); DPUSH( di->size ); + DPRINTF("macparts_get_info %lld %lld\n", di->offs, di->size); } static void

1 0

Re: [OpenBIOS] r255 - in openbios-devel: arch/ppc/qemu include/openbios modules
by Blue Swirl 25 Nov '08

25 Nov '08

On 11/25/08, Blue Swirl <blauwirbel(a)gmail.com> wrote: > On 11/25/08, Laurent Vivier <laurent(a)lvivier.info> wrote: > > > > Le 25 nov. 08 à 17:40, Blue Swirl a écrit : > > > > > > > > > On 11/25/08, Laurent Vivier <Laurent.Vivier(a)bull.net> wrote: > > > > > > > Le lundi 24 novembre 2008 à 18:59 +0200, Blue Swirl a écrit : > > > > > > > > > > > > > On 11/24/08, svn(a)openbios.org <svn(a)openbios.org> wrote: > > > > > > > > > > > Author: stepan > > > > > > Date: 2008-11-24 13:21:36 +0100 (Mon, 24 Nov 2008) > > > > > > New Revision: 255 > > > > > > > > > > > > > > > > > > > > > > void > > > > > > -nvram_init( void ) > > > > > > +nvram_init( char *path ) > > > > > > > > > > > > > > > > Bad idea, this breaks Sparc32 build. > > > > > > > > > > > > > > > > > I've looked in the device tree of sparc32 and didn't find any entry for > > > > nvram, so is the call to nvram_init() really needed ??? > > > > > > > > > > Yes, not for registering it to the device tree, but for reading the > > > config from nvram. The same applies to Sparc64. > > > > > > The function could be changed to check for a NULL (passed to it by > > > Sparc32/64) and perform different actions then, or maybe nvconf_init > > > should be exported and Sparc changed to use it instead of nvram_init. > > > > > > > IMHO the best thing to fo is to export and call nvconf_init. > > > OK, I'm testing the attached patch. Committed as r262.

2 3

r264 - in openbios-devel: arch/ppc/briq arch/ppc/mol arch/ppc/pearpc modules
by svn＠openbios.org 25 Nov '08

25 Nov '08

Author: blueswirl Date: 2008-11-25 20:50:53 +0100 (Tue, 25 Nov 2008) New Revision: 264 Modified: openbios-devel/arch/ppc/briq/init.c openbios-devel/arch/ppc/mol/init.c openbios-devel/arch/ppc/pearpc/init.c openbios-devel/modules/nvram.c Log: Add some debug macros and correct nvram_init() call for other PPC architectures (Laurent Vivier). Modified: openbios-devel/arch/ppc/briq/init.c =================================================================== --- openbios-devel/arch/ppc/briq/init.c 2008-11-25 19:41:41 UTC (rev 263) +++ openbios-devel/arch/ppc/briq/init.c 2008-11-25 19:50:53 UTC (rev 264) @@ -91,7 +91,7 @@ devtree_init(); node_methods_init(); - nvram_init(); + nvram_init("/pci/mac-io/nvram"); modules_init(); #ifdef CONFIG_DRIVER_PCI ob_pci_init(); Modified: openbios-devel/arch/ppc/mol/init.c =================================================================== --- openbios-devel/arch/ppc/mol/init.c 2008-11-25 19:41:41 UTC (rev 263) +++ openbios-devel/arch/ppc/mol/init.c 2008-11-25 19:50:53 UTC (rev 264) @@ -84,7 +84,7 @@ devtree_init(); node_methods_init(); - nvram_init(); + nvram_init("/pci/mac-io/nvram"); modules_init(); pseudodisk_init(); osiblk_init(); Modified: openbios-devel/arch/ppc/pearpc/init.c =================================================================== --- openbios-devel/arch/ppc/pearpc/init.c 2008-11-25 19:41:41 UTC (rev 263) +++ openbios-devel/arch/ppc/pearpc/init.c 2008-11-25 19:50:53 UTC (rev 264) @@ -93,7 +93,7 @@ int autoboot; devtree_init(); - nvram_init(); + nvram_init("/pci/mac-io/nvram"); modules_init(); #ifdef CONFIG_DRIVER_PCI ob_pci_init(); Modified: openbios-devel/modules/nvram.c =================================================================== --- openbios-devel/modules/nvram.c 2008-11-25 19:41:41 UTC (rev 263) +++ openbios-devel/modules/nvram.c 2008-11-25 19:50:53 UTC (rev 264) @@ -18,6 +18,13 @@ #include "openbios/bindings.h" #include "openbios/nvram.h" +#ifdef CONFIG_DEBUG_NVRAM +#define DPRINTF(fmt, args...) \ +do { printk("NVRAM: " fmt , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) do {} while(0) +#endif + #define DEF_SYSTEM_SIZE 0xc10 #define NV_SIG_SYSTEM 0x70 @@ -228,7 +235,7 @@ int pos_hi = POP(); int pos_lo = POP(); - /* printk("NVRAM: seek %08x %08x\n", pos_hi, pos_lo ); */ + DPRINTF("seek %08x %08x\n", pos_hi, pos_lo ); nd->mark_lo = pos_lo; nd->mark_hi = pos_hi; @@ -254,7 +261,7 @@ n++; } PUSH(n); - /* printk("NVRAM: read %08x %x -- %x\n", (int)p, len, n); */ + DPRINTF("read %08x %x -- %x\n", (int)p, len, n); } /* ( addr len -- actual ) */ @@ -270,13 +277,14 @@ n++; } PUSH(n); - /* printk("NVRAM: write %08x %x -- %x\n", (int)p, len, n ); */ + DPRINTF("write %08x %x -- %x\n", (int)p, len, n ); } /* ( -- size ) */ static void nvram_size( __attribute__((unused)) nvram_ibuf_t *nd ) { + DPRINTF("nvram_size %d\n", nvram.size); PUSH( nvram.size ); }

1 0

Re: [OpenBIOS] r251 - in openbios-devel: config/examples kernel
by Blue Swirl 25 Nov '08

25 Nov '08

On 11/24/08, svn(a)openbios.org <svn(a)openbios.org> wrote: > Author: stepan > Date: 2008-11-24 13:13:40 +0100 (Mon, 24 Nov 2008) > New Revision: 251 > -HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) > +HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) -DSWAP_ENDIANNESS Bad idea, SWAP_ENDIANNESS is defined by config/scripts/crosscflags. Didn't it work correctly for you?

2 2

r263 - in openbios-devel/config: examples scripts
by svn＠openbios.org 25 Nov '08

25 Nov '08

Author: blueswirl Date: 2008-11-25 20:41:41 +0100 (Tue, 25 Nov 2008) New Revision: 263 Modified: openbios-devel/config/examples/cross-ppc_rules.xml openbios-devel/config/scripts/crosscflags Log: Fix crosscflags for x86_64 and ppc cases, remove r251 hack, closes ticket #7 Modified: openbios-devel/config/examples/cross-ppc_rules.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_rules.xml 2008-11-25 18:30:22 UTC (rev 262) +++ openbios-devel/config/examples/cross-ppc_rules.xml 2008-11-25 19:41:41 UTC (rev 263) @@ -9,7 +9,7 @@ ARCH := ppc ODIR := obj-$(ARCH) HOSTCC := gcc -HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) -DSWAP_ENDIANNESS +HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include # # MOLPATH is needed if you want to build openbios-mol.elf Modified: openbios-devel/config/scripts/crosscflags =================================================================== --- openbios-devel/config/scripts/crosscflags 2008-11-25 18:30:22 UTC (rev 262) +++ openbios-devel/config/scripts/crosscflags 2008-11-25 19:41:41 UTC (rev 263) @@ -3,7 +3,8 @@ host=$1 target=$2 -if test "$host" = "powerpc" -o "$host" = "mips" -o "$host" = "s390" \ +if test "$host" = "powerpc" -o "$host" = "ppc" \ + -o "$host" = "mips" -o "$host" = "s390" \ -o "$host" = "sparc32" -o "$host" = "sparc64" \ -o "$host" = "m68k" -o "$host" = "armv4b"; then hostbigendian="yes" @@ -13,13 +14,15 @@ # host long bits test if test "$host" = "sparc64" -o "$host" = "ia64" \ - -o "$host" = "amd64" -o "$host" = "alpha"; then + -o "$host" = "amd64" -o "$host" = "x86_64" \ + -o "$host" = "alpha"; then hostlongbits="64" else hostlongbits="32" fi -if test "$target" = "powerpc" -o "$target" = "mips" -o "$target" = "s390" \ +if test "$target" = "powerpc" -o "$target" = "ppc" \ + -o "$target" = "mips" -o "$target" = "s390" \ -o "$target" = "sparc32" -o "$target" = "sparc64" \ -o "$target" = "m68k" -o "$target" = "armv4b"; then targetbigendian="yes" @@ -29,7 +32,8 @@ # target long bits test if test "$target" = "sparc64" -o "$target" = "ia64" \ - -o "$target" = "amd64" -o "$target" = "alpha"; then + -o "$target" = "amd64" -o "target" = "x86_64" \ + -o "$target" = "alpha"; then targetlongbits="64" else targetlongbits="32"

1 0

r262 - in openbios-devel: arch/sparc32 arch/sparc64 include/openbios modules
by svn＠openbios.org 25 Nov '08

25 Nov '08

Author: blueswirl Date: 2008-11-25 19:30:22 +0100 (Tue, 25 Nov 2008) New Revision: 262 Modified: openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/sparc64/openbios.c openbios-devel/include/openbios/nvram.h openbios-devel/modules/nvram.c Log: Rearrange nvram init Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2008-11-24 19:29:24 UTC (rev 261) +++ openbios-devel/arch/sparc32/openbios.c 2008-11-25 18:30:22 UTC (rev 262) @@ -118,7 +118,7 @@ ob_obio_init(hwdef->slavio_base, hwdef->fd_offset, hwdef->counter_offset, hwdef->intr_offset, hwdef->aux1_offset, hwdef->aux2_offset); - nvram_init(); + nvconf_init(); #endif #ifdef CONFIG_DRIVER_SBUS #ifdef CONFIG_DEBUG_CONSOLE_VIDEO Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-11-24 19:29:24 UTC (rev 261) +++ openbios-devel/arch/sparc64/openbios.c 2008-11-25 18:30:22 UTC (rev 262) @@ -833,7 +833,7 @@ init_video(); #endif - nvram_init(); + nvconf_init(); ob_su_init(0x1fe02000000ULL, 0x3f8ULL, 0); device_end(); Modified: openbios-devel/include/openbios/nvram.h =================================================================== --- openbios-devel/include/openbios/nvram.h 2008-11-24 19:29:24 UTC (rev 261) +++ openbios-devel/include/openbios/nvram.h 2008-11-25 18:30:22 UTC (rev 262) @@ -21,7 +21,8 @@ extern void arch_nvram_get( char *buf ); extern void arch_nvram_put( char *buf ); -extern void nvram_init( void ); +extern void nvconf_init( void ); +extern void nvram_init( char *path ); extern void update_nvram( void ); #endif /* _H_NVRAM */ Modified: openbios-devel/modules/nvram.c =================================================================== --- openbios-devel/modules/nvram.c 2008-11-24 19:29:24 UTC (rev 261) +++ openbios-devel/modules/nvram.c 2008-11-25 18:30:22 UTC (rev 262) @@ -163,7 +163,7 @@ arch_nvram_put( nvram.data ); } -static void +void nvconf_init( void ) { int once=0; @@ -219,7 +219,7 @@ uint mark_lo; } nvram_ibuf_t; -DECLARE_NODE( nvram, INSTALL_OPEN, sizeof(nvram_ibuf_t), "Tnvram" ); +DECLARE_UNNAMED_NODE( nvram, INSTALL_OPEN, sizeof(nvram_ibuf_t )); /* ( pos_lo pos_hi -- status ) */ static void @@ -289,9 +289,9 @@ void -nvram_init( void ) +nvram_init( char *path ) { nvconf_init(); - REGISTER_NODE( nvram ); + REGISTER_NAMED_NODE( nvram, path ); }

1 0

r261 - in openbios-devel: drivers include/openbios modules
by svn＠openbios.org 24 Nov '08

24 Nov '08

Author: blueswirl Date: 2008-11-24 20:29:24 +0100 (Mon, 24 Nov 2008) New Revision: 261 Modified: openbios-devel/drivers/build.xml openbios-devel/drivers/pci.c openbios-devel/drivers/vga_load_regs.c openbios-devel/include/openbios/nvram.h openbios-devel/modules/console.c openbios-devel/modules/nvram.c openbios-devel/modules/video.c Log: Fix Sparc32 and Sparc64 build by reverting some of the previous patches Modified: openbios-devel/drivers/build.xml =================================================================== --- openbios-devel/drivers/build.xml 2008-11-24 18:36:19 UTC (rev 260) +++ openbios-devel/drivers/build.xml 2008-11-24 19:29:24 UTC (rev 261) @@ -14,7 +14,6 @@ <object source="obio.c" condition="DRIVER_OBIO"/> <object source="vga_load_regs.c" condition="DRIVER_VGA"/> <object source="vga_set_mode.c" condition="DRIVER_VGA"/> - <object source="vga_vbe.c" condition="DRIVER_VGA"/> </library> <dictionary name="openbios" target="forth"> Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-11-24 18:36:19 UTC (rev 260) +++ openbios-devel/drivers/pci.c 2008-11-24 19:29:24 UTC (rev 261) @@ -16,7 +16,6 @@ #include "openbios/config.h" #include "openbios/bindings.h" #include "openbios/kernel.h" -#include "openbios/pci.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" @@ -54,1227 +53,16 @@ { "close", ob_pci_close }, }; -/* PCI devices database */ -typedef struct pci_class_t pci_class_t; -typedef struct pci_subclass_t pci_subclass_t; -typedef struct pci_iface_t pci_iface_t; -typedef struct pci_dev_t pci_dev_t; - -typedef struct pci_config_t pci_config_t; - -struct pci_config_t { - char path[64]; - uint32_t regions[7]; - uint32_t sizes[7]; -}; - -struct pci_iface_t { - uint8_t iface; - const char *name; - const char *type; - const pci_dev_t *devices; - int (*config_cb)(pci_config_t *config); - const void *private; -}; - -struct pci_subclass_t { - uint8_t subclass; - const char *name; - const char *type; - const pci_dev_t *devices; - const pci_iface_t *iface; - int (*config_cb)(pci_config_t *config); - const void *private; -}; - -struct pci_class_t { - const char *name; - const char *type; - const pci_subclass_t *subc; -}; - -struct pci_dev_t { - uint16_t vendor; - uint16_t product; - const char *type; - const char *name; - const char *model; - const char *compat; - int acells; - int scells; - int icells; - int (*config_cb)(pci_config_t *config); - const void *private; -}; - -/* Current machine description */ - -typedef struct pci_bridge_t pci_bridge_t; - -/* Low level access helpers */ -struct pci_ops_t { - uint8_t (*config_readb)(pci_bridge_t *bridge, - uint8_t bus, uint8_t devfn, uint8_t offset); - void (*config_writeb)(pci_bridge_t *bridge, - uint8_t bus, uint8_t devfn, - uint8_t offset, uint8_t val); - uint16_t (*config_readw)(pci_bridge_t *bridge, - uint8_t bus, uint8_t devfn, uint8_t offset); - void (*config_writew)(pci_bridge_t *bridge, - uint8_t bus, uint8_t devfn, - uint8_t offset, uint16_t val); - uint32_t (*config_readl)(pci_bridge_t *bridge, - uint8_t bus, uint8_t devfn, uint8_t offset); - void (*config_writel)(pci_bridge_t *bridge, - uint8_t bus, uint8_t devfn, - uint8_t offset, uint32_t val); -}; - -static pci_subclass_t undef_subclass[] = { - { - 0x00, "misc undefined", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static int ide_config_cb2 (pci_config_t *config) +static int ob_pci_add_properties(pci_addr addr) { -#if 0 - ide_init(config->path, - config->regions[0] & ~0x0000000F, - config->regions[1] & ~0x0000000F, - config->regions[2] & ~0x0000000F, - config->regions[3] & ~0x0000000F); -#endif - return 0; -} - -static pci_dev_t ide_devices[] = { - { - 0x1095, 0x0646, /* CMD646 IDE controller */ - "pci-ide", "pci-ata", NULL, NULL, - 0, 0, 0, - ide_config_cb2, NULL, - }, - { - 0xFFFF, 0xFFFF, - NULL, NULL, NULL, NULL, - -1, -1, -1, - NULL, NULL, - }, -}; - -static pci_subclass_t mass_subclass[] = { - { - 0x00, "SCSI bus controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x01, "IDE controller", "ide", ide_devices, NULL, - NULL, NULL, - }, - { - 0x02, "Floppy disk controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x03, "IPI bus controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x04, "RAID controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x05, "ATA controller", "ata", NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc mass-storage controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static pci_dev_t eth_devices[] = { - { 0x10EC, 0x8029, - NULL, "NE2000", "NE2000 PCI", NULL, - 0, 0, 0, - NULL, "ethernet", - }, - { - 0xFFFF, 0xFFFF, - NULL, NULL, NULL, NULL, - -1, -1, -1, - NULL, NULL, - }, -}; - -static int eth_config_cb (pci_config_t *config) -{ - phandle_t ph; - int props[12]; - int i; - - ph = find_dev(config->path); - - set_property(ph, "network-type", "ethernet", 9); - set_property(ph, "removable", "network", 8); - set_property(ph, "category", "net", 4); - - for (i = 0; i < 7; i++) - { - props[i*2] = config->regions[i]; - props[i*2 + 1] = config->sizes[i]; - } - set_property(ph, "reg", props, i * 2 * sizeof(int)); -} - -static pci_subclass_t net_subclass[] = { - { - 0x00, "ethernet controller", NULL, eth_devices, NULL, - eth_config_cb, "ethernet", - }, - { - 0x01, "token ring controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x02, "FDDI controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x03, "ATM controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x04, "ISDN controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x05, "WordFip controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x06, "PICMG 2.14 controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc network controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static pci_dev_t vga_devices[] = { - { - 0x1002, 0x5046, - NULL, "ATY", "ATY Rage128", "VGA", - 0, 0, 0, - NULL, NULL, - }, - { - 0x1234, 0x1111, - NULL, "QEMU,VGA", "Qemu VGA", "VGA", - 0, 0, 0, - NULL, NULL, - }, - { - 0xFFFF, 0xFFFF, - NULL, NULL, NULL, NULL, - -1, -1, -1, - NULL, NULL, - }, -}; - -/* VGA configuration */ - -static int vga_config_cb (pci_config_t *config) -{ - if (config->regions[0] != 0x00000000) - vga_vbe_init(config->path, config->regions[0], config->sizes[0], - config->regions[1], config->sizes[1]); - return 0; -} - -static struct pci_iface_t vga_iface[] = { - { - 0x00, "VGA controller", NULL, - vga_devices, &vga_config_cb, NULL, - }, - { - 0x01, "8514 compatible controller", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static pci_subclass_t displ_subclass[] = { - { - 0x00, "display controller", NULL, NULL, vga_iface, - NULL, NULL, - }, - { - 0x01, "XGA display controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x02, "3D display controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc display controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static pci_subclass_t media_subclass[] = { - { - 0x00, "video device", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x01, "audio device", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x02, "computer telephony device", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc multimedia device", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static pci_subclass_t mem_subclass[] = { - { - 0x00, "RAM controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x01, "flash controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -pci_dev_t grackle_fake_bridge = { - 0xFFFF, 0xFFFF, - "pci", "pci-bridge", "DEC,21154", "DEC,21154.pci-bridge", - -1, -1, -1, - NULL, NULL, -}; - -static pci_dev_t uninorth_agp_fake_bridge = { - 0xFFFF, 0xFFFF, - "uni-north-agp", "uni-north-agp", NULL, "uni-north-agp", - -1, -1, -1, - NULL, NULL, -}; - -static pci_dev_t uninorth_fake_bridge = { - 0xFFFF, 0xFFFF, - "uni-north", "uni-north", NULL, "uni-north", - -1, -1, -1, - NULL, NULL, -}; - - -static pci_dev_t hbrg_devices[] = { - { - 0x106B, 0x0020, NULL, - "pci", "AAPL,UniNorth", "uni-north", - 3, 2, 1, - NULL, &uninorth_agp_fake_bridge, - }, - { - 0x106B, 0x001F, NULL, - "pci", "AAPL,UniNorth", "uni-north", - 3, 2, 1, - NULL, &uninorth_fake_bridge, - }, - { - 0x106B, 0x001E, NULL, - "pci", "AAPL,UniNorth", "uni-north", - 3, 2, 1, - NULL, &uninorth_fake_bridge, - }, - { - 0x1057, 0x0002, "pci", - "pci", "MOT,MPC106", "grackle", - 3, 2, 1, - NULL, &grackle_fake_bridge, - }, - { - 0x1057, 0x4801, NULL, - "pci-bridge", "PREP Host PCI Bridge - Motorola Raven", NULL, - 3, 2, 1, - NULL, NULL, - }, - { - 0xFFFF, 0xFFFF, - NULL, NULL, NULL, NULL, - -1, -1, -1, - NULL, NULL, - }, -}; - -static pci_dev_t PCIbrg_devices[] = { - { - 0x1011, 0x0026, NULL, - "pci-bridge", NULL, NULL, - 3, 2, 1, - NULL, NULL, - }, - { - 0xFFFF, 0xFFFF, - NULL, NULL, NULL, NULL, - -1, -1, -1, - NULL, NULL, - }, -}; - -static pci_subclass_t bridg_subclass[] = { - { - 0x00, "PCI host bridge", NULL, hbrg_devices, NULL, - NULL, NULL, - }, - { - 0x01, "ISA bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x02, "EISA bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x03, "MCA bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x04, "PCI-to-PCI bridge", NULL, PCIbrg_devices, NULL, - NULL, NULL, - }, - { - 0x05, "PCMCIA bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x06, "NUBUS bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x07, "cardbus bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x08, "raceway bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x09, "semi-transparent PCI-to-PCI bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x0A, "infiniband-to-PCI bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc PCI bridge", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static pci_iface_t serial_iface[] = { - { - 0x00, "XT serial controller", NULL, - NULL, NULL, NULL, - }, - { - 0x01, "16450 serial controller", NULL, - NULL, NULL, NULL, - }, - { - 0x02, "16550 serial controller", NULL, - NULL, NULL, NULL, - }, - { - 0x03, "16650 serial controller", NULL, - NULL, NULL, NULL, - }, - { - 0x04, "16750 serial controller", NULL, - NULL, NULL, NULL, - }, - { - 0x05, "16850 serial controller", NULL, - NULL, NULL, NULL, - }, - { - 0x06, "16950 serial controller", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static pci_iface_t par_iface[] = { - { - 0x00, "parallel port", NULL, - NULL, NULL, NULL, - }, - { - 0x01, "bi-directional parallel port", NULL, - NULL, NULL, NULL, - }, - { - 0x02, "ECP 1.x parallel port", NULL, - NULL, NULL, NULL, - }, - { - 0x03, "IEEE 1284 controller", NULL, - NULL, NULL, NULL, - }, - { - 0xFE, "IEEE 1284 device", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static pci_iface_t modem_iface[] = { - { - 0x00, "generic modem", NULL, - NULL, NULL, NULL, - }, - { - 0x01, "Hayes 16450 modem", NULL, - NULL, NULL, NULL, - }, - { - 0x02, "Hayes 16550 modem", NULL, - NULL, NULL, NULL, - }, - { - 0x03, "Hayes 16650 modem", NULL, - NULL, NULL, NULL, - }, - { - 0x04, "Hayes 16750 modem", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static pci_subclass_t comm_subclass[] = { - { - 0x00, "serial controller", NULL, NULL, serial_iface, - NULL, NULL, - }, - { - 0x01, "parallel port", NULL, NULL, par_iface, - NULL, NULL, - }, - { - 0x02, "multiport serial controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x03, "modem", NULL, NULL, modem_iface, - NULL, NULL, - }, - { - 0x04, "GPIB controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x05, "smart card", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc communication device", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static pci_iface_t pic_iface[] = { - { - 0x00, "8259 PIC", NULL, - NULL, NULL, NULL, - }, - { - 0x01, "ISA PIC", NULL, - NULL, NULL, NULL, - }, - { - 0x02, "EISA PIC", NULL, - NULL, NULL, NULL, - }, - { - 0x10, "I/O APIC", NULL, - NULL, NULL, NULL, - }, - { - 0x20, "I/O APIC", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static pci_iface_t dma_iface[] = { - { - 0x00, "8237 DMA controller", NULL, - NULL, NULL, NULL, - }, - { - 0x01, "ISA DMA controller", NULL, - NULL, NULL, NULL, - }, - { - 0x02, "EISA DMA controller", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static pci_iface_t tmr_iface[] = { - { - 0x00, "8254 system timer", NULL, - NULL, NULL, NULL, - }, - { - 0x01, "ISA system timer", NULL, - NULL, NULL, NULL, - }, - { - 0x02, "EISA system timer", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static pci_iface_t rtc_iface[] = { - { - 0x00, "generic RTC controller", NULL, - NULL, NULL, NULL, - }, - { - 0x01, "ISA RTC controller", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static const pci_dev_t sys_devices[] = { - /* IBM MPIC controller */ - { - 0x1014, 0x0002, - "open-pic", "MPIC", NULL, "chrp,open-pic", - 0, 0, 2, - NULL, NULL, - }, - /* IBM MPIC2 controller */ - { - 0x1014, 0xFFFF, - "open-pic", "MPIC2", NULL, "chrp,open-pic", - 0, 0, 2, - NULL, NULL, - }, - { - 0xFFFF, 0xFFFF, - NULL, NULL, NULL, NULL, - -1, -1, -1, - NULL, NULL, - }, -}; - -static pci_subclass_t sys_subclass[] = { - { - 0x00, "PIC", NULL, NULL, pic_iface, - NULL, NULL, - }, - { - 0x01, "DMA controller", NULL, NULL, dma_iface, - NULL, NULL, - }, - { - 0x02, "system timer", NULL, NULL, tmr_iface, - NULL, NULL, - }, - { - 0x03, "RTC controller", NULL, NULL, rtc_iface, - NULL, NULL, - }, - { - 0x04, "PCI hotplug controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc system peripheral", NULL, sys_devices, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static pci_subclass_t inp_subclass[] = { - { - 0x00, "keyboard controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x01, "digitizer", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x02, "mouse controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x03, "scanner controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x04, "gameport controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc input device", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static pci_subclass_t dock_subclass[] = { - { - 0x00, "generic docking station", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc docking station", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static pci_subclass_t cpu_subclass[] = { - { - 0x00, "i386 processor", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x01, "i486 processor", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x02, "pentium processor", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x10, "alpha processor", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x20, "PowerPC processor", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x30, "MIPS processor", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x40, "co-processor", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static pci_iface_t usb_iface[] = { - { - 0x00, "UHCI USB controller", NULL, - NULL, NULL, NULL, - }, - { - 0x10, "OHCI USB controller", NULL, - NULL, NULL, NULL, - }, - { - 0x20, "EHCI USB controller", NULL, - NULL, NULL, NULL, - }, - { - 0x80, "misc USB controller", NULL, - NULL, NULL, NULL, - }, - { - 0xFE, "USB device", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static pci_iface_t ipmi_iface[] = { - { - 0x00, "IPMI SMIC interface", NULL, - NULL, NULL, NULL, - }, - { - 0x01, "IPMI keyboard interface", NULL, - NULL, NULL, NULL, - }, - { - 0x02, "IPMI block transfer interface", NULL, - NULL, NULL, NULL, - }, - { - 0xFF, NULL, NULL, - NULL, NULL, NULL, - }, -}; - -static pci_subclass_t ser_subclass[] = { - { - 0x00, "Firewire bus controller", "ieee1394", NULL, NULL, - NULL, NULL, - }, - { - 0x01, "ACCESS bus controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x02, "SSA controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x03, "USB controller", "usb", NULL, usb_iface, - NULL, NULL, - }, - { - 0x04, "fibre channel controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x05, "SMBus controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x06, "InfiniBand controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x07, "IPMI interface", NULL, NULL, ipmi_iface, - NULL, NULL, - }, - { - 0x08, "SERCOS controller", NULL, NULL, ipmi_iface, - NULL, NULL, - }, - { - 0x09, "CANbus controller", NULL, NULL, ipmi_iface, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static pci_subclass_t wrl_subclass[] = { - { - 0x00, "IRDA controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x01, "consumer IR controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x10, "RF controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x11, "bluetooth controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x12, "broadband controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc wireless controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static pci_subclass_t sat_subclass[] = { - { - 0x01, "satellite TV controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x02, "satellite audio controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x03, "satellite voice controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x04, "satellite data controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static pci_subclass_t crypt_subclass[] = { - { - 0x00, "cryptographic network controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x10, "cryptographic entertainment controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc cryptographic controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static pci_subclass_t spc_subclass[] = { - { - 0x00, "DPIO module", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x01, "performances counters", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x10, "communication synchronisation", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x20, "management card", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0x80, "misc signal processing controller", NULL, NULL, NULL, - NULL, NULL, - }, - { - 0xFF, NULL, NULL, NULL, NULL, - NULL, NULL, - }, -}; - -static const pci_class_t pci_classes[] = { - /* 0x00 */ - { "undefined", NULL, undef_subclass, }, - /* 0x01 */ - { "mass-storage controller", NULL, mass_subclass, }, - /* 0x02 */ - { "network controller", "network", net_subclass, }, - /* 0x03 */ - { "display controller", "display", displ_subclass, }, - /* 0x04 */ - { "multimedia device", NULL, media_subclass, }, - /* 0x05 */ - { "memory controller", "memory-controller", mem_subclass, }, - /* 0x06 */ - { "PCI bridge", "pci", bridg_subclass, }, - /* 0x07 */ - { "communication device", NULL, comm_subclass,}, - /* 0x08 */ - { "system peripheral", NULL, sys_subclass, }, - /* 0x09 */ - { "input device", NULL, inp_subclass, }, - /* 0x0A */ - { "docking station", NULL, dock_subclass, }, - /* 0x0B */ - { "processor", NULL, cpu_subclass, }, - /* 0x0C */ - { "serial bus controller", NULL, ser_subclass, }, - /* 0x0D */ - { "wireless controller", NULL, wrl_subclass, }, - /* 0x0E */ - { "intelligent I/O controller", NULL, NULL, }, - /* 0x0F */ - { "satellite communication controller", NULL, sat_subclass, }, - /* 0x10 */ - { "cryptographic controller", NULL, crypt_subclass, }, - /* 0x11 */ - { "signal processing controller", NULL, spc_subclass, }, -}; - -phandle_t pic_handle; -static int macio_config_cb (pci_config_t *config) -{ - char buf[64]; - phandle_t ph; - int props[2]; - - sprintf(buf, "%s/interrupt-controller", config->path); - REGISTER_NAMED_NODE(ob_pci_node, buf); - - ph = find_dev(buf); - set_property(ph, "device_type", "interrupt-controller", 21); - set_property(ph, "compatible", "heathrow\0mac-risc", 18); - set_int_property(ph, "#interrupt-cells", 1); - props[0]= 0x10; - props[1]= 0x20; - set_property(ph, "reg", &props, sizeof(props)); - pic_handle = ph; - - cuda_init(config->path, config->regions[0]); - macio_nvram_init(config->path, config->regions[0]); -#if 0 - ide_init(config->path, - config->regions[0] + 0x1f000, - config->regions[0] + 0x1f000 + 0x1000, - config->regions[0] + 0x1f000 + 0x2000, - config->regions[0] + 0x1f000 + 0x3000); -#endif -#if 0 - OF_finalize_pci_macio(device->common.OF_private, - device->regions[0] & ~0x0000000F, device->sizes[0], - private_data); -#endif - return 0; -} - -static const pci_dev_t misc_pci[] = { - /* Paddington Mac I/O */ - { - 0x106B, 0x0017, - "mac-io", "mac-io", "AAPL,343S1211", "paddington\1heathrow", - 1, 1, 1, - &macio_config_cb, NULL, - }, - /* KeyLargo Mac I/O */ - { - 0x106B, 0x0022, - "mac-io", "mac-io", "AAPL,Keylargo", "Keylargo", - 1, 1, 2, - &macio_config_cb, NULL, - }, - { - 0xFFFF, 0xFFFF, - NULL, NULL, NULL, NULL, - -1, -1, -1, - NULL, NULL, - }, -}; - -static pci_dev_t *pci_find_device (uint8_t class, uint8_t subclass, - uint8_t iface, uint16_t vendor, - uint16_t product) -{ - int (*config_cb)(pci_config_t *config); - const pci_class_t *pclass; - const pci_subclass_t *psubclass; - const pci_iface_t *piface; - const pci_dev_t *dev; - const void *private; - pci_dev_t *new; - const char *name, *type; - - name = "unknown"; - type = "unknown"; - config_cb = NULL; - private = NULL; - - if (class == 0x00 && subclass == 0x01) { - /* Special hack for old style VGA devices */ - class = 0x03; - subclass = 0x00; - } else if (class == 0xFF) { - /* Special case for misc devices */ - dev = misc_pci; - goto find_device; - } - if (class > (sizeof(pci_classes) / sizeof(pci_class_t))) { - name = "invalid PCI device"; - type = "invalid"; - goto bad_device; - } - pclass = &pci_classes[class]; - name = pclass->name; - type = pclass->type; - for (psubclass = pclass->subc; ; psubclass++) { - if (psubclass->subclass == 0xFF) - goto bad_device; - if (psubclass->subclass == subclass) { - if (psubclass->name != NULL) - name = psubclass->name; - if (psubclass->type != NULL) - type = psubclass->type; - if (psubclass->config_cb != NULL) { - config_cb = psubclass->config_cb; - } - if (psubclass->private != NULL) - private = psubclass->private; - if (psubclass->iface != NULL) - break; - dev = psubclass->devices; - goto find_device; - } - } - for (piface = psubclass->iface; ; piface++) { - if (piface->iface == 0xFF) { - dev = psubclass->devices; - break; - } - if (piface->iface == iface) { - if (piface->name != NULL) - name = piface->name; - if (piface->type != NULL) - type = piface->type; - if (piface->config_cb != NULL) { - config_cb = piface->config_cb; - } - if (piface->private != NULL) - private = piface->private; - dev = piface->devices; - break; - } - } - find_device: - for (;; dev++) { - if (dev->vendor == 0xFFFF && dev->product == 0xFFFF) { - goto bad_device; - } - if (dev->vendor == vendor && dev->product == product) { - if (dev->name != NULL) - name = dev->name; - if (dev->type != NULL) - type = dev->type; - if (dev->config_cb != NULL) { - config_cb = dev->config_cb; - } - if (dev->private != NULL) - private = dev->private; - new = malloc(sizeof(pci_dev_t)); - if (new == NULL) - return NULL; - new->vendor = vendor; - new->product = product; - new->type = type; - new->name = name; - new->model = dev->model; - new->compat = dev->compat; - new->config_cb = config_cb; - new->private = private; - - return new; - } - } - bad_device: - printk("Cannot manage '%s' PCI device type '%s':\n %x %x (%x %x %x)\n", - name, type, vendor, product, class, subclass, iface); - - return NULL; -} - -#define set_bool_property(ph, name) set_property(ph, name, NULL, 0); - - -static int ob_pci_add_properties(pci_addr addr, pci_dev_t *pci_dev, - pci_config_t *config) -{ phandle_t dev=get_cur_dev(); int status,id; - uint16_t vendor_id, device_id; - uint8_t rev; - vendor_id = pci_config_read16(addr, PCI_VENDOR_ID); - device_id = pci_config_read16(addr, PCI_DEVICE_ID); - rev = pci_config_read8(addr, PCI_REVISION_ID); - /* create properties as described in 2.5 */ - printk("%s\n", pci_dev->name); - set_int_property(dev, "vendor-id", vendor_id); - set_int_property(dev, "device-id", device_id); - set_int_property(dev, "revision-id", rev); + set_int_property(dev, "vendor-id", pci_config_read16(addr, PCI_VENDOR_ID)); + set_int_property(dev, "device-id", pci_config_read16(addr, PCI_DEVICE_ID)); + set_int_property(dev, "revision-id", pci_config_read8(addr, PCI_REVISION_ID)); set_int_property(dev, "interrupts", pci_config_read8(addr, PCI_INTERRUPT_LINE)); @@ -1282,7 +70,7 @@ set_int_property(dev, "min-grant", pci_config_read8(addr, PCI_MIN_GNT)); set_int_property(dev, "max-latency", pci_config_read8(addr, PCI_MAX_LAT)); - status = pci_config_read16(addr, PCI_STATUS); + status=pci_config_read16(addr, PCI_STATUS); set_int_property(dev, "devsel-speed", (status&PCI_STATUS_DEVSEL_MASK)>>10); @@ -1294,41 +82,24 @@ if(status&PCI_STATUS_UDF) set_bool_property(dev, "udf-supported"); - id = pci_config_read16(addr, PCI_SUBSYSTEM_VENDOR_ID); - if (id) + id=pci_config_read16(addr, PCI_SUBSYSTEM_VENDOR_ID); + if(id) set_int_property(dev, "subsystem-vendor-id", id); - id = pci_config_read16(addr, PCI_SUBSYSTEM_ID); - if (id) + id=pci_config_read16(addr, PCI_SUBSYSTEM_ID); + if(id) set_int_property(dev, "subsystem-id", id); set_int_property(dev, "cache-line-size", pci_config_read16(addr, PCI_CACHE_LINE_SIZE)); - if (pci_dev->type) { - push_str(pci_dev->type); - fword("encode-string"); - push_str("device_type"); - fword("property"); - } - if (pci_dev->model) { - push_str(pci_dev->model); - fword("encode-string"); - push_str("model"); - fword("property"); - } - push_str(pci_dev->name); - fword("encode-string"); - push_str("class"); - fword("property"); - if (pci_dev->config_cb) - pci_dev->config_cb(config); } + static int ob_pci_add_reg(pci_addr addr) { PUSH(0); PUSH(0); - PUSH(addr&(~arch->cfg_base)); + PUSH(addr&(~0x80000000u)); fword("pci-addr-encode"); PUSH(0); PUSH(0); @@ -1338,6 +109,118 @@ fword("property"); } +static int ob_pci_add_class(pci_addr addr) +{ + unsigned int class; + char *strc; + + class=pci_config_read16(addr, PCI_CLASS_DEVICE); + switch (class) { + case 0x001: strc="display"; break; + case 0x100: strc="scsi"; break; + case 0x101: strc="ide"; break; + case 0x102: strc="fdc"; break; + case 0x103: strc="ipi"; break; + case 0x104: strc="raid"; break; + case 0x200: strc="ethernet"; break; + case 0x201: strc="token-ring"; break; + case 0x202: strc="fddi"; break; + case 0x203: strc="atm"; break; + case 0x400: strc="video"; break; + case 0x401: strc="sound"; break; + case 0x500: strc="memory"; break; + case 0x501: strc="flash"; break; + case 0x600: strc="host"; break; + case 0x601: strc="isa"; break; + case 0x602: strc="eisa"; break; + case 0x603: strc="mca"; break; + case 0x604: strc="pci"; break; + case 0x605: strc="pcmcia"; break; + case 0x606: strc="nubus"; break; + case 0x607: strc="cardbus"; break; + case 0x680: strc="pmu"; break; /* not in pci binding */ + case 0x700: strc="serial"; break; + case 0x701: strc="parallel"; break; + case 0x703: strc="modem"; break; /* not in pci binding */ + case 0x800: strc="interrupt-controller"; break; + case 0x801: strc="dma-controller"; break; + case 0x802: strc="timer"; break; + case 0x803: strc="rtc"; break; + case 0x900: strc="keyboard"; break; + case 0x901: strc="pen"; break; + case 0x902: strc="mouse"; break; + case 0xC00: strc="firewire"; break; + case 0xC01: strc="access-bus"; break; + case 0xC02: strc="ssa"; break; + case 0xC03: strc="usb"; break; + case 0xC04: strc="fibre-channel"; break; + default: + switch (class>>8) { + case 0x3: strc="display"; break; + case 0xA: strc="dock"; break; + case 0xB: strc="cpu"; break; + default:strc="unknown"; break; + } + } + if ((class>>8) == 0x03) { + push_str(strc); + fword("encode-string"); + push_str("device_type"); + fword("property"); + } + push_str(strc); + fword("encode-string"); + push_str("class"); + fword("property"); + + +#ifdef CONFIG_DEBUG_PCI + printk("%s\n", strc); +#endif +} + +static void +pci_enable_rom(pci_addr dev) +{ + u32 rom_addr; + + rom_addr=pci_config_read32(dev, PCI_ROM_ADDRESS); + rom_addr |= PCI_ROM_ADDRESS_ENABLE; + pci_config_write32(dev, PCI_ROM_ADDRESS, rom_addr); +} + +static void +pci_disable_rom(pci_addr dev) +{ + u32 rom_addr; + + rom_addr=pci_config_read32(dev, PCI_ROM_ADDRESS); + rom_addr &= ~PCI_ROM_ADDRESS_ENABLE; + pci_config_write32(dev, PCI_ROM_ADDRESS, rom_addr); +} + + +static void ob_pci_scan_rom(pci_addr addr) +{ + unsigned long rom_addr=pci_config_read32(addr,PCI_ROM_ADDRESS); + unsigned char *walk; + + rom_addr &= PCI_ROM_ADDRESS_MASK; + if(rom_addr) { + printk(" ROM found at 0x%lx\n",rom_addr); + pci_enable_rom(addr); + walk=phys_to_virt((unsigned char *)rom_addr); + if (walk[0]!=0x55 || walk[1]!=0xaa) { + printk("no pci rom\n"); + goto rom_err; + } + +rom_err: + pci_disable_rom(addr); + } + +} + #ifdef CONFIG_XBOX static char pci_xbox_blacklisted (int bus, int devnum, int fn) { @@ -1377,92 +260,14 @@ } #endif -static void -ob_pci_configure(pci_arch_t *addr, pci_dev_t *pci_dev, pci_config_t *config, - uint32_t *mem_base, uint32_t *io_base) - +static void ob_scan_pci_bus(int bus, char *path) { - uint32_t smask, omask, amask, size, reloc, min_align; - uint32_t *base; - pci_addr config_addr; - int reg; - - omask = 0x00000000; - for (reg = 0; reg < 7; reg++) { - - config->regions[reg] = 0x00000000; - config->sizes[reg] = 0x00000000; - - if ((omask & 0x0000000f) == 0x4) { - /* 64 bits memory mapping */ - continue; - } - - if (reg == 6) - config_addr = PCI_ROM_ADDRESS; - else - config_addr = PCI_BASE_ADDR_0 + reg * 4; - - /* get region size */ - - pci_config_write32(addr, config_addr, 0xffffffff); - smask = pci_config_read32(addr, config_addr); - if (smask == 0x00000000 || smask == 0xffffffff) - continue; - - if (smask & 0x00000001 && reg != 6) { - /* I/O space */ - base = *io_base; - min_align = 1 << 7; - amask = 0x00000001; - pci_config_write16(addr, PCI_COMMAND, - pci_config_read16(addr, - PCI_COMMAND) | - PCI_COMMAND_IO); - } else { - /* Memory Space */ - base = *mem_base; - min_align = 1 << 16; - amask = 0x0000000F; - if (reg == 6) { - smask |= 1; /* ROM */ - } - pci_config_write16(addr, PCI_COMMAND, - pci_config_read16(addr, - PCI_COMMAND) | - PCI_COMMAND_MEMORY); - } - omask = smask & amask; - smask &= ~amask; - size = (~smask) + 1; - config->sizes[reg] = size; - reloc = base; - if (size < min_align) - size = min_align; - reloc = (reloc + size -1) & ~(size - 1); - if (*io_base == base) { - *io_base = reloc + size; - reloc -= arch->io_base; - } else { - *mem_base = reloc + size; - } - pci_config_write32(addr, config_addr, reloc | omask); - config->regions[reg] = reloc; -printk("region %08x size %08x\n", config->regions[reg], config->sizes[reg]); - } -} - -static void ob_scan_pci_bus(pci_arch_t *arch, int bus, uint32_t *mem_base, uint32_t *io_base, char *path) -{ int devnum, fn, is_multi, vid, did; unsigned int htype; pci_addr addr; char * nodetemp = "%s/pci%x,%x"; + char nodebuff[32]; phandle_t dnode, dbus; - pci_config_t config; - pci_dev_t *pci_dev; - uint32_t ccode; - uint8_t class, subclass, iface, rev; for (devnum = 0; devnum < 32; devnum++) { is_multi = 0; @@ -1471,21 +276,13 @@ if (pci_xbox_blacklisted (bus, devnum, fn)) continue; #endif + addr = PCI_ADDR(bus, devnum, fn); vid = pci_config_read16(addr, PCI_VENDOR_ID); did = pci_config_read16(addr, PCI_DEVICE_ID); if (vid==0xffff || vid==0) continue; - - ccode = pci_config_read16(addr, PCI_CLASS_DEVICE); - class = ccode >> 8; - subclass = ccode; - iface = pci_config_read8(addr, PCI_CLASS_PROG); - rev = pci_config_read8(addr, PCI_REVISION_ID); - - pci_dev = pci_find_device(class, subclass, iface, vid, did); - #ifdef CONFIG_DEBUG_PCI printk("%x:%x.%x - %x:%x - ", bus, devnum, fn, vid, did); @@ -1497,55 +294,35 @@ activate_device(path); dbus=get_cur_dev(); - if (pci_dev == NULL || pci_dev->name == NULL) - sprintf(config.path, nodetemp, path, vid, did); - else - sprintf(config.path, "%s/%s", path, pci_dev->name); + sprintf(nodebuff, nodetemp, path, vid, did); #ifdef CONFIG_DEBUG_PCI - printk("%s - ", config.path); + printk("%s - ", nodebuff); #endif - REGISTER_NAMED_NODE(ob_pci_node, config.path); - dnode=find_dev(config.path); + REGISTER_NAMED_NODE(ob_pci_node, nodebuff); + dnode=find_dev(nodebuff); activate_dev( dnode ); - ob_pci_configure(addr, pci_dev, &config, - mem_base, io_base); -{ - int irq_pin, irq_line; - static uint8_t heathrow_pci_irqs[4] = { 0x15, 0x16, 0x17, 0x18 }; - irq_pin = pci_config_read8(addr, PCI_INTERRUPT_PIN); - if (irq_pin > 0) { - irq_pin = (devnum + irq_pin - 1) & 3; - irq_line = heathrow_pci_irqs[irq_pin]; - } -} - ob_pci_add_properties(addr, pci_dev, &config); + + ob_pci_add_properties(addr); ob_pci_add_reg(addr); + ob_pci_add_class(addr); + ob_pci_scan_rom(addr); device_end(); - + activate_dev( dbus ); } } } + int ob_pci_init(void) { - pci_bridge_t *pci_bridge; - pci_dev_t *pci_dev; - int bus, devfn; - phandle_t aliases; - phandle_t ph; - char buf[64]; - uint32_t mem_base, io_base; + char *path="/pci"; + int bus; printk("Initializing PCI devices...\n"); - + /* brute force bus scan */ - - /* Find all PCI bridges */ - - mem_base = arch->mem_base; - io_base = arch->io_base; - for (bus = 0; bus<0x100; bus++) { - ob_scan_pci_bus(arch, bus, &mem_base, &io_base, "/pci"); + for (bus=0; bus<0x100; bus++) { + ob_scan_pci_bus(bus, path); } return 0; } Modified: openbios-devel/drivers/vga_load_regs.c =================================================================== --- openbios-devel/drivers/vga_load_regs.c 2008-11-24 18:36:19 UTC (rev 260) +++ openbios-devel/drivers/vga_load_regs.c 2008-11-24 19:29:24 UTC (rev 261) @@ -22,8 +22,6 @@ * */ -static int depth; - // prototypes static int vga_decode_var(const struct screeninfo *var, struct vga_par *par); static int vga_set_regs(const struct vga_par *par); @@ -126,7 +124,11 @@ 0, // activate now -1,-1, // height and width in mm 0, // accel flags - 39721, // pixclock + 39721, // pixclock: 79442 -> 12.587 Mhz (NOT USED) + // 70616 -> 14.161 + // 39721 -> 25.175 + // 35308 -> 28.322 + 48, 16, 39, 8, // margins left,right,upper,lower 96, // hsync length 2, // vsync length Modified: openbios-devel/include/openbios/nvram.h =================================================================== --- openbios-devel/include/openbios/nvram.h 2008-11-24 18:36:19 UTC (rev 260) +++ openbios-devel/include/openbios/nvram.h 2008-11-24 19:29:24 UTC (rev 261) @@ -21,7 +21,7 @@ extern void arch_nvram_get( char *buf ); extern void arch_nvram_put( char *buf ); -extern void nvram_init( char *path ); +extern void nvram_init( void ); extern void update_nvram( void ); #endif /* _H_NVRAM */ Modified: openbios-devel/modules/console.c =================================================================== --- openbios-devel/modules/console.c 2008-11-24 18:36:19 UTC (rev 260) +++ openbios-devel/modules/console.c 2008-11-24 19:29:24 UTC (rev 261) @@ -153,8 +153,21 @@ osi_fb_info_t fb; int i, x, offs, size, *dest, *src; - video_scroll( FONT_ADJ_HEIGHT ); + openbios_GetFBInfo( &fb ); + offs = fb.rb * FONT_ADJ_HEIGHT; + size = (fb.h * fb.rb - offs)/16; + dest = (int*)fb.mphys; + src = (int*)(fb.mphys + offs); + + for( i=0; i<size; i++ ) { + dest[0] = src[0]; + dest[1] = src[1]; + dest[2] = src[2]; + dest[3] = src[3]; + dest += 4; + src += 4; + } for( x=0; x<cons.w; x++ ) cons.buf[(cons.h-1)*cons.w + x] = 0; draw_line(cons.h-1); Modified: openbios-devel/modules/nvram.c =================================================================== --- openbios-devel/modules/nvram.c 2008-11-24 18:36:19 UTC (rev 260) +++ openbios-devel/modules/nvram.c 2008-11-24 19:29:24 UTC (rev 261) @@ -18,13 +18,6 @@ #include "openbios/bindings.h" #include "openbios/nvram.h" -#ifdef CONFIG_DEBUG_NVRAM -#define DPRINTF(fmt, args...) \ -do { printk("NVRAM: " fmt , ##args); } while (0) -#else -#define DPRINTF(fmt, args...) do {} while(0) -#endif - #define DEF_SYSTEM_SIZE 0xc10 #define NV_SIG_SYSTEM 0x70 @@ -84,12 +77,10 @@ return 1; } - len=nvpart_size(*p); - if( len == 0) { + if( !(len=nvpart_size(*p)) ) { printk("invalid nvram partition length\n"); return -1; } - *p = (nvpart_t*)((char*)*p + len); if( *p < end ) return 1; @@ -228,7 +219,7 @@ uint mark_lo; } nvram_ibuf_t; -DECLARE_UNNAMED_NODE( nvram, INSTALL_OPEN, sizeof(nvram_ibuf_t )); +DECLARE_NODE( nvram, INSTALL_OPEN, sizeof(nvram_ibuf_t), "Tnvram" ); /* ( pos_lo pos_hi -- status ) */ static void @@ -237,7 +228,7 @@ int pos_hi = POP(); int pos_lo = POP(); - DPRINTF("seek %08x %08x\n", pos_hi, pos_lo ); + /* printk("NVRAM: seek %08x %08x\n", pos_hi, pos_lo ); */ nd->mark_lo = pos_lo; nd->mark_hi = pos_hi; @@ -263,7 +254,7 @@ n++; } PUSH(n); - DPRINTF("read %08x %x -- %x\n", (int)p, len, n); + /* printk("NVRAM: read %08x %x -- %x\n", (int)p, len, n); */ } /* ( addr len -- actual ) */ @@ -279,14 +270,13 @@ n++; } PUSH(n); - DPRINTF("write %08x %x -- %x\n", (int)p, len, n ); + /* printk("NVRAM: write %08x %x -- %x\n", (int)p, len, n ); */ } /* ( -- size ) */ static void nvram_size( __attribute__((unused)) nvram_ibuf_t *nd ) { - DPRINTF("nvram_size %d\n", nvram.size); PUSH( nvram.size ); } @@ -299,9 +289,9 @@ void -nvram_init( char *path ) +nvram_init( void ) { nvconf_init(); - REGISTER_NAMED_NODE( nvram, path ); + REGISTER_NODE( nvram ); } Modified: openbios-devel/modules/video.c =================================================================== --- openbios-devel/modules/video.c 2008-11-24 18:36:19 UTC (rev 260) +++ openbios-devel/modules/video.c 2008-11-24 19:29:24 UTC (rev 261) @@ -146,7 +146,7 @@ while( ww-- ) *p++ = col; } else { - char *p = (ushort*)pp + x; + char *p = (char*)pp + x; while( ww-- ) *p++ = col; } @@ -179,33 +179,10 @@ dac[1] = ((color >> 8) & 0xff) << 24; // Green dac[1] = (color & 0xff) << 24; // Blue } -#else - vga_set_color(ind, ((color >> 16) & 0xff), - ((color >> 8) & 0xff), - (color & 0xff)); #endif } -void -video_scroll( int height ) -{ - int i, x, offs, size, *dest, *src; - offs = video.fb.rb * height; - size = (video.fb.h * video.fb.rb - offs)/16; - dest = (int*)video.fb.mphys; - src = (int*)(video.fb.mphys + offs); - - for( i=0; i<size; i++ ) { - dest[0] = src[0]; - dest[1] = src[1]; - dest[2] = src[2]; - dest[3] = src[3]; - dest += 4; - src += 4; - } -} - /************************************************************************/ /* OF methods */ /************************************************************************/ @@ -280,18 +257,14 @@ PUSH(len); } -#if 0 static void video_open(void) { RET(-1); } -#endif NODE_METHODS( video ) = { -#if 0 {"open", video_open }, -#endif {"dimensions", video_dimensions }, {"set-colors", video_set_colors }, {"fill-rectangle", video_fill_rect }, @@ -305,15 +278,22 @@ /************************************************************************/ void -init_video( uint32_t fb, int width, int height, int depth, int rb ) +init_video( void ) { int i, s, size; - - video.fb.mphys = fb; - video.fb.w = width; - video.fb.h = height; - video.fb.depth = depth; - video.fb.rb = rb; + phandle_t ph=0; + + if( openbios_GetFBInfo(&video.fb) ) { + printk("init_video: No video display\n"); + return; + } + while( (ph=dt_iterate_type(ph, "display")) ) { + set_property( ph, "width", (char*)&video.fb.w, 4 ); + set_property( ph, "height", (char*)&video.fb.h, 4 ); + set_property( ph, "depth", (char*)&video.fb.depth, 4 ); + set_property( ph, "linebytes", (char*)&video.fb.rb, 4 ); + set_property( ph, "address", (char*)&video.fb.mphys, 4 ); + } video.has_video = 1; video.pal = malloc( 256 * sizeof(int) ); @@ -326,7 +306,7 @@ ofmem_claim_virt( video.fb.mphys, size, 0 ); ofmem_map( video.fb.mphys, video.fb.mphys, size, -1 ); #endif - + for( i=0; i<256; i++ ) set_color( i, i * 0x010101 );

1 0

r260 - openbios-devel/drivers
by svn＠openbios.org 24 Nov '08

24 Nov '08

Author: blueswirl Date: 2008-11-24 19:36:19 +0100 (Mon, 24 Nov 2008) New Revision: 260 Modified: openbios-devel/drivers/build.xml Log: Revert bad part of r259 Modified: openbios-devel/drivers/build.xml =================================================================== --- openbios-devel/drivers/build.xml 2008-11-24 12:41:36 UTC (rev 259) +++ openbios-devel/drivers/build.xml 2008-11-24 18:36:19 UTC (rev 260) @@ -6,7 +6,7 @@ <object source="timer.c" condition="DRIVER_IDE"/> <object source="kbd.c" condition="DRIVER_ADB"/> <object source="adb.c" condition="DRIVER_ADB"/> - <object source="cuda.c" condition="DRIVER_PCI"/> + <object source="cuda.c" condition="DRIVER_ADB"/> <object source="floppy.c" condition="DRIVER_FLOPPY"/> <object source="iommu.c" condition="DRIVER_SBUS"/> <object source="sbus.c" condition="DRIVER_SBUS"/>

1 0

Re: [OpenBIOS] r254 - in openbios-devel: arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu include/openbios include/ppc kernel
by Blue Swirl 24 Nov '08

24 Nov '08

On 11/24/08, svn(a)openbios.org <svn(a)openbios.org> wrote: > Author: stepan > Date: 2008-11-24 13:19:05 +0100 (Mon, 24 Nov 2008) > New Revision: 254 > --- openbios-devel/kernel/forth.c 2008-11-24 12:16:22 UTC (rev 253) > +++ openbios-devel/kernel/forth.c 2008-11-24 12:19:05 UTC (rev 254) > @@ -6,6 +6,7 @@ > * the copyright and warranty status of this work. > */ > > +extern uint32_t isa_io_base; Why is this needed? AFAICT forth.c is included by primitives.c, which includes kernel.h, which includes asm/io.h containing the same definition.

1 0

Re: [OpenBIOS] r253 - in openbios-devel: . arch/ppc arch/ppc/qemu config/examples
by Blue Swirl 24 Nov '08

24 Nov '08

On 11/24/08, svn(a)openbios.org <svn(a)openbios.org> wrote: > Author: stepan > Date: 2008-11-24 13:16:22 +0100 (Mon, 24 Nov 2008) > New Revision: 253 > --- openbios-devel/config/examples/cross-ppc_config.xml 2008-11-24 12:15:08 UTC (rev 252) > +++ openbios-devel/config/examples/cross-ppc_config.xml 2008-11-24 12:16:22 UTC (rev 253) > @@ -6,7 +6,8 @@ > <option name="CONFIG_PPC" type="boolean" value="true"/> >  >  > - <option name="CONFIG_PEARPC" type="boolean" value="true"/> > +  Instead of commenting out the wrong type, you should change the option to false.

1 0

Re: [OpenBIOS] r259 - in openbios-devel: arch/ppc/qemu drivers
by Blue Swirl 24 Nov '08

24 Nov '08

On 11/24/08, svn(a)openbios.org <svn(a)openbios.org> wrote: > Author: stepan > Date: 2008-11-24 13:41:36 +0100 (Mon, 24 Nov 2008) > New Revision: 259 > --- openbios-devel/drivers/build.xml 2008-11-24 12:38:23 UTC (rev 258) > +++ openbios-devel/drivers/build.xml 2008-11-24 12:41:36 UTC (rev 259) > @@ -6,7 +6,7 @@ > <object source="timer.c" condition="DRIVER_IDE"/> > <object source="kbd.c" condition="DRIVER_ADB"/> > <object source="adb.c" condition="DRIVER_ADB"/> > - <object source="cuda.c" condition="DRIVER_ADB"/> > + <object source="cuda.c" condition="DRIVER_PCI"/> Bad idea, this adds cuda to Sparc64.

1 0

Re: [OpenBIOS] r258 - in openbios-devel: arch/ppc/qemu config/examples drivers modules
by Blue Swirl 24 Nov '08

24 Nov '08

On 11/24/08, svn(a)openbios.org <svn(a)openbios.org> wrote: > Author: stepan > Date: 2008-11-24 13:38:23 +0100 (Mon, 24 Nov 2008) > New Revision: 258 > void > -init_video( void ) > +init_video( uint32_t fb, int width, int height, int depth, int rb ) > { Bad idea, breaks Sparc32. arch/sparc32/../../modules/video.c: At top level: arch/sparc32/../../modules/video.c:309: error: conflicting types for 'init_video' include/openbios/drivers.h:24: error: previous declaration of 'init_video' was here

1 0

Re: [OpenBIOS] r257 - in openbios-devel: drivers include/ppc
by Blue Swirl 24 Nov '08

24 Nov '08

On 11/24/08, svn(a)openbios.org <svn(a)openbios.org> wrote: > Author: stepan > Date: 2008-11-24 13:29:36 +0100 (Mon, 24 Nov 2008) > New Revision: 257 > static int ob_pci_add_reg(pci_addr addr) > { > PUSH(0); > PUSH(0); > - PUSH(addr&(~0x80000000u)); > + PUSH(addr&(~arch->cfg_base)); > fword("pci-addr-encode"); > PUSH(0); > PUSH(0); Bad idea, breaks Sparc64.

1 0

r259 - in openbios-devel: arch/ppc/qemu drivers
by svn＠openbios.org 24 Nov '08

24 Nov '08

Author: stepan Date: 2008-11-24 13:41:36 +0100 (Mon, 24 Nov 2008) New Revision: 259 Removed: openbios-devel/drivers/adb.fs Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/qemu.fs openbios-devel/drivers/adb.c openbios-devel/drivers/adb.h openbios-devel/drivers/build.xml openbios-devel/drivers/cuda.c openbios-devel/drivers/cuda.h Log: ADB/CUDA fixes Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-11-24 12:38:23 UTC (rev 258) +++ openbios-devel/arch/ppc/qemu/init.c 2008-11-24 12:41:36 UTC (rev 259) @@ -31,7 +31,6 @@ extern void unexpected_excep( int vector ); extern void ob_ide_init( void ); extern void ob_pci_init( void ); -extern void ob_adb_init( void ); extern void setup_timers( void ); void @@ -113,9 +112,6 @@ #ifdef CONFIG_DRIVER_IDE ob_ide_init(); #endif -#ifdef CONFIG_DRIVER_ADB - ob_adb_init(); -#endif node_methods_init(); Modified: openbios-devel/arch/ppc/qemu/qemu.fs =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.fs 2008-11-24 12:38:23 UTC (rev 258) +++ openbios-devel/arch/ppc/qemu/qemu.fs 2008-11-24 12:41:36 UTC (rev 259) @@ -35,12 +35,12 @@ \ preopen device nodes (and store the ihandles under /chosen) :noname - " rtc" " /pci/isa/rtc" preopen + " rtc" " rtc" preopen " memory" " /memory" preopen " mmu" " /cpu@0" preopen \ " stdout" " /packages/terminal-emulator" preopen - " stdout" " /pci/pci6666,6666" preopen - " stdin" " /pci/via-cuda/adb" preopen + " stdout" " screen" preopen + " stdin" " adb-keyboard" preopen ; SYSTEM-initializer @@ -93,8 +93,8 @@ \ use the tty interface if available : activate-tty-interface " /packages/terminal-emulator" find-dev if drop - " /pci/via-cuda/adb" " input-device" $setenv - " /pci/pci6666,6666" " output-device" $setenv + " adb-keyboard" " input-device" $setenv + " screen" " output-device" $setenv then ; Modified: openbios-devel/drivers/adb.c =================================================================== --- openbios-devel/drivers/adb.c 2008-11-24 12:38:23 UTC (rev 258) +++ openbios-devel/drivers/adb.c 2008-11-24 12:41:36 UTC (rev 259) @@ -27,8 +27,10 @@ #include "adb.h" #include "kbd.h" #include "cuda.h" +#include "libc/byteorder.h" +#include "libc/vsprintf.h" -#define DEBUG_ADB 1 +//#define DEBUG_ADB 1 #ifdef DEBUG_ADB #define ADB_DPRINTF(fmt, args...) \ @@ -37,8 +39,29 @@ #define ADB_DPRINTF(fmt, args...) do { } while (0) #endif -DECLARE_NODE( adb, INSTALL_OPEN, 0, "/pci/via-cuda/adb" ); +static void adb_read(void); +DECLARE_UNNAMED_NODE( keyboard, INSTALL_OPEN, sizeof(int)); + +static void +keyboard_open(int *idx) +{ + RET(-1); +} + +static void +keyboard_close(int *idx) +{ +} + +static void keyboard_read(void); + +NODE_METHODS( keyboard ) = { + { "open", keyboard_open }, + { "close", keyboard_close }, + { "read", keyboard_read }, +}; + /* ADB US keyboard translation map * XXX: for now, only shift modifier is defined */ @@ -424,14 +447,9 @@ int next_key; }; +static adb_kbd_t *my_adb_kbd = NULL; +static adb_dev_t *my_adb_dev = NULL; - - - -static adb_kbd_t *my_adb_kbd; -adb_dev_t *my_adb_dev; -//={ NULL, NULL, 2, 1, (unsigned int)0x80816000 }; - static int adb_kbd_read (void *private) { uint8_t buffer[ADB_BUF_SIZE]; @@ -441,7 +459,6 @@ int ret; kbd = (void *)dev->state; - //ADB_DPRINTF("enter\n"); /* Get saved state */ ret = -1; for (key = -1; key == -1; ) { @@ -449,9 +466,8 @@ key = kbd->next_key; kbd->next_key = -1; } else { - if (adb_reg_get(dev, 0, buffer) != 2) { - goto out; - } + if (adb_reg_get(dev, 0, buffer) != 2) + break; kbd->next_key = buffer[1] == 0xFF ? -1 : buffer[1]; key = buffer[0]; } @@ -459,45 +475,102 @@ ADB_DPRINTF("Translated %d (%02x) into %d (%02x)\n", key, key, ret, ret); } - out: return ret; } -void *adb_kbd_new (void *private) +void *adb_kbd_new (char *path, void *private) { - adb_kbd_t *kbd=my_adb_kbd; + char buf[64]; + int props[1]; + phandle_t ph, aliases; + adb_kbd_t *kbd; + adb_dev_t *dev = private; + kbd = (adb_kbd_t*)malloc(sizeof(adb_kbd_t)); + if (kbd != NULL) { + memset(kbd, 0, sizeof(adb_kbd_t)); + kbd_set_keymap(&kbd->kbd, sizeof(ADB_kbd_us) / sizeof(keymap_t), + ADB_kbd_us); + kbd->next_key = -1; + dev->state = (int32_t)kbd; + my_adb_dev = dev; + } - memset(kbd, 0, sizeof(adb_kbd_t)); - kbd_set_keymap(&kbd->kbd, sizeof(ADB_kbd_us) / sizeof(keymap_t), ADB_kbd_us); - kbd->next_key = -1; - - //my_adb_dev.state=(unsigned int)my_adb_kbd; - my_adb_dev=private; - return NULL; + sprintf(buf, "%s/keyboard", path); + REGISTER_NAMED_NODE( keyboard, buf); + + ph = find_dev(buf); + + set_property(ph, "device_type", "keyboard", 9); + props[0] = __cpu_to_be32(dev->addr); + set_property(ph, "reg", &props, sizeof(props)); + + aliases = find_dev("/aliases"); + set_property(aliases, "adb-keyboard", buf, strlen(buf) + 1); + + return kbd; } /* ( addr len -- actual ) */ -void adb_read(void) +static void keyboard_read(void) { char *addr; - int len, key; + int len, key, i; len=POP(); addr=(char *)POP(); - if(len!=1) printk("adb_read: %x %x\n", (unsigned int)addr , len); - - key=adb_kbd_read(my_adb_dev); - //key=-1; - if (key!=-1) { - *addr=(char)key; - PUSH(1); - } else - PUSH(0); + for (i = 0; i < len; i++) { + key = adb_kbd_read(my_adb_dev); + if (key == -1 || key == -2) + break; + *addr++ = (char)key; + } + PUSH(i); } +DECLARE_UNNAMED_NODE( mouse, INSTALL_OPEN, sizeof(int)); +static void +mouse_open(int *idx) +{ + RET(-1); +} + +static void +mouse_close(int *idx) +{ +} + +static void mouse_read(void); + +NODE_METHODS( mouse ) = { + { "open", mouse_open }, + { "close", mouse_close }, +}; + +void *adb_mouse_new (char *path, void *private) +{ + char buf[64]; + int props[1]; + phandle_t ph, aliases; + adb_dev_t *dev = private; + + sprintf(buf, "%s/mouse", path); + REGISTER_NAMED_NODE( mouse, buf); + + ph = find_dev(buf); + + set_property(ph, "device_type", "mouse", 6); + props[0] = __cpu_to_be32(dev->addr); + set_property(ph, "reg", &props, sizeof(props)); + set_int_property(ph, "#buttons", 3); + + aliases = find_dev("/aliases"); + set_property(aliases, "adb-mouse", buf, strlen(buf) + 1); +} + + int adb_cmd (adb_dev_t *dev, uint8_t cmd, uint8_t reg, uint8_t *buf, int len) { @@ -561,18 +634,3 @@ return len; } - - -NODE_METHODS( adb ) = { - { "read", adb_read }, -}; - -int ob_adb_init(void) -{ - printk("Initializing ADB driver\n"); - cuda_init(0x80800000 + 0x16000); - REGISTER_NODE( adb ); - //adb_kbd_new(); - return 0; -} - Deleted: openbios-devel/drivers/adb.fs =================================================================== --- openbios-devel/drivers/adb.fs 2008-11-24 12:38:23 UTC (rev 258) +++ openbios-devel/drivers/adb.fs 2008-11-24 12:41:36 UTC (rev 259) @@ -1,33 +0,0 @@ -[IFDEF] CONFIG_DRIVER_ADB - -dev /pci -\ simple pci bus node -new-device -" via-cuda" device-name -" via-cuda" encode-string " device_type" property -" cuda" encode-string " compatible" property - -external -: open ( ." opening CUDA" cr ) true ; -: close ; -: decode-unit 0 decode-unit-pci-bus ; -: encode-unit encode-unit-pci ; -finish-device - -dev /pci/via-cuda - -new-device -" adb" device-name -" adb" encode-string " device_type" property -0 encode-int " #size-cells" property -1 encode-int " #address-cells" property - -external -: open ( ." opening ADB" cr ) true ; -: close ; -finish-device - -device-end - -[THEN] - Modified: openbios-devel/drivers/adb.h =================================================================== --- openbios-devel/drivers/adb.h 2008-11-24 12:38:23 UTC (rev 258) +++ openbios-devel/drivers/adb.h 2008-11-24 12:41:36 UTC (rev 259) @@ -71,7 +71,7 @@ adb_bus_t *adb_bus_new (void *host, int (*req)(void *host, const uint8_t *snd_buf, int len, uint8_t *rcv_buf)); -int adb_bus_init (adb_bus_t *bus); +int adb_bus_init (char *path, adb_bus_t *bus); static inline int adb_reset (adb_bus_t *bus) { @@ -99,7 +99,7 @@ return adb_cmd(dev, ADB_LISTEN, reg, buf, len); } -void *adb_kbd_new (void *private); +void *adb_kbd_new (char *path, void *private); #endif /* !defined(__OHW_ADB_H__) */ Modified: openbios-devel/drivers/build.xml =================================================================== --- openbios-devel/drivers/build.xml 2008-11-24 12:38:23 UTC (rev 258) +++ openbios-devel/drivers/build.xml 2008-11-24 12:41:36 UTC (rev 259) @@ -6,7 +6,7 @@ <object source="timer.c" condition="DRIVER_IDE"/> <object source="kbd.c" condition="DRIVER_ADB"/> <object source="adb.c" condition="DRIVER_ADB"/> - <object source="cuda.c" condition="DRIVER_ADB"/> + <object source="cuda.c" condition="DRIVER_PCI"/> <object source="floppy.c" condition="DRIVER_FLOPPY"/> <object source="iommu.c" condition="DRIVER_SBUS"/> <object source="sbus.c" condition="DRIVER_SBUS"/> @@ -20,7 +20,6 @@ <dictionary name="openbios" target="forth"> <object source="pci.fs" condition="DRIVER_PCI"/> <object source="ide.fs" condition="DRIVER_IDE"/> - <object source="adb.fs" condition="DRIVER_ADB"/> <object source="sbus.fs" condition="DRIVER_SBUS"/> <object source="esp.fs" condition="DRIVER_ESP"/> </dictionary> Modified: openbios-devel/drivers/cuda.c =================================================================== --- openbios-devel/drivers/cuda.c 2008-11-24 12:38:23 UTC (rev 258) +++ openbios-devel/drivers/cuda.c 2008-11-24 12:41:36 UTC (rev 259) @@ -1,10 +1,13 @@ #include "openbios/config.h" #include "openbios/bindings.h" +#include "libc/byteorder.h" +#include "libc/vsprintf.h" + #include "adb.h" #include "cuda.h" -#define DEBUG_CUDA +//#define DEBUG_CUDA #ifdef DEBUG_CUDA #define CUDA_DPRINTF(fmt, args...) \ do { printk("CUDA - %s: " fmt, __func__ , ##args); } while (0) @@ -13,6 +16,9 @@ #endif #define ADB_DPRINTF CUDA_DPRINTF +#define IO_CUDA_OFFSET 0x00016000 +#define IO_CUDA_SIZE 0x00002000 + /* VIA registers - spaced 0x200 bytes apart */ #define RS 0x200 /* skip between registers */ #define B 0 /* B-side data */ @@ -145,27 +151,158 @@ } -cuda_t *cuda_init (uint32_t base) +DECLARE_UNNAMED_NODE(ob_cuda, INSTALL_OPEN, sizeof(int)); + +static void +ob_cuda_initialize (int *idx) { + extern phandle_t pic_handle; + phandle_t ph=get_cur_dev(); + int props[2]; + + push_str("via-cuda"); + fword("device-type"); + + set_int_property(ph, "#address-cells", 1); + set_int_property(ph, "#size-cells", 0); + + set_property(ph, "compatible", "cuda", 5); + + props[0] = __cpu_to_be32(IO_CUDA_OFFSET); + props[1] = __cpu_to_be32(IO_CUDA_SIZE); + + set_property(ph, "reg", &props, sizeof(props)); + set_int_property(ph, "interrupt-parent", pic_handle); + // HEATHROW + set_int_property(ph, "interrupts", 0x12); +} + +static void +ob_cuda_open(int *idx) +{ + RET(-1); +} + +static void +ob_cuda_close(int *idx) +{ +} + +static void +ob_cuda_decode_unit(void *private) +{ + PUSH(0); + fword("decode-unit-pci-bus"); +} + +static void +ob_cuda_encode_unit(void *private) +{ + fword("encode-unit-pci"); +} + +NODE_METHODS(ob_cuda) = { + { NULL, ob_cuda_initialize }, + { "open", ob_cuda_open }, + { "close", ob_cuda_close }, + { "decode-unit", ob_cuda_decode_unit }, + { "encode-unit", ob_cuda_encode_unit }, +}; + +DECLARE_UNNAMED_NODE(rtc, INSTALL_OPEN, sizeof(int)); + +static void +rtc_open(int *idx) +{ + RET(-1); +} + +NODE_METHODS(rtc) = { + { "open", rtc_open }, +}; + +static void +rtc_init(char *path) +{ + phandle_t ph, aliases; + char buf[64]; + + sprintf(buf, "%s/rtc", path); + REGISTER_NAMED_NODE(rtc, buf); + + ph = find_dev(buf); + set_property(ph, "device_type", "rtc", 4); + set_property(ph, "compatible", "rtc", 4); + + aliases = find_dev("/aliases"); + set_property(aliases, "rtc", buf, strlen(buf) + 1); + +} + +cuda_t *cuda_init (char *path, uint32_t base) +{ cuda_t *cuda; + char buf[64]; - //CUDA_DPRINTF(" base=%08x\n", base); + base += IO_CUDA_OFFSET; + CUDA_DPRINTF(" base=%08x\n", base); cuda = malloc(sizeof(cuda_t)); if (cuda == NULL) return NULL; + + sprintf(buf, "%s/via-cuda", path); + REGISTER_NAMED_NODE(ob_cuda, buf); + cuda->base = base; cuda_writeb(cuda, B, cuda_readb(cuda, B) | TREQ | TIP); +#ifdef CONFIG_DRIVER_ADB cuda->adb_bus = adb_bus_new(cuda, &cuda_adb_req); if (cuda->adb_bus == NULL) { free(cuda); return NULL; } - adb_bus_init(cuda->adb_bus); + adb_bus_init(buf, cuda->adb_bus); +#endif + rtc_init(buf); + return cuda; } +#ifdef CONFIG_DRIVER_ADB +DECLARE_UNNAMED_NODE( adb, INSTALL_OPEN, sizeof(int)); + +static void +adb_initialize (int *idx) +{ + phandle_t ph=get_cur_dev(); + + push_str("adb"); + fword("device-type"); + + set_property(ph, "compatible", "adb", 4); + set_int_property(ph, "#address-cells", 1); + set_int_property(ph, "#size-cells", 0); +} + +static void +adb_open(int *idx) +{ + RET(-1); +} + +static void +adb_close(int *idx) +{ +} + +NODE_METHODS( adb ) = { + { NULL, adb_initialize }, + { "open", adb_open }, + { "close", adb_close }, +}; + adb_bus_t *adb_bus_new (void *host, int (*req)(void *host, const uint8_t *snd_buf, int len, uint8_t *rcv_buf)) @@ -184,8 +321,9 @@ /* Check and relocate all ADB devices as suggested in * * ADB_manager Apple documentation * */ -int adb_bus_init (adb_bus_t *bus) +int adb_bus_init (char *path, adb_bus_t *bus) { + char buf[64]; uint8_t buffer[ADB_BUF_SIZE]; uint8_t adb_addresses[16] = { 8, 9, 10, 11, 12, 13, 14, -1, -1, -1, -1, -1, -1, -1, 0, }; @@ -194,6 +332,8 @@ int reloc = 0, next_free = 7; int keep; + sprintf(buf, "%s/adb", path); + REGISTER_NAMED_NODE( adb, buf); /* Reset the bus */ // ADB_DPRINTF("\n"); adb_reset(bus); @@ -258,11 +398,11 @@ break; case ADB_KEYBD: ADB_DPRINTF("Found one keyboard on address %d\n", address); - adb_kbd_new(*cur); + adb_kbd_new(buf, *cur); break; case ADB_MOUSE: ADB_DPRINTF("Found one mouse on address %d\n", address); - //chardev_register(CHARDEV_MOUSE, &adb_mouse_ops, *cur); + adb_mouse_new(buf, *cur); break; case ADB_ABS: ADB_DPRINTF("Found one absolute positioning device\n"); @@ -294,4 +434,4 @@ return 0; } - +#endif Modified: openbios-devel/drivers/cuda.h =================================================================== --- openbios-devel/drivers/cuda.h 2008-11-24 12:38:23 UTC (rev 258) +++ openbios-devel/drivers/cuda.h 2008-11-24 12:41:36 UTC (rev 259) @@ -15,6 +15,6 @@ }; -cuda_t *cuda_init (uint32_t base); +cuda_t *cuda_init (char *path, uint32_t base);

1 0

r258 - in openbios-devel: arch/ppc/qemu config/examples drivers modules
by svn＠openbios.org 24 Nov '08

24 Nov '08

Author: stepan Date: 2008-11-24 13:38:23 +0100 (Mon, 24 Nov 2008) New Revision: 258 Added: openbios-devel/drivers/vga_vbe.c Modified: openbios-devel/arch/ppc/qemu/console.c openbios-devel/arch/ppc/qemu/init.c openbios-devel/config/examples/cross-ppc_config.xml openbios-devel/drivers/build.xml openbios-devel/drivers/pci.c openbios-devel/drivers/vga.h openbios-devel/drivers/vga_load_regs.c openbios-devel/modules/console.c openbios-devel/modules/video.c Log: Add Bochs VBE VGA support Modified: openbios-devel/arch/ppc/qemu/console.c =================================================================== --- openbios-devel/arch/ppc/qemu/console.c 2008-11-24 12:29:36 UTC (rev 257) +++ openbios-devel/arch/ppc/qemu/console.c 2008-11-24 12:38:23 UTC (rev 258) @@ -131,24 +131,26 @@ } osi_fb_info_t; +#define openbios_GetFBInfo(x) Qemu_GetFBInfo(x) + +#include "../../../modules/font_8x16.c" +#include "../../../modules/video.c" +#include "../../../modules/console.c" + +static uint32_t vga_phys_mem; +static int vga_width, vga_height, vga_depth; + int Qemu_GetFBInfo( osi_fb_info_t *fb ) { + fb->mphys = vga_phys_mem; + fb->w = vga_width; + fb->h = vga_height; + fb->depth = vga_depth; + fb->rb = fb->w * ((fb->depth + 7) / 8); - fb->w=1024; - fb->h=768; - fb->depth=15; - fb->rb=2048; - fb->mphys=0x84000000; - return 0; } -#define openbios_GetFBInfo(x) Qemu_GetFBInfo(x) - -#include "../../../modules/video.c" - -#include "../../../modules/console.c" - /* ****************************************************************** * common functions, implementing simple concurrent console * ****************************************************************** */ Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-11-24 12:29:36 UTC (rev 257) +++ openbios-devel/arch/ppc/qemu/init.c 2008-11-24 12:38:23 UTC (rev 258) @@ -118,7 +118,6 @@ #endif node_methods_init(); - init_video(); #if USE_RTAS if( !(ph=find_dev("/rtas")) ) Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2008-11-24 12:29:36 UTC (rev 257) +++ openbios-devel/config/examples/cross-ppc_config.xml 2008-11-24 12:38:23 UTC (rev 258) @@ -25,7 +25,7 @@ <option name="CONFIG_DEBUG_INTERPRETER" type="boolean" value="false"/> <option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/> <option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/> - <option name="CONFIG_SERIAL_PORT" type="boolean" value="true"/> + <option name="CONFIG_SERIAL_PORT" type="integer" value="1"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> @@ -67,6 +67,7 @@ <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> <option name="CONFIG_DRIVER_ADB" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> </config> Modified: openbios-devel/drivers/build.xml =================================================================== --- openbios-devel/drivers/build.xml 2008-11-24 12:29:36 UTC (rev 257) +++ openbios-devel/drivers/build.xml 2008-11-24 12:38:23 UTC (rev 258) @@ -14,6 +14,7 @@ <object source="obio.c" condition="DRIVER_OBIO"/> <object source="vga_load_regs.c" condition="DRIVER_VGA"/> <object source="vga_set_mode.c" condition="DRIVER_VGA"/> + <object source="vga_vbe.c" condition="DRIVER_VGA"/> </library> <dictionary name="openbios" target="forth"> Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-11-24 12:29:36 UTC (rev 257) +++ openbios-devel/drivers/pci.c 2008-11-24 12:38:23 UTC (rev 258) @@ -301,11 +301,9 @@ static int vga_config_cb (pci_config_t *config) { -#if 0 if (config->regions[0] != 0x00000000) vga_vbe_init(config->path, config->regions[0], config->sizes[0], config->regions[1], config->sizes[1]); -#endif return 0; } Modified: openbios-devel/drivers/vga.h =================================================================== --- openbios-devel/drivers/vga.h 2008-11-24 12:29:36 UTC (rev 257) +++ openbios-devel/drivers/vga.h 2008-11-24 12:38:23 UTC (rev 258) @@ -90,6 +90,8 @@ #define SEQ_I 0x3C4 /* Sequencer Index */ #define PEL_IW 0x3C8 /* PEL Write Index */ #define PEL_IR 0x3C7 /* PEL Read Index */ +#define DAC_REG 0x3C8 /* DAC register */ +#define DAC_VAL 0x3C9 /* DAC value */ /* standard VGA indexes max counts */ #define CRTC_C 25 /* 25 CRT Controller Registers sequentially set*/ Modified: openbios-devel/drivers/vga_load_regs.c =================================================================== --- openbios-devel/drivers/vga_load_regs.c 2008-11-24 12:29:36 UTC (rev 257) +++ openbios-devel/drivers/vga_load_regs.c 2008-11-24 12:38:23 UTC (rev 258) @@ -22,6 +22,8 @@ * */ +static int depth; + // prototypes static int vga_decode_var(const struct screeninfo *var, struct vga_par *par); static int vga_set_regs(const struct vga_par *par); @@ -124,11 +126,7 @@ 0, // activate now -1,-1, // height and width in mm 0, // accel flags - 39721, // pixclock: 79442 -> 12.587 Mhz (NOT USED) - // 70616 -> 14.161 - // 39721 -> 25.175 - // 35308 -> 28.322 - + 39721, // pixclock 48, 16, 39, 8, // margins left,right,upper,lower 96, // hsync length 2, // vsync length Added: openbios-devel/drivers/vga_vbe.c =================================================================== --- openbios-devel/drivers/vga_vbe.c (rev 0) +++ openbios-devel/drivers/vga_vbe.c 2008-11-24 12:38:23 UTC (rev 258) @@ -0,0 +1,131 @@ +/* + * Copyright (c) 2004-2005 Fabrice Bellard + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License V2 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "openbios/config.h" +#include "openbios/kernel.h" +#include "openbios/bindings.h" +#include "openbios/pci.h" +#include "asm/io.h" + +/* VGA init. We use the Bochs VESA VBE extensions */ +#define VBE_DISPI_INDEX_ID 0x0 +#define VBE_DISPI_INDEX_XRES 0x1 +#define VBE_DISPI_INDEX_YRES 0x2 +#define VBE_DISPI_INDEX_BPP 0x3 +#define VBE_DISPI_INDEX_ENABLE 0x4 +#define VBE_DISPI_INDEX_BANK 0x5 +#define VBE_DISPI_INDEX_VIRT_WIDTH 0x6 +#define VBE_DISPI_INDEX_VIRT_HEIGHT 0x7 +#define VBE_DISPI_INDEX_X_OFFSET 0x8 +#define VBE_DISPI_INDEX_Y_OFFSET 0x9 +#define VBE_DISPI_INDEX_NB 0xa + +#define VBE_DISPI_ID0 0xB0C0 +#define VBE_DISPI_ID1 0xB0C1 +#define VBE_DISPI_ID2 0xB0C2 + +#define VBE_DISPI_DISABLED 0x00 +#define VBE_DISPI_ENABLED 0x01 +#define VBE_DISPI_LFB_ENABLED 0x40 +#define VBE_DISPI_NOCLEARMEM 0x80 + +static void vbe_outw(int index, int val) +{ + outw(index, 0x1ce); + outw(val, 0x1d0); +} + +/* for depth = 8 mode, set a hardware palette entry */ +void vga_set_color(int i, unsigned int r, unsigned int g, unsigned int b) +{ + r &= 0xff; + g &= 0xff; + b &= 0xff; + outb(i, 0x3c8); + outb(r >> 2, 0x3c9); + outb(g >> 2, 0x3c9); + outb(b >> 2, 0x3c9); +} + +/* build standard RGB palette */ +static void vga_build_rgb_palette(void) +{ + static const uint8_t pal_value[6] = { 0x00, 0x33, 0x66, 0x99, 0xcc, 0xff }; + int i, r, g, b; + + i = 0; + for(r = 0; r < 6; r++) { + for(g = 0; g < 6; g++) { + for(b = 0; b < 6; b++) { + vga_set_color(i, pal_value[r], pal_value[g], pal_value[b]); + i++; + } + } + } +} + +/* depth = 8, 15, 16 or 32 */ +void vga_vbe_set_mode(int width, int height, int depth) +{ + outb(0x00, 0x3c0); /* enable blanking */ + vbe_outw(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_DISABLED); + vbe_outw(VBE_DISPI_INDEX_X_OFFSET, 0); + vbe_outw(VBE_DISPI_INDEX_Y_OFFSET, 0); + vbe_outw(VBE_DISPI_INDEX_XRES, width); + vbe_outw(VBE_DISPI_INDEX_YRES, height); + vbe_outw(VBE_DISPI_INDEX_BPP, depth); + vbe_outw(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_ENABLED); + outb(0x00, 0x3c0); + outb(0x20, 0x3c0); /* disable blanking */ + + if (depth == 8) + vga_build_rgb_palette(); +} + +void vga_vbe_init(char *path, uint32_t fb, uint32_t fb_size, + uint32_t rom, uint32_t rom_size) +{ + phandle_t ph, chosen, aliases; + + vga_vbe_set_mode(800, 600, 8); + + ph = find_dev(path); + + set_int_property(ph, "width", 800); + set_int_property(ph, "height", 600); + set_int_property(ph, "depth", 8); + set_int_property(ph, "linebytes", 800); + set_int_property(ph, "address", fb & ~0x0000000F); + + chosen = find_dev("/chosen"); + set_int_property(chosen, "display", ph); + + aliases = find_dev("/aliases"); + set_property(aliases, "screen", path, strlen(path) + 1); + if (rom_size >= 8) { + const uint8_t *p; + int size; + p = rom; + if (p[0] == 'N' && p[1] == 'D' && p[2] == 'R' && p[3] == 'V') { + size = *(uint32_t*)(p + 4); + set_property(ph, "driver,AAPL,MacOS,PowerPC", + p + 8, size); + } + } + + init_video(fb, 800, 600, 8, 800); +} Modified: openbios-devel/modules/console.c =================================================================== --- openbios-devel/modules/console.c 2008-11-24 12:29:36 UTC (rev 257) +++ openbios-devel/modules/console.c 2008-11-24 12:38:23 UTC (rev 258) @@ -153,21 +153,8 @@ osi_fb_info_t fb; int i, x, offs, size, *dest, *src; - openbios_GetFBInfo( &fb ); + video_scroll( FONT_ADJ_HEIGHT ); - offs = fb.rb * FONT_ADJ_HEIGHT; - size = (fb.h * fb.rb - offs)/16; - dest = (int*)fb.mphys; - src = (int*)(fb.mphys + offs); - - for( i=0; i<size; i++ ) { - dest[0] = src[0]; - dest[1] = src[1]; - dest[2] = src[2]; - dest[3] = src[3]; - dest += 4; - src += 4; - } for( x=0; x<cons.w; x++ ) cons.buf[(cons.h-1)*cons.w + x] = 0; draw_line(cons.h-1); Modified: openbios-devel/modules/video.c =================================================================== --- openbios-devel/modules/video.c 2008-11-24 12:29:36 UTC (rev 257) +++ openbios-devel/modules/video.c 2008-11-24 12:38:23 UTC (rev 258) @@ -146,7 +146,7 @@ while( ww-- ) *p++ = col; } else { - char *p = (char*)pp + x; + char *p = (ushort*)pp + x; while( ww-- ) *p++ = col; } @@ -179,10 +179,33 @@ dac[1] = ((color >> 8) & 0xff) << 24; // Green dac[1] = (color & 0xff) << 24; // Blue } +#else + vga_set_color(ind, ((color >> 16) & 0xff), + ((color >> 8) & 0xff), + (color & 0xff)); #endif } +void +video_scroll( int height ) +{ + int i, x, offs, size, *dest, *src; + offs = video.fb.rb * height; + size = (video.fb.h * video.fb.rb - offs)/16; + dest = (int*)video.fb.mphys; + src = (int*)(video.fb.mphys + offs); + + for( i=0; i<size; i++ ) { + dest[0] = src[0]; + dest[1] = src[1]; + dest[2] = src[2]; + dest[3] = src[3]; + dest += 4; + src += 4; + } +} + /************************************************************************/ /* OF methods */ /************************************************************************/ @@ -257,14 +280,18 @@ PUSH(len); } +#if 0 static void video_open(void) { RET(-1); } +#endif NODE_METHODS( video ) = { +#if 0 {"open", video_open }, +#endif {"dimensions", video_dimensions }, {"set-colors", video_set_colors }, {"fill-rectangle", video_fill_rect }, @@ -278,22 +305,15 @@ /************************************************************************/ void -init_video( void ) +init_video( uint32_t fb, int width, int height, int depth, int rb ) { int i, s, size; - phandle_t ph=0; - - if( openbios_GetFBInfo(&video.fb) ) { - printk("init_video: No video display\n"); - return; - } - while( (ph=dt_iterate_type(ph, "display")) ) { - set_property( ph, "width", (char*)&video.fb.w, 4 ); - set_property( ph, "height", (char*)&video.fb.h, 4 ); - set_property( ph, "depth", (char*)&video.fb.depth, 4 ); - set_property( ph, "linebytes", (char*)&video.fb.rb, 4 ); - set_property( ph, "address", (char*)&video.fb.mphys, 4 ); - } + + video.fb.mphys = fb; + video.fb.w = width; + video.fb.h = height; + video.fb.depth = depth; + video.fb.rb = rb; video.has_video = 1; video.pal = malloc( 256 * sizeof(int) ); @@ -306,7 +326,7 @@ ofmem_claim_virt( video.fb.mphys, size, 0 ); ofmem_map( video.fb.mphys, video.fb.mphys, size, -1 ); #endif - + for( i=0; i<256; i++ ) set_color( i, i * 0x010101 );

1 0

r257 - in openbios-devel: drivers include/ppc
by svn＠openbios.org 24 Nov '08

24 Nov '08

Author: stepan Date: 2008-11-24 13:29:36 +0100 (Mon, 24 Nov 2008) New Revision: 257 Modified: openbios-devel/drivers/pci.c openbios-devel/drivers/pci.h openbios-devel/include/ppc/pci.h Log: Create device tree according found PCI devices. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-11-24 12:23:01 UTC (rev 256) +++ openbios-devel/drivers/pci.c 2008-11-24 12:29:36 UTC (rev 257) @@ -16,6 +16,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" #include "openbios/kernel.h" +#include "openbios/pci.h" #include "libc/byteorder.h" #include "libc/vsprintf.h" @@ -53,16 +54,1229 @@ { "close", ob_pci_close }, }; -static int ob_pci_add_properties(pci_addr addr) +/* PCI devices database */ +typedef struct pci_class_t pci_class_t; +typedef struct pci_subclass_t pci_subclass_t; +typedef struct pci_iface_t pci_iface_t; +typedef struct pci_dev_t pci_dev_t; + +typedef struct pci_config_t pci_config_t; + +struct pci_config_t { + char path[64]; + uint32_t regions[7]; + uint32_t sizes[7]; +}; + +struct pci_iface_t { + uint8_t iface; + const char *name; + const char *type; + const pci_dev_t *devices; + int (*config_cb)(pci_config_t *config); + const void *private; +}; + +struct pci_subclass_t { + uint8_t subclass; + const char *name; + const char *type; + const pci_dev_t *devices; + const pci_iface_t *iface; + int (*config_cb)(pci_config_t *config); + const void *private; +}; + +struct pci_class_t { + const char *name; + const char *type; + const pci_subclass_t *subc; +}; + +struct pci_dev_t { + uint16_t vendor; + uint16_t product; + const char *type; + const char *name; + const char *model; + const char *compat; + int acells; + int scells; + int icells; + int (*config_cb)(pci_config_t *config); + const void *private; +}; + +/* Current machine description */ + +typedef struct pci_bridge_t pci_bridge_t; + +/* Low level access helpers */ +struct pci_ops_t { + uint8_t (*config_readb)(pci_bridge_t *bridge, + uint8_t bus, uint8_t devfn, uint8_t offset); + void (*config_writeb)(pci_bridge_t *bridge, + uint8_t bus, uint8_t devfn, + uint8_t offset, uint8_t val); + uint16_t (*config_readw)(pci_bridge_t *bridge, + uint8_t bus, uint8_t devfn, uint8_t offset); + void (*config_writew)(pci_bridge_t *bridge, + uint8_t bus, uint8_t devfn, + uint8_t offset, uint16_t val); + uint32_t (*config_readl)(pci_bridge_t *bridge, + uint8_t bus, uint8_t devfn, uint8_t offset); + void (*config_writel)(pci_bridge_t *bridge, + uint8_t bus, uint8_t devfn, + uint8_t offset, uint32_t val); +}; + +static pci_subclass_t undef_subclass[] = { + { + 0x00, "misc undefined", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static int ide_config_cb2 (pci_config_t *config) { +#if 0 + ide_init(config->path, + config->regions[0] & ~0x0000000F, + config->regions[1] & ~0x0000000F, + config->regions[2] & ~0x0000000F, + config->regions[3] & ~0x0000000F); +#endif + return 0; +} + +static pci_dev_t ide_devices[] = { + { + 0x1095, 0x0646, /* CMD646 IDE controller */ + "pci-ide", "pci-ata", NULL, NULL, + 0, 0, 0, + ide_config_cb2, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static pci_subclass_t mass_subclass[] = { + { + 0x00, "SCSI bus controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "IDE controller", "ide", ide_devices, NULL, + NULL, NULL, + }, + { + 0x02, "Floppy disk controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "IPI bus controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x04, "RAID controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x05, "ATA controller", "ata", NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc mass-storage controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static pci_dev_t eth_devices[] = { + { 0x10EC, 0x8029, + NULL, "NE2000", "NE2000 PCI", NULL, + 0, 0, 0, + NULL, "ethernet", + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static int eth_config_cb (pci_config_t *config) +{ + phandle_t ph; + int props[12]; + int i; + + ph = find_dev(config->path); + + set_property(ph, "network-type", "ethernet", 9); + set_property(ph, "removable", "network", 8); + set_property(ph, "category", "net", 4); + + for (i = 0; i < 7; i++) + { + props[i*2] = config->regions[i]; + props[i*2 + 1] = config->sizes[i]; + } + set_property(ph, "reg", props, i * 2 * sizeof(int)); +} + +static pci_subclass_t net_subclass[] = { + { + 0x00, "ethernet controller", NULL, eth_devices, NULL, + eth_config_cb, "ethernet", + }, + { + 0x01, "token ring controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "FDDI controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "ATM controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x04, "ISDN controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x05, "WordFip controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x06, "PICMG 2.14 controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc network controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static pci_dev_t vga_devices[] = { + { + 0x1002, 0x5046, + NULL, "ATY", "ATY Rage128", "VGA", + 0, 0, 0, + NULL, NULL, + }, + { + 0x1234, 0x1111, + NULL, "QEMU,VGA", "Qemu VGA", "VGA", + 0, 0, 0, + NULL, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +/* VGA configuration */ + +static int vga_config_cb (pci_config_t *config) +{ +#if 0 + if (config->regions[0] != 0x00000000) + vga_vbe_init(config->path, config->regions[0], config->sizes[0], + config->regions[1], config->sizes[1]); +#endif + return 0; +} + +static struct pci_iface_t vga_iface[] = { + { + 0x00, "VGA controller", NULL, + vga_devices, &vga_config_cb, NULL, + }, + { + 0x01, "8514 compatible controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static pci_subclass_t displ_subclass[] = { + { + 0x00, "display controller", NULL, NULL, vga_iface, + NULL, NULL, + }, + { + 0x01, "XGA display controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "3D display controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc display controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static pci_subclass_t media_subclass[] = { + { + 0x00, "video device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "audio device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "computer telephony device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc multimedia device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static pci_subclass_t mem_subclass[] = { + { + 0x00, "RAM controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "flash controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +pci_dev_t grackle_fake_bridge = { + 0xFFFF, 0xFFFF, + "pci", "pci-bridge", "DEC,21154", "DEC,21154.pci-bridge", + -1, -1, -1, + NULL, NULL, +}; + +static pci_dev_t uninorth_agp_fake_bridge = { + 0xFFFF, 0xFFFF, + "uni-north-agp", "uni-north-agp", NULL, "uni-north-agp", + -1, -1, -1, + NULL, NULL, +}; + +static pci_dev_t uninorth_fake_bridge = { + 0xFFFF, 0xFFFF, + "uni-north", "uni-north", NULL, "uni-north", + -1, -1, -1, + NULL, NULL, +}; + + +static pci_dev_t hbrg_devices[] = { + { + 0x106B, 0x0020, NULL, + "pci", "AAPL,UniNorth", "uni-north", + 3, 2, 1, + NULL, &uninorth_agp_fake_bridge, + }, + { + 0x106B, 0x001F, NULL, + "pci", "AAPL,UniNorth", "uni-north", + 3, 2, 1, + NULL, &uninorth_fake_bridge, + }, + { + 0x106B, 0x001E, NULL, + "pci", "AAPL,UniNorth", "uni-north", + 3, 2, 1, + NULL, &uninorth_fake_bridge, + }, + { + 0x1057, 0x0002, "pci", + "pci", "MOT,MPC106", "grackle", + 3, 2, 1, + NULL, &grackle_fake_bridge, + }, + { + 0x1057, 0x4801, NULL, + "pci-bridge", "PREP Host PCI Bridge - Motorola Raven", NULL, + 3, 2, 1, + NULL, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static pci_dev_t PCIbrg_devices[] = { + { + 0x1011, 0x0026, NULL, + "pci-bridge", NULL, NULL, + 3, 2, 1, + NULL, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static pci_subclass_t bridg_subclass[] = { + { + 0x00, "PCI host bridge", NULL, hbrg_devices, NULL, + NULL, NULL, + }, + { + 0x01, "ISA bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "EISA bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "MCA bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x04, "PCI-to-PCI bridge", NULL, PCIbrg_devices, NULL, + NULL, NULL, + }, + { + 0x05, "PCMCIA bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x06, "NUBUS bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x07, "cardbus bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x08, "raceway bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x09, "semi-transparent PCI-to-PCI bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x0A, "infiniband-to-PCI bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc PCI bridge", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static pci_iface_t serial_iface[] = { + { + 0x00, "XT serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "16450 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "16550 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x03, "16650 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x04, "16750 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x05, "16850 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0x06, "16950 serial controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static pci_iface_t par_iface[] = { + { + 0x00, "parallel port", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "bi-directional parallel port", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "ECP 1.x parallel port", NULL, + NULL, NULL, NULL, + }, + { + 0x03, "IEEE 1284 controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFE, "IEEE 1284 device", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static pci_iface_t modem_iface[] = { + { + 0x00, "generic modem", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "Hayes 16450 modem", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "Hayes 16550 modem", NULL, + NULL, NULL, NULL, + }, + { + 0x03, "Hayes 16650 modem", NULL, + NULL, NULL, NULL, + }, + { + 0x04, "Hayes 16750 modem", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static pci_subclass_t comm_subclass[] = { + { + 0x00, "serial controller", NULL, NULL, serial_iface, + NULL, NULL, + }, + { + 0x01, "parallel port", NULL, NULL, par_iface, + NULL, NULL, + }, + { + 0x02, "multiport serial controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "modem", NULL, NULL, modem_iface, + NULL, NULL, + }, + { + 0x04, "GPIB controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x05, "smart card", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc communication device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static pci_iface_t pic_iface[] = { + { + 0x00, "8259 PIC", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "ISA PIC", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "EISA PIC", NULL, + NULL, NULL, NULL, + }, + { + 0x10, "I/O APIC", NULL, + NULL, NULL, NULL, + }, + { + 0x20, "I/O APIC", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static pci_iface_t dma_iface[] = { + { + 0x00, "8237 DMA controller", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "ISA DMA controller", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "EISA DMA controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static pci_iface_t tmr_iface[] = { + { + 0x00, "8254 system timer", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "ISA system timer", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "EISA system timer", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static pci_iface_t rtc_iface[] = { + { + 0x00, "generic RTC controller", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "ISA RTC controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static const pci_dev_t sys_devices[] = { + /* IBM MPIC controller */ + { + 0x1014, 0x0002, + "open-pic", "MPIC", NULL, "chrp,open-pic", + 0, 0, 2, + NULL, NULL, + }, + /* IBM MPIC2 controller */ + { + 0x1014, 0xFFFF, + "open-pic", "MPIC2", NULL, "chrp,open-pic", + 0, 0, 2, + NULL, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static pci_subclass_t sys_subclass[] = { + { + 0x00, "PIC", NULL, NULL, pic_iface, + NULL, NULL, + }, + { + 0x01, "DMA controller", NULL, NULL, dma_iface, + NULL, NULL, + }, + { + 0x02, "system timer", NULL, NULL, tmr_iface, + NULL, NULL, + }, + { + 0x03, "RTC controller", NULL, NULL, rtc_iface, + NULL, NULL, + }, + { + 0x04, "PCI hotplug controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc system peripheral", NULL, sys_devices, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static pci_subclass_t inp_subclass[] = { + { + 0x00, "keyboard controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "digitizer", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "mouse controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "scanner controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x04, "gameport controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc input device", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static pci_subclass_t dock_subclass[] = { + { + 0x00, "generic docking station", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc docking station", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static pci_subclass_t cpu_subclass[] = { + { + 0x00, "i386 processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "i486 processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "pentium processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x10, "alpha processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x20, "PowerPC processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x30, "MIPS processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x40, "co-processor", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static pci_iface_t usb_iface[] = { + { + 0x00, "UHCI USB controller", NULL, + NULL, NULL, NULL, + }, + { + 0x10, "OHCI USB controller", NULL, + NULL, NULL, NULL, + }, + { + 0x20, "EHCI USB controller", NULL, + NULL, NULL, NULL, + }, + { + 0x80, "misc USB controller", NULL, + NULL, NULL, NULL, + }, + { + 0xFE, "USB device", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static pci_iface_t ipmi_iface[] = { + { + 0x00, "IPMI SMIC interface", NULL, + NULL, NULL, NULL, + }, + { + 0x01, "IPMI keyboard interface", NULL, + NULL, NULL, NULL, + }, + { + 0x02, "IPMI block transfer interface", NULL, + NULL, NULL, NULL, + }, + { + 0xFF, NULL, NULL, + NULL, NULL, NULL, + }, +}; + +static pci_subclass_t ser_subclass[] = { + { + 0x00, "Firewire bus controller", "ieee1394", NULL, NULL, + NULL, NULL, + }, + { + 0x01, "ACCESS bus controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "SSA controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "USB controller", "usb", NULL, usb_iface, + NULL, NULL, + }, + { + 0x04, "fibre channel controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x05, "SMBus controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x06, "InfiniBand controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x07, "IPMI interface", NULL, NULL, ipmi_iface, + NULL, NULL, + }, + { + 0x08, "SERCOS controller", NULL, NULL, ipmi_iface, + NULL, NULL, + }, + { + 0x09, "CANbus controller", NULL, NULL, ipmi_iface, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static pci_subclass_t wrl_subclass[] = { + { + 0x00, "IRDA controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "consumer IR controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x10, "RF controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x11, "bluetooth controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x12, "broadband controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc wireless controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static pci_subclass_t sat_subclass[] = { + { + 0x01, "satellite TV controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x02, "satellite audio controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x03, "satellite voice controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x04, "satellite data controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static pci_subclass_t crypt_subclass[] = { + { + 0x00, "cryptographic network controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x10, "cryptographic entertainment controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc cryptographic controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static pci_subclass_t spc_subclass[] = { + { + 0x00, "DPIO module", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x01, "performances counters", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x10, "communication synchronisation", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x20, "management card", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0x80, "misc signal processing controller", NULL, NULL, NULL, + NULL, NULL, + }, + { + 0xFF, NULL, NULL, NULL, NULL, + NULL, NULL, + }, +}; + +static const pci_class_t pci_classes[] = { + /* 0x00 */ + { "undefined", NULL, undef_subclass, }, + /* 0x01 */ + { "mass-storage controller", NULL, mass_subclass, }, + /* 0x02 */ + { "network controller", "network", net_subclass, }, + /* 0x03 */ + { "display controller", "display", displ_subclass, }, + /* 0x04 */ + { "multimedia device", NULL, media_subclass, }, + /* 0x05 */ + { "memory controller", "memory-controller", mem_subclass, }, + /* 0x06 */ + { "PCI bridge", "pci", bridg_subclass, }, + /* 0x07 */ + { "communication device", NULL, comm_subclass,}, + /* 0x08 */ + { "system peripheral", NULL, sys_subclass, }, + /* 0x09 */ + { "input device", NULL, inp_subclass, }, + /* 0x0A */ + { "docking station", NULL, dock_subclass, }, + /* 0x0B */ + { "processor", NULL, cpu_subclass, }, + /* 0x0C */ + { "serial bus controller", NULL, ser_subclass, }, + /* 0x0D */ + { "wireless controller", NULL, wrl_subclass, }, + /* 0x0E */ + { "intelligent I/O controller", NULL, NULL, }, + /* 0x0F */ + { "satellite communication controller", NULL, sat_subclass, }, + /* 0x10 */ + { "cryptographic controller", NULL, crypt_subclass, }, + /* 0x11 */ + { "signal processing controller", NULL, spc_subclass, }, +}; + +phandle_t pic_handle; +static int macio_config_cb (pci_config_t *config) +{ + char buf[64]; + phandle_t ph; + int props[2]; + + sprintf(buf, "%s/interrupt-controller", config->path); + REGISTER_NAMED_NODE(ob_pci_node, buf); + + ph = find_dev(buf); + set_property(ph, "device_type", "interrupt-controller", 21); + set_property(ph, "compatible", "heathrow\0mac-risc", 18); + set_int_property(ph, "#interrupt-cells", 1); + props[0]= 0x10; + props[1]= 0x20; + set_property(ph, "reg", &props, sizeof(props)); + pic_handle = ph; + + cuda_init(config->path, config->regions[0]); + macio_nvram_init(config->path, config->regions[0]); +#if 0 + ide_init(config->path, + config->regions[0] + 0x1f000, + config->regions[0] + 0x1f000 + 0x1000, + config->regions[0] + 0x1f000 + 0x2000, + config->regions[0] + 0x1f000 + 0x3000); +#endif +#if 0 + OF_finalize_pci_macio(device->common.OF_private, + device->regions[0] & ~0x0000000F, device->sizes[0], + private_data); +#endif + return 0; +} + +static const pci_dev_t misc_pci[] = { + /* Paddington Mac I/O */ + { + 0x106B, 0x0017, + "mac-io", "mac-io", "AAPL,343S1211", "paddington\1heathrow", + 1, 1, 1, + &macio_config_cb, NULL, + }, + /* KeyLargo Mac I/O */ + { + 0x106B, 0x0022, + "mac-io", "mac-io", "AAPL,Keylargo", "Keylargo", + 1, 1, 2, + &macio_config_cb, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + +static pci_dev_t *pci_find_device (uint8_t class, uint8_t subclass, + uint8_t iface, uint16_t vendor, + uint16_t product) +{ + int (*config_cb)(pci_config_t *config); + const pci_class_t *pclass; + const pci_subclass_t *psubclass; + const pci_iface_t *piface; + const pci_dev_t *dev; + const void *private; + pci_dev_t *new; + const char *name, *type; + + name = "unknown"; + type = "unknown"; + config_cb = NULL; + private = NULL; + + if (class == 0x00 && subclass == 0x01) { + /* Special hack for old style VGA devices */ + class = 0x03; + subclass = 0x00; + } else if (class == 0xFF) { + /* Special case for misc devices */ + dev = misc_pci; + goto find_device; + } + if (class > (sizeof(pci_classes) / sizeof(pci_class_t))) { + name = "invalid PCI device"; + type = "invalid"; + goto bad_device; + } + pclass = &pci_classes[class]; + name = pclass->name; + type = pclass->type; + for (psubclass = pclass->subc; ; psubclass++) { + if (psubclass->subclass == 0xFF) + goto bad_device; + if (psubclass->subclass == subclass) { + if (psubclass->name != NULL) + name = psubclass->name; + if (psubclass->type != NULL) + type = psubclass->type; + if (psubclass->config_cb != NULL) { + config_cb = psubclass->config_cb; + } + if (psubclass->private != NULL) + private = psubclass->private; + if (psubclass->iface != NULL) + break; + dev = psubclass->devices; + goto find_device; + } + } + for (piface = psubclass->iface; ; piface++) { + if (piface->iface == 0xFF) { + dev = psubclass->devices; + break; + } + if (piface->iface == iface) { + if (piface->name != NULL) + name = piface->name; + if (piface->type != NULL) + type = piface->type; + if (piface->config_cb != NULL) { + config_cb = piface->config_cb; + } + if (piface->private != NULL) + private = piface->private; + dev = piface->devices; + break; + } + } + find_device: + for (;; dev++) { + if (dev->vendor == 0xFFFF && dev->product == 0xFFFF) { + goto bad_device; + } + if (dev->vendor == vendor && dev->product == product) { + if (dev->name != NULL) + name = dev->name; + if (dev->type != NULL) + type = dev->type; + if (dev->config_cb != NULL) { + config_cb = dev->config_cb; + } + if (dev->private != NULL) + private = dev->private; + new = malloc(sizeof(pci_dev_t)); + if (new == NULL) + return NULL; + new->vendor = vendor; + new->product = product; + new->type = type; + new->name = name; + new->model = dev->model; + new->compat = dev->compat; + new->config_cb = config_cb; + new->private = private; + + return new; + } + } + bad_device: + printk("Cannot manage '%s' PCI device type '%s':\n %x %x (%x %x %x)\n", + name, type, vendor, product, class, subclass, iface); + + return NULL; +} + +#define set_bool_property(ph, name) set_property(ph, name, NULL, 0); + + +static int ob_pci_add_properties(pci_addr addr, pci_dev_t *pci_dev, + pci_config_t *config) +{ phandle_t dev=get_cur_dev(); int status,id; + uint16_t vendor_id, device_id; + uint8_t rev; + vendor_id = pci_config_read16(addr, PCI_VENDOR_ID); + device_id = pci_config_read16(addr, PCI_DEVICE_ID); + rev = pci_config_read8(addr, PCI_REVISION_ID); + /* create properties as described in 2.5 */ - set_int_property(dev, "vendor-id", pci_config_read16(addr, PCI_VENDOR_ID)); - set_int_property(dev, "device-id", pci_config_read16(addr, PCI_DEVICE_ID)); - set_int_property(dev, "revision-id", pci_config_read8(addr, PCI_REVISION_ID)); + printk("%s\n", pci_dev->name); + set_int_property(dev, "vendor-id", vendor_id); + set_int_property(dev, "device-id", device_id); + set_int_property(dev, "revision-id", rev); set_int_property(dev, "interrupts", pci_config_read8(addr, PCI_INTERRUPT_LINE)); @@ -70,7 +1284,7 @@ set_int_property(dev, "min-grant", pci_config_read8(addr, PCI_MIN_GNT)); set_int_property(dev, "max-latency", pci_config_read8(addr, PCI_MAX_LAT)); - status=pci_config_read16(addr, PCI_STATUS); + status = pci_config_read16(addr, PCI_STATUS); set_int_property(dev, "devsel-speed", (status&PCI_STATUS_DEVSEL_MASK)>>10); @@ -82,24 +1296,41 @@ if(status&PCI_STATUS_UDF) set_bool_property(dev, "udf-supported"); - id=pci_config_read16(addr, PCI_SUBSYSTEM_VENDOR_ID); - if(id) + id = pci_config_read16(addr, PCI_SUBSYSTEM_VENDOR_ID); + if (id) set_int_property(dev, "subsystem-vendor-id", id); - id=pci_config_read16(addr, PCI_SUBSYSTEM_ID); - if(id) + id = pci_config_read16(addr, PCI_SUBSYSTEM_ID); + if (id) set_int_property(dev, "subsystem-id", id); set_int_property(dev, "cache-line-size", pci_config_read16(addr, PCI_CACHE_LINE_SIZE)); + if (pci_dev->type) { + push_str(pci_dev->type); + fword("encode-string"); + push_str("device_type"); + fword("property"); + } + if (pci_dev->model) { + push_str(pci_dev->model); + fword("encode-string"); + push_str("model"); + fword("property"); + } + push_str(pci_dev->name); + fword("encode-string"); + push_str("class"); + fword("property"); + if (pci_dev->config_cb) + pci_dev->config_cb(config); } - static int ob_pci_add_reg(pci_addr addr) { PUSH(0); PUSH(0); - PUSH(addr&(~0x80000000u)); + PUSH(addr&(~arch->cfg_base)); fword("pci-addr-encode"); PUSH(0); PUSH(0); @@ -109,118 +1340,6 @@ fword("property"); } -static int ob_pci_add_class(pci_addr addr) -{ - unsigned int class; - char *strc; - - class=pci_config_read16(addr, PCI_CLASS_DEVICE); - switch (class) { - case 0x001: strc="display"; break; - case 0x100: strc="scsi"; break; - case 0x101: strc="ide"; break; - case 0x102: strc="fdc"; break; - case 0x103: strc="ipi"; break; - case 0x104: strc="raid"; break; - case 0x200: strc="ethernet"; break; - case 0x201: strc="token-ring"; break; - case 0x202: strc="fddi"; break; - case 0x203: strc="atm"; break; - case 0x400: strc="video"; break; - case 0x401: strc="sound"; break; - case 0x500: strc="memory"; break; - case 0x501: strc="flash"; break; - case 0x600: strc="host"; break; - case 0x601: strc="isa"; break; - case 0x602: strc="eisa"; break; - case 0x603: strc="mca"; break; - case 0x604: strc="pci"; break; - case 0x605: strc="pcmcia"; break; - case 0x606: strc="nubus"; break; - case 0x607: strc="cardbus"; break; - case 0x680: strc="pmu"; break; /* not in pci binding */ - case 0x700: strc="serial"; break; - case 0x701: strc="parallel"; break; - case 0x703: strc="modem"; break; /* not in pci binding */ - case 0x800: strc="interrupt-controller"; break; - case 0x801: strc="dma-controller"; break; - case 0x802: strc="timer"; break; - case 0x803: strc="rtc"; break; - case 0x900: strc="keyboard"; break; - case 0x901: strc="pen"; break; - case 0x902: strc="mouse"; break; - case 0xC00: strc="firewire"; break; - case 0xC01: strc="access-bus"; break; - case 0xC02: strc="ssa"; break; - case 0xC03: strc="usb"; break; - case 0xC04: strc="fibre-channel"; break; - default: - switch (class>>8) { - case 0x3: strc="display"; break; - case 0xA: strc="dock"; break; - case 0xB: strc="cpu"; break; - default:strc="unknown"; break; - } - } - if ((class>>8) == 0x03) { - push_str(strc); - fword("encode-string"); - push_str("device_type"); - fword("property"); - } - push_str(strc); - fword("encode-string"); - push_str("class"); - fword("property"); - - -#ifdef CONFIG_DEBUG_PCI - printk("%s\n", strc); -#endif -} - -static void -pci_enable_rom(pci_addr dev) -{ - u32 rom_addr; - - rom_addr=pci_config_read32(dev, PCI_ROM_ADDRESS); - rom_addr |= PCI_ROM_ADDRESS_ENABLE; - pci_config_write32(dev, PCI_ROM_ADDRESS, rom_addr); -} - -static void -pci_disable_rom(pci_addr dev) -{ - u32 rom_addr; - - rom_addr=pci_config_read32(dev, PCI_ROM_ADDRESS); - rom_addr &= ~PCI_ROM_ADDRESS_ENABLE; - pci_config_write32(dev, PCI_ROM_ADDRESS, rom_addr); -} - - -static void ob_pci_scan_rom(pci_addr addr) -{ - unsigned long rom_addr=pci_config_read32(addr,PCI_ROM_ADDRESS); - unsigned char *walk; - - rom_addr &= PCI_ROM_ADDRESS_MASK; - if(rom_addr) { - printk(" ROM found at 0x%lx\n",rom_addr); - pci_enable_rom(addr); - walk=phys_to_virt((unsigned char *)rom_addr); - if (walk[0]!=0x55 || walk[1]!=0xaa) { - printk("no pci rom\n"); - goto rom_err; - } - -rom_err: - pci_disable_rom(addr); - } - -} - #ifdef CONFIG_XBOX static char pci_xbox_blacklisted (int bus, int devnum, int fn) { @@ -260,14 +1379,92 @@ } #endif -static void ob_scan_pci_bus(int bus, char *path) +static void +ob_pci_configure(pci_arch_t *addr, pci_dev_t *pci_dev, pci_config_t *config, + uint32_t *mem_base, uint32_t *io_base) + { + uint32_t smask, omask, amask, size, reloc, min_align; + uint32_t *base; + pci_addr config_addr; + int reg; + + omask = 0x00000000; + for (reg = 0; reg < 7; reg++) { + + config->regions[reg] = 0x00000000; + config->sizes[reg] = 0x00000000; + + if ((omask & 0x0000000f) == 0x4) { + /* 64 bits memory mapping */ + continue; + } + + if (reg == 6) + config_addr = PCI_ROM_ADDRESS; + else + config_addr = PCI_BASE_ADDR_0 + reg * 4; + + /* get region size */ + + pci_config_write32(addr, config_addr, 0xffffffff); + smask = pci_config_read32(addr, config_addr); + if (smask == 0x00000000 || smask == 0xffffffff) + continue; + + if (smask & 0x00000001 && reg != 6) { + /* I/O space */ + base = *io_base; + min_align = 1 << 7; + amask = 0x00000001; + pci_config_write16(addr, PCI_COMMAND, + pci_config_read16(addr, + PCI_COMMAND) | + PCI_COMMAND_IO); + } else { + /* Memory Space */ + base = *mem_base; + min_align = 1 << 16; + amask = 0x0000000F; + if (reg == 6) { + smask |= 1; /* ROM */ + } + pci_config_write16(addr, PCI_COMMAND, + pci_config_read16(addr, + PCI_COMMAND) | + PCI_COMMAND_MEMORY); + } + omask = smask & amask; + smask &= ~amask; + size = (~smask) + 1; + config->sizes[reg] = size; + reloc = base; + if (size < min_align) + size = min_align; + reloc = (reloc + size -1) & ~(size - 1); + if (*io_base == base) { + *io_base = reloc + size; + reloc -= arch->io_base; + } else { + *mem_base = reloc + size; + } + pci_config_write32(addr, config_addr, reloc | omask); + config->regions[reg] = reloc; +printk("region %08x size %08x\n", config->regions[reg], config->sizes[reg]); + } +} + +static void ob_scan_pci_bus(pci_arch_t *arch, int bus, uint32_t *mem_base, uint32_t *io_base, char *path) +{ int devnum, fn, is_multi, vid, did; unsigned int htype; pci_addr addr; char * nodetemp = "%s/pci%x,%x"; - char nodebuff[32]; phandle_t dnode, dbus; + pci_config_t config; + pci_dev_t *pci_dev; + uint32_t ccode; + uint8_t class, subclass, iface, rev; for (devnum = 0; devnum < 32; devnum++) { is_multi = 0; @@ -276,13 +1473,21 @@ if (pci_xbox_blacklisted (bus, devnum, fn)) continue; #endif - addr = PCI_ADDR(bus, devnum, fn); vid = pci_config_read16(addr, PCI_VENDOR_ID); did = pci_config_read16(addr, PCI_DEVICE_ID); if (vid==0xffff || vid==0) continue; + + ccode = pci_config_read16(addr, PCI_CLASS_DEVICE); + class = ccode >> 8; + subclass = ccode; + iface = pci_config_read8(addr, PCI_CLASS_PROG); + rev = pci_config_read8(addr, PCI_REVISION_ID); + + pci_dev = pci_find_device(class, subclass, iface, vid, did); + #ifdef CONFIG_DEBUG_PCI printk("%x:%x.%x - %x:%x - ", bus, devnum, fn, vid, did); @@ -294,35 +1499,55 @@ activate_device(path); dbus=get_cur_dev(); - sprintf(nodebuff, nodetemp, path, vid, did); + if (pci_dev == NULL || pci_dev->name == NULL) + sprintf(config.path, nodetemp, path, vid, did); + else + sprintf(config.path, "%s/%s", path, pci_dev->name); #ifdef CONFIG_DEBUG_PCI - printk("%s - ", nodebuff); + printk("%s - ", config.path); #endif - REGISTER_NAMED_NODE(ob_pci_node, nodebuff); - dnode=find_dev(nodebuff); + REGISTER_NAMED_NODE(ob_pci_node, config.path); + dnode=find_dev(config.path); activate_dev( dnode ); - - ob_pci_add_properties(addr); + ob_pci_configure(addr, pci_dev, &config, + mem_base, io_base); +{ + int irq_pin, irq_line; + static uint8_t heathrow_pci_irqs[4] = { 0x15, 0x16, 0x17, 0x18 }; + irq_pin = pci_config_read8(addr, PCI_INTERRUPT_PIN); + if (irq_pin > 0) { + irq_pin = (devnum + irq_pin - 1) & 3; + irq_line = heathrow_pci_irqs[irq_pin]; + } +} + ob_pci_add_properties(addr, pci_dev, &config); ob_pci_add_reg(addr); - ob_pci_add_class(addr); - ob_pci_scan_rom(addr); device_end(); - activate_dev( dbus ); + } } } - int ob_pci_init(void) { - char *path="/pci"; - int bus; + pci_bridge_t *pci_bridge; + pci_dev_t *pci_dev; + int bus, devfn; + phandle_t aliases; + phandle_t ph; + char buf[64]; + uint32_t mem_base, io_base; printk("Initializing PCI devices...\n"); - + /* brute force bus scan */ - for (bus=0; bus<0x100; bus++) { - ob_scan_pci_bus(bus, path); + + /* Find all PCI bridges */ + + mem_base = arch->mem_base; + io_base = arch->io_base; + for (bus = 0; bus<0x100; bus++) { + ob_scan_pci_bus(arch, bus, &mem_base, &io_base, "/pci"); } return 0; } Modified: openbios-devel/drivers/pci.h =================================================================== --- openbios-devel/drivers/pci.h 2008-11-24 12:23:01 UTC (rev 256) +++ openbios-devel/drivers/pci.h 2008-11-24 12:29:36 UTC (rev 257) @@ -4,6 +4,10 @@ #define PCI_VENDOR_ID 0x00 #define PCI_DEVICE_ID 0x02 +#define PCI_COMMAND 0x04 +#define PCI_COMMAND_IO 0x01 +#define PCI_COMMAND_MEMORY 0x02 + #define PCI_STATUS 0x06 /* 16 bits */ #define PCI_STATUS_CAP_LIST 0x10 /* Support Capability List */ #define PCI_STATUS_66MHZ 0x20 /* Support 66 Mhz PCI 2.1 bus */ @@ -46,6 +50,7 @@ #define PCI_ROM_ADDRESS_MASK (~0x7ffUL) #define PCI_INTERRUPT_LINE 0x3c /* 8 bits */ +#define PCI_INTERRUPT_PIN 0x3d /* 8 bits */ #define PCI_MIN_GNT 0x3e /* 8 bits */ #define PCI_MAX_LAT 0x3f /* 8 bits */ Modified: openbios-devel/include/ppc/pci.h =================================================================== --- openbios-devel/include/ppc/pci.h 2008-11-24 12:23:01 UTC (rev 256) +++ openbios-devel/include/ppc/pci.h 2008-11-24 12:29:36 UTC (rev 257) @@ -3,15 +3,6 @@ #include "asm/io.h" -/* Sandpoint example */ -#define ISA_IO_BASE 0x80000000 -#define ISA_MEM_BASE 0xc0000000 -#define PCIC0_CFGADDR 0xfec00cf8 -#define PCIC0_CFGDATA 0xfee00cfc -#ifndef _IO_BASE -#define _IO_BASE ISA_IO_BASE -#endif - #if !(PCI_CONFIG_1 || PCI_CONFIG_2) #define PCI_CONFIG_1 1 /* default */ #endif @@ -20,10 +11,10 @@ /* PCI Configuration Mechanism #1 */ -/* Have pci_addr in the same format as the values written to PCIC0_CFGADDR - * so register accesses can be made easy. */ +extern pci_arch_t *arch; + #define PCI_ADDR(bus, dev, fn) \ - ((pci_addr) (0x80000000u \ + ((pci_addr) (arch->cfg_base \ | (uint32_t) (bus) << 16 \ | (uint32_t) (dev) << 11 \ | (uint32_t) (fn) << 8)) @@ -34,49 +25,45 @@ static inline uint8_t pci_config_read8(pci_addr dev, uint8_t reg) { - uint8_t res; - - out_le32((unsigned *)PCIC0_CFGADDR, (dev | (reg & ~3))); - res = in_8((unsigned char *)PCIC0_CFGDATA + (reg & 3)); - return res; + uint8_t res; + out_le32((unsigned *)arch->cfg_addr, dev | (reg & ~3)); + res = in_8((unsigned char*)(arch->cfg_data + (reg & 3))); + return res; } static inline uint16_t pci_config_read16(pci_addr dev, uint8_t reg) { uint16_t res; - - out_le32((unsigned *)PCIC0_CFGADDR, (dev | (reg & ~3))); - res = in_le16((unsigned char *)PCIC0_CFGDATA + (reg & 2)); - return res; + out_le32((unsigned *)arch->cfg_addr, dev | (reg & ~3)); + res = in_le16((unsigned short*)(arch->cfg_data + (reg & 2))); + return res; } static inline uint32_t pci_config_read32(pci_addr dev, uint8_t reg) { uint32_t res; - - out_le32((unsigned *)PCIC0_CFGADDR, (dev | (reg & ~3))); - res = in_le32((unsigned char *)PCIC0_CFGDATA); - return res; + out_le32((unsigned *)arch->cfg_addr, dev | reg); + res = in_le32((unsigned *)(arch->cfg_data + reg)); + return res; } static inline void pci_config_write8(pci_addr dev, uint8_t reg, uint8_t val) { - outl(dev | (reg & ~3), 0xcf8); - outb(val, 0xcfc | (reg & 3)); + out_le32((unsigned *)arch->cfg_addr, dev | (reg & ~3)); + out_8((unsigned char*)(arch->cfg_data + (reg & 3)), val); } static inline void pci_config_write16(pci_addr dev, uint8_t reg, uint16_t val) { - outl(dev | (reg & ~3), 0xcf8); - outw(val, 0xcfc | (reg & 2)); + out_le32((unsigned *)arch->cfg_addr, dev | (reg & ~3)); + out_le16((unsigned short *)(arch->cfg_data + (reg & 2)), val); } static inline void pci_config_write32(pci_addr dev, uint8_t reg, uint32_t val) { - outl(dev | reg, 0xcf8); - outl(val, 0xcfc); + out_le32((unsigned *)arch->cfg_addr, dev | reg); + out_le32((unsigned *)(arch->cfg_data + reg), val); } - #else /* !PCI_CONFIG_1 */ #error PCI Configuration Mechanism is not specified or implemented #endif

1 0

r256 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 24 Nov '08

24 Nov '08

Author: stepan Date: 2008-11-24 13:23:01 +0100 (Mon, 24 Nov 2008) New Revision: 256 Modified: openbios-devel/arch/ppc/qemu/console.c openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/qemu.c Log: Copy serial support from arch/amd64/console.c Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: openbios-devel/arch/ppc/qemu/console.c =================================================================== --- openbios-devel/arch/ppc/qemu/console.c 2008-11-24 12:21:36 UTC (rev 255) +++ openbios-devel/arch/ppc/qemu/console.c 2008-11-24 12:23:01 UTC (rev 256) @@ -1,4 +1,3 @@ - /* * <console.c> * @@ -13,12 +12,119 @@ */ #include "openbios/config.h" +#include "openbios/kernel.h" #include "openbios/bindings.h" #include "libc/diskio.h" #include "ofmem.h" #include "qemu/qemu.h" +#ifdef CONFIG_DEBUG_CONSOLE +/* ****************************************************************** + * serial console functions + * ****************************************************************** */ + +#ifdef CONFIG_DEBUG_CONSOLE_SERIAL + +#define UART(port) (port==2?0x2f8:0x3f8) + +#define RBR(port) (UART(port) + 0) +#define THR(port) (UART(port) + 0) +#define IER(port) (UART(port) + 1) +#define IIR(port) (UART(port) + 2) +#define LCR(port) (UART(port) + 3) +#define MCR(port) (UART(port) + 4) +#define LSR(port) (UART(port) + 5) +#define MSR(port) (UART(port) + 6) +#define SCR(port) (UART(port) + 7) +#define DLL(port) (UART(port) + 0) +#define DLM(port) (UART(port) + 1) + +static int uart_charav(int port) +{ + if (!port) + return -1; + return ((inb(LSR(port)) & 1) != 0); +} + +static char uart_getchar(int port) +{ + if (!port) + return -1; + while (!uart_charav(port)); + return ((char) inb(RBR(port)) & 0177); +} + +static void uart_putchar(int port, unsigned char c) +{ + if (!port) + return -1; + while (!(inb(LSR(port)) & 0x20)); + outb(c, THR(port)); +} + +static void serial_putchar(int c) +{ + if (c == '\n') + uart_putchar(CONFIG_SERIAL_PORT, '\r'); + uart_putchar(CONFIG_SERIAL_PORT, c); +} + +static void uart_init_line(int port, unsigned long baud) +{ + int i, baudconst; + + switch (baud) { + case 115200: + baudconst = 1; + break; + case 57600: + baudconst = 2; + break; + case 38400: + baudconst = 3; + break; + case 19200: + baudconst = 6; + break; + case 9600: + default: + baudconst = 12; + break; + } + + outb(0x87, LCR(port)); + outb(0x00, DLM(port)); + outb(baudconst, DLL(port)); + outb(0x07, LCR(port)); + outb(0x0f, MCR(port)); + + for (i = 10; i > 0; i--) { + if (inb(LSR(port)) == (unsigned int) 0) + break; + inb(RBR(port)); + } +} + +int +serial_init(void) +{ + if (CONFIG_SERIAL_PORT) + uart_init_line(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED); + return -1; +} + +static void serial_cls(void) +{ + serial_putchar(27); + serial_putchar('['); + serial_putchar('H'); + serial_putchar(27); + serial_putchar('['); + serial_putchar('J'); +} +#endif // CONFIG_DEBUG_CONSOLE_SERIAL + typedef struct osi_fb_info { unsigned long mphys; int rb, w, h, depth; @@ -43,5 +149,40 @@ #include "../../../modules/console.c" +/* ****************************************************************** + * common functions, implementing simple concurrent console + * ****************************************************************** */ +int putchar(int c) +{ +#ifdef CONFIG_DEBUG_CONSOLE_SERIAL + serial_putchar(c); +#endif + return c; +} +int availchar(void) +{ +#ifdef CONFIG_DEBUG_CONSOLE_SERIAL + if (uart_charav(CONFIG_SERIAL_PORT)) + return 1; +#endif + return 0; +} + +int getchar(void) +{ +#ifdef CONFIG_DEBUG_CONSOLE_SERIAL + if (uart_charav(CONFIG_SERIAL_PORT)) + return (uart_getchar(CONFIG_SERIAL_PORT)); +#endif + return 0; +} + +void cls(void) +{ +#ifdef CONFIG_DEBUG_CONSOLE_SERIAL + serial_cls(); +#endif +} +#endif // CONFIG_DEBUG_CONSOLE Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-11-24 12:21:36 UTC (rev 255) +++ openbios-devel/arch/ppc/qemu/init.c 2008-11-24 12:23:01 UTC (rev 256) @@ -70,6 +70,11 @@ { arch = &known_arch[ARCH_HEATHROW]; isa_io_base = arch->io_base; +#ifdef CONFIG_DEBUG_CONSOLE +#ifdef CONFIG_DEBUG_CONSOLE_SERIAL + serial_init(); +#endif +#endif printk("\n"); printk("=============================================================\n"); printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); Modified: openbios-devel/arch/ppc/qemu/qemu.c =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.c 2008-11-24 12:21:36 UTC (rev 255) +++ openbios-devel/arch/ppc/qemu/qemu.c 2008-11-24 12:23:01 UTC (rev 256) @@ -19,24 +19,23 @@ #include "openbios/config.h" #include "openbios/kernel.h" #include "openbios/nvram.h" +#include "openbios/bindings.h" #include "libc/vsprintf.h" #include "libc/string.h" #include "libc/byteorder.h" #include "qemu/qemu.h" #include <stdarg.h> -#define UART_BASE 0x3f8 - // FIXME unsigned long virt_offset = 0; //#define DUMP_NVRAM void -exit( int status ) +exit( int status __attribute__ ((unused))) { for (;;); -} +} __attribute__ ((noreturn)) void fatal_error( const char *err ) @@ -50,10 +49,6 @@ { printk("Panic: %s\n", err ); exit(0); - - /* won't come here... this keeps the gcc happy */ - for( ;; ) - ; } @@ -92,62 +87,6 @@ /* TTY iface */ /************************************************************************/ -static int ttychar = -1; - -static int -tty_avail( void ) -{ - return 1; -} - -static int -tty_putchar( int c ) -{ - if( tty_avail() ) { - while (!(inb(UART_BASE + 0x05) & 0x20)) - ; - outb(c, UART_BASE); - while (!(inb(UART_BASE + 0x05) & 0x40)) - ; - } - return c; -} - -int -availchar( void ) -{ - if( !tty_avail() ) - return 0; - - if( ttychar < 0 ) - ttychar = inb(UART_BASE); - return (ttychar >= 0); -} - -int -getchar( void ) -{ - int ch; - - if( !tty_avail() ) - return 0; - - if( ttychar < 0 ) - return inb(UART_BASE); - ch = ttychar; - ttychar = -1; - return ch; -} - -int -putchar( int c ) -{ - if (c == '\n') - tty_putchar('\r'); - return tty_putchar(c); -} - - /************************************************************************/ /* briQ specific stuff */ /************************************************************************/

1 0

r255 - in openbios-devel: arch/ppc/qemu include/openbios modules
by svn＠openbios.org 24 Nov '08

24 Nov '08

Author: stepan Date: 2008-11-24 13:21:36 +0100 (Mon, 24 Nov 2008) New Revision: 255 Modified: openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/qemu.c openbios-devel/include/openbios/nvram.h openbios-devel/modules/nvram.c Log: Access to nvram must left shifted by 4. Initialize device tree (used by PCI patch, to follow). Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-11-24 12:19:05 UTC (rev 254) +++ openbios-devel/arch/ppc/qemu/init.c 2008-11-24 12:21:36 UTC (rev 255) @@ -100,13 +100,12 @@ int autoboot; devtree_init(); - nvram_init(); modules_init(); + setup_timers(); #ifdef CONFIG_DRIVER_PCI ob_pci_init(); #endif #ifdef CONFIG_DRIVER_IDE - setup_timers(); ob_ide_init(); #endif #ifdef CONFIG_DRIVER_ADB Modified: openbios-devel/arch/ppc/qemu/qemu.c =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.c 2008-11-24 12:19:05 UTC (rev 254) +++ openbios-devel/arch/ppc/qemu/qemu.c 2008-11-24 12:21:36 UTC (rev 255) @@ -21,6 +21,7 @@ #include "openbios/nvram.h" #include "libc/vsprintf.h" #include "libc/string.h" +#include "libc/byteorder.h" #include "qemu/qemu.h" #include <stdarg.h> @@ -29,6 +30,7 @@ // FIXME unsigned long virt_offset = 0; +//#define DUMP_NVRAM void exit( int status ) @@ -150,57 +152,84 @@ /* briQ specific stuff */ /************************************************************************/ -#define IO_NVRAM_PA_START 0x80860000 -#define IO_NVRAM_PA_END 0x80880000 +#define IO_NVRAM_SIZE 0x00020000 +#define IO_NVRAM_OFFSET 0x00060000 -static char *nvram=(char *)IO_NVRAM_PA_START; +static char *nvram; +void macio_nvram_init(char *path, uint32_t addr) +{ + phandle_t chosen, aliases; + phandle_t dnode; + int props[2]; + char buf[64]; + + nvram = (char*)addr + IO_NVRAM_OFFSET; + sprintf(buf, "%s/nvram", path); + nvram_init(buf); + dnode = find_dev(buf); + set_int_property(dnode, "#bytes", IO_NVRAM_SIZE >> 4); + set_property(dnode, "compatible", "nvram,flash", 12); + props[0] = __cpu_to_be32(IO_NVRAM_OFFSET); + props[1] = __cpu_to_be32(IO_NVRAM_SIZE); + set_property(dnode, "reg", &props, sizeof(props)); + set_property(dnode, "device_type", "nvram", 6); + + chosen = find_dev("/chosen"); + set_int_property(chosen, "nvram", dnode); + + aliases = find_dev("/aliases"); + set_property(aliases, "nvram", buf, strlen(buf) + 1); +} + +#ifdef DUMP_NVRAM void dump_nvram(void) { - static char hexdigit[] = "0123456789abcdef"; - int i; - for (i = 0; i < 16*4; i++) + int i, j; + for (i = 0; i < 10; i++) { - printk ("%c", hexdigit[nvram[i<<4] >> 4]); - printk ("%c", hexdigit[nvram[i<<4] % 16]); - if (!((i + 1) % 16)) - { - printk ("\n"); - } - else - { - printk (" "); - } - } + for (j = 0; j < 16; j++) + printk ("%02x ", nvram[(i*16+j)<<4]); + printk (" "); + for (j = 0; j < 16; j++) + if (isprint(nvram[(i*16+j)<<4])) + printk("%c", nvram[(i*16+j)<<4]); + else + printk("."); + printk ("\n"); + } } +#endif int arch_nvram_size( void ) { - return (IO_NVRAM_PA_END-IO_NVRAM_PA_START)>>4; + return IO_NVRAM_SIZE>>4; } void arch_nvram_put( char *buf ) { int i; - for (i=0; i<(IO_NVRAM_PA_END-IO_NVRAM_PA_START)>>4; i++) + for (i=0; i<IO_NVRAM_SIZE>>4; i++) nvram[i<<4]=buf[i]; - // memcpy(nvram, buf, IO_NVRAM_PA_END-IO_NVRAM_PA_START); +#ifdef DUMP_NVRAM printk("new nvram:\n"); dump_nvram(); +#endif } void arch_nvram_get( char *buf ) { int i; - for (i=0; i<(IO_NVRAM_PA_END-IO_NVRAM_PA_START)>>4; i++) + for (i=0; i<IO_NVRAM_SIZE>>4; i++) buf[i]=nvram[i<<4]; - //memcpy(buf, nvram, IO_NVRAM_PA_END-IO_NVRAM_PA_START); +#ifdef DUMP_NVRAM printk("current nvram:\n"); dump_nvram(); +#endif } Modified: openbios-devel/include/openbios/nvram.h =================================================================== --- openbios-devel/include/openbios/nvram.h 2008-11-24 12:19:05 UTC (rev 254) +++ openbios-devel/include/openbios/nvram.h 2008-11-24 12:21:36 UTC (rev 255) @@ -21,7 +21,7 @@ extern void arch_nvram_get( char *buf ); extern void arch_nvram_put( char *buf ); -extern void nvram_init( void ); +extern void nvram_init( char *path ); extern void update_nvram( void ); #endif /* _H_NVRAM */ Modified: openbios-devel/modules/nvram.c =================================================================== --- openbios-devel/modules/nvram.c 2008-11-24 12:19:05 UTC (rev 254) +++ openbios-devel/modules/nvram.c 2008-11-24 12:21:36 UTC (rev 255) @@ -18,6 +18,13 @@ #include "openbios/bindings.h" #include "openbios/nvram.h" +#ifdef CONFIG_DEBUG_NVRAM +#define DPRINTF(fmt, args...) \ +do { printk("NVRAM: " fmt , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) do {} while(0) +#endif + #define DEF_SYSTEM_SIZE 0xc10 #define NV_SIG_SYSTEM 0x70 @@ -77,10 +84,12 @@ return 1; } - if( !(len=nvpart_size(*p)) ) { + len=nvpart_size(*p); + if( len == 0) { printk("invalid nvram partition length\n"); return -1; } + *p = (nvpart_t*)((char*)*p + len); if( *p < end ) return 1; @@ -219,7 +228,7 @@ uint mark_lo; } nvram_ibuf_t; -DECLARE_NODE( nvram, INSTALL_OPEN, sizeof(nvram_ibuf_t), "Tnvram" ); +DECLARE_UNNAMED_NODE( nvram, INSTALL_OPEN, sizeof(nvram_ibuf_t )); /* ( pos_lo pos_hi -- status ) */ static void @@ -228,7 +237,7 @@ int pos_hi = POP(); int pos_lo = POP(); - /* printk("NVRAM: seek %08x %08x\n", pos_hi, pos_lo ); */ + DPRINTF("seek %08x %08x\n", pos_hi, pos_lo ); nd->mark_lo = pos_lo; nd->mark_hi = pos_hi; @@ -254,7 +263,7 @@ n++; } PUSH(n); - /* printk("NVRAM: read %08x %x -- %x\n", (int)p, len, n); */ + DPRINTF("read %08x %x -- %x\n", (int)p, len, n); } /* ( addr len -- actual ) */ @@ -270,13 +279,14 @@ n++; } PUSH(n); - /* printk("NVRAM: write %08x %x -- %x\n", (int)p, len, n ); */ + DPRINTF("write %08x %x -- %x\n", (int)p, len, n ); } /* ( -- size ) */ static void nvram_size( __attribute__((unused)) nvram_ibuf_t *nd ) { + DPRINTF("nvram_size %d\n", nvram.size); PUSH( nvram.size ); } @@ -289,9 +299,9 @@ void -nvram_init( void ) +nvram_init( char *path ) { nvconf_init(); - REGISTER_NODE( nvram ); + REGISTER_NAMED_NODE( nvram, path ); }

1 0

r254 - in openbios-devel: arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu include/openbios include/ppc kernel
by svn＠openbios.org 24 Nov '08

24 Nov '08

Author: stepan Date: 2008-11-24 13:19:05 +0100 (Mon, 24 Nov 2008) New Revision: 254 Added: openbios-devel/include/openbios/pci.h Modified: openbios-devel/arch/ppc/briq/init.c openbios-devel/arch/ppc/mol/init.c openbios-devel/arch/ppc/pearpc/init.c openbios-devel/arch/ppc/qemu/init.c openbios-devel/include/ppc/io.h openbios-devel/kernel/forth.c Log: Define the ISA io base according machine type. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: openbios-devel/arch/ppc/briq/init.c =================================================================== --- openbios-devel/arch/ppc/briq/init.c 2008-11-24 12:16:22 UTC (rev 253) +++ openbios-devel/arch/ppc/briq/init.c 2008-11-24 12:19:05 UTC (rev 254) @@ -53,9 +53,13 @@ ; } +uint32_t isa_io_base; + void entry( void ) { + isa_io_base = 0x80000000; + printk("\n"); printk("=============================================================\n"); printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); Modified: openbios-devel/arch/ppc/mol/init.c =================================================================== --- openbios-devel/arch/ppc/mol/init.c 2008-11-24 12:16:22 UTC (rev 253) +++ openbios-devel/arch/ppc/mol/init.c 2008-11-24 12:19:05 UTC (rev 254) @@ -48,9 +48,13 @@ ; } +uint32_t isa_io_base; + void entry( void ) { + isa_io_base = 0x80000000; + printk("\n"); printk("=============================================================\n"); printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); Modified: openbios-devel/arch/ppc/pearpc/init.c =================================================================== --- openbios-devel/arch/ppc/pearpc/init.c 2008-11-24 12:16:22 UTC (rev 253) +++ openbios-devel/arch/ppc/pearpc/init.c 2008-11-24 12:19:05 UTC (rev 254) @@ -56,9 +56,13 @@ ; } +uint32_t isa_io_base; + void entry( void ) { + isa_io_base = 0x80000000; + printk("\n"); printk("=============================================================\n"); printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); Modified: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c 2008-11-24 12:16:22 UTC (rev 253) +++ openbios-devel/arch/ppc/qemu/init.c 2008-11-24 12:19:05 UTC (rev 254) @@ -22,6 +22,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" +#include "openbios/pci.h" #include "openbios/nvram.h" #include "qemu/qemu.h" #include "ofmem.h" @@ -33,21 +34,6 @@ extern void ob_adb_init( void ); extern void setup_timers( void ); -#if 0 -int -get_bool_res( const char *res ) -{ - char buf[8], *p; - - p = BootHGetStrRes( res, buf, sizeof(buf) ); - if( !p ) - return -1; - if( !strcasecmp(p,"true") || !strcasecmp(p,"yes") || !strcasecmp(p,"1") ) - return 1; - return 0; -} -#endif - void unexpected_excep( int vector ) { @@ -56,9 +42,34 @@ ; } +enum { + ARCH_PREP = 0, + ARCH_MAC99, + ARCH_HEATHROW, +}; + +pci_arch_t known_arch[] = { + [ARCH_PREP] = { "PREP", 0x1057, 0x4801, 0x80800000, 0x800c0000, + 0x80000000, 0x00100000, 0xf0000000, 0x10000000, + 0x80000000, 0x00010000, 0x00000000, 0x00400000, + }, + [ARCH_MAC99] = { "MAC99", 0x106b, 0x001F, 0xf2800000, 0xf2c00000, + 0xf2000000, 0x02000000, 0x80000000, 0x10000000, + 0xf2000000, 0x00800000, 0x00000000, 0x01000000, + }, + [ARCH_HEATHROW] = { "HEATHROW", 0x1057, 0x0002, 0xfec00000, 0xfee00000, + 0x80000000, 0x7f000000, 0x80000000, 0x01000000, + 0xfe000000, 0x00800000, 0xfd000000, 0x01000000, + }, +}; +pci_arch_t *arch; +uint32_t isa_io_base; + void entry( void ) { + arch = &known_arch[ARCH_HEATHROW]; + isa_io_base = arch->io_base; printk("\n"); printk("=============================================================\n"); printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); @@ -115,10 +126,9 @@ set_property( ph, "rtas-size", (char*)&size, sizeof(size) ); } #endif - #if 0 /* tweak boot settings */ - autoboot = !!get_bool_res("autoboot"); + autoboot = !!getbool("autoboot?"); #endif autoboot = 0; if( !autoboot ) @@ -127,7 +137,7 @@ setenv("boot-command", "qemuboot"); #if 0 - if( get_bool_res("tty-interface") == 1 ) + if( getbool("tty-interface?") == 1 ) #endif fword("activate-tty-interface"); Added: openbios-devel/include/openbios/pci.h =================================================================== --- openbios-devel/include/openbios/pci.h (rev 0) +++ openbios-devel/include/openbios/pci.h 2008-11-24 12:19:05 UTC (rev 254) @@ -0,0 +1,22 @@ +#ifndef _H_PCI +#define _H_PCI + +typedef struct pci_arch_t pci_arch_t; + +struct pci_arch_t { + char * name; + uint16_t vendor_id; + uint16_t device_id; + uint32_t cfg_addr; + uint32_t cfg_data; + uint32_t cfg_base; + uint32_t cfg_len; + uint32_t mem_base; + uint32_t mem_len; + uint32_t io_base; + uint32_t io_len; + uint32_t rbase; + uint32_t rlen; +}; + +#endif /* _H_PCI */ Modified: openbios-devel/include/ppc/io.h =================================================================== --- openbios-devel/include/ppc/io.h 2008-11-24 12:16:22 UTC (rev 253) +++ openbios-devel/include/ppc/io.h 2008-11-24 12:19:05 UTC (rev 254) @@ -10,9 +10,7 @@ #ifndef BOOTSTRAP -#ifndef _IO_BASE -#define _IO_BASE 0x80000000 -#endif +extern uint32_t isa_io_base; /* * The insw/outsw/insl/outsl macros don't do byte-swapping. @@ -20,15 +18,15 @@ * are arrays of bytes, and byte-swapping is not appropriate in * that case. - paulus */ -#define insw(port, buf, ns) _insw_ns((uint16_t *)((port)+_IO_BASE), (buf), (ns)) -#define outsw(port, buf, ns) _outsw_ns((uint16_t *)((port)+_IO_BASE), (buf), (ns)) +#define insw(port, buf, ns) _insw((uint16_t *)((port)+isa_io_base), (buf), (ns)) +#define outsw(port, buf, ns) _outsw((uint16_t *)((port)+isa_io_base), (buf), (ns)) -#define inb(port) in_8((uint8_t *)((port)+_IO_BASE)) -#define outb(val, port) out_8((uint8_t *)((port)+_IO_BASE), (val)) -#define inw(port) in_le16((uint16_t *)((port)+_IO_BASE)) -#define outw(val, port) out_le16((uint16_t *)((port)+_IO_BASE), (val)) -#define inl(port) in_le32((uint32_t *)((port)+_IO_BASE)) -#define outl(val, port) out_le32((uint32_t *)((port)+_IO_BASE), (val)) +#define inb(port) in_8((uint8_t *)((port)+isa_io_base)) +#define outb(val, port) out_8((uint8_t *)((port)+isa_io_base), (val)) +#define inw(port) in_le16((uint16_t *)((port)+isa_io_base)) +#define outw(val, port) out_le16((uint16_t *)((port)+isa_io_base), (val)) +#define inl(port) in_le32((uint32_t *)((port)+isa_io_base)) +#define outl(val, port) out_le32((uint32_t *)((port)+isa_io_base), (val)) /* * 8, 16 and 32 bit, big and little endian I/O operations, with barrier. Modified: openbios-devel/kernel/forth.c =================================================================== --- openbios-devel/kernel/forth.c 2008-11-24 12:16:22 UTC (rev 253) +++ openbios-devel/kernel/forth.c 2008-11-24 12:19:05 UTC (rev 254) @@ -6,6 +6,7 @@ * the copyright and warranty status of this work. */ +extern uint32_t isa_io_base; /* * dup ( x -- x x )

1 0

r253 - in openbios-devel: . arch/ppc arch/ppc/qemu config/examples
by svn＠openbios.org 24 Nov '08

24 Nov '08

Author: stepan Date: 2008-11-24 13:16:22 +0100 (Mon, 24 Nov 2008) New Revision: 253 Added: openbios-devel/arch/ppc/qemu/ openbios-devel/arch/ppc/qemu/console.c openbios-devel/arch/ppc/qemu/init.c openbios-devel/arch/ppc/qemu/kernel.c openbios-devel/arch/ppc/qemu/main.c openbios-devel/arch/ppc/qemu/methods.c openbios-devel/arch/ppc/qemu/qemu.c openbios-devel/arch/ppc/qemu/qemu.fs openbios-devel/arch/ppc/qemu/qemu.h openbios-devel/arch/ppc/qemu/tree.c openbios-devel/arch/ppc/qemu/tree.fs openbios-devel/arch/ppc/qemu/vfd.c Modified: openbios-devel/Makefile openbios-devel/arch/ppc/build.xml openbios-devel/config/examples/cross-ppc_config.xml Log: Create arch/ppc/qemu by copying arch/ppc/pearpc. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: openbios-devel/Makefile =================================================================== --- openbios-devel/Makefile 2008-11-24 12:15:08 UTC (rev 252) +++ openbios-devel/Makefile 2008-11-24 12:16:22 UTC (rev 253) @@ -41,6 +41,7 @@ @mkdir -p $(ODIR)/target/arch/ppc @mkdir -p $(ODIR)/target/arch/ppc/briq # no autodetection of those.. @mkdir -p $(ODIR)/target/arch/ppc/pearpc + @mkdir -p $(ODIR)/target/arch/ppc/qemu @mkdir -p $(ODIR)/target/arch/ppc/mol @mkdir -p $(ODIR)/target/arch/x86 @mkdir -p $(ODIR)/target/arch/x86/xbox Modified: openbios-devel/arch/ppc/build.xml =================================================================== --- openbios-devel/arch/ppc/build.xml 2008-11-24 12:15:08 UTC (rev 252) +++ openbios-devel/arch/ppc/build.xml 2008-11-24 12:16:22 UTC (rev 253) @@ -13,6 +13,12 @@ <object source="pearpc/pearpc.fs"/> </dictionary> + <dictionary name="openbios-qemu" init="openbios" target="forth" condition="QEMU"> + <object source="ppc.fs"/> + <object source="qemu/tree.fs"/> + <object source="qemu/qemu.fs"/> + </dictionary> + <dictionary name="openbios-mol" init="openbios" target="forth" condition="MOL"> <object source="ppc.fs"/> <object source="mol/tree.fs"/> @@ -56,6 +62,23 @@ <external-object source="target/include/pearpc-dict.h"/> </executable> + <executable name="target/include/qemu-dict.h" target="target" condition="QEMU"> + <rule><![CDATA[ + @echo "static const char forth_dictionary[] = {" > $@ + @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ + | sed 's/0x ,//g' >> $@ + @echo "};" >> $@ + ]]></rule> + <external-object source="openbios-qemu.dict"/> + </executable> + + <executable name="target/arch/ppc/qemu/kernel.o" target="target" condition="QEMU"> + <rule><![CDATA[ + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/ppc/qemu/kernel.c + ]]></rule> + <external-object source="target/include/qemu-dict.h"/> + </executable> + <executable name="target/include/mol-dict.h" target="target" condition="MOL"> <rule><![CDATA[ @@ -112,6 +135,24 @@ <object source="pearpc/console.c" flags="-Iarch/ppc"/> </library> + <library name="qemu" target="target" type="static" condition="QEMU"> + <object source="misc.S"> + <rule><![CDATA[ + $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s + $(AS) $@.s $(AS_FLAGS) -o $@ + ]]></rule> + </object> + <object source="ofmem.c"/> + <object source="qemu/qemu.c" flags="-Iarch/ppc"/> + <object source="qemu/init.c" flags="-Iarch/ppc"/> + <external-object source="target/arch/ppc/qemu/kernel.o"/> + <object source="qemu/main.c" flags="-Iarch/ppc"/> + <object source="qemu/methods.c" flags="-Iarch/ppc"/> + <object source="qemu/tree.c" flags="-Iarch/ppc"/> + <object source="qemu/vfd.c" flags="-Iarch/ppc"/> + <object source="qemu/console.c" flags="-Iarch/ppc"/> + </library> + <library name="mol" target="target" type="static" condition="MOL"> <object source="misc.S"> @@ -188,6 +229,34 @@ <external-object source="liblibc.a"/> <external-object source="libfs.a"/> </executable> + + <executable name="openbios-qemu.elf" target="target" condition="QEMU"> + <rule> + $(LD) -g -Ttext=0x01e01000 -Bstatic $^ $(shell $(CC) -print-libgcc-file-name) -o $@ + $(NM) $@ | sort > $(ODIR)/openbios-qemu.syms + cp $@ $@.nostrip + $(STRIP) $@ + </rule> + <object source="start.S"> + <rule><![CDATA[ + $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s + $(AS) $@.s $(AS_FLAGS) -o $@ + ]]></rule> + </object> + <object source="timebase.S"> + <rule><![CDATA[ + $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s + $(AS) $@.s $(AS_FLAGS) -o $@ + ]]></rule> + </object> + <external-object source="libqemu.a"/> + <external-object source="libbootstrap.a"/> + <external-object source="libmodules.a"/> + <external-object source="libdrivers.a"/> + <external-object source="liblibc.a"/> + <external-object source="libfs.a"/> + </executable> + Added: openbios-devel/arch/ppc/qemu/console.c =================================================================== --- openbios-devel/arch/ppc/qemu/console.c (rev 0) +++ openbios-devel/arch/ppc/qemu/console.c 2008-11-24 12:16:22 UTC (rev 253) @@ -0,0 +1,47 @@ + +/* + * <console.c> + * + * Simple text console + * + * Copyright (C) 2005 Stefan Reinauer <stepan(a)openbios.org> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "libc/diskio.h" +#include "ofmem.h" +#include "qemu/qemu.h" + + +typedef struct osi_fb_info { + unsigned long mphys; + int rb, w, h, depth; +} osi_fb_info_t; + + +int Qemu_GetFBInfo( osi_fb_info_t *fb ) +{ + + fb->w=1024; + fb->h=768; + fb->depth=15; + fb->rb=2048; + fb->mphys=0x84000000; + + return 0; +} + +#define openbios_GetFBInfo(x) Qemu_GetFBInfo(x) + +#include "../../../modules/video.c" + +#include "../../../modules/console.c" + + + Added: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c (rev 0) +++ openbios-devel/arch/ppc/qemu/init.c 2008-11-24 12:16:22 UTC (rev 253) @@ -0,0 +1,137 @@ +/* + * Creation Date: <2004/08/28 18:38:22 greg> + * Time-stamp: <2004/08/28 18:38:22 greg> + * + * <init.c> + * + * Initialization for qemu + * + * Copyright (C) 2004 Greg Watson + * Copyright (C) 2005 Stefan Reinauer + * + * based on mol/init.c: + * + * Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Samuel & David Rydh + * (samuel(a)ibrium.se, dary(a)lindesign.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "openbios/nvram.h" +#include "qemu/qemu.h" +#include "ofmem.h" +#include "openbios-version.h" + +extern void unexpected_excep( int vector ); +extern void ob_ide_init( void ); +extern void ob_pci_init( void ); +extern void ob_adb_init( void ); +extern void setup_timers( void ); + +#if 0 +int +get_bool_res( const char *res ) +{ + char buf[8], *p; + + p = BootHGetStrRes( res, buf, sizeof(buf) ); + if( !p ) + return -1; + if( !strcasecmp(p,"true") || !strcasecmp(p,"yes") || !strcasecmp(p,"1") ) + return 1; + return 0; +} +#endif + +void +unexpected_excep( int vector ) +{ + printk("openbios panic: Unexpected exception %x\n", vector ); + for( ;; ) + ; +} + +void +entry( void ) +{ + printk("\n"); + printk("=============================================================\n"); + printk("OpenBIOS %s [%s]\n", OPENBIOS_RELEASE, OPENBIOS_BUILD_DATE ); + + ofmem_init(); + initialize_forth(); + /* won't return */ + + printk("of_startup returned!\n"); + for( ;; ) + ; +} + +static void +setenv( char *env, char *value ) +{ + push_str( value ); + push_str( env ); + fword("$setenv"); +} + +void +arch_of_init( void ) +{ +#if USE_RTAS + phandle_t ph; +#endif + int autoboot; + + devtree_init(); + nvram_init(); + modules_init(); +#ifdef CONFIG_DRIVER_PCI + ob_pci_init(); +#endif +#ifdef CONFIG_DRIVER_IDE + setup_timers(); + ob_ide_init(); +#endif +#ifdef CONFIG_DRIVER_ADB + ob_adb_init(); +#endif + + node_methods_init(); + init_video(); + +#if USE_RTAS + if( !(ph=find_dev("/rtas")) ) + printk("Warning: No /rtas node\n"); + else { + ulong size = 0x1000; + while( size < (ulong)of_rtas_end - (ulong)of_rtas_start ) + size *= 2; + set_property( ph, "rtas-size", (char*)&size, sizeof(size) ); + } +#endif + +#if 0 + /* tweak boot settings */ + autoboot = !!get_bool_res("autoboot"); +#endif + autoboot = 0; + if( !autoboot ) + printk("Autobooting disabled - dropping into OpenFirmware\n"); + setenv("auto-boot?", autoboot ? "true" : "false" ); + setenv("boot-command", "qemuboot"); + +#if 0 + if( get_bool_res("tty-interface") == 1 ) +#endif + fword("activate-tty-interface"); + + /* hack */ + device_end(); + bind_func("qemuboot", boot ); +} Added: openbios-devel/arch/ppc/qemu/kernel.c =================================================================== --- openbios-devel/arch/ppc/qemu/kernel.c (rev 0) +++ openbios-devel/arch/ppc/qemu/kernel.c 2008-11-24 12:16:22 UTC (rev 253) @@ -0,0 +1,17 @@ +/* + * Creation Date: <2004/08/28 18:03:25 stepan> + * Time-stamp: <2004/08/28 18:03:25 stepan> + * + * <qemu/kernel.c> + * + * Copyright (C) 2005 Stefan Reinauer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "qemu-dict.h" +#include "../kernel.c" + Added: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c (rev 0) +++ openbios-devel/arch/ppc/qemu/main.c 2008-11-24 12:16:22 UTC (rev 253) @@ -0,0 +1,145 @@ +/* + * Creation Date: <2004/08/28 18:38:22 greg> + * Time-stamp: <2004/08/28 18:38:22 greg> + * + * <main.c> + * + * Copyright (C) 2004 Greg Watson + * + * Based on MOL specific code which is + * Copyright (C) 2002, 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "openbios/elfload.h" +#include "openbios/nvram.h" +#include "libc/diskio.h" +#include "libc/vsprintf.h" +#include "qemu/qemu.h" +#include "ofmem.h" + +static void +transfer_control_to_elf( ulong entry ) +{ + extern void call_elf( ulong entry ); + printk("Starting ELF image at 0x%08lX\n", entry); + call_elf( 0x400000 ); + //call_elf( entry ); + + fatal_error("call_elf returned unexpectedly\n"); +} + +static int +load_elf_rom( ulong *entry, int fd ) +{ + int i, lszz_offs, elf_offs; + char buf[128], *addr; + Elf_ehdr ehdr; + Elf_phdr *phdr; + size_t s; + + printk("Loading '%s'\n", get_file_path(fd)); + + /* the ELF-image (usually) starts at offset 0x4000 */ + if( (elf_offs=find_elf(fd)) < 0 ) { + printk("----> %s is not an ELF image\n", buf ); + exit(1); + } + if( !(phdr=elf_readhdrs(fd, elf_offs, &ehdr)) ) + fatal_error("elf_readhdrs failed\n"); + + *entry = ehdr.e_entry; + + /* load segments. Compressed ROM-image assumed to be located immediately + * after the last segment */ + lszz_offs = elf_offs; + for( i=0; i<ehdr.e_phnum; i++ ) { + /* p_memsz, p_flags */ + s = MIN( phdr[i].p_filesz, phdr[i].p_memsz ); + seek_io( fd, elf_offs + phdr[i].p_offset ); + + /* printk("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX\n", + phdr[i].p_filesz, phdr[i].p_memsz, phdr[i].p_offset, + phdr[i].p_vaddr ); */ + + if( phdr[i].p_vaddr != phdr[i].p_paddr ) + printk("WARNING: ELF segment virtual addr != physical addr\n"); + lszz_offs = MAX( lszz_offs, elf_offs + phdr[i].p_offset + phdr[i].p_filesz ); + if( !s ) + continue; + if( ofmem_claim( phdr[i].p_vaddr, phdr[i].p_memsz, 0 ) == -1 ) + fatal_error("Claim failed!\n"); + + addr = (char*)phdr[i].p_vaddr; + if( read_io(fd, addr, s) != s ) + fatal_error("read failed\n"); + +#if 0 + /* patch CODE segment */ + if( *entry >= phdr[i].p_vaddr && *entry < phdr[i].p_vaddr + s ) { + patch_newworld_rom( (char*)phdr[i].p_vaddr, s ); + newworld_timer_hack( (char*)phdr[i].p_vaddr, s ); + } +#endif + flush_icache_range( addr, addr+s ); + + /*printk("ELF ROM-section loaded at %08lX (size %08lX)\n", + (ulong)phdr[i].p_vaddr, (ulong)phdr[i].p_memsz );*/ + } + free( phdr ); + return lszz_offs; +} + + +static void +encode_bootpath( const char *spec, const char *args ) +{ + phandle_t chosen_ph = find_dev("/chosen"); + set_property( chosen_ph, "bootpath", spec, strlen(spec)+1 ); + set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); +} + +/************************************************************************/ +/* qemu booting */ +/************************************************************************/ + +static void +qemu_startup( void ) +{ + const char *paths[] = { "hd:0,\\zImage.chrp", NULL }; + const char *args[] = { "root=/dev/hda2 console=ttyS0,115200", NULL }; + ulong entry; + int i, fd; + + for( i=0; paths[i]; i++ ) { + if( (fd=open_io(paths[i])) == -1 ) + continue; + (void) load_elf_rom( &entry, fd ); + close_io( fd ); + encode_bootpath( paths[i], args[i] ); + + update_nvram(); + transfer_control_to_elf( entry ); + /* won't come here */ + } + printk("*** Boot failure! No secondary bootloader specified ***\n"); +} + + +/************************************************************************/ +/* entry */ +/************************************************************************/ + +void +boot( void ) +{ + fword("update-chosen"); + qemu_startup(); +} Added: openbios-devel/arch/ppc/qemu/methods.c =================================================================== --- openbios-devel/arch/ppc/qemu/methods.c (rev 0) +++ openbios-devel/arch/ppc/qemu/methods.c 2008-11-24 12:16:22 UTC (rev 253) @@ -0,0 +1,335 @@ +/* + * Creation Date: <2004/08/28 18:38:22 greg> + * Time-stamp: <2004/08/28 18:38:22 greg> + * + * <methods.c> + * + * Misc device node methods + * + * Copyright (C) 2004 Greg Watson + * + * Based on MOL specific code which is + * + * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "libc/string.h" +#include "qemu/qemu.h" +#include "ofmem.h" + +/************************************************************************/ +/* RTAS (run-time abstraction services) */ +/************************************************************************/ + +#ifdef USE_RTAS +DECLARE_NODE( rtas, INSTALL_OPEN, 0, "+/rtas" ); + +/* ( physbase -- rtas_callback ) */ +static void +rtas_instantiate( void ) +{ + int physbase = POP(); + int s=0x1000, size = (int)of_rtas_end - (int)of_rtas_start; + ulong virt; + + while( s < size ) + s += 0x1000; + virt = ofmem_claim_virt( 0, s, 0x1000 ); + ofmem_map( physbase, virt, s, -1 ); + memcpy( (char*)virt, of_rtas_start, size ); + + printk("RTAS instantiated at %08x\n", physbase ); + flush_icache_range( (char*)virt, (char*)virt + size ); + + PUSH( physbase ); +} + +NODE_METHODS( rtas ) = { + { "instantiate", rtas_instantiate }, + { "instantiate-rtas", rtas_instantiate }, +}; +#endif + + +/************************************************************************/ +/* stdout */ +/************************************************************************/ + +DECLARE_NODE( video_stdout, INSTALL_OPEN, 0, "Tdisplay" ); + +/* ( addr len -- actual ) */ +static void +stdout_write( void ) +{ + int len = POP(); + char *addr = (char*)POP(); + char *s = malloc( len + 1 ); + + strncpy_nopad( s, addr, len ); + s[len]=0; + + printk( "%s", s ); + //vfd_draw_str( s ); + console_draw_str( s ); + + free( s ); + + PUSH( len ); +} + +NODE_METHODS( video_stdout ) = { + { "write", stdout_write }, +}; + + +/************************************************************************/ +/* tty */ +/************************************************************************/ + +DECLARE_NODE( tty, INSTALL_OPEN, 0, "/packages/terminal-emulator" ); + +/* ( addr len -- actual ) */ +static void +tty_read( void ) +{ + int ch, len = POP(); + char *p = (char*)POP(); + int ret=0; + + if( len > 0 ) { + ret = 1; + ch = getchar(); + if( ch >= 0 ) { + *p = ch; + } else { + ret = 0; + } + } + PUSH( ret ); +} + +/* ( addr len -- actual ) */ +static void +tty_write( void ) +{ + int i, len = POP(); + char *p = (char*)POP(); + for( i=0; i<len; i++ ) + putchar( *p++ ); + RET( len ); +} + +NODE_METHODS( tty ) = { + { "read", tty_read }, + { "write", tty_write }, +}; + +/************************************************************************/ +/* client interface 'quiesce' */ +/************************************************************************/ + +DECLARE_NODE( ciface, 0, 0, "/packages/client-iface" ); + +/* ( -- ) */ +static void +ciface_quiesce( ulong args[], ulong ret[] ) +{ +#if 0 + ulong msr; + /* This seems to be the correct thing to do - but I'm not sure */ + asm volatile("mfmsr %0" : "=r" (msr) : ); + msr &= ~(MSR_IR | MSR_DR); + asm volatile("mtmsr %0" :: "r" (msr) ); +#endif + printk("=============================================================\n\n"); +} + +/* ( -- ms ) */ +static void +ciface_milliseconds( ulong args[], ulong ret[] ) +{ + extern unsigned long get_timer_freq(); + static ulong mticks=0, usecs=0; + ulong t; + + asm volatile("mftb %0" : "=r" (t) : ); + if( mticks ) + usecs += get_timer_freq() / 1000000 * ( t-mticks ); + mticks = t; + + PUSH( usecs/1000 ); +} + + +NODE_METHODS( ciface ) = { + { "quiesce", ciface_quiesce }, + { "milliseconds", ciface_milliseconds }, +}; + + +/************************************************************************/ +/* MMU/memory methods */ +/************************************************************************/ + +DECLARE_NODE( memory, INSTALL_OPEN, 0, "/memory" ); +DECLARE_NODE( mmu, INSTALL_OPEN, 0, "/cpu@0" ); +DECLARE_NODE( mmu_ciface, 0, 0, "/packages/client-iface" ); + + +/* ( phys size align --- base ) */ +static void +mem_claim( void ) +{ + int align = POP(); + int size = POP(); + int phys = POP(); + int ret = ofmem_claim_phys( phys, size, align ); + + if( ret == -1 ) { + printk("MEM: claim failure\n"); + throw( -13 ); + return; + } + PUSH( ret ); +} + +/* ( phys size --- ) */ +static void +mem_release( void ) +{ + POP(); POP(); +} + +/* ( phys size align --- base ) */ +static void +mmu_claim( void ) +{ + int align = POP(); + int size = POP(); + int phys = POP(); + int ret = ofmem_claim_virt( phys, size, align ); + + if( ret == -1 ) { + printk("MMU: CLAIM failure\n"); + throw( -13 ); + return; + } + PUSH( ret ); +} + +/* ( phys size --- ) */ +static void +mmu_release( void ) +{ + POP(); POP(); +} + +/* ( phys virt size mode -- [ret???] ) */ +static void +mmu_map( void ) +{ + int mode = POP(); + int size = POP(); + int virt = POP(); + int phys = POP(); + int ret; + + /* printk("mmu_map: %x %x %x %x\n", phys, virt, size, mode ); */ + ret = ofmem_map( phys, virt, size, mode ); + + if( ret ) { + printk("MMU: map failure\n"); + throw( -13 ); + return; + } +} + +/* ( virt size -- ) */ +static void +mmu_unmap( void ) +{ + POP(); POP(); +} + +/* ( virt -- false | phys mode true ) */ +static void +mmu_translate( void ) +{ + ulong mode; + int virt = POP(); + int phys = ofmem_translate( virt, &mode ); + + if( phys == -1 ) { + PUSH( 0 ); + } else { + PUSH( phys ); + PUSH( (int)mode ); + PUSH( -1 ); + } +} + +/* ( virt size align -- baseaddr|-1 ) */ +static void +ciface_claim( void ) +{ + int align = POP(); + int size = POP(); + int virt = POP(); + int ret = ofmem_claim( virt, size, align ); + + /* printk("ciface_claim: %08x %08x %x\n", virt, size, align ); */ + PUSH( ret ); +} + +/* ( virt size -- ) */ +static void +ciface_release( void ) +{ + POP(); + POP(); +} + + +NODE_METHODS( memory ) = { + { "claim", mem_claim }, + { "release", mem_release }, +}; + +NODE_METHODS( mmu ) = { + { "claim", mmu_claim }, + { "release", mmu_release }, + { "map", mmu_map }, + { "unmap", mmu_unmap }, + { "translate", mmu_translate }, +}; + +NODE_METHODS( mmu_ciface ) = { + { "claim", ciface_claim }, + { "release", ciface_release }, +}; + + +/************************************************************************/ +/* init */ +/************************************************************************/ + +void +node_methods_init( void ) +{ +#ifdef USE_RTAS + REGISTER_NODE( rtas ); +#endif + REGISTER_NODE( video_stdout ); + REGISTER_NODE( ciface ); + REGISTER_NODE( memory ); + REGISTER_NODE( mmu ); + REGISTER_NODE( mmu_ciface ); + REGISTER_NODE( tty ); +} Added: openbios-devel/arch/ppc/qemu/qemu.c =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.c (rev 0) +++ openbios-devel/arch/ppc/qemu/qemu.c 2008-11-24 12:16:22 UTC (rev 253) @@ -0,0 +1,206 @@ +/* + * Creation Date: <2004/08/28 18:38:22 greg> + * Time-stamp: <2004/08/28 18:38:22 greg> + * + * <qemu.c> + * + * Copyright (C) 2004, Greg Watson + * + * derived from mol.c + * + * Copyright (C) 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "openbios/config.h" +#include "openbios/kernel.h" +#include "openbios/nvram.h" +#include "libc/vsprintf.h" +#include "libc/string.h" +#include "qemu/qemu.h" +#include <stdarg.h> + +#define UART_BASE 0x3f8 + +// FIXME +unsigned long virt_offset = 0; + + +void +exit( int status ) +{ + for (;;); +} + +void +fatal_error( const char *err ) +{ + printk("Fatal error: %s\n", err ); + exit(0); +} + +void +panic( const char *err ) +{ + printk("Panic: %s\n", err ); + exit(0); + + /* won't come here... this keeps the gcc happy */ + for( ;; ) + ; +} + + +/************************************************************************/ +/* print using OSI interface */ +/************************************************************************/ + +static int do_indent; + +int +printk( const char *fmt, ... ) +{ + char *p, buf[1024]; /* XXX: no buffer overflow protection... */ + va_list args; + int i; + + va_start(args, fmt); + i=vsprintf(buf,fmt,args); + va_end(args); + + for( p=buf; *p; p++ ) { + if( *p == '\n' ) + do_indent = 0; + if( do_indent++ == 1 ) { + putchar( '>' ); + putchar( '>' ); + putchar( ' ' ); + } + putchar( *p ); + } + return i; +} + + +/************************************************************************/ +/* TTY iface */ +/************************************************************************/ + +static int ttychar = -1; + +static int +tty_avail( void ) +{ + return 1; +} + +static int +tty_putchar( int c ) +{ + if( tty_avail() ) { + while (!(inb(UART_BASE + 0x05) & 0x20)) + ; + outb(c, UART_BASE); + while (!(inb(UART_BASE + 0x05) & 0x40)) + ; + } + return c; +} + +int +availchar( void ) +{ + if( !tty_avail() ) + return 0; + + if( ttychar < 0 ) + ttychar = inb(UART_BASE); + return (ttychar >= 0); +} + +int +getchar( void ) +{ + int ch; + + if( !tty_avail() ) + return 0; + + if( ttychar < 0 ) + return inb(UART_BASE); + ch = ttychar; + ttychar = -1; + return ch; +} + +int +putchar( int c ) +{ + if (c == '\n') + tty_putchar('\r'); + return tty_putchar(c); +} + + +/************************************************************************/ +/* briQ specific stuff */ +/************************************************************************/ + +#define IO_NVRAM_PA_START 0x80860000 +#define IO_NVRAM_PA_END 0x80880000 + +static char *nvram=(char *)IO_NVRAM_PA_START; + +void +dump_nvram(void) +{ + static char hexdigit[] = "0123456789abcdef"; + int i; + for (i = 0; i < 16*4; i++) + { + printk ("%c", hexdigit[nvram[i<<4] >> 4]); + printk ("%c", hexdigit[nvram[i<<4] % 16]); + if (!((i + 1) % 16)) + { + printk ("\n"); + } + else + { + printk (" "); + } + } +} + + +int +arch_nvram_size( void ) +{ + return (IO_NVRAM_PA_END-IO_NVRAM_PA_START)>>4; +} + +void +arch_nvram_put( char *buf ) +{ + int i; + for (i=0; i<(IO_NVRAM_PA_END-IO_NVRAM_PA_START)>>4; i++) + nvram[i<<4]=buf[i]; + // memcpy(nvram, buf, IO_NVRAM_PA_END-IO_NVRAM_PA_START); + printk("new nvram:\n"); + dump_nvram(); +} + +void +arch_nvram_get( char *buf ) +{ + int i; + for (i=0; i<(IO_NVRAM_PA_END-IO_NVRAM_PA_START)>>4; i++) + buf[i]=nvram[i<<4]; + + //memcpy(buf, nvram, IO_NVRAM_PA_END-IO_NVRAM_PA_START); + printk("current nvram:\n"); + dump_nvram(); +} Added: openbios-devel/arch/ppc/qemu/qemu.fs =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.fs (rev 0) +++ openbios-devel/arch/ppc/qemu/qemu.fs 2008-11-24 12:16:22 UTC (rev 253) @@ -0,0 +1,116 @@ +\ qemu specific initialization code +\ +\ Copyright (C) 2005 Stefan Reinauer +\ +\ This program is free software; you can redistribute it and/or +\ modify it under the terms of the GNU General Public License +\ as published by the Free Software Foundation +\ + + +\ ------------------------------------------------------------------------- +\ initialization +\ ------------------------------------------------------------------------- + +: make-openable ( path ) + find-dev if + begin ?dup while + \ install trivial open and close methods + dup active-package! is-open + parent + repeat + then +; + +: preopen ( chosen-str node-path ) + 2dup make-openable + + " /chosen" find-device + open-dev ?dup if + encode-int 2swap property + else + 2drop + then +; + +\ preopen device nodes (and store the ihandles under /chosen) +:noname + " rtc" " /pci/isa/rtc" preopen + " memory" " /memory" preopen + " mmu" " /cpu@0" preopen + \ " stdout" " /packages/terminal-emulator" preopen + " stdout" " /pci/pci6666,6666" preopen + " stdin" " /pci/via-cuda/adb" preopen + +; SYSTEM-initializer + + +\ ------------------------------------------------------------------------- +\ device tree fixing +\ ------------------------------------------------------------------------- + +\ add decode-address methods +: (make-decodable) ( phandle -- ) + + dup " #address-cells" rot get-package-property 0= if + decode-int nip nip + over " decode-unit" rot find-method if 2drop else + ( save phandle ncells ) + + over active-package! + case + 1 of ['] parse-hex " decode-unit" is-xt-func endof + 3 of + " bus-range" active-package get-package-property 0= if + decode-int nip nip + ['] encode-unit-pci " encode-unit" is-xt-func + " decode-unit" is-func-begin + ['] (lit) , , + ['] decode-unit-pci-bus , + is-func-end + then + endof + endcase + then + then + drop +; + +: init-qemu-tree ( -- ) + active-package + + iterate-tree-begin + begin ?dup while + + dup (make-decodable) + + iterate-tree + repeat + + active-package! +; + +\ use the tty interface if available +: activate-tty-interface + " /packages/terminal-emulator" find-dev if drop + " /pci/via-cuda/adb" " input-device" $setenv + " /pci/pci6666,6666" " output-device" $setenv + then +; + +:noname + " keyboard" input +; CONSOLE-IN-initializer + + +\ ------------------------------------------------------------------------- +\ pre-booting +\ ------------------------------------------------------------------------- + +: update-chosen + " /chosen" find-device + stdin @ encode-int " stdin" property + stdout @ encode-int " stdout" property + " /pci/isa/interrupt-controller" find-dev if encode-int " interrupt-controller" property then + device-end +; Added: openbios-devel/arch/ppc/qemu/qemu.h =================================================================== --- openbios-devel/arch/ppc/qemu/qemu.h (rev 0) +++ openbios-devel/arch/ppc/qemu/qemu.h 2008-11-24 12:16:22 UTC (rev 253) @@ -0,0 +1,26 @@ +/* + * Creation Date: <2004/08/28 17:50:12 stepan> + * Time-stamp: <2004/08/28 17:50:12 stepan> + * + * <qemu.h> + * + * Copyright (C) 2005 Stefan Reinauer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#ifndef _H_QEMU +#define _H_QEMU + +/* vfd.c */ +extern int vfd_draw_str( const char *str ); +extern void vfd_close( void ); + +extern int console_draw_str( const char *str ); + +#include "kernel.h" + +#endif /* _H_QEMU */ Added: openbios-devel/arch/ppc/qemu/tree.c =================================================================== --- openbios-devel/arch/ppc/qemu/tree.c (rev 0) +++ openbios-devel/arch/ppc/qemu/tree.c 2008-11-24 12:16:22 UTC (rev 253) @@ -0,0 +1,23 @@ +/* + * Creation Date: <2004/08/28 18:38:22 greg> + * Time-stamp: <2004/08/28 18:38:22 greg> + * + * <tree.c> + * + * device tree setup + * + * Copyright (C) 2004 Greg Watson + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" + +void devtree_init( void ) +{ + fword("init-qemu-tree"); +} Added: openbios-devel/arch/ppc/qemu/tree.fs =================================================================== --- openbios-devel/arch/ppc/qemu/tree.fs (rev 0) +++ openbios-devel/arch/ppc/qemu/tree.fs 2008-11-24 12:16:22 UTC (rev 253) @@ -0,0 +1,247 @@ +\ Qemu specific initialization code +\ +\ Copyright (C) 2005 Stefan Reinauer +\ +\ This program is free software; you can redistribute it and/or +\ modify it under the terms of the GNU General Public License +\ as published by the Free Software Foundation +\ + +\ ------------------------------------------------------------- +\ device-tree +\ ------------------------------------------------------------- + +" /" find-device + +" chrp" device-type +" OpenSource,QEMU" model +h# 80000000 encode-int " isa-io-base" property +1 encode-int " #interrupt-cells" property +1 encode-int " #size-cells" property + +new-device + " memory" device-name + " memory" device-type + 0 encode-int h# 1E00000 encode-int encode+ + h# 2000000 encode-int encode+ h# 40000000 encode-int encode+ + " available" property + 0 h# 40000000 reg + external + : open true ; + : close ; +finish-device + +new-device + " cpu" device-name + " cpu" device-type + " " encode-string " translations" property + 0 encode-phys h# 8000000 encode-int encode+ " available" property + d# 32 encode-int " d-cache-block-size" property + 8 encode-int " d-cache-sets" property + d# 32768 encode-int " d-cache-size" property + d# 32 encode-int " i-cache-block-size" property + 8 encode-int " i-cache-sets" property + d# 32768 encode-int " i-cache-size" property + " " encode-string " cache-unified" property + 2 encode-int " i-tlb-sets" property + d# 128 encode-int " i-tlb-size" property + 2 encode-int " d-tlb-sets" property + d# 128 encode-int " d-tlb-size" property + " " encode-string " tlb-split" property + 2 encode-int " tlb-sets" property + d# 256 encode-int " tlb-size" property + " " encode-string " performance-monitor" property + " " encode-string " graphics" property + 4 encode-int " reservation-granule-size" property + d# 25000000 encode-int " timebase-frequency" property + d# 300000000 encode-int " clock-frequency" property + d# 66000000 encode-int " bus-frequency" property + h# 88201 encode-int " cpu-version" property + 0 encode-int " reg" property +finish-device + +" /pci" find-device + h# 01000000 encode-int 0 encode-int encode+ 0 encode-int encode+ + h# 80000000 encode-int encode+ 0 encode-int encode+ + h# 01000000 encode-int encode+ + h# 02000000 encode-int encode+ 0 encode-int encode+ 0 encode-int encode+ + h# C0000000 encode-int encode+ 0 encode-int encode+ + h# 08000000 encode-int encode+ + " ranges" property + " IBM,CPC710" model + h# FF5F7700 encode-int " 8259-interrupt-acknowledge" property + h# 0000F800 encode-int 0 encode-int encode+ 0 encode-int encode+ + 7 encode-int encode+ + " interrupt-map-mask" property + 1 encode-int " #interrupt-cells" property + h# 80000000 encode-int " system-dma-base" property + d# 33333333 encode-int " clock-frequency" property + " " encode-string " primary-bridge" property + 0 encode-int " pci-bridge-number" property + h# FEC00000 encode-int h# 100000 encode-int encode+ " reg" property + 0 encode-int 0 encode-int encode+ " bus-range" property + +new-device + " ide" device-name + " ide" device-type + " WINBOND,82C553" model + h# 28 encode-int " max-latency" property + h# 2 encode-int " min-grant" property + h# 1 encode-int " devsel-speed" property + h# 0 encode-int " subsystem-vendor-id" property + h# 0 encode-int " subsystem-id" property + h# 1018A encode-int " class-code" property + h# 5 encode-int " revision-id" property + h# 105 encode-int " device-id" property + h# 10AD encode-int " vendor-id" property + h# 1003110 encode-int 0 encode-int encode+ h# 10020 encode-int encode+ + h# 10 encode-int encode+ 0 encode-int encode+ + h# 1003114 encode-int 0 encode-int encode+ h# 10030 encode-int encode+ + h# 4 encode-int encode+ 0 encode-int encode+ + h# 1003118 encode-int 0 encode-int encode+ h# 10040 encode-int encode+ + h# 10 encode-int encode+ 0 encode-int encode+ + h# 100311C encode-int 0 encode-int encode+ h# 10034 encode-int encode+ + h# 4 encode-int encode+ 0 encode-int encode+ + h# 1003120 encode-int 0 encode-int encode+ h# 10050 encode-int encode+ + h# 10 encode-int encode+ 0 encode-int encode+ + h# 1003124 encode-int 0 encode-int encode+ h# 10060 encode-int encode+ + h# 10 encode-int encode+ 0 encode-int encode+ + " assigned-addresses" property + h# 3100 encode-int 0 encode-int encode+ 0 encode-int encode+ + 0 encode-int encode+ 0 encode-int encode+ + h# 1003110 encode-int 0 encode-int encode+ h# 0 encode-int encode+ + h# 10 encode-int encode+ 0 encode-int encode+ + h# 1003114 encode-int 0 encode-int encode+ h# 0 encode-int encode+ + h# 4 encode-int encode+ 0 encode-int encode+ + h# 1003118 encode-int 0 encode-int encode+ h# 0 encode-int encode+ + h# 10 encode-int encode+ 0 encode-int encode+ + h# 100311C encode-int 0 encode-int encode+ h# 0 encode-int encode+ + h# 4 encode-int encode+ 0 encode-int encode+ + h# 1003120 encode-int 0 encode-int encode+ h# 0 encode-int encode+ + h# 10 encode-int encode+ 0 encode-int encode+ + h# 1003124 encode-int 0 encode-int encode+ h# 0 encode-int encode+ + h# 10 encode-int encode+ 0 encode-int encode+ + " reg" property +finish-device + +new-device + " ethernet" device-name + " network" device-type + " AMD,79C973" model + h# 3800 encode-int 0 encode-int encode+ 0 encode-int encode+ + 0 encode-int encode+ 0 encode-int encode+ + " reg" property +finish-device + +" /pci/isa" find-device + 0 0 " assigned-addresses" property + 0 0 " ranges" property + 0 encode-int " slot-names" property + d# 8333333 encode-int " clock-frequency" property + 0 encode-int " eisa-slots" property + 2 encode-int " #interrupt-cells" property + " W83C553F" encode-string " compatible" property + " WINBOND,82C553" model + 0 encode-int " max-latency" property + 0 encode-int " min-grant" property + 1 encode-int " devsel-speed" property + 0 encode-int " subsystem-vendor-id" property + 0 encode-int " subsystem-id" property + h# 60100 encode-int " class-code" property + h# 10 encode-int " revision-id" property + h# 565 encode-int " device-id" property + h# 10AD encode-int " vendor-id" property + h# 3000 encode-int 0 encode-int encode+ 0 encode-int encode+ + 0 encode-int encode+ 0 encode-int encode+ " reg" property + +new-device + " rtc" device-name + " rtc" device-type + " DS17285S" model + " MC146818" encode-string + " DS17285S" encode-string encode+ + " pnpPNP,b00" encode-string encode+ " compatible" property + 8 encode-int 0 encode-int encode+ " interrupts" property + h# 70 encode-int 1 encode-int encode+ + 2 encode-int encode+ " reg" property +finish-device + +new-device + " interrupt-controller" device-name + " interrupt-controller" device-type + " 8259" model + " " encode-string " interrupt-controller" property + 2 encode-int " #interrupt-cells" property + 1 encode-int + 2 encode-int encode+ + 3 encode-int encode+ + 6 encode-int encode+ + " reserved-interrupts" property + " 8259" encode-string + " chrp,iic" encode-string encode+ + " compatible" property + h# 20 encode-int 1 encode-int encode+ + 2 encode-int encode+ " reg" property +finish-device + +new-device + " serial" device-name + " serial" device-type + " no" encode-string " ctsrts" property + " no" encode-string " xon" property + " no" encode-string " parity" property + d# 115200 encode-int " bps" property + 1 encode-int " stop-bits" property + 8 encode-int " data-bits" property + h# 70800 encode-int " divisor" property + h# 708000 encode-int " clock-frequency" property + 4 encode-int 0 encode-int encode+ " interrupts" property + h# 3F8 encode-int 1 encode-int encode+ + 8 encode-int encode+ " reg" property +finish-device + +" /pci" find-device + " /pci/isa/interrupt-controller" find-dev if + encode-int " interrupt-parent" property + then + h# 3800 encode-int 0 encode-int encode+ + 0 encode-int encode+ 1 encode-int encode+ + " /pci/isa/interrupt-controller" find-dev if + encode-int encode+ + then + h# 0C encode-int encode+ 1 encode-int encode+ + " interrupt-map" property + +" /pci/isa" find-device + " /pci/isa/interrupt-controller" find-dev if + encode-int " interrupt-parent" property + then + +\ ------------------------------------------------------------- +\ /packages +\ ------------------------------------------------------------- + +" /packages" find-device + + " packages" device-name + external + \ allow packages to be opened with open-dev + : open true ; + : close ; + +\ /packages/terminal-emulator +new-device + " terminal-emulator" device-name + external + : open true ; + : close ; + \ : write ( addr len -- actual ) + \ dup -rot type + \ ; +finish-device + +\ ------------------------------------------------------------- +\ The END +\ ------------------------------------------------------------- +device-end + Added: openbios-devel/arch/ppc/qemu/vfd.c =================================================================== --- openbios-devel/arch/ppc/qemu/vfd.c (rev 0) +++ openbios-devel/arch/ppc/qemu/vfd.c 2008-11-24 12:16:22 UTC (rev 253) @@ -0,0 +1,42 @@ +/* + * Creation Date: <2004/08/28 17:29:43 greg> + * Time-stamp: <2004/08/28 17:29:43 greg> + * + * <vfd.c> + * + * Simple text console + * + * Copyright (C) 2004 Greg Watson + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "qemu/qemu.h" + +static int vfd_is_open; + +static int +vfd_init( void ) +{ + vfd_is_open = 1; + return 0; +} + +void +vfd_close( void ) +{ +} + +int +vfd_draw_str( const char *str ) +{ + if (!vfd_is_open) + vfd_init(); + + return 0; +} Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2008-11-24 12:15:08 UTC (rev 252) +++ openbios-devel/config/examples/cross-ppc_config.xml 2008-11-24 12:16:22 UTC (rev 253) @@ -6,7 +6,8 @@ <option name="CONFIG_PPC" type="boolean" value="true"/>   - <option name="CONFIG_PEARPC" type="boolean" value="true"/> +  + <option name="CONFIG_QEMU" type="boolean" value="true"/> <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/>  @@ -57,7 +58,7 @@ <option name="CONFIG_DEBUG_FS" type="boolean" value="true"/>  - <option name="CONFIG_LINUXBIOS" type="boolean" value="true"/> + <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/>  <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/>

1 0

r252 - in openbios-devel: arch/sparc64 drivers include/openbios
by svn＠openbios.org 24 Nov '08

24 Nov '08

Author: stepan Date: 2008-11-24 13:15:08 +0100 (Mon, 24 Nov 2008) New Revision: 252 Modified: openbios-devel/arch/sparc64/console.c openbios-devel/arch/sparc64/openbios.c openbios-devel/drivers/esp.c openbios-devel/drivers/floppy.c openbios-devel/drivers/ide.c openbios-devel/drivers/obio.c openbios-devel/drivers/pci.c openbios-devel/include/openbios/bindings.h Log: This patch moves all definitions of REGISTER_NAMED_NODE and REGISTER_NODE_METHODS to openbios/bindings.h. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: openbios-devel/arch/sparc64/console.c =================================================================== --- openbios-devel/arch/sparc64/console.c 2008-11-24 12:13:40 UTC (rev 251) +++ openbios-devel/arch/sparc64/console.c 2008-11-24 12:15:08 UTC (rev 252) @@ -14,19 +14,6 @@ #include "sys_info.h" #include "boot.h" -#define REGISTER_NAMED_NODE( name, path ) do { \ - bind_new_node( name##_flags_, name##_size_, \ - path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ - } while(0) - -#define REGISTER_NODE_METHODS( name, path ) do { \ - const char *paths[1]; \ - \ - paths[0] = path; \ - bind_node( name##_flags_, name##_size_, \ - paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t)); \ - } while(0) - /* ****************************************************************** * serial console functions * ****************************************************************** */ Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-11-24 12:13:40 UTC (rev 251) +++ openbios-devel/arch/sparc64/openbios.c 2008-11-24 12:15:08 UTC (rev 252) @@ -30,19 +30,6 @@ #define BIOS_CFG_CMD 0x510 #define BIOS_CFG_DATA 0x511 -#define REGISTER_NAMED_NODE( name, path ) do { \ - bind_new_node( name##_flags_, name##_size_, \ - path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ - } while(0) - -#define REGISTER_NODE_METHODS( name, path ) do { \ - const char *paths[1]; \ - \ - paths[0] = path; \ - bind_node( name##_flags_, name##_size_, \ - paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t)); \ - } while(0) - static unsigned char intdict[256 * 1024]; // XXX Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2008-11-24 12:13:40 UTC (rev 251) +++ openbios-devel/drivers/esp.c 2008-11-24 12:15:08 UTC (rev 252) @@ -27,19 +27,6 @@ #define BUFSIZE 4096 -#define REGISTER_NAMED_NODE( name, path ) do { \ - bind_new_node( name##_flags_, name##_size_, \ - path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ - } while(0) - -#define REGISTER_NODE_METHODS( name, path ) do { \ - const char *paths[1]; \ - \ - paths[0] = path; \ - bind_node( name##_flags_, name##_size_, \ - paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t)); \ - } while(0) - #ifdef CONFIG_DEBUG_ESP #define DPRINTF(fmt, args...) \ do { printk(fmt , ##args); } while (0) Modified: openbios-devel/drivers/floppy.c =================================================================== --- openbios-devel/drivers/floppy.c 2008-11-24 12:13:40 UTC (rev 251) +++ openbios-devel/drivers/floppy.c 2008-11-24 12:15:08 UTC (rev 252) @@ -8,11 +8,6 @@ #include "timer.h" -#define REGISTER_NAMED_NODE( name, path ) do { \ - bind_new_node( name##_flags_, name##_size_, \ - path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ - } while(0) - /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_floppy, INSTALL_OPEN, 2*sizeof(int) ); Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2008-11-24 12:13:40 UTC (rev 251) +++ openbios-devel/drivers/ide.c 2008-11-24 12:15:08 UTC (rev 252) @@ -29,12 +29,6 @@ #include "hdreg.h" #include "timer.h" -#define REGISTER_NAMED_NODE( name, path ) do { \ - bind_new_node( name##_flags_, name##_size_, \ - path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ - } while(0) - - /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_ide, INSTALL_OPEN, 2*sizeof(int) ); DECLARE_UNNAMED_NODE( ob_ide_ctrl, INSTALL_OPEN, sizeof(int)); Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2008-11-24 12:13:40 UTC (rev 251) +++ openbios-devel/drivers/obio.c 2008-11-24 12:15:08 UTC (rev 252) @@ -24,19 +24,6 @@ #define NO_QEMU_PROTOS #include "openbios/fw_cfg.h" -#define REGISTER_NAMED_NODE( name, path ) do { \ - bind_new_node( name##_flags_, name##_size_, \ - path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ - } while(0) - -#define REGISTER_NODE_METHODS( name, path ) do { \ - const char *paths[1]; \ - \ - paths[0] = path; \ - bind_node( name##_flags_, name##_size_, \ - paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t)); \ - } while(0) - #define PROMDEV_KBD 0 /* input from keyboard */ #define PROMDEV_SCREEN 0 /* output to screen */ #define PROMDEV_TTYA 1 /* in/out to ttya */ Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-11-24 12:13:40 UTC (rev 251) +++ openbios-devel/drivers/pci.c 2008-11-24 12:15:08 UTC (rev 252) @@ -23,11 +23,6 @@ #include "timer.h" #include "pci.h" -#define REGISTER_NAMED_NODE( name, path ) do { \ - bind_new_node( name##_flags_, name##_size_, \ - path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ - } while(0) - #define set_bool_property(ph, name) set_property(ph, name, NULL, 0); /* DECLARE data structures for the nodes. */ Modified: openbios-devel/include/openbios/bindings.h =================================================================== --- openbios-devel/include/openbios/bindings.h 2008-11-24 12:13:40 UTC (rev 251) +++ openbios-devel/include/openbios/bindings.h 2008-11-24 12:15:08 UTC (rev 252) @@ -106,6 +106,19 @@ void *func; } method_t; +#define REGISTER_NAMED_NODE( name, path ) do { \ + bind_new_node( name##_flags_, name##_size_, \ + path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ + } while(0) + +#define REGISTER_NODE_METHODS( name, path ) do { \ + const char *paths[1]; \ + \ + paths[0] = path; \ + bind_node( name##_flags_, name##_size_, \ + paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t)); \ + } while(0) + #define DECLARE_UNNAMED_NODE( name, flags, size ) \ static const int name##_flags_ = flags; \ static const int name##_size_ = size;

1 0

r251 - in openbios-devel: config/examples kernel
by svn＠openbios.org 24 Nov '08

24 Nov '08

Author: stepan Date: 2008-11-24 13:13:40 +0100 (Mon, 24 Nov 2008) New Revision: 251 Modified: openbios-devel/config/examples/cross-ppc_rules.xml openbios-devel/kernel/bootstrap.c openbios-devel/kernel/cross.h Log: This patch allows me to compile openbios using the cross-pcc target on amd64 host. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: openbios-devel/config/examples/cross-ppc_rules.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_rules.xml 2008-11-17 19:42:11 UTC (rev 250) +++ openbios-devel/config/examples/cross-ppc_rules.xml 2008-11-24 12:13:40 UTC (rev 251) @@ -9,20 +9,21 @@ ARCH := ppc ODIR := obj-$(ARCH) HOSTCC := gcc -HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) +HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) -DSWAP_ENDIANNESS HOSTINCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include # # MOLPATH is needed if you want to build openbios-mol.elf # MOLPATH=$(HOME)/mol-0.9.71 -CC := powerpc-linux-gcc -AS := powerpc-linux-as -AR := powerpc-linux-ar -LD := powerpc-linux-ld -NM := powerpc-linux-nm -STRIP := powerpc-linux-strip -RANLIB := powerpc-linux-ranlib +TARGET=powerpc-linux-gnu- +CC := $(TARGET)gcc +AS := $(TARGET)as +AR := $(TARGET)ar +LD := $(TARGET)ld +NM := $(TARGET)nm +STRIP := $(TARGET)strip +RANLIB := $(TARGET)ranlib CFLAGS := -Os -Wall -W -msoft-float -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin-bcopy -fno-builtin-log2 INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include Modified: openbios-devel/kernel/bootstrap.c =================================================================== --- openbios-devel/kernel/bootstrap.c 2008-11-17 19:42:11 UTC (rev 250) +++ openbios-devel/kernel/bootstrap.c 2008-11-24 12:13:40 UTC (rev 251) @@ -47,7 +47,7 @@ static unsigned int cursrc = 0; #ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH -ucell base_address; +unsigned long base_address; #endif /* include path handling */ Modified: openbios-devel/kernel/cross.h =================================================================== --- openbios-devel/kernel/cross.h 2008-11-17 19:42:11 UTC (rev 250) +++ openbios-devel/kernel/cross.h 2008-11-24 12:13:40 UTC (rev 251) @@ -113,7 +113,7 @@ #endif #ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH -extern ucell base_address; +extern unsigned long base_address; #define pointer2cell(x) ((ucell)(((unsigned long)(x))-base_address)) #define cell2pointer(x) ((u8 *)(((unsigned long)(x))+base_address)) #define FMT_CELL_x "x"

1 0

[PATCH][qemu][RFC] Make working IDE on powermac
by Laurent Vivier 24 Nov '08

24 Nov '08

1 0

[PATCH][qemu] Make working ADB
by Laurent Vivier 24 Nov '08

24 Nov '08

1 0

[PATCH][qemu] Add Bochs VBE VGA support
by Laurent Vivier 24 Nov '08

24 Nov '08

1 0

[PATCH][RFC] identify PCI devices
by Laurent Vivier 24 Nov '08

24 Nov '08

Create device tree according found PCI devices. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info>

1 0

[PATCH][qemu] better serial support.
by Laurent Vivier 24 Nov '08

24 Nov '08

Copy serial support from arch/amd64/console.c Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info>

1 0

[PATCH][qemu] Correct powermac nvram access
by Laurent Vivier 24 Nov '08

24 Nov '08

Access to nvram must left shifted by 4. Initialize device tree (used by PCI patch, to follow). Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info>

1 0

[PATCH][qemu] Define ISA io base according machine.
by Laurent Vivier 24 Nov '08

24 Nov '08

Define the ISA io base according machine type. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info>

1 0

[PATCH] Create arch/ppc/qemu
by Laurent Vivier 24 Nov '08

24 Nov '08

Create arch/ppc/qemu by copying arch/ppc/pearpc. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info>

1 0

[PATCH] Move REGISTER_NAMED_NODE and REGISTER_NODE_METHODS
by Laurent Vivier 24 Nov '08

24 Nov '08

This patch moves all definitions of REGISTER_NAMED_NODE and REGISTER_NODE_METHODS to openbios/bindings.h. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info>

1 0

[PATCH] compile cross-ppc target on amd64 host
by Laurent Vivier 24 Nov '08

24 Nov '08

This patch allows me to compile openbios using the cross-pcc target on amd64 host. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info>

1 0

Re: [OpenBIOS] [Qemu-devel] atapi on ppc issue (was Re: qemu-system-ppc broken ?)
by Blue Swirl 17 Nov '08

17 Nov '08

On 11/10/08, François Revol <revol(a)free.fr> wrote: > > >>> Of course it'd be much better to switch to a real OF instead... > > >>> but I don't have the time for that, couldn't find usable OpenBIOS > > >>> images, > > >> > > >> I once tried to get OpenBIOS working but failed, Laurent appeared > > > > to > > >> get some further - any update on that? > > > > > > I tried building it for PPC yesterday, but I only had an powerpc- > > > apple- > > > haiku- gcc around, and it didn't like it... Even after pointing it > > > to > > > find our stdint.h and endian.h > > > > Try a Linux (cross-)compiler, I tried natively on Linux/ppc. > > > I don't have a native linux ppc around... and I was too lazy to build > yet another cross gcc I fixed a lot of accidental uses of system headers in r250. Now I can compile OpenBIOS for Sparc32, Sparc64 and PPC using a cross compiler without local include directory at all (sparc-unknown-elf etc.). I still have to hack around for three assembler files on PPC which won't compile if __linux__ is not defined. Please try again.

1 0

r250 - in openbios-devel: arch/sparc32 arch/sparc64 drivers fs/grubfs include/ppc include/sparc32 include/sparc64
by svn＠openbios.org 17 Nov '08

17 Nov '08

Author: blueswirl Date: 2008-11-17 20:42:11 +0100 (Mon, 17 Nov 2008) New Revision: 250 Modified: openbios-devel/arch/sparc32/builtin.c openbios-devel/arch/sparc32/romvec.c openbios-devel/arch/sparc64/builtin.c openbios-devel/drivers/adb.c openbios-devel/drivers/adb.h openbios-devel/drivers/esp.h openbios-devel/drivers/kbd.c openbios-devel/drivers/kbd.h openbios-devel/drivers/vga_load_regs.c openbios-devel/fs/grubfs/fsys_ext2fs.c openbios-devel/fs/grubfs/fsys_reiserfs.c openbios-devel/fs/grubfs/fsys_ufs.c openbios-devel/include/ppc/types.h openbios-devel/include/sparc32/types.h openbios-devel/include/sparc64/types.h Log: Fix system include file use Modified: openbios-devel/arch/sparc32/builtin.c =================================================================== --- openbios-devel/arch/sparc32/builtin.c 2008-11-16 19:40:16 UTC (rev 249) +++ openbios-devel/arch/sparc32/builtin.c 2008-11-17 19:42:11 UTC (rev 250) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include <asm/types.h> +#include "asm/types.h" #include "sys_info.h" /* Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2008-11-16 19:40:16 UTC (rev 249) +++ openbios-devel/arch/sparc32/romvec.c 2008-11-17 19:42:11 UTC (rev 250) @@ -8,7 +8,6 @@ */ #include "openprom.h" -#include "stdint.h" #include "asm/io.h" #include "asm/types.h" #include "libc/vsprintf.h" Modified: openbios-devel/arch/sparc64/builtin.c =================================================================== --- openbios-devel/arch/sparc64/builtin.c 2008-11-16 19:40:16 UTC (rev 249) +++ openbios-devel/arch/sparc64/builtin.c 2008-11-17 19:42:11 UTC (rev 250) @@ -7,7 +7,7 @@ */ #include "openbios/config.h" -#include <asm/types.h> +#include "asm/types.h" #include "sys_info.h" /* Modified: openbios-devel/drivers/adb.c =================================================================== --- openbios-devel/drivers/adb.c 2008-11-16 19:40:16 UTC (rev 249) +++ openbios-devel/drivers/adb.c 2008-11-17 19:42:11 UTC (rev 250) @@ -23,6 +23,7 @@ #include "openbios/config.h" #include "openbios/bindings.h" +#include "asm/types.h" #include "adb.h" #include "kbd.h" #include "cuda.h" Modified: openbios-devel/drivers/adb.h =================================================================== --- openbios-devel/drivers/adb.h 2008-11-16 19:40:16 UTC (rev 249) +++ openbios-devel/drivers/adb.h 2008-11-17 19:42:11 UTC (rev 250) @@ -20,8 +20,6 @@ #if !defined(__OHW_ADB_H__) #define __OHW_ADB_H__ -#include <stdint.h> - typedef struct adb_bus_t adb_bus_t; typedef struct adb_dev_t adb_dev_t; Modified: openbios-devel/drivers/esp.h =================================================================== --- openbios-devel/drivers/esp.h 2008-11-16 19:40:16 UTC (rev 249) +++ openbios-devel/drivers/esp.h 2008-11-17 19:42:11 UTC (rev 250) @@ -9,7 +9,7 @@ #define _SPARC_ESP_H /* For dvma controller register definitions. */ -#include <asm/dma.h> +#include "asm/dma.h" /* The ESP SCSI controllers have their register sets in three * "classes": Modified: openbios-devel/drivers/kbd.c =================================================================== --- openbios-devel/drivers/kbd.c 2008-11-16 19:40:16 UTC (rev 249) +++ openbios-devel/drivers/kbd.c 2008-11-17 19:42:11 UTC (rev 250) @@ -19,8 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA */ -#include <stdlib.h> -#include <stdio.h> +#include "asm/types.h" #include "kbd.h" //#define DEBUG_KBD Modified: openbios-devel/drivers/kbd.h =================================================================== --- openbios-devel/drivers/kbd.h 2008-11-16 19:40:16 UTC (rev 249) +++ openbios-devel/drivers/kbd.h 2008-11-17 19:42:11 UTC (rev 250) @@ -21,7 +21,6 @@ #if !defined (__OHW_KBD_H__) #define __OHW_KBD_H__ -#include <stdint.h> typedef struct kbd_t kbd_t; typedef struct keymap_t keymap_t; struct kbd_t { Modified: openbios-devel/drivers/vga_load_regs.c =================================================================== --- openbios-devel/drivers/vga_load_regs.c 2008-11-16 19:40:16 UTC (rev 249) +++ openbios-devel/drivers/vga_load_regs.c 2008-11-17 19:42:11 UTC (rev 250) @@ -1,6 +1,5 @@ #include "asm/io.h" #include "video_subr.h" -#include "string.h" #include "vga.h" /* Modified: openbios-devel/fs/grubfs/fsys_ext2fs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_ext2fs.c 2008-11-16 19:40:16 UTC (rev 249) +++ openbios-devel/fs/grubfs/fsys_ext2fs.c 2008-11-17 19:42:11 UTC (rev 250) @@ -22,7 +22,7 @@ #include "openbios/config.h" #include "shared.h" #include "filesys.h" -#include <libc/byteorder.h> +#include "libc/byteorder.h" #ifdef CONFIG_DEBUG_EXT2FS #define E2DEBUG Modified: openbios-devel/fs/grubfs/fsys_reiserfs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_reiserfs.c 2008-11-16 19:40:16 UTC (rev 249) +++ openbios-devel/fs/grubfs/fsys_reiserfs.c 2008-11-17 19:42:11 UTC (rev 250) @@ -40,7 +40,7 @@ /* linux/posix_type.h */ typedef long linux_off_t; -#include <libc/byteorder.h> +#include "libc/byteorder.h" /* include/linux/reiser_fs.h */ /* This is the new super block of a journaling reiserfs system */ Modified: openbios-devel/fs/grubfs/fsys_ufs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_ufs.c 2008-11-16 19:40:16 UTC (rev 249) +++ openbios-devel/fs/grubfs/fsys_ufs.c 2008-11-17 19:42:11 UTC (rev 250) @@ -53,7 +53,7 @@ */ #ifdef FSYS_UFS -#include <stdint.h> +#include "asm/types.h" #include "shared.h" #include "filesys.h" Modified: openbios-devel/include/ppc/types.h =================================================================== --- openbios-devel/include/ppc/types.h 2008-11-16 19:40:16 UTC (rev 249) +++ openbios-devel/include/ppc/types.h 2008-11-17 19:42:11 UTC (rev 250) @@ -11,30 +11,22 @@ #include "mconfig.h" -#ifndef __APPLE__ +#ifdef BOOTSTRAP #include <stdint.h> #else -/* Mac OS X */ -typedef char int8_t; -typedef unsigned char uint8_t; -typedef unsigned char u_int8_t; -typedef short int16_t; -typedef unsigned short uint16_t; -typedef unsigned short u_int16_t; -typedef int int32_t; -typedef unsigned int uint32_t; -typedef unsigned int u_int32_t; -typedef long long int64_t; +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; typedef unsigned long long uint64_t; -typedef unsigned long long u_int64_t; + +typedef signed char int8_t; +typedef short int16_t; +typedef int int32_t; +typedef long long int64_t; #endif /* endianess */ -#ifdef HAVE_ENDIAN_H -#include <endian.h> -#else -#include <machine/endian.h> -#endif +#include "autoconf.h" /* cell based types */ Modified: openbios-devel/include/sparc32/types.h =================================================================== --- openbios-devel/include/sparc32/types.h 2008-11-16 19:40:16 UTC (rev 249) +++ openbios-devel/include/sparc32/types.h 2008-11-17 19:42:11 UTC (rev 250) @@ -11,8 +11,20 @@ #include "mconfig.h" +#ifdef BOOTSTRAP #include <stdint.h> +#else +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +typedef unsigned long long uint64_t; +typedef signed char int8_t; +typedef short int16_t; +typedef int int32_t; +typedef long long int64_t; +#endif + /* endianess */ #include "autoconf.h" Modified: openbios-devel/include/sparc64/types.h =================================================================== --- openbios-devel/include/sparc64/types.h 2008-11-16 19:40:16 UTC (rev 249) +++ openbios-devel/include/sparc64/types.h 2008-11-17 19:42:11 UTC (rev 250) @@ -11,23 +11,39 @@ #include "mconfig.h" +#ifdef BOOTSTRAP #include <stdint.h> +#else +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +typedef unsigned long long uint64_t; +typedef signed char int8_t; +typedef short int16_t; +typedef int int32_t; +typedef long long int64_t; +#endif + +/* endianess */ +#include "autoconf.h" + +/* cell based types */ +typedef int64_t cell; +typedef uint64_t ucell; + #ifdef NEED_FAKE_INT128_T typedef struct { uint64_t hi; uint64_t lo; } blob_128_t; -typedef blob_128_t __int128_t; -typedef blob_128_t __uint128_t; -#endif - -/* cell based types */ -typedef int64_t cell; -typedef uint64_t ucell; +typedef blob_128_t dcell; +typedef blob_128_t ducell; +#else typedef __int128_t dcell; typedef __uint128_t ducell; +#endif #define bitspercell (sizeof(cell)<<3) #define bitsperdcell (sizeof(dcell)<<3) @@ -39,11 +55,11 @@ typedef unsigned char u8; typedef unsigned short u16; typedef unsigned int u32; -typedef unsigned long u64; +typedef unsigned long long u64; typedef signed char s8; typedef short s16; typedef int s32; -typedef long s64; +typedef long long s64; #endif

1 0

Re: [OpenBIOS] [Qemu-devel] atapi on ppc issue (was Re: qemu-system-ppc broken ?)
by Blue Swirl 16 Nov '08

16 Nov '08

On 11/10/08, François Revol <revol(a)free.fr> wrote: > > >>> Of course it'd be much better to switch to a real OF instead... > > >>> but I don't have the time for that, couldn't find usable OpenBIOS > > >>> images, > > >> > > >> I once tried to get OpenBIOS working but failed, Laurent appeared > > > > to > > >> get some further - any update on that? > > > > > > I tried building it for PPC yesterday, but I only had an powerpc- > > > apple- > > > haiku- gcc around, and it didn't like it... Even after pointing it > > > to > > > find our stdint.h and endian.h > > > > Try a Linux (cross-)compiler, I tried natively on Linux/ppc. > > > I don't have a native linux ppc around... and I was too lazy to build > yet another cross gcc > > > > > (WTF does it need OS headers to build a > > > BIOS ???). > > > > It also builds a version you can execute from the shell. > > > Hmm right, specifically for a "cross-ppc" named target, really logical > :) Fixed in r249.

1 0

r249 - openbios-devel/config/examples
by svn＠openbios.org 16 Nov '08

16 Nov '08

Author: blueswirl Date: 2008-11-16 20:40:16 +0100 (Sun, 16 Nov 2008) New Revision: 249 Added: openbios-devel/config/examples/ppc_config.xml Modified: openbios-devel/config/examples/cross-ppc_config.xml Log: PPC: Do not make a UNIX target when cross compiling, add native config Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2008-11-09 19:15:08 UTC (rev 248) +++ openbios-devel/config/examples/cross-ppc_config.xml 2008-11-16 19:40:16 UTC (rev 249) @@ -10,7 +10,7 @@ <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/>  - <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> + <option name="CONFIG_HOST_UNIX" type="boolean" value="false"/> <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> <option name="CONFIG_PLUGINS" type="boolean" value="false"/> Added: openbios-devel/config/examples/ppc_config.xml =================================================================== --- openbios-devel/config/examples/ppc_config.xml (rev 0) +++ openbios-devel/config/examples/ppc_config.xml 2008-11-16 19:40:16 UTC (rev 249) @@ -0,0 +1,71 @@ +<?xml version="1.0"?> +<config> + +  +  + <option name="CONFIG_PPC" type="boolean" value="true"/> +  +  + <option name="CONFIG_PEARPC" type="boolean" value="true"/> + <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/> + +  + <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> + <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> + <option name="CONFIG_PLUGINS" type="boolean" value="false"/> + +  + <option name="CONFIG_DEBUG" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_DSTACK" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_RSTACK" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_DICTIONARY" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_INTERNAL" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_INTERPRETER" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/> + <option name="CONFIG_SERIAL_PORT" type="boolean" value="true"/> + <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> + <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> + + +  + <option name="CONFIG_CMDLINE" type="boolean" value="true"/> + <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> + + +  + <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> + <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> + <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> + <option name="CONFIG_FS" type="boolean" value="true"/> + <option name="CONFIG_HFS" type="boolean" value="false"/> + <option name="CONFIG_HFSP" type="boolean" value="true"/> + <option name="CONFIG_GRUBFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> + <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> + <option name="CONFIG_FSYS_REISERFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_UFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_ISO9660" type="boolean" value="false"/> + <option name="CONFIG_FSYS_FFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_FS" type="boolean" value="true"/> + +  + <option name="CONFIG_LINUXBIOS" type="boolean" value="true"/> + +  + <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> + <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> + <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> + <option name="CONFIG_DRIVER_ADB" type="boolean" value="true"/> + +</config> +

1 0

Re: [OpenBIOS] [Qemu-devel] atapi on ppc issue (was Re: qemu-system-ppc broken ?)
by Blue Swirl 11 Nov '08

11 Nov '08

Cross-posted to OpenBIOS list. On 11/10/08, François Revol <revol(a)free.fr> wrote: > > >>> Of course it'd be much better to switch to a real OF instead... > > >>> but I don't have the time for that, couldn't find usable OpenBIOS > > >>> images, > > >> > > >> I once tried to get OpenBIOS working but failed, Laurent appeared > > > > to > > >> get some further - any update on that? > > > > > > I tried building it for PPC yesterday, but I only had an powerpc- > > > apple- > > > haiku- gcc around, and it didn't like it... Even after pointing it > > > to > > > find our stdint.h and endian.h > > > > Try a Linux (cross-)compiler, I tried natively on Linux/ppc. > > > I don't have a native linux ppc around... and I was too lazy to build > yet another cross gcc > > > > > (WTF does it need OS headers to build a > > > BIOS ???). > > > > It also builds a version you can execute from the shell. > > > Hmm right, specifically for a "cross-ppc" named target, really logical > :) I see, Unix version is incorrectly enabled. Should be easy to fix.

1 0

Re: [OpenBIOS] [Qemu-devel] atapi on ppc issue (was Re: qemu-system-ppc broken ?)
by Blue Swirl 11 Nov '08

11 Nov '08

Crossposted to OpenBIOS and Coreboot lists. On 11/10/08, François Revol <revol(a)free.fr> wrote: > > > The attached patch makes OpenHackware happy again. > > > At least qemu-system-ppc can now start debian iso, and mine as well > > [...] > > > OpenHackware should be fixed instead, but it seems the binary in > > > svn > > > has been updated after the last sources I found > > [...] > > > Seems the last update was already about ATAPI... > > > Anyone has the latest source used ? > > > I could at least fix it to check for bits on errors... > > > > Rene Rebe recently posted some diff against qemu's OHW diff, but it > > appeared to be whitespace-damaged. > > > Ohhh, I didn't even notice ohw.diff in pc-bios/ despite looking for > one! > I'll try to dig that one on gmane.org. > > I just hope it's easier to build than OpenBIOS... > > > > > Of course it'd be much better to switch to a real OF instead... > > > but I don't have the time for that, couldn't find usable OpenBIOS > > > images, > > > > I once tried to get OpenBIOS working but failed, Laurent appeared to > > get some further - any update on that? > > > I tried building it for PPC yesterday, but I only had an powerpc-apple- > haiku- gcc around, and it didn't like it... Even after pointing it to > find our stdint.h and endian.h (WTF does it need OS headers to build a > BIOS ???). > It seems to be doing nasty things with m4 macros on C headers, really > ugly. The M4 macro nastiness seems to be limited to the asm files only and even then the macros are not used. It should be possible to remove the macros with little effort. Maybe they are a leftover from something earlier? > > > and it see[m]s CoreBoot v2 and v3 don't support ppc yet. > > > > I believe CoreBoot is unrelated to ppc, it replaces the x86 BIOS. It > > does allow to use OpenBIOS (Open Firmware) as payload but not the > > other direction - Blue Swirl used some assembler wizardry to > > bootstrap > > the sparc OpenBIOS. > > > CoreBoot actually supports more arch than just x86: > http://www.coreboot.org/Supported_Chipsets_and_Devices > > But only v1 seemed to have ppc support. Perhaps PPC support can be revived?

1 0

r248 - openbios-devel/include
by svn＠openbios.org 09 Nov '08

09 Nov '08

Author: blueswirl Date: 2008-11-09 20:15:08 +0100 (Sun, 09 Nov 2008) New Revision: 248 Modified: openbios-devel/include/a.out.h Log: Avoid including system <asm/page.h>, based on patch by Aurelien Jarno Modified: openbios-devel/include/a.out.h =================================================================== --- openbios-devel/include/a.out.h 2008-11-08 13:26:37 UTC (rev 247) +++ openbios-devel/include/a.out.h 2008-11-09 19:15:08 UTC (rev 248) @@ -128,9 +128,10 @@ #endif #ifdef linux -#include <asm/page.h> #if defined(__i386__) || defined(__mc68000__) #define SEGMENT_SIZE 1024 +#elif defined(__sparc__) +#define SEGMENT_SIZE 4096 #else #ifndef SEGMENT_SIZE #define SEGMENT_SIZE PAGE_SIZE

1 0

[PATCH] Avoid including <asm/page.h>
by Aurelien Jarno 09 Nov '08

09 Nov '08

Hi, openbios fails to build on sparc with recent kernel headers as <asm/page.h> has been removed. The following patch defines SEGMENT_SIZE instead of including <asm/page.h>. Aurelien Index: include/a.out.h =================================================================== --- include/a.out.h (révision 245) +++ include/a.out.h (copie de travail) @@ -128,10 +128,12 @@ #endif #ifdef linux -#include <asm/page.h> #if defined(__i386__) || defined(__mc68000__) #define SEGMENT_SIZE 1024 +#elif defined(__sparc__) +#define SEGMENT_SIZE 4096 #else +#include <asm/page.h> #ifndef SEGMENT_SIZE #define SEGMENT_SIZE PAGE_SIZE #endif -- .''`. 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

r247 - openbios-devel/arch/sparc32
by svn＠openbios.org 08 Nov '08

08 Nov '08

Author: blueswirl Date: 2008-11-08 14:26:37 +0100 (Sat, 08 Nov 2008) New Revision: 247 Modified: openbios-devel/arch/sparc32/boot.c Log: Partially revert r244, breaks disk boot Modified: openbios-devel/arch/sparc32/boot.c =================================================================== --- openbios-devel/arch/sparc32/boot.c 2008-11-08 09:10:52 UTC (rev 246) +++ openbios-devel/arch/sparc32/boot.c 2008-11-08 13:26:37 UTC (rev 247) @@ -41,12 +41,12 @@ oldpath = "fd()"; break; case 'c': - path = strdup("disk:d"); + path = strdup("disk"); oldpath = "sd(0,0,0):d"; break; default: case 'd': - path = strdup("cdrom:b"); + path = strdup("cdrom"); // FIXME: hardcoding this looks almost definitely wrong. // With sd(0,2,0):b we get to see the solaris kernel though //oldpath = "sd(0,2,0):d";

1 0

r246 - in openbios-devel: arch/sparc32 include/sparc32 kernel
by svn＠openbios.org 08 Nov '08

08 Nov '08

Author: blueswirl Date: 2008-11-08 10:10:52 +0100 (Sat, 08 Nov 2008) New Revision: 246 Added: openbios-devel/include/sparc32/asi.h Removed: openbios-devel/arch/sparc32/asi.h Modified: openbios-devel/arch/sparc32/entry.S openbios-devel/arch/sparc32/switch.S openbios-devel/arch/sparc32/vectors.S openbios-devel/kernel/bootstrap.c Log: Fix compilation on OpenBSD: avoid accidental system include file use Deleted: openbios-devel/arch/sparc32/asi.h =================================================================== --- openbios-devel/arch/sparc32/asi.h 2008-11-05 15:52:59 UTC (rev 245) +++ openbios-devel/arch/sparc32/asi.h 2008-11-08 09:10:52 UTC (rev 246) @@ -1,111 +0,0 @@ -/* $Id: asi.h,v 1.1 2002/07/12 17:06:36 zaitcev Exp $ */ -#ifndef _SPARC_ASI_H -#define _SPARC_ASI_H - -/* asi.h: Address Space Identifier values for the sparc. - * - * Copyright (C) 1995 David S. Miller (davem(a)caip.rutgers.edu) - * - * Pioneer work for sun4m: Paul Hatchman (paul(a)sfe.com.au) - * Joint edition for sun4c+sun4m: Pete A. Zaitcev <zaitcev(a)ipmce.su> - */ - -/* The first batch are for the sun4c. */ - -#define ASI_NULL1 0x00 -#define ASI_NULL2 0x01 - -/* sun4c and sun4 control registers and mmu/vac ops */ -#define ASI_CONTROL 0x02 -#define ASI_SEGMAP 0x03 -#define ASI_PTE 0x04 -#define ASI_HWFLUSHSEG 0x05 -#define ASI_HWFLUSHPAGE 0x06 -#define ASI_REGMAP 0x06 -#define ASI_HWFLUSHCONTEXT 0x07 - -#define ASI_USERTXT 0x08 -#define ASI_KERNELTXT 0x09 -#define ASI_USERDATA 0x0a -#define ASI_KERNELDATA 0x0b - -/* VAC Cache flushing on sun4c and sun4 */ -#define ASI_FLUSHSEG 0x0c -#define ASI_FLUSHPG 0x0d -#define ASI_FLUSHCTX 0x0e - -/* SPARCstation-5: only 6 bits are decoded. */ -/* wo = Write Only, rw = Read Write; */ -/* ss = Single Size, as = All Sizes; */ -#define ASI_M_RES00 0x00 /* Don't touch... */ -#define ASI_M_UNA01 0x01 /* Same here... */ -#define ASI_M_MXCC 0x02 /* Access to TI VIKING MXCC registers */ -#define ASI_M_FLUSH_PROBE 0x03 /* Reference MMU Flush/Probe; rw, ss */ -#define ASI_M_MMUREGS 0x04 /* MMU Registers; rw, ss */ -#define ASI_M_TLBDIAG 0x05 /* MMU TLB only Diagnostics */ -#define ASI_M_DIAGS 0x06 /* Reference MMU Diagnostics */ -#define ASI_M_IODIAG 0x07 /* MMU I/O TLB only Diagnostics */ -#define ASI_M_USERTXT 0x08 /* Same as ASI_USERTXT; rw, as */ -#define ASI_M_KERNELTXT 0x09 /* Same as ASI_KERNELTXT; rw, as */ -#define ASI_M_USERDATA 0x0A /* Same as ASI_USERDATA; rw, as */ -#define ASI_M_KERNELDATA 0x0B /* Same as ASI_KERNELDATA; rw, as */ -#define ASI_M_TXTC_TAG 0x0C /* Instruction Cache Tag; rw, ss */ -#define ASI_M_TXTC_DATA 0x0D /* Instruction Cache Data; rw, ss */ -#define ASI_M_DATAC_TAG 0x0E /* Data Cache Tag; rw, ss */ -#define ASI_M_DATAC_DATA 0x0F /* Data Cache Data; rw, ss */ - -/* The following cache flushing ASIs work only with the 'sta' - * instruction. Results are unpredictable for 'swap' and 'ldstuba', - * so don't do it. - */ - -/* These ASI flushes affect external caches too. */ -#define ASI_M_FLUSH_PAGE 0x10 /* Flush I&D Cache Line (page); wo, ss */ -#define ASI_M_FLUSH_SEG 0x11 /* Flush I&D Cache Line (seg); wo, ss */ -#define ASI_M_FLUSH_REGION 0x12 /* Flush I&D Cache Line (region); wo, ss */ -#define ASI_M_FLUSH_CTX 0x13 /* Flush I&D Cache Line (context); wo, ss */ -#define ASI_M_FLUSH_USER 0x14 /* Flush I&D Cache Line (user); wo, ss */ - -/* Block-copy operations are available only on certain V8 cpus. */ -#define ASI_M_BCOPY 0x17 /* Block copy */ - -/* These affect only the ICACHE and are Ross HyperSparc and TurboSparc specific. */ -#define ASI_M_IFLUSH_PAGE 0x18 /* Flush I Cache Line (page); wo, ss */ -#define ASI_M_IFLUSH_SEG 0x19 /* Flush I Cache Line (seg); wo, ss */ -#define ASI_M_IFLUSH_REGION 0x1A /* Flush I Cache Line (region); wo, ss */ -#define ASI_M_IFLUSH_CTX 0x1B /* Flush I Cache Line (context); wo, ss */ -#define ASI_M_IFLUSH_USER 0x1C /* Flush I Cache Line (user); wo, ss */ - -/* Block-fill operations are available on certain V8 cpus */ -#define ASI_M_BFILL 0x1F - -/* This allows direct access to main memory, actually 0x20 to 0x2f are - * the available ASI's for physical ram pass-through, but I don't have - * any idea what the other ones do.... - */ - -#define ASI_M_BYPASS 0x20 /* Reference MMU bypass; rw, as */ -#define ASI_M_FBMEM 0x29 /* Graphics card frame buffer access */ -#define ASI_M_VMEUS 0x2A /* VME user 16-bit access */ -#define ASI_M_VMEPS 0x2B /* VME priv 16-bit access */ -#define ASI_M_VMEUT 0x2C /* VME user 32-bit access */ -#define ASI_M_VMEPT 0x2D /* VME priv 32-bit access */ -#define ASI_M_SBUS 0x2E /* Direct SBus access */ -#define ASI_M_CTL 0x2F /* Control Space (ECC and MXCC are here) */ - - -/* This is ROSS HyperSparc only. */ -#define ASI_M_FLUSH_IWHOLE 0x31 /* Flush entire ICACHE; wo, ss */ - -/* Tsunami/Viking/TurboSparc i/d cache flash clear. */ -#define ASI_M_IC_FLCLEAR 0x36 -#define ASI_M_DC_FLCLEAR 0x37 - -#define ASI_M_DCDR 0x39 /* Data Cache Diagnostics Register rw, ss */ - -#define ASI_M_VIKING_TMP1 0x40 /* Emulation temporary 1 on Viking */ -#define ASI_M_VIKING_TMP2 0x41 /* Emulation temporary 2 on Viking */ - -#define ASI_M_ACTION 0x4c /* Breakpoint Action Register (GNU/Viking) */ - -#endif /* _SPARC_ASI_H */ Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2008-11-05 15:52:59 UTC (rev 245) +++ openbios-devel/arch/sparc32/entry.S 2008-11-08 09:10:52 UTC (rev 246) @@ -8,7 +8,7 @@ */ #include "psr.h" -#include "asi.h" +#include "asm/asi.h" #include "asm/crs.h" #define __ASSEMBLY__ #include "openbios/firmware_abi.h" Modified: openbios-devel/arch/sparc32/switch.S =================================================================== --- openbios-devel/arch/sparc32/switch.S 2008-11-05 15:52:59 UTC (rev 245) +++ openbios-devel/arch/sparc32/switch.S 2008-11-08 09:10:52 UTC (rev 246) @@ -1,5 +1,5 @@ #include "psr.h" -#include "asi.h" +#include "asm/asi.h" #define ASI_BP ASI_M_BYPASS #define REGWIN_SZ 0x40 Modified: openbios-devel/arch/sparc32/vectors.S =================================================================== --- openbios-devel/arch/sparc32/vectors.S 2008-11-05 15:52:59 UTC (rev 245) +++ openbios-devel/arch/sparc32/vectors.S 2008-11-08 09:10:52 UTC (rev 246) @@ -25,7 +25,7 @@ #define __ASSEMBLY #include "psr.h" -#include "asi.h" +#include "asm/asi.h" #define SER_ADDR5 0x71100004 #define SER_ADDR10 0xf1100004 Copied: openbios-devel/include/sparc32/asi.h (from rev 245, openbios-devel/arch/sparc32/asi.h) =================================================================== --- openbios-devel/include/sparc32/asi.h (rev 0) +++ openbios-devel/include/sparc32/asi.h 2008-11-08 09:10:52 UTC (rev 246) @@ -0,0 +1,111 @@ +/* $Id: asi.h,v 1.1 2002/07/12 17:06:36 zaitcev Exp $ */ +#ifndef _SPARC_ASI_H +#define _SPARC_ASI_H + +/* asi.h: Address Space Identifier values for the sparc. + * + * Copyright (C) 1995 David S. Miller (davem(a)caip.rutgers.edu) + * + * Pioneer work for sun4m: Paul Hatchman (paul(a)sfe.com.au) + * Joint edition for sun4c+sun4m: Pete A. Zaitcev <zaitcev(a)ipmce.su> + */ + +/* The first batch are for the sun4c. */ + +#define ASI_NULL1 0x00 +#define ASI_NULL2 0x01 + +/* sun4c and sun4 control registers and mmu/vac ops */ +#define ASI_CONTROL 0x02 +#define ASI_SEGMAP 0x03 +#define ASI_PTE 0x04 +#define ASI_HWFLUSHSEG 0x05 +#define ASI_HWFLUSHPAGE 0x06 +#define ASI_REGMAP 0x06 +#define ASI_HWFLUSHCONTEXT 0x07 + +#define ASI_USERTXT 0x08 +#define ASI_KERNELTXT 0x09 +#define ASI_USERDATA 0x0a +#define ASI_KERNELDATA 0x0b + +/* VAC Cache flushing on sun4c and sun4 */ +#define ASI_FLUSHSEG 0x0c +#define ASI_FLUSHPG 0x0d +#define ASI_FLUSHCTX 0x0e + +/* SPARCstation-5: only 6 bits are decoded. */ +/* wo = Write Only, rw = Read Write; */ +/* ss = Single Size, as = All Sizes; */ +#define ASI_M_RES00 0x00 /* Don't touch... */ +#define ASI_M_UNA01 0x01 /* Same here... */ +#define ASI_M_MXCC 0x02 /* Access to TI VIKING MXCC registers */ +#define ASI_M_FLUSH_PROBE 0x03 /* Reference MMU Flush/Probe; rw, ss */ +#define ASI_M_MMUREGS 0x04 /* MMU Registers; rw, ss */ +#define ASI_M_TLBDIAG 0x05 /* MMU TLB only Diagnostics */ +#define ASI_M_DIAGS 0x06 /* Reference MMU Diagnostics */ +#define ASI_M_IODIAG 0x07 /* MMU I/O TLB only Diagnostics */ +#define ASI_M_USERTXT 0x08 /* Same as ASI_USERTXT; rw, as */ +#define ASI_M_KERNELTXT 0x09 /* Same as ASI_KERNELTXT; rw, as */ +#define ASI_M_USERDATA 0x0A /* Same as ASI_USERDATA; rw, as */ +#define ASI_M_KERNELDATA 0x0B /* Same as ASI_KERNELDATA; rw, as */ +#define ASI_M_TXTC_TAG 0x0C /* Instruction Cache Tag; rw, ss */ +#define ASI_M_TXTC_DATA 0x0D /* Instruction Cache Data; rw, ss */ +#define ASI_M_DATAC_TAG 0x0E /* Data Cache Tag; rw, ss */ +#define ASI_M_DATAC_DATA 0x0F /* Data Cache Data; rw, ss */ + +/* The following cache flushing ASIs work only with the 'sta' + * instruction. Results are unpredictable for 'swap' and 'ldstuba', + * so don't do it. + */ + +/* These ASI flushes affect external caches too. */ +#define ASI_M_FLUSH_PAGE 0x10 /* Flush I&D Cache Line (page); wo, ss */ +#define ASI_M_FLUSH_SEG 0x11 /* Flush I&D Cache Line (seg); wo, ss */ +#define ASI_M_FLUSH_REGION 0x12 /* Flush I&D Cache Line (region); wo, ss */ +#define ASI_M_FLUSH_CTX 0x13 /* Flush I&D Cache Line (context); wo, ss */ +#define ASI_M_FLUSH_USER 0x14 /* Flush I&D Cache Line (user); wo, ss */ + +/* Block-copy operations are available only on certain V8 cpus. */ +#define ASI_M_BCOPY 0x17 /* Block copy */ + +/* These affect only the ICACHE and are Ross HyperSparc and TurboSparc specific. */ +#define ASI_M_IFLUSH_PAGE 0x18 /* Flush I Cache Line (page); wo, ss */ +#define ASI_M_IFLUSH_SEG 0x19 /* Flush I Cache Line (seg); wo, ss */ +#define ASI_M_IFLUSH_REGION 0x1A /* Flush I Cache Line (region); wo, ss */ +#define ASI_M_IFLUSH_CTX 0x1B /* Flush I Cache Line (context); wo, ss */ +#define ASI_M_IFLUSH_USER 0x1C /* Flush I Cache Line (user); wo, ss */ + +/* Block-fill operations are available on certain V8 cpus */ +#define ASI_M_BFILL 0x1F + +/* This allows direct access to main memory, actually 0x20 to 0x2f are + * the available ASI's for physical ram pass-through, but I don't have + * any idea what the other ones do.... + */ + +#define ASI_M_BYPASS 0x20 /* Reference MMU bypass; rw, as */ +#define ASI_M_FBMEM 0x29 /* Graphics card frame buffer access */ +#define ASI_M_VMEUS 0x2A /* VME user 16-bit access */ +#define ASI_M_VMEPS 0x2B /* VME priv 16-bit access */ +#define ASI_M_VMEUT 0x2C /* VME user 32-bit access */ +#define ASI_M_VMEPT 0x2D /* VME priv 32-bit access */ +#define ASI_M_SBUS 0x2E /* Direct SBus access */ +#define ASI_M_CTL 0x2F /* Control Space (ECC and MXCC are here) */ + + +/* This is ROSS HyperSparc only. */ +#define ASI_M_FLUSH_IWHOLE 0x31 /* Flush entire ICACHE; wo, ss */ + +/* Tsunami/Viking/TurboSparc i/d cache flash clear. */ +#define ASI_M_IC_FLCLEAR 0x36 +#define ASI_M_DC_FLCLEAR 0x37 + +#define ASI_M_DCDR 0x39 /* Data Cache Diagnostics Register rw, ss */ + +#define ASI_M_VIKING_TMP1 0x40 /* Emulation temporary 1 on Viking */ +#define ASI_M_VIKING_TMP2 0x41 /* Emulation temporary 2 on Viking */ + +#define ASI_M_ACTION 0x4c /* Breakpoint Action Register (GNU/Viking) */ + +#endif /* _SPARC_ASI_H */ Modified: openbios-devel/kernel/bootstrap.c =================================================================== --- openbios-devel/kernel/bootstrap.c 2008-11-05 15:52:59 UTC (rev 245) +++ openbios-devel/kernel/bootstrap.c 2008-11-08 09:10:52 UTC (rev 246) @@ -177,6 +177,9 @@ .relocation = -1, .length = target_ulong(dicthead), .last = target_ucell(((unsigned long)last-(unsigned long)dict)), + .reserved[0] = 0, + .reserved[1] = 0, + .reserved[2] = 0, }; /*

1 0

Unable to compile sparc32 version of openbios with gcc 4.x
by Aurelien Jarno 05 Nov '08

05 Nov '08

Hi, I am unable to compile openbios for sparc32 (on a sparc64 host) using gcc 4.x (tested with 4.0, 4.2 and 4.3), it looks like it does not like the TI mode and the __uint128_t type: | libgcc/libgcc.h:14: error: unable to emulate ‘TI’ | libgcc/libgcc.h:18: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘__udivmodti4’ | libgcc/libgcc.h:22: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘__divti3’ | libgcc/libgcc.h:23: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘__udivti3’ | libgcc/libgcc.h:26: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘__umodti3’ Anyone as an idea of a fix? Thanks, Aurelien -- .''`. 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 2

r245 - openbios-devel/libgcc
by svn＠openbios.org 05 Nov '08

05 Nov '08

Author: blueswirl Date: 2008-11-05 16:52:59 +0100 (Wed, 05 Nov 2008) New Revision: 245 Modified: openbios-devel/libgcc/libgcc.h Log: TImode confuses GCC 4.x on Sparc32, so use them only on Sparc64 Modified: openbios-devel/libgcc/libgcc.h =================================================================== --- openbios-devel/libgcc/libgcc.h 2008-11-02 19:25:05 UTC (rev 244) +++ openbios-devel/libgcc/libgcc.h 2008-11-05 15:52:59 UTC (rev 245) @@ -11,27 +11,33 @@ typedef unsigned int USItype __attribute__ ((mode (SI))); typedef int DItype __attribute__ ((mode (DI))); typedef unsigned int UDItype __attribute__ ((mode (DI))); -typedef int TItype __attribute__ ((mode (TI))); typedef int word_type __attribute__ ((mode (__word__))); uint64_t __udivmoddi4(uint64_t num, uint64_t den, uint64_t *rem); -__uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem); int64_t __divdi3(int64_t num, int64_t den); uint64_t __udivdi3(uint64_t num, uint64_t den); -__int128_t __divti3(__int128_t num, __int128_t den); -__uint128_t __udivti3(__uint128_t num, __uint128_t den); uint64_t __umoddi3(uint64_t num, uint64_t den); -__uint128_t __umodti3(__uint128_t num, __uint128_t den); DItype __ashldi3 (DItype u, word_type b); DItype __lshrdi3 (DItype u, word_type b); DItype __ashrdi3 (DItype u, word_type b); -TItype __multi3 (TItype u, TItype v); - // Must be implemented outside: void __divide_error(void); +#ifdef __arch64__ +typedef int TItype __attribute__ ((mode (TI))); + +__uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem); + +__int128_t __divti3(__int128_t num, __int128_t den); +__uint128_t __udivti3(__uint128_t num, __uint128_t den); + +__uint128_t __umodti3(__uint128_t num, __uint128_t den); + +TItype __multi3 (TItype u, TItype v); +#endif + #endif /* _LIBGCC_H */

1 0

OpenBIOS as an intermediate loader
by Mark Morgan Lloyd 03 Nov '08

03 Nov '08

Please excuse the stupid question, but is it possible- or even remotely feasible- to load OpenBIOS from disc in lieu of an operating system kernel? I use a number of architectures here including PCs and Sun systems. Recently I got my hands on some ARM boards which are flashed for CE but should also in principle be able to run Linux. Now these CE boards boot in a very PC-like fashion, so I presume they have something similar to a PC BIOS in Flash. If it were possible to load a variant of OpenBIOS as an intermediate loader then it should be possible to use that to load Linux, this approach would also be valuable for engineering purposes on both PCs and other systems which did not have OpenBIOS in Flash. -- Mark Morgan Lloyd markMLl .AT. telemetry.co .DOT. uk [Opinions above are the author's, not those of his employers or colleagues]

5 7

r244 - openbios-devel/arch/sparc32
by svn＠openbios.org 02 Nov '08

02 Nov '08

Author: blueswirl Date: 2008-11-02 20:25:05 +0100 (Sun, 02 Nov 2008) New Revision: 244 Modified: openbios-devel/arch/sparc32/boot.c openbios-devel/arch/sparc32/boot.h openbios-devel/arch/sparc32/romvec.c Log: Fix OpenBSD >4.2 crash when printing out bootpath Modified: openbios-devel/arch/sparc32/boot.c =================================================================== --- openbios-devel/arch/sparc32/boot.c 2008-09-29 17:20:02 UTC (rev 243) +++ openbios-devel/arch/sparc32/boot.c 2008-11-02 19:25:05 UTC (rev 244) @@ -41,12 +41,12 @@ oldpath = "fd()"; break; case 'c': - path = strdup("disk"); + path = strdup("disk:d"); oldpath = "sd(0,0,0):d"; break; default: case 'd': - path = strdup("cdrom"); + path = strdup("cdrom:b"); // FIXME: hardcoding this looks almost definitely wrong. // With sd(0,2,0):b we get to see the solaris kernel though //oldpath = "sd(0,2,0):d"; @@ -86,7 +86,7 @@ obp_arg.argv[1] = param; } - romvec = init_openprom(qemu_mem_size); + romvec = init_openprom(qemu_mem_size, path); if (kernel_size) { int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); Modified: openbios-devel/arch/sparc32/boot.h =================================================================== --- openbios-devel/arch/sparc32/boot.h 2008-09-29 17:20:02 UTC (rev 243) +++ openbios-devel/arch/sparc32/boot.h 2008-11-02 19:25:05 UTC (rev 244) @@ -16,7 +16,7 @@ unsigned int start_elf(unsigned long entry_point, unsigned long param); -void *init_openprom(unsigned long memsize); +void *init_openprom(unsigned long memsize, const char *path); void boot(void); extern struct sys_info sys_info; Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2008-09-29 17:20:02 UTC (rev 243) +++ openbios-devel/arch/sparc32/romvec.c 2008-11-02 19:25:05 UTC (rev 244) @@ -50,6 +50,7 @@ static int obp_devseek(int dev_desc, int hi, int lo); struct linux_arguments_v0 obp_arg; +static const char *bootpath; static const struct linux_arguments_v0 * const obp_argp = &obp_arg; static void (*sync_hook)(void); @@ -507,7 +508,7 @@ } void * -init_openprom(unsigned long memsize) +init_openprom(unsigned long memsize, const char *path) { ptphys = totphys; ptmap = totmap; @@ -564,7 +565,12 @@ romvec0.pv_v2devops.v2_dev_read = obp_devread; romvec0.pv_v2devops.v2_dev_write = obp_devwrite; romvec0.pv_v2devops.v2_dev_seek = obp_devseek; - romvec0.pv_v2bootargs.bootpath = &obp_arg.argv[0]; + + push_str(path); + fword("pathres-resolve-aliases"); + bootpath = pop_fstr_copy(); + romvec0.pv_v2bootargs.bootpath = &bootpath; + romvec0.pv_v2bootargs.bootargs = &obp_arg.argv[1]; romvec0.pv_v2bootargs.fd_stdin = &obp_fd_stdin; romvec0.pv_v2bootargs.fd_stdout = &obp_fd_stdout;

1 0

Open-Bios on a compaq R4000?
by Spencer Hall 27 Oct '08

27 Oct '08

Hello, I have a compaq R4125CA with an AMD 3800+ CPU on socket 939. I would like to put in an AMD 4000 X2, but unfortuantely there is no bios support to activate the second core. I have read of other people putting a dual core processor in this same model and having it operate with just one core. Does anyone know what the possability of getting open-bios running on this system would be and activating the second core that way? Also, would it be possible to write a hook or patch the existing compaq bios to activate the second core? Maybe some code executed pre OS boot, like in the boot loader? I'm not sure how involved it would be to activate the second core, if tables must be set or just registers set, etc? I've been toying with this notion for awhile and have recieved some discouraging comments of the laptops ability to handle the heat dissipation, but I think it can handle it witha few updates to the thermal module and some high quality thermal paste. I'm not too concerned about battery life. Thanks, Spencer

1 0

OpenBIOS to replace outdated laptop bios
by J.P. Trosclair 15 Oct '08

15 Oct '08

Hi folks, I found this project looking for ways to add 48bit LBA support to an x86 laptop. The laptop was manufactured ~2005 give or take to the best I can tell. Anyway, it will not recognize more than 137GB of a hard drive (tested with a brand new 250GB WD drive). The company that produced the laptop says they will not provide anymore bios updates for it and they also said they will not release any information or specifications regarding the motherboard so that leaves me with very few options for attempting to address this problem. The bios installed on it now is Phoenix 4.0 release 6 and it has no serial numbers or anything that I've been able to find to help identify the manufacturer of the motherboard, in fact, I'm starting to think the board was built by the company who sold the laptop. Based on my research, the laptop comes from a company called clevo who resells to companies that rebrand the computers. With that said, I'm wondering if the OpenBIOS project can help me to address the problem I've described. Thanks for any information, J.P.

1 0

r243 - openbios-devel/arch/sparc32
by svn＠openbios.org 29 Sep '08

29 Sep '08

Author: blueswirl Date: 2008-09-29 19:20:02 +0200 (Mon, 29 Sep 2008) New Revision: 243 Modified: openbios-devel/arch/sparc32/entry.S Log: Remove surplus wim init Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2008-09-29 17:18:57 UTC (rev 242) +++ openbios-devel/arch/sparc32/entry.S 2008-09-29 17:20:02 UTC (rev 243) @@ -344,10 +344,6 @@ bl 1b add %o0, 0x4, %o0 - mov 2, %g1 - wr %g1, 0x0, %wim ! make window 1 invalid - WRITE_PAUSE - set trap_table, %g1 wr %g1, 0x0, %tbr

1 0

r242 - openbios-devel/arch/sparc32
by svn＠openbios.org 29 Sep '08

29 Sep '08

Author: blueswirl Date: 2008-09-29 19:18:57 +0200 (Mon, 29 Sep 2008) New Revision: 242 Modified: openbios-devel/arch/sparc32/build.xml Log: Fix vectors.S compile dependencies Modified: openbios-devel/arch/sparc32/build.xml =================================================================== --- openbios-devel/arch/sparc32/build.xml 2008-09-29 17:11:00 UTC (rev 241) +++ openbios-devel/arch/sparc32/build.xml 2008-09-29 17:18:57 UTC (rev 242) @@ -27,8 +27,8 @@ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> <executable name="target/arch/sparc32/vectors.o" target="target"> - <rule><![CDATA[ arch/sparc32/vectors.S - $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> + <rule><![CDATA[ arch/sparc32/vectors.S arch/sparc32/wof.S arch/sparc32/wuf.S + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/vectors.S]]></rule> </executable> <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF">

1 0

r241 - openbios-devel/arch/sparc32
by svn＠openbios.org 29 Sep '08

29 Sep '08

Author: blueswirl Date: 2008-09-29 19:11:00 +0200 (Mon, 29 Sep 2008) New Revision: 241 Modified: openbios-devel/arch/sparc32/entry.S openbios-devel/arch/sparc32/wof.S openbios-devel/arch/sparc32/wuf.S Log: Fix window handling on 7 window Sparcs Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2008-09-28 19:55:25 UTC (rev 240) +++ openbios-devel/arch/sparc32/entry.S 2008-09-29 17:11:00 UTC (rev 241) @@ -364,6 +364,49 @@ mov %y, %g2 st %g2, [%g1] + /* Compute NWINDOWS and stash it away. Now uses %wim trick explained + * in the V8 manual. Ok, this method seems to work, Sparc is cool... + * No, it doesn't work, have to play the save/readCWP/restore trick. + */ + + wr %g0, 0x0, %wim ! so we do not get a trap + WRITE_PAUSE + + save + + rd %psr, %g3 + + restore + + and %g3, 0x1f, %g3 + add %g3, 0x1, %g3 + + mov 2, %g1 + wr %g1, 0x0, %wim ! make window 1 invalid + WRITE_PAUSE + + cmp %g3, 0x7 + bne 1f + nop + + /* Adjust our window handling routines to + * do things correctly on 7 window Sparcs. + */ +#define PATCH_INSN(src, dest) \ + set src, %g5; \ + set dest, %g2; \ + ld [%g5], %g4; \ + st %g4, [%g2]; + + /* Patch for window spills... */ + PATCH_INSN(spnwin_patch1_7win, spnwin_patch1) + PATCH_INSN(spnwin_patch2_7win, spnwin_patch2) + + /* Patch for window fills... */ + PATCH_INSN(fnwin_patch1_7win, fnwin_patch1) + PATCH_INSN(fnwin_patch2_7win, fnwin_patch2) + +1: /* Finally, turn on traps so that we can call c-code. */ rd %psr, %g3 wr %g3, 0x0, %psr Modified: openbios-devel/arch/sparc32/wof.S =================================================================== --- openbios-devel/arch/sparc32/wof.S 2008-09-28 19:55:25 UTC (rev 240) +++ openbios-devel/arch/sparc32/wof.S 2008-09-29 17:11:00 UTC (rev 241) @@ -77,7 +77,7 @@ .text .align 4 -#if 0 + /* BEGINNING OF PATCH INSTRUCTIONS */ /* On a 7-window Sparc the boot code patches spnwin_* * instructions with the following ones. @@ -87,7 +87,7 @@ spnwin_patch2_7win: and %glob_tmp, 0x7f, %glob_tmp spnwin_patch3_7win: and %twin_tmp, 0x7f, %twin_tmp /* END OF PATCH INSTRUCTIONS */ -#endif + /* The trap entry point has done the following: * * rd %psr, %l0 Modified: openbios-devel/arch/sparc32/wuf.S =================================================================== --- openbios-devel/arch/sparc32/wuf.S 2008-09-28 19:55:25 UTC (rev 240) +++ openbios-devel/arch/sparc32/wuf.S 2008-09-29 17:11:00 UTC (rev 241) @@ -96,7 +96,7 @@ * I == this window will be the invalid one when we * are done and return from trap if successful */ -#if 0 + /* BEGINNING OF PATCH INSTRUCTIONS */ /* On 7-window Sparc the boot code patches fnwin_patch1 @@ -106,8 +106,8 @@ fnwin_patch1_7win: srl %t_wim, 6, %twin_tmp2 fnwin_patch2_7win: and %twin_tmp1, 0x7f, %twin_tmp1 /* END OF PATCH INSTRUCTIONS */ -#endif + .globl fill_window_entry, fnwin_patch1, fnwin_patch2 fill_window_entry: /* LOCATION: Window 'T' */

1 0

r240 - openbios-devel/drivers
by svn＠openbios.org 28 Sep '08

28 Sep '08

Author: blueswirl Date: 2008-09-28 21:55:25 +0200 (Sun, 28 Sep 2008) New Revision: 240 Modified: openbios-devel/drivers/obio.c Log: Add more machine types Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2008-09-27 19:46:18 UTC (rev 239) +++ openbios-devel/drivers/obio.c 2008-09-28 19:55:25 UTC (rev 240) @@ -739,6 +739,46 @@ .initfn = dummy_mach_init, }, { + .machine_id = 33, + .banner_name = "SPARCstation Voyager", + .model = "SUNW,501-2581", + .name = "SUNW,SPARCstation-Voyager", + .mid_offset = 0, + .initfn = dummy_mach_init, + }, + { + .machine_id = 34, + .banner_name = "SPARCstation LX", + .model = "SUNW,501-2031", + .name = "SUNW,SPARCstation-LX", + .mid_offset = 0, + .initfn = dummy_mach_init, + }, + { + .machine_id = 35, + .banner_name = "SPARCstation 4", + .model = "SUNW,501-2572", + .name = "SUNW,SPARCstation-4", + .mid_offset = 0, + .initfn = dummy_mach_init, + }, + { + .machine_id = 36, + .banner_name = "SPARCstation Classic", + .model = "SUNW,501-2326", + .name = "SUNW,SPARCstation-Classic", + .mid_offset = 0, + .initfn = dummy_mach_init, + }, + { + .machine_id = 37, + .banner_name = "Tadpole S3 GX", + .model = "S3", + .name = "Tadpole_S3GX", + .mid_offset = 0, + .initfn = dummy_mach_init, + }, + { .machine_id = 64, .banner_name = "SPARCstation 10 (1 X 390Z55)", .model = "SUNW,S10,501-2365",

1 0

[PATCH] sparc64 add mmu translate and unmap methods
by Igor Kovalenko 27 Sep '08

27 Sep '08

Hi! This patch enables mmu methonds "translate" and "unmap" for sparc64. Helper function spitfire_translate walks through dtlb entries and performs phys to virt translation. Two other helpers itlb_demap and dtlb_demap perform actual tlb entry demapping. It is then easy to implement unmap_pages() which is the reverse of map_pages(), and enable mmu_unmap as the result. I tested these changes to work with qemu-system-sparc64 loading gentoo 2008.0 iso image. qemu is currently lacking spitfire demap ASI support which I'll post there shortly. Please apply. -- Kind regards, Igor V. Kovalenko

2 1

r239 - openbios-devel/arch/sparc64
by svn＠openbios.org 27 Sep '08

27 Sep '08

Author: blueswirl Date: 2008-09-27 21:46:18 +0200 (Sat, 27 Sep 2008) New Revision: 239 Modified: openbios-devel/arch/sparc64/openbios.c Log: Add fake cpuid to cpu node (Igor Kovalenko) Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-09-27 19:45:19 UTC (rev 238) +++ openbios-devel/arch/sparc64/openbios.c 2008-09-27 19:46:18 UTC (rev 239) @@ -413,6 +413,11 @@ push_str("sparc-version"); fword("property"); + PUSH(1); + fword("encode-int"); + push_str("cpuid"); + fword("property"); + fword("finish-device"); // MMU node

1 0

r238 - openbios-devel/arch/sparc64
by svn＠openbios.org 27 Sep '08

27 Sep '08

Author: blueswirl Date: 2008-09-27 21:45:19 +0200 (Sat, 27 Sep 2008) New Revision: 238 Modified: openbios-devel/arch/sparc64/openbios.c Log: Add mmu translate and unmap methods (Igor Kovalenko) Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-09-18 18:41:26 UTC (rev 237) +++ openbios-devel/arch/sparc64/openbios.c 2008-09-27 19:45:19 UTC (rev 238) @@ -85,18 +85,13 @@ { } -/* - 3.6.5 translate - ( virt -- false | phys.lo ... phys.hi mode true ) -*/ -static void -mmu_translate(void) +static int +spitfire_translate(unsigned long virt, unsigned long *p_phys, + unsigned long *p_data, unsigned long *p_size) { - unsigned long virt, phys, tag, data, mask; + unsigned long phys, tag, data, mask, size; unsigned int i; - virt = POP(); - for (i = 0; i < 64; i++) { data = spitfire_get_dtlb_data(i); if (data & 0x8000000000000000) { // Valid entry? @@ -104,29 +99,54 @@ default: case 0x0: // 8k mask = 0xffffffffffffe000ULL; + size = PAGE_SIZE_8K; break; case 0x1: // 64k mask = 0xffffffffffff0000ULL; + size = PAGE_SIZE_64K; break; case 0x2: // 512k mask = 0xfffffffffff80000ULL; + size = PAGE_SIZE_512K; break; case 0x3: // 4M mask = 0xffffffffffc00000ULL; + size = PAGE_SIZE_4M; break; } tag = spitfire_get_dtlb_tag(i); if ((virt & mask) == (tag & mask)) { phys = data & mask & 0x000001fffffff000; phys |= virt & ~mask; - PUSH(phys & 0xffffffff); - PUSH(phys >> 32); - PUSH(data & 0xfff); - PUSH(-1); - return; + *p_phys = phys; + *p_data = data & 0xfff; + *p_size = size; + return -1; } } } + + return 0; +} + +/* + 3.6.5 translate + ( virt -- false | phys.lo ... phys.hi mode true ) +*/ +static void +mmu_translate(void) +{ + unsigned long virt, phys, data, size; + + virt = POP(); + + if (spitfire_translate(virt, &phys, &data, &size)) { + PUSH(phys & 0xffffffff); + PUSH(phys >> 32); + PUSH(data); + PUSH(-1); + return; + } PUSH(0); } @@ -250,6 +270,40 @@ map_pages(virt, size, phys); } +static void +itlb_demap(unsigned long vaddr) +{ + asm("stxa %0, [%0] %1\n" + : : "r" (vaddr), "i" (ASI_IMMU_DEMAP)); +} + +static void +dtlb_demap(unsigned long vaddr) +{ + asm("stxa %0, [%0] %1\n" + : : "r" (vaddr), "i" (ASI_DMMU_DEMAP)); +} + +static void +unmap_pages(unsigned long virt, unsigned long size) +{ + unsigned long phys, data; + + unsigned long tte_data, currsize; + + // align size + size = (size + PAGE_MASK_8K) & ~PAGE_MASK_8K; + + while (spitfire_translate(virt, &phys, &data, &currsize)) { + + itlb_demap(virt & ~0x1fffULL); + dtlb_demap(virt & ~0x1fffULL); + + size -= currsize; + virt += currsize; + } +} + /* 3.6.5 unmap ( virt size -- ) @@ -261,7 +315,7 @@ size = POP(); virt = POP(); - //unmap_pages(virt, size); + unmap_pages(virt, size); } /*

1 0

r237 - in openbios-devel: arch/sparc32 arch/sparc64 drivers include/openbios
by svn＠openbios.org 18 Sep '08

18 Sep '08

Author: blueswirl Date: 2008-09-18 20:41:26 +0200 (Thu, 18 Sep 2008) New Revision: 237 Added: openbios-devel/include/openbios/fw_cfg.h Modified: openbios-devel/arch/sparc32/entry.S openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/sparc64/entry.S openbios-devel/arch/sparc64/openbios.c openbios-devel/drivers/obio.c openbios-devel/drivers/obio.h openbios-devel/drivers/sbus.c Log: Use the firmware device introduced in Qemu SVN r5256 Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2008-09-11 19:33:02 UTC (rev 236) +++ openbios-devel/arch/sparc32/entry.S 2008-09-18 18:41:26 UTC (rev 237) @@ -12,7 +12,12 @@ #include "asm/crs.h" #define __ASSEMBLY__ #include "openbios/firmware_abi.h" +#define NO_QEMU_PROTOS +#include "openbios/fw_cfg.h" +#define CFG_ADDR 0x00000510 +#define CFG_ASI 0x2d + #define PHYS_JJ_EEPROM 0x71200000 /* [2000] MK48T08 */ #define PHYS_JJ_INTR0 0x71E00000 /* CPU0 interrupt control registers */ @@ -44,41 +49,84 @@ * Main context is statically defined in C. */ - ! Check if this is QEMU for SS-5 - set PHYS_JJ_EEPROM, %g1 - lduba [%g1] ASI_M_BYPASS, %g2 + ! Check signature "QEMU" + set CFG_ADDR, %g5 + mov FW_CFG_SIGNATURE, %g2 + stha %g2, [%g5] CFG_ASI + add %g5, 2, %g5 + lduba [%g5] CFG_ASI, %g2 cmp %g2, 'Q' - bne ss10 - inc %g1 - lduba [%g1] ASI_M_BYPASS, %g2 + bne bad_conf + nop + lduba [%g5] CFG_ASI, %g2 cmp %g2, 'E' - bne ss10 - inc %g1 - lduba [%g1] ASI_M_BYPASS, %g2 + bne bad_conf + nop + lduba [%g5] CFG_ASI, %g2 cmp %g2, 'M' - bne ss10 - inc %g1 - lduba [%g1] ASI_M_BYPASS, %g2 + bne bad_conf + nop + lduba [%g5] CFG_ASI, %g2 cmp %g2, 'U' - bne ss10 + bne bad_conf + nop + ! Get memory size from configuration device + ! NB: little endian format + mov FW_CFG_RAM_SIZE, %g2 + sub %g5, 2, %g5 + stha %g2, [%g5] CFG_ASI + add %g5, 2, %g5 + lduba [%g5] CFG_ASI, %g4 + + lduba [%g5] CFG_ASI, %g3 + sll %g3, 8, %g3 + or %g3, %g4, %g4 + + lduba [%g5] CFG_ASI, %g3 + sll %g3, 16, %g3 + or %g3, %g4, %g4 + + lduba [%g5] CFG_ASI, %g3 + sll %g3, 24, %g3 + or %g3, %g4, %g1 + ! %g1 contains end of memory + + ! Get machine ID from configuration device + mov FW_CFG_MACHINE_ID, %g2 + sub %g5, 2, %g5 + stha %g2, [%g5] CFG_ASI + add %g5, 2, %g5 + lduba [%g5] CFG_ASI, %g4 + + lduba [%g5] CFG_ASI, %g3 + sll %g3, 8, %g3 + or %g3, %g4, %g4 + mov %g4, %y + + cmp %g4, 96 + bgeu ss1000 + cmp %g4, 64 + bgeu ss10 + cmp %g4, 32 + blu ss2 + nop + ! Ok, this is SS-5 - mov 0x80, %y ! Find architecture specific part - set PHYS_JJ_EEPROM + OHW_ARCH_PTR, %g1 - lduha [%g1] ASI_M_BYPASS, %g2 - set PHYS_JJ_EEPROM, %g1 - add %g1, %g2, %g3 + set PHYS_JJ_EEPROM + OHW_ARCH_PTR, %g5 + lduha [%g5] ASI_M_BYPASS, %g2 + set PHYS_JJ_EEPROM, %g5 + add %g5, %g2, %g3 ! Check if this not the first SMP CPU, if so, bypass PROM entirely - add %g3, SPARC_SMP_VALID, %g1 - lduba [%g1] ASI_M_BYPASS, %g2 - stba %g0, [%g1] ASI_M_BYPASS - set PHYS_JJ_EEPROM + OHW_RAM_SIZE, %g1 - ldda [%g1] ASI_M_BYPASS, %g0 + add %g3, SPARC_SMP_VALID, %g5 + lduba [%g5] ASI_M_BYPASS, %g2 + stba %g0, [%g5] ASI_M_BYPASS tst %g2 bz first_cpu nop + ! SMP init, jump to user specified address set PHYS_JJ_INTR0 + 0x04, %g1 sll %g2, 12, %g2 add %g1, %g2, %g2 @@ -104,41 +152,21 @@ sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu ss10: - set PHYS_SS10_EEPROM, %g1 - lduba [%g1] ASI_M_CTL, %g2 - cmp %g2, 'Q' - bne ss2 - inc %g1 - lduba [%g1] ASI_M_CTL, %g2 - cmp %g2, 'E' - bne ss2 - inc %g1 - lduba [%g1] ASI_M_CTL, %g2 - cmp %g2, 'M' - bne ss2 - inc %g1 - lduba [%g1] ASI_M_CTL, %g2 - cmp %g2, 'U' - bne ss2 - ! Ok, this is SS-10 or SS-600MP - set PHYS_SS10_EEPROM + SPARC_MACHINE_ID, %g1 - lduba [%g1] ASI_M_CTL, %g2 - mov %g2, %y ! Find architecture specific part - set PHYS_SS10_EEPROM + OHW_ARCH_PTR, %g1 - lduha [%g1] ASI_M_CTL, %g2 - set PHYS_SS10_EEPROM, %g1 - add %g1, %g2, %g3 + set PHYS_SS10_EEPROM + OHW_ARCH_PTR, %g5 + lduha [%g5] ASI_M_CTL, %g2 + set PHYS_SS10_EEPROM, %g5 + add %g5, %g2, %g3 ! Check if this not the first SMP CPU, if so, bypass PROM entirely - add %g3, SPARC_SMP_VALID, %g1 - lduba [%g1] ASI_M_CTL, %g2 - stba %g0, [%g1] ASI_M_CTL - set PHYS_SS10_EEPROM + OHW_RAM_SIZE, %g1 - ldda [%g1] ASI_M_CTL, %g0 + add %g3, SPARC_SMP_VALID, %g5 + lduba [%g5] ASI_M_CTL, %g2 + stba %g0, [%g5] ASI_M_CTL tst %g2 bz first_cpu nop + + ! SMP init, jump to user specified address set PHYS_SS10_INTR0 + 0x04, %g1 sll %g2, 12, %g2 add %g1, %g2, %g2 @@ -164,46 +192,12 @@ sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu ss2: - set PHYS_SS2_EEPROM, %g1 - lduba [%g1] ASI_M_BYPASS, %g2 - cmp %g2, 'Q' - bne ss1000 - inc %g1 - lduba [%g1] ASI_M_BYPASS, %g2 - cmp %g2, 'E' - bne ss1000 - inc %g1 - lduba [%g1] ASI_M_BYPASS, %g2 - cmp %g2, 'M' - bne ss1000 - inc %g1 - lduba [%g1] ASI_M_BYPASS, %g2 - cmp %g2, 'U' - bne ss1000 - ! Ok, this is SS-2 set ss2_error, %o2 b ss2_ss1000_halt nop ss1000: - set PHYS_SS1000_EEPROM, %g1 - lduba [%g1] ASI_M_CTL, %g2 - cmp %g2, 'Q' - bne bad_nvram - inc %g1 - lduba [%g1] ASI_M_CTL, %g2 - cmp %g2, 'E' - bne bad_nvram - inc %g1 - lduba [%g1] ASI_M_CTL, %g2 - cmp %g2, 'M' - bne bad_nvram - inc %g1 - lduba [%g1] ASI_M_CTL, %g2 - cmp %g2, 'U' - bne bad_nvram - ! Ok, this is SS-1000 or SS-2000 set ss1000_error, %o2 b ss2_ss1000_halt @@ -408,7 +402,7 @@ stba %o3, [%o1] ASI_M_CTL b 1b inc %o2 -bad_nvram: +bad_conf: 2: b 2b nop Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2008-09-11 19:33:02 UTC (rev 236) +++ openbios-devel/arch/sparc32/openbios.c 2008-09-18 18:41:26 UTC (rev 237) @@ -27,7 +27,7 @@ unsigned long aux1_offset, aux2_offset; uint64_t dma_base, esp_base, le_base; uint64_t tcx_base; - int machine_id; + int machine_id_low, machine_id_high; }; static const struct hwdef hwdefs[] = { @@ -47,7 +47,8 @@ .dma_base = 0x78400000, .esp_base = 0x78800000, .le_base = 0x78c00000, - .machine_id = 0x80, + .machine_id_low = 32, + .machine_id_high = 63, }, /* SS-10 */ { @@ -65,7 +66,8 @@ .dma_base = 0xef0400000ULL, .esp_base = 0xef0800000ULL, .le_base = 0xef0c00000ULL, - .machine_id = 0x72, + .machine_id_low = 64, + .machine_id_high = 65, }, /* SS-600MP */ { @@ -83,7 +85,8 @@ .dma_base = 0xef0081000ULL, .esp_base = 0xef0080000ULL, .le_base = 0xef0060000ULL, - .machine_id = 0x71, + .machine_id_low = 66, + .machine_id_high = 66, }, }; @@ -121,7 +124,7 @@ #ifdef CONFIG_DEBUG_CONSOLE_VIDEO init_video(); #endif - ob_sbus_init(hwdef->iommu_base + 0x1000ULL, hwdef->machine_id); + ob_sbus_init(hwdef->iommu_base + 0x1000ULL, qemu_machine_type); #endif device_end(); @@ -133,7 +136,8 @@ unsigned int i; for (i = 0; i < sizeof(hwdefs) / sizeof(struct hwdef); i++) { - if (hwdefs[i].machine_id == qemu_machine_type) { + if (hwdefs[i].machine_id_low <= qemu_machine_type && + hwdefs[i].machine_id_high >= qemu_machine_type) { hwdef = &hwdefs[i]; break; } Modified: openbios-devel/arch/sparc64/entry.S =================================================================== --- openbios-devel/arch/sparc64/entry.S 2008-09-11 19:33:02 UTC (rev 236) +++ openbios-devel/arch/sparc64/entry.S 2008-09-18 18:41:26 UTC (rev 237) @@ -11,10 +11,11 @@ #include "asi.h" #include "pstate.h" #include "lsu.h" -#define __ASSEMBLY__ -#include "openbios/firmware_abi.h" +#define NO_QEMU_PROTOS +#include "openbios/fw_cfg.h" #define PROM_ADDR 0x1fff0000000 +#define CFG_ADDR 0x1fe02000510 .globl entry, _entry @@ -52,59 +53,65 @@ ! Disable I/D MMUs and caches stxa %g0, [%g0] ASI_LSU_CONTROL - ! Get memory size from NVRAM - setx 0x1fe02000074, %g2, %g5 - mov OHW_RAM_SIZE, %g2 - stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E - add %g5, 1, %g1 - stba %g0, [%g1] ASI_PHYS_BYPASS_EC_E - add %g1, 2, %g1 - lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g4 + ! Check signature "QEMU" + setx CFG_ADDR, %g2, %g5 + mov FW_CFG_SIGNATURE, %g2 + stha %g2, [%g5] ASI_PHYS_BYPASS_EC_E + inc %g5 + lduba [%g5] ASI_PHYS_BYPASS_EC_E, %g2 + cmp %g2, 'Q' + bne bad_conf + nop + lduba [%g5] ASI_PHYS_BYPASS_EC_E, %g2 + cmp %g2, 'E' + bne bad_conf + nop + lduba [%g5] ASI_PHYS_BYPASS_EC_E, %g2 + cmp %g2, 'M' + bne bad_conf + nop + lduba [%g5] ASI_PHYS_BYPASS_EC_E, %g2 + cmp %g2, 'U' + bne bad_conf + nop - sll %g4, 8, %g4 - inc %g2 - stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E - lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3 + ! Get memory size from configuration device + ! NB: little endian format + mov FW_CFG_RAM_SIZE, %g2 + dec %g5 + stha %g2, [%g5] ASI_PHYS_BYPASS_EC_E + inc %g5 + lduba [%g5] ASI_PHYS_BYPASS_EC_E, %g4 + + lduba [%g5] ASI_PHYS_BYPASS_EC_E, %g3 + sllx %g3, 8, %g3 or %g3, %g4, %g4 - sll %g4, 8, %g4 - inc %g2 - stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E - lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3 + lduba [%g5] ASI_PHYS_BYPASS_EC_E, %g3 + sllx %g3, 16, %g3 or %g3, %g4, %g4 - sll %g4, 8, %g4 - inc %g2 - stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E - lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3 + lduba [%g5] ASI_PHYS_BYPASS_EC_E, %g3 + sllx %g3, 24, %g3 or %g3, %g4, %g4 - sll %g4, 8, %g4 - inc %g2 - stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E - lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3 + lduba [%g5] ASI_PHYS_BYPASS_EC_E, %g3 + sllx %g3, 32, %g3 or %g3, %g4, %g4 - sll %g4, 8, %g4 - inc %g2 - stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E - lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3 + lduba [%g5] ASI_PHYS_BYPASS_EC_E, %g3 + sllx %g3, 40, %g3 or %g3, %g4, %g4 - sll %g4, 8, %g4 - inc %g2 - stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E - lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3 + lduba [%g5] ASI_PHYS_BYPASS_EC_E, %g3 + sllx %g3, 48, %g3 or %g3, %g4, %g4 - sll %g4, 8, %g4 - inc %g2 - stba %g2, [%g5] ASI_PHYS_BYPASS_EC_E - lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3 + lduba [%g5] ASI_PHYS_BYPASS_EC_E, %g3 + sllx %g3, 56, %g3 or %g3, %g4, %g1 - ! %g1 contains end of memory + ! %g1 contains end of memory - setx _end, %g7, %g3 set 0xffff, %g2 add %g3, %g2, %g3 @@ -301,8 +308,7 @@ /* We get here when the main context switches back to * the boot context. - * Return to previous bootloader. */ - ret +bad_conf: + b bad_conf nop - Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-09-11 19:33:02 UTC (rev 236) +++ openbios-devel/arch/sparc64/openbios.c 2008-09-18 18:41:26 UTC (rev 237) @@ -24,7 +24,12 @@ #include "asi.h" #include "spitfire.h" #include "libc/vsprintf.h" +#define NO_QEMU_PROTOS +#include "openbios/fw_cfg.h" +#define BIOS_CFG_CMD 0x510 +#define BIOS_CFG_DATA 0x511 + #define REGISTER_NAMED_NODE( name, path ) do { \ bind_new_node( name##_flags_, name##_size_, \ path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ @@ -67,6 +72,8 @@ #define PAGE_MASK_64K (64 * 1024 - 1) #define PAGE_MASK_8K (8 * 1024 - 1) +#define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" + static void mmu_open(void) { @@ -474,6 +481,8 @@ for (;;); } +static uint8_t qemu_uuid[16]; + void arch_nvram_get(char *data) { unsigned short i; @@ -481,6 +490,9 @@ uint32_t size; const struct cpudef *cpu; const char *bootpath; + char buf[256]; + uint32_t temp; + uint64_t ram_size; for (i = 0; i < sizeof(ohwcfg_v3_t); i++) { outb(i & 0xff, 0x74); @@ -488,15 +500,21 @@ *nvptr++ = inb(0x77); } - printk("Nvram id %s, version %d\n", nv_info.struct_ident, - nv_info.struct_version); - if (strcmp(nv_info.struct_ident, "QEMU_BIOS") || - nv_info.struct_version != 3 || - OHW_compute_crc(&nv_info, 0x00, 0xF8) != nv_info.crc) { - printk("Unknown nvram, freezing!\n"); - for (;;); - } + outw(__cpu_to_le16(FW_CFG_SIGNATURE), BIOS_CFG_CMD); + for (i = 0; i < 4; i++) + buf[i] = inb(BIOS_CFG_DATA); + buf[4] = '\0'; + + printk("Configuration device id %s", buf); + + outw(__cpu_to_le16(FW_CFG_ID), BIOS_CFG_CMD); + for (i = 0; i < 4; i++) + buf[i] = inb(BIOS_CFG_DATA); + + temp = __le32_to_cpu(*(uint32_t *)buf); + printk(" version %d\n", temp); + kernel_image = nv_info.kernel_image; kernel_size = nv_info.kernel_size; size = nv_info.cmdline_size; @@ -518,16 +536,40 @@ data[i] = inb(0x77); } - printk("CPUs: %x", nv_info.nb_cpus); + outw(__cpu_to_le16(FW_CFG_NB_CPUS), BIOS_CFG_CMD); + for (i = 0; i < 4; i++) + buf[i] = inb(BIOS_CFG_DATA); + + temp = __le32_to_cpu(*(uint32_t *)buf); + + printk("CPUs: %x", temp); + cpu = id_cpu(); //cpu->initfn(); cpu_generic_init(cpu); printk(" x %s\n", cpu->name); - // Add /idprom + // Add /uuid + outw(__cpu_to_le16(FW_CFG_UUID), BIOS_CFG_CMD); + for (i = 0; i < 16; i++) + qemu_uuid[i] = inb(BIOS_CFG_DATA); + + printk("UUID: " UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], qemu_uuid[2], + qemu_uuid[3], qemu_uuid[4], qemu_uuid[5], qemu_uuid[6], + qemu_uuid[7], qemu_uuid[8], qemu_uuid[9], qemu_uuid[10], + qemu_uuid[11], qemu_uuid[12], qemu_uuid[13], qemu_uuid[14], + qemu_uuid[15]); + push_str("/"); fword("find-device"); + PUSH((long)&qemu_uuid); + PUSH(16); + fword("encode-bytes"); + push_str("uuid"); + fword("property"); + + // Add /idprom for (i = 0; i < 32; i++) { outb((i + 0x1fd8) & 0xff, 0x74); outb((i + 0x1fd8) >> 8, 0x75); @@ -548,16 +590,22 @@ push_str("/memory"); fword("find-device"); + outw(__cpu_to_le16(FW_CFG_RAM_SIZE), BIOS_CFG_CMD); + for (i = 0; i < 8; i++) + buf[i] = inb(BIOS_CFG_DATA); + + ram_size = __le64_to_cpu(*(uint64_t *)buf); + // All memory: 0 to RAM_size PUSH(0); fword("encode-int"); PUSH(0); fword("encode-int"); fword("encode+"); - PUSH((int)(nv_info.RAM0_size >> 32)); + PUSH((int)(ram_size >> 32)); fword("encode-int"); fword("encode+"); - PUSH((int)(nv_info.RAM0_size & 0xffffffff)); + PUSH((int)(ram_size & 0xffffffff)); fword("encode-int"); fword("encode+"); push_str("reg"); Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2008-09-11 19:33:02 UTC (rev 236) +++ openbios-devel/drivers/obio.c 2008-09-18 18:41:26 UTC (rev 237) @@ -21,6 +21,8 @@ #include "obio.h" #define cpu_to_be16(x) __cpu_to_be16(x) #include "openbios/firmware_abi.h" +#define NO_QEMU_PROTOS +#include "openbios/fw_cfg.h" #define REGISTER_NAMED_NODE( name, path ) do { \ bind_new_node( name##_flags_, name##_size_, \ @@ -294,7 +296,7 @@ } } -static uint32_t +static void ob_eccmemctl_init(void) { uint32_t version, *regs; @@ -333,8 +335,6 @@ fword("property"); fword("finish-device"); - - return version; } static unsigned char *nvram; @@ -716,6 +716,67 @@ for (;;); } +static void dummy_mach_init(void) +{ +} + +struct machdef { + uint16_t machine_id; + const char *banner_name; + const char *model; + const char *name; + int mid_offset; + void (*initfn)(void); +}; + +static const struct machdef sun4m_defs[] = { + { + .machine_id = 32, + .banner_name = "SPARCstation 5", + .model = "SUNW,501-3059", + .name = "SUNW,SPARCstation-5", + .mid_offset = 0, + .initfn = dummy_mach_init, + }, + { + .machine_id = 64, + .banner_name = "SPARCstation 10 (1 X 390Z55)", + .model = "SUNW,S10,501-2365", + .name = "SUNW,SPARCstation-10", + .mid_offset = 8, + .initfn = ob_eccmemctl_init, + }, + { + .machine_id = 65, + .banner_name = "SPARCstation 20 (1 X 390Z55)", + .model = "SUNW,S20,501-2324", + .name = "SUNW,SPARCstation-20", + .mid_offset = 8, + .initfn = ob_eccmemctl_init, + }, + { + .machine_id = 66, + .banner_name = "SPARCsystem 600(1 X 390Z55)", + .model = NULL, + .name = "SUNW,SPARCsystem-600", + .mid_offset = 8, + .initfn = ob_eccmemctl_init, + }, +}; + +static const struct machdef * +id_machine(uint16_t machine_id) +{ + unsigned int i; + + for (i = 0; i < sizeof(sun4m_defs)/sizeof(struct machdef); i++) { + if (machine_id == sun4m_defs[i].machine_id) + return &sun4m_defs[i]; + } + printk("Unknown machine (ID %d), freezing!\n", machine_id); + for (;;); +} + static void ob_nvram_init(uint64_t base, uint64_t offset) { @@ -732,9 +793,14 @@ unsigned int i; char nographic; uint32_t size; - unsigned int machine_id; + uint16_t machine_id; const struct cpudef *cpu; + const struct machdef *mach; ohwcfg_v3_t *header; + volatile uint8_t *fw_cfg_data; + volatile uint16_t *fw_cfg_cmd; + char buf[256]; + uint32_t temp; ob_new_obio_device("eeprom", NULL); @@ -745,17 +811,30 @@ push_str("address"); fword("property"); + fw_cfg_cmd = map_io(CFG_ADDR, CFG_SIZE); + fw_cfg_data = (uint8_t *)fw_cfg_cmd + 2; + + *fw_cfg_cmd = FW_CFG_SIGNATURE; + for (i = 0; i < 4; i++) + buf[i] = *fw_cfg_data; + buf[4] = '\0'; + printk("Configuration device id %s", buf); + + *fw_cfg_cmd = FW_CFG_ID; + for (i = 0; i < 4; i++) + buf[i] = *fw_cfg_data; + + temp = __le32_to_cpu(*(uint32_t *)buf); + printk(" version %d", temp); + + *fw_cfg_cmd = FW_CFG_MACHINE_ID; + for (i = 0; i < 2; i++) + buf[i] = *fw_cfg_data; + + machine_id = __le16_to_cpu(*(uint16_t *)buf); + printk(" machine id %d\n", machine_id); + memcpy(&nv_info, nvram, sizeof(nv_info)); - machine_id = (unsigned int)nvram[0x1fd9] & 0xff; - printk("Nvram id %s, version %d, machine id 0x%2.2x\n", - nv_info.struct_ident, nv_info.struct_version, machine_id); - if (strcmp(nv_info.struct_ident, "QEMU_BIOS") || - nv_info.struct_version != 3 || - OHW_compute_crc(&nv_info, 0x00, 0xF8) != nv_info.crc) { - printk("Unknown nvram, freezing!\n"); - for (;;); - } - kernel_image = nv_info.kernel_image; kernel_size = nv_info.kernel_size; size = nv_info.cmdline_size; @@ -772,8 +851,10 @@ header->crc = OHW_compute_crc(header, 0x00, 0xF8); boot_device = nv_info.boot_devices[0]; - nographic = nv_info.graphic_flags & OHW_GF_NOGRAPHICS; - graphic_depth = nv_info.depth; + *fw_cfg_cmd = FW_CFG_NOGRAPHIC; + nographic = *fw_cfg_data; + *fw_cfg_cmd = FW_CFG_SUN4M_DEPTH; + graphic_depth = *fw_cfg_data; push_str("mk48t08"); fword("model"); @@ -790,74 +871,37 @@ push_str("idprom"); fword("property"); - switch (machine_id) { - case 0x71: - push_str("SPARCsystem 600(1 X 390Z55)"); + mach = id_machine(machine_id); + + mach->initfn(); + + push_str(mach->banner_name); + fword("encode-string"); + push_str("banner-name"); + fword("property"); + + if (mach->model) { + push_str(mach->model); fword("encode-string"); - push_str("banner-name"); - fword("property"); - push_str("SUNW,SPARCsystem-600"); - fword("encode-string"); - push_str("name"); - fword("property"); - ob_eccmemctl_init(); - break; - case 0x72: - switch (ob_eccmemctl_init()) { - default: - case 0x10000000: - push_str("SPARCstation 10 (1 X 390Z55)"); - fword("encode-string"); - push_str("banner-name"); - fword("property"); - push_str("SUNW,S10,501-2365"); - fword("encode-string"); - push_str("model"); - fword("property"); - push_str("SUNW,SPARCstation-10"); - fword("encode-string"); - push_str("name"); - fword("property"); - break; - case 0x20000000: - push_str("SPARCstation 20 (1 X 390Z55)"); - fword("encode-string"); - push_str("banner-name"); - fword("property"); - push_str("SUNW,S20,501-2324"); - fword("encode-string"); - push_str("model"); - fword("property"); - push_str("SUNW,SPARCstation-20"); - fword("encode-string"); - push_str("name"); - fword("property"); - break; - } - break; - case 0x80: - push_str("SPARCstation 5"); - fword("encode-string"); - push_str("banner-name"); - fword("property"); - push_str("SUNW,501-3059"); - fword("encode-string"); push_str("model"); fword("property"); - push_str("SUNW,SPARCstation-5"); - fword("encode-string"); - push_str("name"); - fword("property"); - break; - default: - printk("Unknown machine, freezing!\n"); - for (;;); } + push_str(mach->name); + fword("encode-string"); + push_str("name"); + fword("property"); + // Add cpus - printk("CPUs: %x", nv_info.nb_cpus); + *fw_cfg_cmd = FW_CFG_NB_CPUS; + for (i = 0; i < 4; i++) + buf[i] = *fw_cfg_data; + + temp = __le32_to_cpu(*(uint32_t *)buf); + + printk("CPUs: %x", temp); cpu = id_cpu(); printk(" x %s\n", cpu->name); - for (i = 0; i < (unsigned int)nv_info.nb_cpus; i++) { + for (i = 0; i < temp; i++) { push_str("/"); fword("find-device"); @@ -959,15 +1003,7 @@ push_str("cache-coherence?"); fword("property"); - switch (machine_id) { - case 0x71: - case 0x72: - PUSH(i + 8); - break; - case 0x80: - PUSH(i); - break; - } + PUSH(i + mach->mid_offset); fword("encode-int"); push_str("mid"); fword("property"); Modified: openbios-devel/drivers/obio.h =================================================================== --- openbios-devel/drivers/obio.h 2008-09-11 19:33:02 UTC (rev 236) +++ openbios-devel/drivers/obio.h 2008-09-18 18:41:26 UTC (rev 237) @@ -38,6 +38,10 @@ #define SUN4M_NCPUS 16 #define PAGE_SIZE 4096 +#define CFG_ADDR 0xd00000510ULL +#define CFG_SIZE 3 +#define FW_CFG_SUN4M_DEPTH (FW_CFG_ARCH_LOCAL + 0x00) + /* linux/include/asm-sparc/timer.h */ /* A sun4m has two blocks of registers which are probably of the same Modified: openbios-devel/drivers/sbus.c =================================================================== --- openbios-devel/drivers/sbus.c 2008-09-11 19:33:02 UTC (rev 236) +++ openbios-devel/drivers/sbus.c 2008-09-18 18:41:26 UTC (rev 237) @@ -571,11 +571,11 @@ ob_sbus_node_init(base); switch (machine_id) { - case 0x71: + case 66: return ob_sbus_init_ss600mp(); - case 0x72: + case 64 ... 65: return ob_sbus_init_ss10(); - case 0x80: + case 32 ... 63: return ob_sbus_init_ss5(); default: return -1; Added: openbios-devel/include/openbios/fw_cfg.h =================================================================== --- openbios-devel/include/openbios/fw_cfg.h (rev 0) +++ openbios-devel/include/openbios/fw_cfg.h 2008-09-18 18:41:26 UTC (rev 237) @@ -0,0 +1,33 @@ +#ifndef FW_CFG_H +#define FW_CFG_H + +#define FW_CFG_SIGNATURE 0x00 +#define FW_CFG_ID 0x01 +#define FW_CFG_UUID 0x02 +#define FW_CFG_RAM_SIZE 0x03 +#define FW_CFG_NOGRAPHIC 0x04 +#define FW_CFG_NB_CPUS 0x05 +#define FW_CFG_MACHINE_ID 0x06 +#define FW_CFG_MAX_ENTRY 0x10 + +#define FW_CFG_WRITE_CHANNEL 0x4000 +#define FW_CFG_ARCH_LOCAL 0x8000 +#define FW_CFG_ENTRY_MASK ~(FW_CFG_WRITE_CHANNEL | FW_CFG_ARCH_LOCAL) + +#define FW_CFG_INVALID 0xffff + +#ifndef NO_QEMU_PROTOS +typedef void (*FWCfgCallback)(void *opaque, uint8_t *data); + +int fw_cfg_add_bytes(void *opaque, uint16_t key, uint8_t *data, uint16_t len); +int fw_cfg_add_i16(void *opaque, uint16_t key, uint16_t value); +int fw_cfg_add_i32(void *opaque, uint16_t key, uint32_t value); +int fw_cfg_add_i64(void *opaque, uint16_t key, uint64_t value); +int fw_cfg_add_callback(void *opaque, uint16_t key, FWCfgCallback callback, + void *callback_opaque, uint8_t *data, size_t len); +void *fw_cfg_init(uint32_t ctl_port, uint32_t data_port, + target_phys_addr_t crl_addr, target_phys_addr_t data_addr); + +#endif /* NO_QEMU_PROTOS */ + +#endif

1 0

r236 - in openbios-devel/arch: sparc32 sparc64
by svn＠openbios.org 11 Sep '08

11 Sep '08

Author: blueswirl Date: 2008-09-11 21:33:02 +0200 (Thu, 11 Sep 2008) New Revision: 236 Modified: openbios-devel/arch/sparc32/build.xml openbios-devel/arch/sparc64/build.xml Log: Enable ld flag --warn-common Modified: openbios-devel/arch/sparc32/build.xml =================================================================== --- openbios-devel/arch/sparc32/build.xml 2008-09-11 19:32:16 UTC (rev 235) +++ openbios-devel/arch/sparc32/build.xml 2008-09-11 19:33:02 UTC (rev 236) @@ -33,7 +33,7 @@ <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> <rule> - $(LD) -N -T arch/sparc32/ldscript -o $@.nostrip $^ + $(LD) --warn-common -N -T arch/sparc32/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms cp $@.nostrip $@ $(STRIP) $@</rule> @@ -69,7 +69,7 @@ <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule> - $(LD) -N -T arch/sparc32/ldscript -o $@.nostrip $^ + $(LD) --warn-common -N -T arch/sparc32/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms cp $@.nostrip $@ $(STRIP) $@</rule> Modified: openbios-devel/arch/sparc64/build.xml =================================================================== --- openbios-devel/arch/sparc64/build.xml 2008-09-11 19:32:16 UTC (rev 235) +++ openbios-devel/arch/sparc64/build.xml 2008-09-11 19:33:02 UTC (rev 236) @@ -32,7 +32,7 @@ <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> <rule> - $(LD) -T arch/sparc64/ldscript -o $@.nostrip $^ + $(LD) --warn-common -T arch/sparc64/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms cp $@.nostrip $@ $(STRIP) $@</rule> @@ -69,7 +69,7 @@ <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED">  <rule> - $(LD) -N -T arch/sparc64/ldscript -o $@.nostrip $^ + $(LD) --warn-common -N -T arch/sparc64/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms cp $@.nostrip $@ $(STRIP) $@</rule>

1 0

r235 - in openbios-devel/arch: sparc32 sparc64
by svn＠openbios.org 11 Sep '08

11 Sep '08

Author: blueswirl Date: 2008-09-11 21:32:16 +0200 (Thu, 11 Sep 2008) New Revision: 235 Modified: openbios-devel/arch/sparc32/aoutload.c openbios-devel/arch/sparc32/elfload.c openbios-devel/arch/sparc64/aoutload.c openbios-devel/arch/sparc64/elfload.c Log: Fix warnings that would be caused by ld flag --warn-common Modified: openbios-devel/arch/sparc32/aoutload.c =================================================================== --- openbios-devel/arch/sparc32/aoutload.c 2008-09-02 15:59:28 UTC (rev 234) +++ openbios-devel/arch/sparc32/aoutload.c 2008-09-11 19:32:16 UTC (rev 235) @@ -15,7 +15,6 @@ #define addr_fixup(addr) ((addr) & 0x00ffffff) static char *image_name, *image_version; -const char *program_name, *program_version; static int check_mem_ranges(struct sys_info *info, unsigned long start, Modified: openbios-devel/arch/sparc32/elfload.c =================================================================== --- openbios-devel/arch/sparc32/elfload.c 2008-09-02 15:59:28 UTC (rev 234) +++ openbios-devel/arch/sparc32/elfload.c 2008-09-11 19:32:16 UTC (rev 235) @@ -18,7 +18,6 @@ #define addr_fixup(addr) ((addr) & 0x00ffffff) static char *image_name, *image_version; -const char *program_name, *program_version; static void *calloc(size_t nmemb, size_t size) { Modified: openbios-devel/arch/sparc64/aoutload.c =================================================================== --- openbios-devel/arch/sparc64/aoutload.c 2008-09-02 15:59:28 UTC (rev 234) +++ openbios-devel/arch/sparc64/aoutload.c 2008-09-11 19:32:16 UTC (rev 235) @@ -16,7 +16,6 @@ #define addr_fixup(addr) ((addr) & 0x00ffffff) static char *image_name, *image_version; -const char *program_name, *program_version; static int check_mem_ranges(struct sys_info *info, unsigned long start, Modified: openbios-devel/arch/sparc64/elfload.c =================================================================== --- openbios-devel/arch/sparc64/elfload.c 2008-09-02 15:59:28 UTC (rev 234) +++ openbios-devel/arch/sparc64/elfload.c 2008-09-11 19:32:16 UTC (rev 235) @@ -18,7 +18,6 @@ #define addr_fixup(addr) ((addr) & 0x00ffffff) static char *image_name, *image_version; -const char *program_name, *program_version; static void *calloc(size_t nmemb, size_t size) {

1 0

[PATCH] sparc64 implement itlb/dtlb directed writes
by Igor Kovalenko 02 Sep '08

02 Sep '08

Hi! This patch implements directed (indexed) writes to itlb/dtlb entries. Methods "SUNW,dtlb-load" and "SUNW,itlb-load" used to ignore tlb index parameter. Now the gentoo sparc64 installation iso booting traps much later :) Please apply. -- Kind regards, Igor V. Kovalenko

2 1

r234 - openbios-devel/arch/sparc64
by svn＠openbios.org 02 Sep '08

02 Sep '08

Author: blueswirl Date: 2008-09-02 17:59:28 +0200 (Tue, 02 Sep 2008) New Revision: 234 Modified: openbios-devel/arch/sparc64/openbios.c Log: Implement itlb/dtlb directed writes (Igor Kovalenko) Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-09-02 15:46:27 UTC (rev 233) +++ openbios-devel/arch/sparc64/openbios.c 2008-09-02 15:59:28 UTC (rev 234) @@ -132,6 +132,16 @@ "r" (tte_data), "i" (ASI_DTLB_DATA_IN)); } +static void +dtlb_load3(unsigned long vaddr, unsigned long tte_data, + unsigned long tte_index) +{ + asm("stxa %0, [%1] %2\n" + "stxa %3, [%4] %5\n" + : : "r" (vaddr), "r" (48), "i" (ASI_DMMU), + "r" (tte_data), "r" (tte_index << 3), "i" (ASI_DTLB_DATA_ACCESS)); +} + /* ( index tte_data vaddr -- ? ) */ @@ -143,7 +153,7 @@ vaddr = POP(); tte_data = POP(); idx = POP(); - dtlb_load2(vaddr, tte_data); + dtlb_load3(vaddr, tte_data, idx); } static void @@ -155,6 +165,16 @@ "r" (tte_data), "i" (ASI_ITLB_DATA_IN)); } +static void +itlb_load3(unsigned long vaddr, unsigned long tte_data, + unsigned long tte_index) +{ + asm("stxa %0, [%1] %2\n" + "stxa %3, [%4] %5\n" + : : "r" (vaddr), "r" (48), "i" (ASI_IMMU), + "r" (tte_data), "r" (tte_index << 3), "i" (ASI_ITLB_DATA_ACCESS)); +} + /* ( index tte_data vaddr -- ? ) */ @@ -166,7 +186,7 @@ vaddr = POP(); tte_data = POP(); idx = POP(); - itlb_load2(vaddr, tte_data); + itlb_load3(vaddr, tte_data, idx); } static void

1 0

r233 - openbios-devel/arch/sparc64
by svn＠openbios.org 02 Sep '08

02 Sep '08

Author: blueswirl Date: 2008-09-02 17:46:27 +0200 (Tue, 02 Sep 2008) New Revision: 233 Modified: openbios-devel/arch/sparc64/openbios.c Log: Fix virtual to physical address translation (Igor Kovalenko) Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-08-30 10:55:33 UTC (rev 232) +++ openbios-devel/arch/sparc64/openbios.c 2008-09-02 15:46:27 UTC (rev 233) @@ -110,7 +110,7 @@ } tag = spitfire_get_dtlb_tag(i); if ((virt & mask) == (tag & mask)) { - phys = tag & mask & 0x000001fffffff000; + phys = data & mask & 0x000001fffffff000; phys |= virt & ~mask; PUSH(phys & 0xffffffff); PUSH(phys >> 32);

1 0

[PATCH] sparc64 fix virtual to physical address translation
by Igor Kovalenko 02 Sep '08

02 Sep '08

Hi! This patch fixes "translate" method implementation to actually return physical address of mapped entry. It used to return virtual base obtained from matched tte. Now it should be possible to boot gentoo install-sparc64-minimal-2008.0.iso beyond the point of "Remapping the kernel... done." Remapping the kernel... done. bootmem_init: Scan pavail, choose_bootmap_pfn: kern[400000:8b2000] avoid[c00000:da4000] choose_bootmap_pfn: Using 0 [0] init_bootmem(min[0], bootmap[0], max[3f6f]) free_bootmem(pavail:0): base[0] size[7ede000] reserve_bootmem(initrd): base[c00000] size[da3354] reserve_bootmem(kernel): base[400000] size[4b0720] reserve_bootmem(bootmap): base[0] size[7f0] memory_present(0, 0, 3f6f) -- Kind regards, Igor V. Kovalenko

1 0

Info and help
by Israel Miranda 30 Aug '08

30 Aug '08

Hi there people. I´d like to have some info on the project, because I didn´t understand it very well, and didn´t find many info on the net(I recognize I didn´t googled a lot). Can I install openbios on any x86 motherboard ? Or only the ones which implements the open firmware standard ? If so, is there a list of which hardware/mobo are compatible ? My problem is: I have and old computer... an Intel pentium 4 2.6ghz on a Intel D865PERL motherboard. Recently I acquired an used nvidia 6800 GS video card, and I´m experiencing freezes and lockups, and for what I had researched, seems to be a problem with AGP FAST WRITE option turned on. The problem is: I don´t have the option to turn it off on my bios anymore.... My diagnostics (everest) says it´s enabled. When I bought my computer in 2004 I remebered of this option, and at that time my gforce 4400 mx card didn´t support this option so I had to turn it off. Some years later I upgraded my bios, and didn´t miss this option. Now I´m looking for it and it´s not there anymore. I tried flashing 5 older bios to my card, to see if this option would "come back", but no luck. Now I doubt even myself I had ever had this option.... that´s where I got the old bios from intel server: ftp://download.intel.com/design/motherbd/rl/ Then I remebered of this openbios project, and I thought: If I can use this bios, and turn off this option, it´ll solve my problems! So, is there any chance I can do that ? Thanks in advance, and congratulations for the project. -- Filosofia de software livre: Informação é de graça pessoas não são contribuidores não tem preço. Israel Vinícius Nogueira Miranda

2 1

r232 - openbios-devel/forth/device
by svn＠openbios.org 30 Aug '08

30 Aug '08

Author: blueswirl Date: 2008-08-30 12:55:33 +0200 (Sat, 30 Aug 2008) New Revision: 232 Modified: openbios-devel/forth/device/package.fs Log: Remove package finding code that finds unrelated packages Modified: openbios-devel/forth/device/package.fs =================================================================== --- openbios-devel/forth/device/package.fs 2008-08-30 10:51:55 UTC (rev 231) +++ openbios-devel/forth/device/package.fs 2008-08-30 10:55:33 UTC (rev 232) @@ -119,17 +119,7 @@ " /packages" find-dev 0= if 2drop false exit then find-rel-dev 0= if false exit then - \ Find the most recent node that match. One could make life - \ simple and add nodes at the head but I prefer it this way. - >r - " name" r@ get-package-property if " " then - r@ begin >dn.peer @ dup while - 3dup - " name" rot get-package-property if " " then - strcmp - 0= if r> drop dup >r then - repeat 3drop - r> true + true ; : open-package ( arg-str arg-len phandle -- ihandle | 0 )

1 0

r231 - openbios-devel/forth/bootstrap
by svn＠openbios.org 30 Aug '08

30 Aug '08

Author: blueswirl Date: 2008-08-30 12:51:55 +0200 (Sat, 30 Aug 2008) New Revision: 231 Modified: openbios-devel/forth/bootstrap/bootstrap.fs Log: Fix pad alignment Modified: openbios-devel/forth/bootstrap/bootstrap.fs =================================================================== --- openbios-devel/forth/bootstrap/bootstrap.fs 2008-08-24 12:54:03 UTC (rev 230) +++ openbios-devel/forth/bootstrap/bootstrap.fs 2008-08-30 10:51:55 UTC (rev 231) @@ -1083,7 +1083,7 @@ false value capital-hex? -: pad ( -- addr ) here 100 + ; +: pad ( -- addr ) here 100 + aligned ; : todigit ( num -- ascii ) dup 9 > if

1 0

r230 - openbios-devel/fs/grubfs
by svn＠openbios.org 24 Aug '08

24 Aug '08

Author: stepan Date: 2008-08-24 14:54:03 +0200 (Sun, 24 Aug 2008) New Revision: 230 Modified: openbios-devel/fs/grubfs/fsys_ext2fs.c Log: >From Igor V. Kovalenko: This openbios-grubfs-ext2fs-block.patch fixes a problem where inode pointer is truncated to 32bit integer and then sign-extended to 64bit integer while passing second pointer argument to ext2_rdfsb. Modified: openbios-devel/fs/grubfs/fsys_ext2fs.c =================================================================== --- openbios-devel/fs/grubfs/fsys_ext2fs.c 2008-08-10 18:12:17 UTC (rev 229) +++ openbios-devel/fs/grubfs/fsys_ext2fs.c 2008-08-24 12:54:03 UTC (rev 230) @@ -587,7 +587,7 @@ log2 (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode))); printf ("ext2fs_dir: inode table fsblock=%d\n", ino_blk); #endif /* E2DEBUG */ - if (!ext2_rdfsb (ino_blk, (int) INODE)) + if (!ext2_rdfsb (ino_blk, INODE)) { return 0; }

1 0

[PATCH] fix ext2fs_dir on sparc64
by Igor Kovalenko 24 Aug '08

24 Aug '08

This openbios-grubfs-ext2fs-block.patch fixes a problem where inode pointer is truncated to 32bit integer and then sign-extended to 64bit integer while passing second pointer argument to ext2_rdfsb. Please apply. -- Kind regards, Igor V. Kovalenko

1 0

r229 - in openbios-devel: arch/sparc64 forth/device forth/system
by svn＠openbios.org 10 Aug '08

10 Aug '08

Author: blueswirl Date: 2008-08-10 20:12:17 +0200 (Sun, 10 Aug 2008) New Revision: 229 Modified: openbios-devel/arch/sparc64/openbios.c openbios-devel/forth/device/tree.fs openbios-devel/forth/system/ciface.fs Log: Rename /packages/client-iface to /openprom/client-services Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-08-10 18:09:55 UTC (rev 228) +++ openbios-devel/arch/sparc64/openbios.c 2008-08-10 18:12:17 UTC (rev 229) @@ -360,7 +360,7 @@ fword("property"); // Trap table - push_str("/packages/client-iface"); + push_str("/openprom/client-services"); fword("find-device"); bind_func("SUNW,set-trap-table", set_trap_table); } Modified: openbios-devel/forth/device/tree.fs =================================================================== --- openbios-devel/forth/device/tree.fs 2008-08-10 18:09:55 UTC (rev 228) +++ openbios-devel/forth/device/tree.fs 2008-08-10 18:12:17 UTC (rev 229) @@ -44,12 +44,6 @@ : open true ; : close ; - new-device - " client-services" device-name - : open true ; - : close ; - finish-device - finish-device new-device Modified: openbios-devel/forth/system/ciface.fs =================================================================== --- openbios-devel/forth/system/ciface.fs 2008-08-10 18:09:55 UTC (rev 228) +++ openbios-devel/forth/system/ciface.fs 2008-08-10 18:12:17 UTC (rev 229) @@ -1,9 +1,9 @@ 0 value ciface-ph -dev /packages/ +dev /openprom/ new-device -" client-iface" device-name +" client-services" device-name active-package to ciface-ph

1 0

r228 - in openbios-devel: arch/sparc64 config/examples include/sparc64
by svn＠openbios.org 10 Aug '08

10 Aug '08

Author: blueswirl Date: 2008-08-10 20:09:55 +0200 (Sun, 10 Aug 2008) New Revision: 228 Added: openbios-devel/include/sparc64/a.out.h Modified: openbios-devel/arch/sparc64/spitfire.h openbios-devel/arch/sparc64/sys_info.c openbios-devel/config/examples/sparc64_rules.xml Log: Fix compilation on OpenBSD: avoid accidental system include file use Modified: openbios-devel/arch/sparc64/spitfire.h =================================================================== --- openbios-devel/arch/sparc64/spitfire.h 2008-08-09 14:20:29 UTC (rev 227) +++ openbios-devel/arch/sparc64/spitfire.h 2008-08-10 18:09:55 UTC (rev 228) @@ -7,7 +7,7 @@ #ifndef _SPARC64_SPITFIRE_H #define _SPARC64_SPITFIRE_H -#include <asm/asi.h> +#include "asi.h" /* The following register addresses are accessible via ASI_DMMU * and ASI_IMMU, that is there is a distinct and unique copy of Modified: openbios-devel/arch/sparc64/sys_info.c =================================================================== --- openbios-devel/arch/sparc64/sys_info.c 2008-08-09 14:20:29 UTC (rev 227) +++ openbios-devel/arch/sparc64/sys_info.c 2008-08-10 18:09:55 UTC (rev 228) @@ -12,7 +12,7 @@ #endif uint64_t qemu_mem_size; -uint64_t va_shift; +unsigned long va_shift; void collect_multiboot_info(struct sys_info *); Modified: openbios-devel/config/examples/sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/sparc64_rules.xml 2008-08-09 14:20:29 UTC (rev 227) +++ openbios-devel/config/examples/sparc64_rules.xml 2008-08-10 18:09:55 UTC (rev 228) @@ -35,6 +35,10 @@ INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include AS_FLAGS := -Wa,-xarch=v9b -Wa,-64 -g +ifeq ($(shell uname), OpenBSD) + CFLAGS+= -fno-stack-protector +endif + # # pre rules # Added: openbios-devel/include/sparc64/a.out.h =================================================================== --- openbios-devel/include/sparc64/a.out.h (rev 0) +++ openbios-devel/include/sparc64/a.out.h 2008-08-10 18:09:55 UTC (rev 228) @@ -0,0 +1,108 @@ +/* $Id: a.out.h,v 1.8 2002/02/09 19:49:31 davem Exp $ */ +#ifndef __SPARC64_A_OUT_H__ +#define __SPARC64_A_OUT_H__ + +#define SPARC_PGSIZE 0x2000 /* Thanks to the sun4 architecture... */ +#define SEGMENT_SIZE SPARC_PGSIZE /* whee... */ + +#ifndef __ASSEMBLY__ + +struct exec { + unsigned char a_dynamic:1; /* A __DYNAMIC is in this image */ + unsigned char a_toolversion:7; + unsigned char a_machtype; + unsigned short a_info; + unsigned int a_text; /* length of text, in bytes */ + unsigned int a_data; /* length of data, in bytes */ + unsigned int a_bss; /* length of bss, in bytes */ + unsigned int a_syms; /* length of symbol table, in bytes */ + unsigned int a_entry; /* where program begins */ + unsigned int a_trsize; + unsigned int a_drsize; +}; + +#endif /* !__ASSEMBLY__ */ + +/* Where in the file does the text information begin? */ +#define N_TXTOFF(x) (N_MAGIC(x) == ZMAGIC ? 0 : sizeof (struct exec)) + +/* Where do the Symbols start? */ +#define N_SYMOFF(x) (N_TXTOFF(x) + (x).a_text + \ + (x).a_data + (x).a_trsize + \ + (x).a_drsize) + +/* Where does text segment go in memory after being loaded? */ +#define N_TXTADDR(x) (unsigned long)(((N_MAGIC(x) == ZMAGIC) && \ + ((x).a_entry < SPARC_PGSIZE)) ? \ + 0 : SPARC_PGSIZE) + +/* And same for the data segment.. */ +#define N_DATADDR(x) (N_MAGIC(x)==OMAGIC ? \ + (N_TXTADDR(x) + (x).a_text) \ + : (unsigned long)(_N_SEGMENT_ROUND (_N_TXTENDADDR(x)))) + +#define N_TRSIZE(a) ((a).a_trsize) +#define N_DRSIZE(a) ((a).a_drsize) +#define N_SYMSIZE(a) ((a).a_syms) + +#ifndef __ASSEMBLY__ + +/* + * Sparc relocation types + */ +enum reloc_type +{ + RELOC_8, + RELOC_16, + RELOC_32, /* simplest relocs */ + RELOC_DISP8, + RELOC_DISP16, + RELOC_DISP32, /* Disp's (pc-rel) */ + RELOC_WDISP30, + RELOC_WDISP22, /* SR word disp's */ + RELOC_HI22, + RELOC_22, /* SR 22-bit relocs */ + RELOC_13, + RELOC_LO10, /* SR 13&10-bit relocs */ + RELOC_SFA_BASE, + RELOC_SFA_OFF13, /* SR S.F.A. relocs */ + RELOC_BASE10, + RELOC_BASE13, + RELOC_BASE22, /* base_relative pic */ + RELOC_PC10, + RELOC_PC22, /* special pc-rel pic */ + RELOC_JMP_TBL, /* jmp_tbl_rel in pic */ + RELOC_SEGOFF16, /* ShLib offset-in-seg */ + RELOC_GLOB_DAT, + RELOC_JMP_SLOT, + RELOC_RELATIVE /* rtld relocs */ +}; + +/* + * Format of a relocation datum. + */ +struct relocation_info /* used when header.a_machtype == M_SPARC */ +{ + unsigned int r_address; /* relocation addr */ + unsigned int r_index:24; /* segment index or symbol index */ + unsigned int r_extern:1; /* if F, r_index==SEG#; if T, SYM idx */ + int r_pad:2; /* <unused> */ + enum reloc_type r_type:5; /* type of relocation to perform */ + int r_addend; /* addend for relocation value */ +}; + +#define N_RELOCATION_INFO_DECLARED 1 + +#ifdef __KERNEL__ + +#define STACK_TOP32 ((1UL << 32UL) - PAGE_SIZE) +#define STACK_TOP64 (0x0000080000000000UL - (1UL << 32UL)) + +#define STACK_TOP (test_thread_flag(TIF_32BIT) ? \ + STACK_TOP32 : STACK_TOP64) + +#endif + +#endif /* !(__ASSEMBLY__) */ + +#endif /* !(__SPARC64_A_OUT_H__) */

1 0

r227 - openbios-devel/arch/sparc64
by svn＠openbios.org 09 Aug '08

09 Aug '08

Author: blueswirl Date: 2008-08-09 16:20:29 +0200 (Sat, 09 Aug 2008) New Revision: 227 Modified: openbios-devel/arch/sparc64/boot.c Log: Use nvram boot-args and boot-device variables also for Sparc64 (cf. r137) Modified: openbios-devel/arch/sparc64/boot.c =================================================================== --- openbios-devel/arch/sparc64/boot.c 2008-08-09 14:10:37 UTC (rev 226) +++ openbios-devel/arch/sparc64/boot.c 2008-08-09 14:20:29 UTC (rev 227) @@ -34,20 +34,29 @@ } if(!path) { - switch(boot_device) { - case 'a': - path = "/obio/SUNW,fdtwo"; - break; - case 'c': - path = "disk"; - break; - default: - case 'd': - path = "cdrom"; - break; - case 'n': - path = "net"; - break; + push_str("boot-device"); + push_str("/options"); + fword("(find-dev)"); + POP(); + fword("get-package-property"); + if (!POP()) { + path = pop_fstr_copy(); + } else { + switch (boot_device) { + case 'a': + path = "/obio/SUNW,fdtwo"; + break; + case 'c': + path = "disk"; + break; + default: + case 'd': + path = "cdrom"; + break; + case 'n': + path = "net"; + break; + } } } @@ -57,6 +66,14 @@ param++; } else if (cmdline_size) { param = (char *)qemu_cmdline; + } else { + push_str("boot-args"); + push_str("/options"); + fword("(find-dev)"); + POP(); + fword("get-package-property"); + POP(); + param = pop_fstr_copy(); } printk("[sparc64] Booting file '%s' ", path);

1 0

r226 - openbios-devel/arch/sparc64
by svn＠openbios.org 09 Aug '08

09 Aug '08

Author: blueswirl Date: 2008-08-09 16:10:37 +0200 (Sat, 09 Aug 2008) New Revision: 226 Modified: openbios-devel/arch/sparc64/init.fs Log: Set variable defaults before nvram_init also for Sparc64 (cf. r136) Modified: openbios-devel/arch/sparc64/init.fs =================================================================== --- openbios-devel/arch/sparc64/init.fs 2008-08-09 12:54:56 UTC (rev 225) +++ openbios-devel/arch/sparc64/init.fs 2008-08-09 14:10:37 UTC (rev 226) @@ -27,7 +27,7 @@ :noname set-defaults -; SYSTEM-initializer +; PREPOST-initializer \ preopen device nodes (and store the ihandles under /chosen) :noname

1 0

r225 - openbios-devel/arch/sparc64
by svn＠openbios.org 09 Aug '08

09 Aug '08

Author: blueswirl Date: 2008-08-09 14:54:56 +0200 (Sat, 09 Aug 2008) New Revision: 225 Modified: openbios-devel/arch/sparc64/openbios.c Log: Add mmu release (claim added in r219) Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-08-09 12:52:34 UTC (rev 224) +++ openbios-devel/arch/sparc64/openbios.c 2008-08-09 12:54:56 UTC (rev 225) @@ -252,6 +252,20 @@ PUSH(virt); // XXX } +/* + 3.6.5 release + ( virt size -- ) +*/ +static void +mmu_release(void) +{ + unsigned long virt, size; + + size = POP(); + virt = POP(); + // XXX +} + DECLARE_UNNAMED_NODE(mmu, INSTALL_OPEN, 0); NODE_METHODS(mmu) = { @@ -263,6 +277,7 @@ { "map", mmu_map }, { "unmap", mmu_unmap }, { "claim", mmu_claim }, + { "release", mmu_release }, }; /*

1 0

r224 - openbios-devel/arch/sparc64
by svn＠openbios.org 09 Aug '08

09 Aug '08

Author: blueswirl Date: 2008-08-09 14:52:34 +0200 (Sat, 09 Aug 2008) New Revision: 224 Modified: openbios-devel/arch/sparc64/console.c Log: Switch keyboard controller to translated mode so it works as expected Modified: openbios-devel/arch/sparc64/console.c =================================================================== --- openbios-devel/arch/sparc64/console.c 2008-08-06 23:24:48 UTC (rev 223) +++ openbios-devel/arch/sparc64/console.c 2008-08-09 12:52:34 UTC (rev 224) @@ -309,6 +309,15 @@ while (inb(0x64) & 2); } +static void keyboard_controller_cmd(unsigned char cmd, unsigned char val) +{ + outb(cmd, 0x64); + /* wait until keyboard controller accepts cmds: */ + while (inb(0x64) & 2); + outb(val, 0x60); + while (inb(0x64) & 2); +} + static char keyboard_poll(void) { unsigned int c; @@ -575,4 +584,6 @@ fword("encode-int"); push_str("stdout"); fword("property"); + + keyboard_controller_cmd(0x60, 0x40); // Write mode command, translated mode }

1 0

r223 - openbios-devel/forth/system
by svn＠openbios.org 07 Aug '08

07 Aug '08

Author: stepan Date: 2008-08-07 01:24:48 +0200 (Thu, 07 Aug 2008) New Revision: 223 Modified: openbios-devel/forth/system/ciface.fs Log: add set-callback for Aurora 2.0 Modified: openbios-devel/forth/system/ciface.fs =================================================================== --- openbios-devel/forth/system/ciface.fs 2008-08-06 18:24:51 UTC (rev 222) +++ openbios-devel/forth/system/ciface.fs 2008-08-06 23:24:48 UTC (rev 223) @@ -11,6 +11,8 @@ \ private stuff \ ------------------------------------------------------------- +variable callback-function + : ?phandle ( phandle -- phandle ) dup 0= if ." NULL phandle" -1 throw then ; @@ -267,7 +269,12 @@ \ ." --- " cr ; -\ : set-callback ( newfunc -- oldfunc ) ; +: set-callback ( newfunc -- oldfunc ) + callback-function @ + swap + callback-function ! +; + \ : set-symbol-lookup ( sym-to-value -- value-to-sym ) ;

1 0

r222 - openbios-devel/arch/sparc64
by svn＠openbios.org 06 Aug '08

06 Aug '08

Author: blueswirl Date: 2008-08-06 20:24:51 +0200 (Wed, 06 Aug 2008) New Revision: 222 Modified: openbios-devel/arch/sparc64/boot.c Log: Fix device names to allow Net/OpenBSD to boot Modified: openbios-devel/arch/sparc64/boot.c =================================================================== --- openbios-devel/arch/sparc64/boot.c 2008-08-06 18:23:13 UTC (rev 221) +++ openbios-devel/arch/sparc64/boot.c 2008-08-06 18:24:51 UTC (rev 222) @@ -39,11 +39,11 @@ path = "/obio/SUNW,fdtwo"; break; case 'c': - path = "/pci/isa/ide0/disk@0,0:a"; + path = "disk"; break; default: case 'd': - path = "/pci/isa/ide1/cdrom@0,0:a"; + path = "cdrom"; break; case 'n': path = "net";

1 0

r221 - openbios-devel/arch/sparc64
by svn＠openbios.org 06 Aug '08

06 Aug '08

Author: blueswirl Date: 2008-08-06 20:23:13 +0200 (Wed, 06 Aug 2008) New Revision: 221 Modified: openbios-devel/arch/sparc64/openbios.c Log: More realistic mmu_translate Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-08-06 18:20:57 UTC (rev 220) +++ openbios-devel/arch/sparc64/openbios.c 2008-08-06 18:23:13 UTC (rev 221) @@ -22,6 +22,7 @@ #include "boot.h" #include "../../drivers/timer.h" // XXX #include "asi.h" +#include "spitfire.h" #include "libc/vsprintf.h" #define REGISTER_NAMED_NODE( name, path ) do { \ @@ -84,22 +85,42 @@ static void mmu_translate(void) { - unsigned long virt, phys; + unsigned long virt, phys, tag, data, mask; + unsigned int i; virt = POP(); - asm("ldxa [%1] %2, %0\n" - : "=r"(phys) : "r" (virt), "i" (ASI_DTLB_TAG_READ)); - - if (phys & 0x8000000000000000) { // Valid entry? - phys &= 0x000001fffffff000; - PUSH(phys & 0xffffffff); - PUSH(phys >> 32); - PUSH(0); // XXX - PUSH(-1); - } else { - PUSH(0); + for (i = 0; i < 64; i++) { + data = spitfire_get_dtlb_data(i); + if (data & 0x8000000000000000) { // Valid entry? + switch ((data >> 61) & 3) { + default: + case 0x0: // 8k + mask = 0xffffffffffffe000ULL; + break; + case 0x1: // 64k + mask = 0xffffffffffff0000ULL; + break; + case 0x2: // 512k + mask = 0xfffffffffff80000ULL; + break; + case 0x3: // 4M + mask = 0xffffffffffc00000ULL; + break; + } + tag = spitfire_get_dtlb_tag(i); + if ((virt & mask) == (tag & mask)) { + phys = tag & mask & 0x000001fffffff000; + phys |= virt & ~mask; + PUSH(phys & 0xffffffff); + PUSH(phys >> 32); + PUSH(data & 0xfff); + PUSH(-1); + return; + } + } } + PUSH(0); } static void

1 0

r220 - openbios-devel/arch/sparc64
by svn＠openbios.org 06 Aug '08

06 Aug '08

Author: blueswirl Date: 2008-08-06 20:20:57 +0200 (Wed, 06 Aug 2008) New Revision: 220 Modified: openbios-devel/arch/sparc64/openbios.c Log: Fix typo Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-08-06 18:20:12 UTC (rev 219) +++ openbios-devel/arch/sparc64/openbios.c 2008-08-06 18:20:57 UTC (rev 220) @@ -164,7 +164,7 @@ } else if (currsize >= PAGE_SIZE_512K && (virt & PAGE_MASK_512K) == 0 && (phys & PAGE_MASK_512K) == 0) { - currsize = PAGE_SIZE_8K; + currsize = PAGE_SIZE_512K; tte_data = 4ULL << 60; } else if (currsize >= PAGE_SIZE_64K && (virt & PAGE_MASK_64K) == 0 &&

1 0

r219 - openbios-devel/arch/sparc64
by svn＠openbios.org 06 Aug '08

06 Aug '08

Author: blueswirl Date: 2008-08-06 20:20:12 +0200 (Wed, 06 Aug 2008) New Revision: 219 Modified: openbios-devel/arch/sparc64/openbios.c openbios-devel/arch/sparc64/tree.fs Log: Fix #size-cells for HelenOS, add /openprom/version node Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-08-02 10:59:05 UTC (rev 218) +++ openbios-devel/arch/sparc64/openbios.c 2008-08-06 18:20:12 UTC (rev 219) @@ -216,6 +216,21 @@ //unmap_pages(virt, size); } +/* + 3.6.5 claim + ( virt size align -- base ) +*/ +static void +mmu_claim(void) +{ + unsigned long virt, size, align; + + align = POP(); + size = POP(); + virt = POP(); + PUSH(virt); // XXX +} + DECLARE_UNNAMED_NODE(mmu, INSTALL_OPEN, 0); NODE_METHODS(mmu) = { @@ -226,6 +241,7 @@ { "SUNW,itlb-load", itlb_load }, { "map", mmu_map }, { "unmap", mmu_unmap }, + { "claim", mmu_claim }, }; /* Modified: openbios-devel/arch/sparc64/tree.fs =================================================================== --- openbios-devel/arch/sparc64/tree.fs 2008-08-02 10:59:05 UTC (rev 218) +++ openbios-devel/arch/sparc64/tree.fs 2008-08-06 18:20:12 UTC (rev 219) @@ -1,7 +1,7 @@ " /" find-device 2 encode-int " #address-cells" property - 1 encode-int " #size-cells" property + 2 encode-int " #size-cells" property " sun4u" encode-string " compatible" property \ : encode-unit encode-unit-sbus ; @@ -13,6 +13,7 @@ : open true ; : close ; \ claim ( phys size align -- base ) + : claim 2drop ; \ release ( phys size -- ) finish-device @@ -22,9 +23,12 @@ : open true ; : close ; \ claim ( phys size align -- base ) + : claim 2drop ; \ release ( phys size -- ) finish-device " /options" find-device " disk" encode-string " boot-from" property +" /openprom" find-device + " OBP 3.10.24 1999/01/01 01:01" encode-string " version" property

1 0

r218 - openbios-devel/arch/sparc64
by svn＠openbios.org 02 Aug '08

02 Aug '08

Author: blueswirl Date: 2008-08-02 12:59:05 +0200 (Sat, 02 Aug 2008) New Revision: 218 Modified: openbios-devel/arch/sparc64/boot.c openbios-devel/arch/sparc64/ldscript openbios-devel/arch/sparc64/openbios.c Log: Finally fix the very obscure problem which prevented normal and especially FCode boot: too small heap (used for Forth memory)! Remove forced arch_init and boot hacks Modified: openbios-devel/arch/sparc64/boot.c =================================================================== --- openbios-devel/arch/sparc64/boot.c 2008-08-02 10:53:24 UTC (rev 217) +++ openbios-devel/arch/sparc64/boot.c 2008-08-02 10:59:05 UTC (rev 218) @@ -39,11 +39,11 @@ path = "/obio/SUNW,fdtwo"; break; case 'c': - path = "disk"; + path = "/pci/isa/ide0/disk@0,0:a"; break; default: case 'd': - path = "cdrom"; + path = "/pci/isa/ide1/cdrom@0,0:a"; break; case 'n': path = "net"; Modified: openbios-devel/arch/sparc64/ldscript =================================================================== --- openbios-devel/arch/sparc64/ldscript 2008-08-02 10:53:24 UTC (rev 217) +++ openbios-devel/arch/sparc64/ldscript 2008-08-02 10:59:05 UTC (rev 218) @@ -10,8 +10,8 @@ */ BASE_ADDR = 0x00000000ffd00000; -/* 16KB heap and stack */ -HEAP_SIZE = 16384; +/* 512KB heap and 16KB stack */ +HEAP_SIZE = 512 * 1024; STACK_SIZE = 16384; VMEM_SIZE = 128 * 1024; IOMEM_SIZE = 256 * 1024 + 768 * 1024; Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-08-02 10:53:24 UTC (rev 217) +++ openbios-devel/arch/sparc64/openbios.c 2008-08-02 10:59:05 UTC (rev 218) @@ -52,8 +52,6 @@ static uint8_t idprom[32]; -static const char *bootpath; - struct cpudef { unsigned long iu_version; const char *name; @@ -410,6 +408,7 @@ unsigned char *nvptr = (unsigned char *)&nv_info; uint32_t size; const struct cpudef *cpu; + const char *bootpath; for (i = 0; i < sizeof(ohwcfg_v3_t); i++) { outb(i & 0xff, 0x74); @@ -674,6 +673,7 @@ device_end(); bind_func("platform-boot", boot ); + printk("\n"); // XXX needed for boot, why? } int openbios(void) @@ -723,10 +723,6 @@ #endif enterforth((xt_t)PC); - arch_init(); // XXX - printk("force boot\n"); - push_str(bootpath); - boot(); // XXX printk("falling off...\n"); return 0; }

1 0

r217 - openbios-devel/arch/sparc64
by svn＠openbios.org 02 Aug '08

02 Aug '08

Author: blueswirl Date: 2008-08-02 12:53:24 +0200 (Sat, 02 Aug 2008) New Revision: 217 Modified: openbios-devel/arch/sparc64/openbios.c Log: Add bootargs property for kernel command line Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-08-02 10:51:51 UTC (rev 216) +++ openbios-devel/arch/sparc64/openbios.c 2008-08-02 10:53:24 UTC (rev 217) @@ -605,6 +605,11 @@ fword("encode-string"); push_str("bootpath"); fword("property"); + + push_str(obio_cmdline); + fword("encode-string"); + push_str("bootargs"); + fword("property"); } void arch_nvram_put(char *data)

1 0

r216 - openbios-devel/arch/sparc64
by svn＠openbios.org 02 Aug '08

02 Aug '08

Author: blueswirl Date: 2008-08-02 12:51:51 +0200 (Sat, 02 Aug 2008) New Revision: 216 Modified: openbios-devel/arch/sparc64/openbios.c Log: Fix wrong translations Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-07-22 07:07:37 UTC (rev 215) +++ openbios-devel/arch/sparc64/openbios.c 2008-08-02 10:51:51 UTC (rev 216) @@ -512,16 +512,16 @@ push_str("/virtual-memory"); fword("find-device"); - // 0 to va2pa(_start): 1:1 + // 0 to 16M: 1:1 PUSH(0); fword("encode-int"); PUSH(0); fword("encode-int"); fword("encode+"); - PUSH((va2pa((unsigned long)&_data) - 8192) >> 32); + PUSH(0); fword("encode-int"); fword("encode+"); - PUSH((va2pa((unsigned long)&_data) - 8192) & 0xffffffff); + PUSH(16 * 1024 * 1024); fword("encode-int"); fword("encode+"); PUSH(0x80000000); @@ -555,7 +555,7 @@ PUSH(0); fword("encode-int"); fword("encode+"); - PUSH((unsigned long)&_start); + PUSH((unsigned long)&_data); fword("encode-int"); fword("encode+"); PUSH(0);

1 0

Re: [OpenBIOS] OpenBIOS Digest, Vol 44, Issue 14
by Stefan Florin Neagu 27 Jul '08

27 Jul '08

They don't support my board. Stefan Neagu -------------------------------------------- 'Mac users swear by their Mac, PC users swear at their PC.' http://claimid.com/neasteflorin On Sun, Jul 27, 2008 at 1:00 PM, <openbios-request(a)openbios.org> wrote: > Send OpenBIOS mailing list submissions to > openbios(a)openbios.org > > To subscribe or unsubscribe via the World Wide Web, visit > http://lists.openbios.org/mailman/listinfo/openbios > or, via email, send a message with subject or body 'help' to > openbios-request(a)openbios.org > > You can reach the person managing the list at > openbios-owner(a)openbios.org > > When replying, please edit your Subject line so it is more specific > than "Re: Contents of OpenBIOS digest..." > > > Today's Topics: > > 1. Re: Support for Acer Aspire 5100 Series (Blue Swirl) > > > ---------------------------------------------------------------------- > > Message: 1 > Date: Sat, 26 Jul 2008 14:08:24 +0300 > From: "Blue Swirl" <blauwirbel(a)gmail.com> > Subject: Re: [OpenBIOS] Support for Acer Aspire 5100 Series > To: "The OpenBIOS Mailinglist" <openbios(a)openbios.org> > Message-ID: > <f43fc5580807260408n4410a53ahf1b33a52d63163c6(a)mail.gmail.com> > Content-Type: text/plain; charset=UTF-8 > > On 7/25/08, Stefan Florin Neagu <neasteflorin(a)gmail.com> wrote: > > I'm pretty good with the command line, but my PC's out of warranty and > > debugging the BIOS is a little over my head. Wanted to ask if Open BIOS > will > > work on Acer Aspire 5100 which is using a custom award bios that is very > > crippled, very few settings. Thanks! > > I don't think it will work. Maybe you want to try coreboot instead of > OpenBIOS. > > > > ------------------------------ > > -- > OpenBIOS mailing list > OpenBIOS(a)openbios.org > http://lists.openbios.org/mailman/listinfo/openbios > > End of OpenBIOS Digest, Vol 44, Issue 14 > **************************************** >

1 0

Support for Acer Aspire 5100 Series
by Stefan Florin Neagu 26 Jul '08

26 Jul '08

I'm pretty good with the command line, but my PC's out of warranty and debugging the BIOS is a little over my head. Wanted to ask if Open BIOS will work on Acer Aspire 5100 which is using a custom award bios that is very crippled, very few settings. Thanks! Stefan Neagu -------------------------------------------- 'Mac users swear by their Mac, PC users swear at their PC.' http://claimid.com/neasteflorin

2 1

r215 - openbios-devel/arch/sparc64
by svn＠openbios.org 22 Jul '08

22 Jul '08

Author: blueswirl Date: 2008-07-22 09:07:37 +0200 (Tue, 22 Jul 2008) New Revision: 215 Modified: openbios-devel/arch/sparc64/openbios.c Log: Add T1 and T2 CPUs Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-07-21 11:16:17 UTC (rev 214) +++ openbios-devel/arch/sparc64/openbios.c 2008-07-22 07:07:37 UTC (rev 215) @@ -373,6 +373,14 @@ .name = "SUNW,UltraSPARC-IIIi+", }, { + .iu_version = (0x3eULL << 48) | (0x23ULL << 32), + .name = "SUNW,UltraSPARC-T1", + }, + { + .iu_version = (0x3eULL << 48) | (0x24ULL << 32), + .name = "SUNW,UltraSPARC-T2", + }, + { .iu_version = (0x22ULL << 48) | (0x10ULL << 32), .name = "SUNW,UltraSPARC", },

1 0

r214 - openbios-devel/arch/sparc64
by svn＠openbios.org 21 Jul '08

21 Jul '08

Author: blueswirl Date: 2008-07-21 13:16:17 +0200 (Mon, 21 Jul 2008) New Revision: 214 Modified: openbios-devel/arch/sparc64/vectors.S Log: Add correct reset vectors Modified: openbios-devel/arch/sparc64/vectors.S =================================================================== --- openbios-devel/arch/sparc64/vectors.S 2008-07-21 07:50:53 UTC (rev 213) +++ openbios-devel/arch/sparc64/vectors.S 2008-07-21 11:16:17 UTC (rev 214) @@ -105,9 +105,13 @@ #define STACK_BIAS 2047 .globl sparc64_ttable_tl0, sparc64_ttable_tl1 sparc64_ttable_tl0: - ba entry; nop; nop; nop; nop; nop; nop; nop; - BTRAP(0x01) BTRAP(0x02) BTRAP(0x03) BTRAP(0x04) BTRAP(0x05) BTRAP(0x06) BTRAP(0x07) - BTRAPS(0x08) + ba entry; nop; nop; nop; nop; nop; nop; nop;! XXX remove + ba entry; nop; nop; nop; nop; nop; nop; nop;! Power-on reset + ba entry; nop; nop; nop; nop; nop; nop; nop;! Watchdog reset + ba entry; nop; nop; nop; nop; nop; nop; nop;! External reset + ba entry; nop; nop; nop; nop; nop; nop; nop;! Software reset + ba entry; nop; nop; nop; nop; nop; nop; nop;! RED state + BTRAP(0x06) BTRAP(0x07) BTRAPS(0x08) BTRAPS(0x10) BTRAPS(0x18) BTRAP(0x20) BTRAP(0x21) BTRAP(0x22) BTRAP(0x23) CLEAN_WINDOW ! 24-27

1 0

r213 - openbios-devel/arch/sparc64
by svn＠openbios.org 21 Jul '08

21 Jul '08

Author: blueswirl Date: 2008-07-21 09:50:53 +0200 (Mon, 21 Jul 2008) New Revision: 213 Added: openbios-devel/arch/sparc64/fcodeload.c Modified: openbios-devel/arch/sparc64/boot.c openbios-devel/arch/sparc64/boot.h openbios-devel/arch/sparc64/build.xml Log: Add FCode boot loader for Solaris etc. Modified: openbios-devel/arch/sparc64/boot.c =================================================================== --- openbios-devel/arch/sparc64/boot.c 2008-07-21 07:48:11 UTC (rev 212) +++ openbios-devel/arch/sparc64/boot.c 2008-07-21 07:50:53 UTC (rev 213) @@ -68,15 +68,22 @@ if (elf_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) - if (aout_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) { + if (aout_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) + if (fcode_load(&sys_info, path, param) + == LOADER_NOT_SUPPORT) { - sprintf(altpath, "%s:d", path); + sprintf(altpath, "%s:d", path); - if (elf_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT) - if (linux_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT) - if (aout_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT) - printk("Unsupported image format\n"); - } + if (elf_load(&sys_info, altpath, param) + == LOADER_NOT_SUPPORT) + if (linux_load(&sys_info, altpath, param) + == LOADER_NOT_SUPPORT) + if (aout_load(&sys_info, altpath, param) + == LOADER_NOT_SUPPORT) + if (fcode_load(&sys_info, path, param) + == LOADER_NOT_SUPPORT) + printk("Unsupported image format\n"); + } free(path); } Modified: openbios-devel/arch/sparc64/boot.h =================================================================== --- openbios-devel/arch/sparc64/boot.h 2008-07-21 07:48:11 UTC (rev 212) +++ openbios-devel/arch/sparc64/boot.h 2008-07-21 07:50:53 UTC (rev 213) @@ -10,6 +10,8 @@ int elf_load(struct sys_info *info, const char *filename, const char *cmdline); int linux_load(struct sys_info *info, const char *file, const char *cmdline); int aout_load(struct sys_info *info, const char *filename, const char *cmdline); +int fcode_load(struct sys_info *info, const char *filename, + const char *cmdline); uint64_t start_elf(uint64_t entry_point, uint64_t param); Modified: openbios-devel/arch/sparc64/build.xml =================================================================== --- openbios-devel/arch/sparc64/build.xml 2008-07-21 07:48:11 UTC (rev 212) +++ openbios-devel/arch/sparc64/build.xml 2008-07-21 07:50:53 UTC (rev 213) @@ -17,6 +17,7 @@ <object source="elfload.c"/> <object source="aoutload.c"/> <object source="forthload.c"/> + <object source="fcodeload.c"/> <object source="loadfs.c"/> </library> Added: openbios-devel/arch/sparc64/fcodeload.c =================================================================== --- openbios-devel/arch/sparc64/fcodeload.c (rev 0) +++ openbios-devel/arch/sparc64/fcodeload.c 2008-07-21 07:50:53 UTC (rev 213) @@ -0,0 +1,76 @@ +/* + * FCode boot loader + */ + +#include "openbios/config.h" +#include "openbios/kernel.h" +#include "openbios/bindings.h" +#include "sys_info.h" +#include "loadfs.h" +#include "boot.h" +#define printf printk +#define debug printk + +int fcode_load(struct sys_info *info, const char *filename, + const char *cmdline) +{ + int retval = -1; + uint8_t fcode_header[8]; + unsigned long start, size; + unsigned int offset; + + if (!file_open(filename)) + goto out; + + for (offset = 0; offset < 16 * 512; offset += 512) { + file_seek(offset); + if (lfile_read(&fcode_header, sizeof(fcode_header)) + != sizeof(fcode_header)) { + debug("Can't read FCode header from file %s\n", filename); + retval = LOADER_NOT_SUPPORT; + goto out; + } + switch (fcode_header[0]) { + case 0xf0: // start0 + case 0xf1: // start1 + case 0xf2: // start2 + case 0xf3: // start4 + case 0xfd: // version1 + goto found; + } + } + + debug("Not a bootable FCode image\n"); + retval = LOADER_NOT_SUPPORT; + goto out; + + found: + size = (fcode_header[4] << 24) | (fcode_header[5] << 16) | + (fcode_header[6] << 8) | fcode_header[7]; + + start = 0x4000; + + printf("Loading FCode image...\n"); + + file_seek(offset + sizeof(fcode_header)); + + if ((unsigned long)lfile_read((void *)start, size) != size) { + printf("Can't read file (size 0x%lx)\n", size); + goto out; + } + + debug("Loaded %lu bytes\n", size); + + debug("entry point is %#lx\n", start); + printf("Evaluating FCode...\n"); + + PUSH(start); + PUSH(1); + fword("byte-load"); + + retval = 0; + +out: + file_close(); + return retval; +}

1 0

r212 - in openbios-devel/arch: sparc32 sparc64
by svn＠openbios.org 21 Jul '08

21 Jul '08

Author: blueswirl Date: 2008-07-21 09:48:11 +0200 (Mon, 21 Jul 2008) New Revision: 212 Modified: openbios-devel/arch/sparc32/build.xml openbios-devel/arch/sparc64/build.xml Log: Fix builtin.c dependencies Modified: openbios-devel/arch/sparc32/build.xml =================================================================== --- openbios-devel/arch/sparc32/build.xml 2008-07-18 20:14:09 UTC (rev 211) +++ openbios-devel/arch/sparc32/build.xml 2008-07-21 07:48:11 UTC (rev 212) @@ -61,8 +61,8 @@ </executable> <executable name="target/arch/sparc32/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> - <rule><![CDATA[ arch/sparc32/builtin.c - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> + <rule><![CDATA[ arch/sparc32/builtin.c $(ODIR)/target/include/static-dict.h + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/builtin.c]]></rule> </executable>  Modified: openbios-devel/arch/sparc64/build.xml =================================================================== --- openbios-devel/arch/sparc64/build.xml 2008-07-18 20:14:09 UTC (rev 211) +++ openbios-devel/arch/sparc64/build.xml 2008-07-21 07:48:11 UTC (rev 212) @@ -59,8 +59,8 @@ </executable> <executable name="target/arch/sparc64/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> - <rule><![CDATA[ arch/sparc64/builtin.c - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> + <rule><![CDATA[ arch/sparc64/builtin.c $(ODIR)/target/include/static-dict.h + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc64/builtin.c]]></rule> </executable>

1 0

r211 - openbios-devel/arch/sparc64
by svn＠openbios.org 18 Jul '08

18 Jul '08

Author: blueswirl Date: 2008-07-18 22:14:09 +0200 (Fri, 18 Jul 2008) New Revision: 211 Modified: openbios-devel/arch/sparc64/openbios.c Log: Fix available and total memory Implement a static list of mmu translations Map more pages Add a fake unmap method Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-07-18 10:34:17 UTC (rev 210) +++ openbios-devel/arch/sparc64/openbios.c 2008-07-18 20:14:09 UTC (rev 211) @@ -59,6 +59,15 @@ const char *name; }; +#define PAGE_SIZE_4M (4 * 1024 * 1024) +#define PAGE_SIZE_512K (512 * 1024) +#define PAGE_SIZE_64K (64 * 1024) +#define PAGE_SIZE_8K (8 * 1024) +#define PAGE_MASK_4M (4 * 1024 * 1024 - 1) +#define PAGE_MASK_512K (512 * 1024 - 1) +#define PAGE_MASK_64K (64 * 1024 - 1) +#define PAGE_MASK_8K (8 * 1024 - 1) + static void mmu_open(void) { @@ -95,6 +104,15 @@ } } +static void +dtlb_load2(unsigned long vaddr, unsigned long tte_data) +{ + asm("stxa %0, [%1] %2\n" + "stxa %3, [%%g0] %4\n" + : : "r" (vaddr), "r" (48), "i" (ASI_DMMU), + "r" (tte_data), "i" (ASI_DTLB_DATA_IN)); +} + /* ( index tte_data vaddr -- ? ) */ @@ -106,11 +124,16 @@ vaddr = POP(); tte_data = POP(); idx = POP(); + dtlb_load2(vaddr, tte_data); +} +static void +itlb_load2(unsigned long vaddr, unsigned long tte_data) +{ asm("stxa %0, [%1] %2\n" "stxa %3, [%%g0] %4\n" - : : "r" (vaddr), "r" (48), "i" (ASI_DMMU), - "r" (tte_data), "i" (ASI_DTLB_DATA_IN)); + : : "r" (vaddr), "r" (48), "i" (ASI_IMMU), + "r" (tte_data), "i" (ASI_ITLB_DATA_IN)); } /* @@ -124,11 +147,43 @@ vaddr = POP(); tte_data = POP(); idx = POP(); + itlb_load2(vaddr, tte_data); +} - asm("stxa %0, [%1] %2\n" - "stxa %3, [%%g0] %4\n" - : : "r" (vaddr), "r" (48), "i" (ASI_IMMU), - "r" (tte_data), "i" (ASI_ITLB_DATA_IN)); +static void +map_pages(unsigned long virt, unsigned long size, unsigned long phys) +{ + unsigned long tte_data, currsize; + + size = (size + PAGE_MASK_8K) & ~PAGE_MASK_8K; + while (size >= PAGE_SIZE_8K) { + currsize = size; + if (currsize >= PAGE_SIZE_4M && + (virt & PAGE_MASK_4M) == 0 && + (phys & PAGE_MASK_4M) == 0) { + currsize = PAGE_SIZE_4M; + tte_data = 6ULL << 60; + } else if (currsize >= PAGE_SIZE_512K && + (virt & PAGE_MASK_512K) == 0 && + (phys & PAGE_MASK_512K) == 0) { + currsize = PAGE_SIZE_8K; + tte_data = 4ULL << 60; + } else if (currsize >= PAGE_SIZE_64K && + (virt & PAGE_MASK_64K) == 0 && + (phys & PAGE_MASK_64K) == 0) { + currsize = PAGE_SIZE_64K; + tte_data = 2ULL << 60; + } else { + currsize = PAGE_SIZE_8K; + tte_data = 0; + } + tte_data |= phys | 0x8000000000000036ULL; + dtlb_load2(virt, tte_data); + itlb_load2(virt, tte_data); + size -= currsize; + phys += currsize; + virt += currsize; + } } /* @@ -138,7 +193,7 @@ static void mmu_map(void) { - unsigned long virt, size, mode, phys, tte_data; + unsigned long virt, size, mode, phys; mode = POP(); size = POP(); @@ -146,29 +201,21 @@ phys = POP(); phys <<= 32; phys |= POP(); + map_pages(virt, size, phys); +} - tte_data = phys | 0x8000000000000036ULL; - switch (size) { - case 8192: - break; - case 65536: - tte_data |= 2ULL << 60; - break; - case 512 * 1024: - tte_data |= 4ULL << 60; - break; - case 4 * 1024 * 1024: - tte_data |= 6ULL << 60; - break; - } - asm("stxa %0, [%1] %2\n" - "stxa %3, [%%g0] %4\n" - : : "r" (virt), "r" (48), "i" (ASI_DMMU), - "r" (tte_data), "i" (ASI_DTLB_DATA_IN)); - asm("stxa %0, [%1] %2\n" - "stxa %3, [%%g0] %4\n" - : : "r" (virt), "r" (48), "i" (ASI_IMMU), - "r" (tte_data), "i" (ASI_ITLB_DATA_IN)); +/* + 3.6.5 unmap + ( virt size -- ) +*/ +static void +mmu_unmap(void) +{ + unsigned long virt, size; + + size = POP(); + virt = POP(); + //unmap_pages(virt, size); } DECLARE_UNNAMED_NODE(mmu, INSTALL_OPEN, 0); @@ -180,6 +227,7 @@ { "SUNW,dtlb-load", dtlb_load }, { "SUNW,itlb-load", itlb_load }, { "map", mmu_map }, + { "unmap", mmu_unmap }, }; /* @@ -421,8 +469,12 @@ push_str("/memory"); fword("find-device"); + // All memory: 0 to RAM_size PUSH(0); fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); PUSH((int)(nv_info.RAM0_size >> 32)); fword("encode-int"); fword("encode+"); @@ -432,47 +484,105 @@ push_str("reg"); fword("property"); + // Available memory: 0 to va2pa(_start) PUSH(0); fword("encode-int"); PUSH(0); fword("encode-int"); fword("encode+"); - PUSH((unsigned long)&_start - 4096); + PUSH((va2pa((unsigned long)&_data) - 8192) >> 32); fword("encode-int"); fword("encode+"); - PUSH(0); + PUSH((va2pa((unsigned long)&_data) - 8192) & 0xffffffff); fword("encode-int"); fword("encode+"); - PUSH(va2pa((unsigned long)&_iomem)); - fword("encode-int"); - fword("encode+"); - PUSH(-va2pa((unsigned long)&_iomem)); - fword("encode-int"); - fword("encode+"); push_str("available"); fword("property"); // XXX + // Translations push_str("/virtual-memory"); fword("find-device"); + // 0 to va2pa(_start): 1:1 PUSH(0); fword("encode-int"); PUSH(0); fword("encode-int"); fword("encode+"); + PUSH((va2pa((unsigned long)&_data) - 8192) >> 32); + fword("encode-int"); + fword("encode+"); + PUSH((va2pa((unsigned long)&_data) - 8192) & 0xffffffff); + fword("encode-int"); + fword("encode+"); + PUSH(0x80000000); + fword("encode-int"); + fword("encode+"); + PUSH(0x00000036); + fword("encode-int"); + fword("encode+"); + + // _start to _data: ROM used PUSH(0); fword("encode-int"); fword("encode+"); + PUSH((unsigned long)&_start); + fword("encode-int"); + fword("encode+"); PUSH(0); fword("encode-int"); fword("encode+"); + PUSH((unsigned long)&_data - (unsigned long)&_start); + fword("encode-int"); + fword("encode+"); + PUSH(0x800001ff); + fword("encode-int"); + fword("encode+"); + PUSH(0xf0000074); + fword("encode-int"); + fword("encode+"); + + // _data to _end: end of RAM PUSH(0); fword("encode-int"); fword("encode+"); + PUSH((unsigned long)&_start); + fword("encode-int"); + fword("encode+"); PUSH(0); fword("encode-int"); fword("encode+"); + PUSH((unsigned long)&_data - (unsigned long)&_start); + fword("encode-int"); + fword("encode+"); + PUSH(((va2pa((unsigned long)&_data) - 8192) >> 32) | 0x80000000); + fword("encode-int"); + fword("encode+"); + PUSH(((va2pa((unsigned long)&_data) - 8192) & 0xffffffff) | 0x36); + fword("encode-int"); + fword("encode+"); + + // VGA buffer (128k): 1:1 + PUSH(0x1ff); + fword("encode-int"); + fword("encode+"); + PUSH(0x004a0000); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(128 * 1024); + fword("encode-int"); + fword("encode+"); + PUSH(0x800001ff); + fword("encode-int"); + fword("encode+"); + PUSH(0x004a0076); + fword("encode-int"); + fword("encode+"); + push_str("translations"); fword("property");

1 0

r210 - openbios-devel/arch/sparc64
by svn＠openbios.org 18 Jul '08

18 Jul '08

Author: blueswirl Date: 2008-07-18 12:34:17 +0200 (Fri, 18 Jul 2008) New Revision: 210 Modified: openbios-devel/arch/sparc64/openbios.c Log: Add a clock-frequency node Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-07-18 10:29:47 UTC (rev 209) +++ openbios-devel/arch/sparc64/openbios.c 2008-07-18 10:34:17 UTC (rev 210) @@ -413,6 +413,11 @@ push_str("idprom"); fword("property"); + PUSH(500 * 1000 * 1000); + fword("encode-int"); + push_str("clock-frequency"); + fword("property"); + push_str("/memory"); fword("find-device");

1 0

r209 - in openbios-devel: arch/sparc64 config/examples
by svn＠openbios.org 18 Jul '08

18 Jul '08

Author: blueswirl Date: 2008-07-18 12:29:47 +0200 (Fri, 18 Jul 2008) New Revision: 209 Modified: openbios-devel/arch/sparc64/entry.S openbios-devel/config/examples/cross-sparc64_rules.xml openbios-devel/config/examples/sparc64_rules.xml Log: Set up tick_cmpr, update assembly flags Modified: openbios-devel/arch/sparc64/entry.S =================================================================== --- openbios-devel/arch/sparc64/entry.S 2008-07-17 19:12:23 UTC (rev 208) +++ openbios-devel/arch/sparc64/entry.S 2008-07-18 10:29:47 UTC (rev 209) @@ -45,6 +45,9 @@ wrpr %g0, 0, %canrestore wrpr %g0, 0, %otherwin wrpr %g0, 0, %wstate + ! 100 Hz timer + set 10 * 1000 * 1000, %g1 + wr %g1, 0, %tick_cmpr ! Disable I/D MMUs and caches stxa %g0, [%g0] ASI_LSU_CONTROL Modified: openbios-devel/config/examples/cross-sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_rules.xml 2008-07-17 19:12:23 UTC (rev 208) +++ openbios-devel/config/examples/cross-sparc64_rules.xml 2008-07-18 10:29:47 UTC (rev 209) @@ -20,12 +20,12 @@ STRIP := sparc64-linux-strip RANLIB := sparc64-linux-ranlib CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -g -CFLAGS+= -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany +CFLAGS+= -Wa,-xarch=v9b -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany CFLAGS+= -fno-builtin -nostdlib -ffreestanding CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include -AS_FLAGS := -Wa,-xarch=v9 -Wa,-64 -g +AS_FLAGS := -Wa,-xarch=v9b -Wa,-64 -g # # pre rules Modified: openbios-devel/config/examples/sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/sparc64_rules.xml 2008-07-17 19:12:23 UTC (rev 208) +++ openbios-devel/config/examples/sparc64_rules.xml 2008-07-18 10:29:47 UTC (rev 209) @@ -29,11 +29,11 @@ endif CFLAGS := -Os -Wall -W -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -fno-builtin -g -CFLAGS+= -Wa,-xarch=v9 -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany +CFLAGS+= -Wa,-xarch=v9b -Wa,-64 -m64 -mcpu=ultrasparc -mcmodel=medany CFLAGS+= -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations CFLAGS+= -Wundef -Wendif-labels -Wstrict-aliasing INCLUDES := -Iinclude -Ikernel/include -I$(ODIR)/target/include -AS_FLAGS := -Wa,-xarch=v9 -Wa,-64 -g +AS_FLAGS := -Wa,-xarch=v9b -Wa,-64 -g # # pre rules

1 0

Sparc64 progress
by Blue Swirl 17 Jul '08

17 Jul '08

Hi, With Qemu r4780 and OpenBIOS r201 I get the following output on serial console: ./qemu-system-sparc64 -L . -kernel vmlinux-2.6.25.10-sun4u -serial stdio OpenBIOS for Sparc64 Initializing PCI devices... ide0: [io ports 0x1f0-0x1f7,0x3f6] ide1: [io ports 0x170-0x177,0x376] drive0 [ATAPI cdrom]: QEMU DVD-ROM floppy_init FDC is a S82078B floppy_reset floppy_motor_off SENSEI 20 00 status = 80, reply_buffer= 20 0 fdc_specify FD_SPECIFY(c1, 11) set_drive status = 80, new_dor = 10 floppy_recalibrate fdc_state.version = 0062 Nvram id QEMU_BIOS, version 3 kernel addr 404000 size 4d4640 CPUs: 1 x SUNW,UltraSPARC-II force boot [sparc64] Kernel already loaded NULL ihandleNULL ihandle PROMLIB: Sun IEEE Boot Prom '' PROMLIB: Root node compatible: sun4u Linux version 2.6.25.10 (test@host) (gcc version 3.4.6 (Debian 3.4.6-5)) #4 Tue Jul 15 14:41:01 UTC 2008 console [earlyprom0] enabled ARCH: SUN4U Ethernet address: 52:54:00:12:34:56 Kernel: Using 2 locked TLB entries for main kernel image. Remapping the kernel... NULL ihandleSegmentation fault

4 5

r208 - openbios-devel/arch/sparc64
by svn＠openbios.org 17 Jul '08

17 Jul '08

Author: blueswirl Date: 2008-07-17 21:12:23 +0200 (Thu, 17 Jul 2008) New Revision: 208 Modified: openbios-devel/arch/sparc64/vectors.S Log: Fix printing of exception messages Modified: openbios-devel/arch/sparc64/vectors.S =================================================================== --- openbios-devel/arch/sparc64/vectors.S 2008-07-17 19:10:10 UTC (rev 207) +++ openbios-devel/arch/sparc64/vectors.S 2008-07-17 19:12:23 UTC (rev 208) @@ -27,6 +27,7 @@ #include "pstate.h" #include "asi.h" #define ASI_BP ASI_PHYS_BYPASS_EC_E +#define PROM_ADDR 0x1fff0000000 #define SER_ADDR 0x1fe020003f8 .section ".text.vectors", "ax" @@ -303,11 +304,18 @@ or %g2, PSTATE_PRIV, %g2 wrpr %g2, %pstate wr %g0, 0, %fprs - wrpr %g0, 0x0, %tl - ! Disable I/D MMUs and caches - stxa %g0, [%g0] ASI_LSU_CONTROL + ! Jump to ROM ... + setx _start, %g2, %g3 + setx highmem, %g2, %g4 + sub %g4, %g3, %g4 + setx PROM_ADDR, %g2, %g3 + add %g4, %g3, %g3 + jmp %g3 + ! ... while disabling I/D MMUs and caches + stxa %g0, [%g0] ASI_LSU_CONTROL +highmem: ! Extract NWINDOWS from %ver rdpr %ver, %g2 and %g2, 0xf, %g2 @@ -317,12 +325,9 @@ wrpr %g0, 0, %otherwin wrpr %g0, 0, %wstate - call dump_exception + b dump_exception nop -_forever: - /* Loop forever */ - b _forever ; - nop + outstr: /* void outstr (unsigned long port, const unsigned char *str); * Writes a string on an IO port. @@ -372,32 +377,35 @@ */ dump_exception: setx SER_ADDR, %o3, %o0 - setx (_BUG_message_0), %o3, %o1 + set _start, %g3 + set (_BUG_message_0), %o1 + sub %o1, %g3, %g4 + setx PROM_ADDR, %g2, %g3 + add %g4, %g3, %g3 call outstr - nop + mov %g3, %o1 call outhex mov %g1, %o1 - setx (_BUG_message_1), %o3, %o1 call outstr - nop + add %g3, (_BUG_message_1 - _BUG_message_0), %o1 call outhex rdpr %tpc, %o1 - setx (_BUG_message_2), %o3, %o1 call outstr - nop + add %g3, (_BUG_message_2 - _BUG_message_0), %o1 call outhex rdpr %tnpc, %o1 - setx (_BUG_message_3), %o3, %o1 call outstr - nop + add %g3, (_BUG_message_3 - _BUG_message_0), %o1 - retl +_forever: + /* Loop forever */ + b _forever ; nop .section .rodata

1 0

r207 - openbios-devel/arch/sparc64
by svn＠openbios.org 17 Jul '08

17 Jul '08

Author: blueswirl Date: 2008-07-17 21:10:10 +0200 (Thu, 17 Jul 2008) New Revision: 207 Modified: openbios-devel/arch/sparc64/openbios.c Log: Fix TLB entry generation Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-07-17 12:49:25 UTC (rev 206) +++ openbios-devel/arch/sparc64/openbios.c 2008-07-17 19:10:10 UTC (rev 207) @@ -147,7 +147,7 @@ phys <<= 32; phys |= POP(); - tte_data = phys | 0x36; + tte_data = phys | 0x8000000000000036ULL; switch (size) { case 8192: break; @@ -167,8 +167,8 @@ "r" (tte_data), "i" (ASI_DTLB_DATA_IN)); asm("stxa %0, [%1] %2\n" "stxa %3, [%%g0] %4\n" - : : "r" (virt), "r" (48), "i" (ASI_DMMU), - "r" (tte_data), "i" (ASI_DTLB_DATA_IN)); + : : "r" (virt), "r" (48), "i" (ASI_IMMU), + "r" (tte_data), "i" (ASI_ITLB_DATA_IN)); } DECLARE_UNNAMED_NODE(mmu, INSTALL_OPEN, 0);

1 0

r206 - openbios-devel/arch/sparc64
by svn＠openbios.org 17 Jul '08

17 Jul '08

Author: blueswirl Date: 2008-07-17 14:49:25 +0200 (Thu, 17 Jul 2008) New Revision: 206 Modified: openbios-devel/arch/sparc64/openbios.c Log: Support for simple boot device selection Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-07-17 12:48:11 UTC (rev 205) +++ openbios-devel/arch/sparc64/openbios.c 2008-07-17 12:49:25 UTC (rev 206) @@ -52,6 +52,8 @@ static uint8_t idprom[32]; +static const char *bootpath; + struct cpudef { unsigned long iu_version; const char *name; @@ -468,6 +470,18 @@ fword("encode+"); push_str("translations"); fword("property"); + + push_str("/chosen"); + fword("find-device"); + + if (nv_info.boot_devices[0] == 'c') + bootpath = "/pci/isa/ide0/disk@0,0:a"; + else + bootpath = "/pci/isa/ide1/cdrom@0,0:a"; + push_str(bootpath); + fword("encode-string"); + push_str("bootpath"); + fword("property"); } void arch_nvram_put(char *data) @@ -583,7 +597,7 @@ enterforth((xt_t)PC); arch_init(); // XXX printk("force boot\n"); - push_str("/pci/isa/ide0/disk@0,0:a"); + push_str(bootpath); boot(); // XXX printk("falling off...\n"); return 0;

1 0

r205 - openbios-devel/arch/sparc64
by svn＠openbios.org 17 Jul '08

17 Jul '08

Author: blueswirl Date: 2008-07-17 14:48:11 +0200 (Thu, 17 Jul 2008) New Revision: 205 Removed: openbios-devel/arch/sparc64/ttable.h openbios-devel/arch/sparc64/winfixup.S Modified: openbios-devel/arch/sparc64/vectors.S Log: Handle 32 bit windows, remove now unused files Deleted: openbios-devel/arch/sparc64/ttable.h =================================================================== --- openbios-devel/arch/sparc64/ttable.h 2008-07-16 16:51:39 UTC (rev 204) +++ openbios-devel/arch/sparc64/ttable.h 2008-07-17 12:48:11 UTC (rev 205) @@ -1,407 +0,0 @@ -/* $Id: ttable.h,v 1.18 2002/02/09 19:49:32 davem Exp $ */ -#ifndef _SPARC64_TTABLE_H -#define _SPARC64_TTABLE_H - -//#include <linux/config.h> -//#include <asm/utrap.h> - -//#ifdef __ASSEMBLY__ -//#include <asm/thread_info.h> -//#endif - -//#define BOOT_KERNEL b sparc64_boot; nop; nop; nop; nop; nop; nop; nop; - -/* We need a "cleaned" instruction... */ -#define CLEAN_WINDOW \ - rdpr %cleanwin, %l0; add %l0, 1, %l0; \ - wrpr %l0, 0x0, %cleanwin; \ - clr %o0; clr %o1; clr %o2; clr %o3; \ - clr %o4; clr %o5; clr %o6; clr %o7; \ - clr %l0; clr %l1; clr %l2; clr %l3; \ - clr %l4; clr %l5; clr %l6; clr %l7; \ - retry; \ - nop;nop;nop;nop;nop;nop;nop;nop;nop;nop;nop;nop; - -#define TRAP(routine) \ - sethi %hi(109f), %g7; \ - ba,pt %xcc, etrap; \ -109: or %g7, %lo(109b), %g7; \ - call routine; \ - add %sp, PTREGS_OFF, %o0; \ - ba,pt %xcc, rtrap; \ - clr %l6; \ - nop; - -#define TRAP_7INSNS(routine) \ - sethi %hi(109f), %g7; \ - ba,pt %xcc, etrap; \ -109: or %g7, %lo(109b), %g7; \ - call routine; \ - add %sp, PTREGS_OFF, %o0; \ - ba,pt %xcc, rtrap; \ - clr %l6; - -#define TRAP_SAVEFPU(routine) \ - sethi %hi(109f), %g7; \ - ba,pt %xcc, do_fptrap; \ -109: or %g7, %lo(109b), %g7; \ - call routine; \ - add %sp, PTREGS_OFF, %o0; \ - ba,pt %xcc, rtrap; \ - clr %l6; \ - nop; - -#define TRAP_NOSAVE(routine) \ - ba,pt %xcc, routine; \ - nop; \ - nop; nop; nop; nop; nop; nop; - -#define TRAP_NOSAVE_7INSNS(routine) \ - ba,pt %xcc, routine; \ - nop; \ - nop; nop; nop; nop; nop; - -#define TRAPTL1(routine) \ - sethi %hi(109f), %g7; \ - ba,pt %xcc, etraptl1; \ -109: or %g7, %lo(109b), %g7; \ - call routine; \ - add %sp, PTREGS_OFF, %o0; \ - ba,pt %xcc, rtrap; \ - clr %l6; \ - nop; - -#define TRAP_ARG(routine, arg) \ - sethi %hi(109f), %g7; \ - ba,pt %xcc, etrap; \ -109: or %g7, %lo(109b), %g7; \ - add %sp, PTREGS_OFF, %o0; \ - call routine; \ - mov arg, %o1; \ - ba,pt %xcc, rtrap; \ - clr %l6; - -#define TRAPTL1_ARG(routine, arg) \ - sethi %hi(109f), %g7; \ - ba,pt %xcc, etraptl1; \ -109: or %g7, %lo(109b), %g7; \ - add %sp, PTREGS_OFF, %o0; \ - call routine; \ - mov arg, %o1; \ - ba,pt %xcc, rtrap; \ - clr %l6; - -#define SYSCALL_TRAP(routine, systbl) \ - sethi %hi(109f), %g7; \ - ba,pt %xcc, scetrap; \ -109: or %g7, %lo(109b), %g7; \ - sethi %hi(systbl), %l7; \ - ba,pt %xcc, routine; \ - or %l7, %lo(systbl), %l7; \ - nop; nop; - -#define INDIRECT_SOLARIS_SYSCALL(num) \ - sethi %hi(109f), %g7; \ - ba,pt %xcc, etrap; \ -109: or %g7, %lo(109b), %g7; \ - ba,pt %xcc, tl0_solaris + 0xc; \ - mov num, %g1; \ - nop;nop;nop; - -#define TRAP_UTRAP(handler,lvl) \ - ldx [%g6 + TI_UTRAPS], %g1; \ - sethi %hi(109f), %g7; \ - brz,pn %g1, utrap; \ - or %g7, %lo(109f), %g7; \ - ba,pt %xcc, utrap; \ -109: ldx [%g1 + handler*8], %g1; \ - ba,pt %xcc, utrap_ill; \ - mov lvl, %o1; - -#ifdef CONFIG_SUNOS_EMUL -#define SUNOS_SYSCALL_TRAP SYSCALL_TRAP(linux_sparc_syscall32, sunos_sys_table) -#else -#define SUNOS_SYSCALL_TRAP TRAP(sunos_syscall) -#endif -#ifdef CONFIG_COMPAT -#define LINUX_32BIT_SYSCALL_TRAP SYSCALL_TRAP(linux_sparc_syscall32, sys_call_table32) -#else -#define LINUX_32BIT_SYSCALL_TRAP BTRAP(0x110) -#endif -#define LINUX_64BIT_SYSCALL_TRAP SYSCALL_TRAP(linux_sparc_syscall, sys_call_table64) -#define GETCC_TRAP TRAP(getcc) -#define SETCC_TRAP TRAP(setcc) -#ifdef CONFIG_SOLARIS_EMUL -#define SOLARIS_SYSCALL_TRAP TRAP(solaris_sparc_syscall) -#else -#define SOLARIS_SYSCALL_TRAP TRAP(solaris_syscall) -#endif -/* FIXME: Write these actually */ -#define NETBSD_SYSCALL_TRAP TRAP(netbsd_syscall) -#define BREAKPOINT_TRAP TRAP(breakpoint_trap) - -#define TRAP_IRQ(routine, level) \ - rdpr %pil, %g2; \ - wrpr %g0, 15, %pil; \ - b,pt %xcc, etrap_irq; \ - rd %pc, %g7; \ - mov level, %o0; \ - call routine; \ - add %sp, PTREGS_OFF, %o1; \ - ba,a,pt %xcc, rtrap_irq; - -#define TICK_SMP_IRQ \ - rdpr %pil, %g2; \ - wrpr %g0, 15, %pil; \ - sethi %hi(109f), %g7; \ - b,pt %xcc, etrap_irq; \ -109: or %g7, %lo(109b), %g7; \ - call smp_percpu_timer_interrupt; \ - add %sp, PTREGS_OFF, %o0; \ - ba,a,pt %xcc, rtrap_irq; - -#define TRAP_IVEC TRAP_NOSAVE(do_ivec) - -#define BTRAP(lvl) TRAP_ARG(bad_trap, lvl) - -#define BTRAPTL1(lvl) TRAPTL1_ARG(bad_trap_tl1, lvl) - -#define FLUSH_WINDOW_TRAP \ - ba,pt %xcc, etrap; \ - rd %pc, %g7; \ - flushw; \ - ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1; \ - add %l1, 4, %l2; \ - stx %l1, [%sp + PTREGS_OFF + PT_V9_TPC]; \ - ba,pt %xcc, rtrap_clr_l6; \ - stx %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]; - -#ifdef CONFIG_KPROBES -#define KPROBES_TRAP(lvl) TRAP_IRQ(kprobe_trap, lvl) -#else -#define KPROBES_TRAP(lvl) TRAP_ARG(bad_trap, lvl) -#endif - -/* Before touching these macros, you owe it to yourself to go and - * see how arch/sparc64/kernel/winfixup.S works... -DaveM - * - * For the user cases we used to use the %asi register, but - * it turns out that the "wr xxx, %asi" costs ~5 cycles, so - * now we use immediate ASI loads and stores instead. Kudos - * to Greg Onufer for pointing out this performance anomaly. - * - * Further note that we cannot use the g2, g4, g5, and g7 alternate - * globals in the spill routines, check out the save instruction in - * arch/sparc64/kernel/etrap.S to see what I mean about g2, and - * g4/g5 are the globals which are preserved by etrap processing - * for the caller of it. The g7 register is the return pc for - * etrap. Finally, g6 is the current thread register so we cannot - * us it in the spill handlers either. Most of these rules do not - * apply to fill processing, only g6 is not usable. - */ - -/* Normal kernel spill */ -#define SPILL_0_NORMAL \ - stx %l0, [%sp + STACK_BIAS + 0x00]; \ - stx %l1, [%sp + STACK_BIAS + 0x08]; \ - stx %l2, [%sp + STACK_BIAS + 0x10]; \ - stx %l3, [%sp + STACK_BIAS + 0x18]; \ - stx %l4, [%sp + STACK_BIAS + 0x20]; \ - stx %l5, [%sp + STACK_BIAS + 0x28]; \ - stx %l6, [%sp + STACK_BIAS + 0x30]; \ - stx %l7, [%sp + STACK_BIAS + 0x38]; \ - stx %i0, [%sp + STACK_BIAS + 0x40]; \ - stx %i1, [%sp + STACK_BIAS + 0x48]; \ - stx %i2, [%sp + STACK_BIAS + 0x50]; \ - stx %i3, [%sp + STACK_BIAS + 0x58]; \ - stx %i4, [%sp + STACK_BIAS + 0x60]; \ - stx %i5, [%sp + STACK_BIAS + 0x68]; \ - stx %i6, [%sp + STACK_BIAS + 0x70]; \ - stx %i7, [%sp + STACK_BIAS + 0x78]; \ - saved; retry; nop; nop; nop; nop; nop; nop; \ - nop; nop; nop; nop; nop; nop; nop; nop; - -/* Normal 64bit spill */ -#define SPILL_1_GENERIC(ASI) \ - add %sp, STACK_BIAS + 0x00, %g1; \ - stxa %l0, [%g1 + %g0] ASI; \ - mov 0x08, %g3; \ - stxa %l1, [%g1 + %g3] ASI; \ - add %g1, 0x10, %g1; \ - stxa %l2, [%g1 + %g0] ASI; \ - stxa %l3, [%g1 + %g3] ASI; \ - add %g1, 0x10, %g1; \ - stxa %l4, [%g1 + %g0] ASI; \ - stxa %l5, [%g1 + %g3] ASI; \ - add %g1, 0x10, %g1; \ - stxa %l6, [%g1 + %g0] ASI; \ - stxa %l7, [%g1 + %g3] ASI; \ - add %g1, 0x10, %g1; \ - stxa %i0, [%g1 + %g0] ASI; \ - stxa %i1, [%g1 + %g3] ASI; \ - add %g1, 0x10, %g1; \ - stxa %i2, [%g1 + %g0] ASI; \ - stxa %i3, [%g1 + %g3] ASI; \ - add %g1, 0x10, %g1; \ - stxa %i4, [%g1 + %g0] ASI; \ - stxa %i5, [%g1 + %g3] ASI; \ - add %g1, 0x10, %g1; \ - stxa %i6, [%g1 + %g0] ASI; \ - stxa %i7, [%g1 + %g3] ASI; \ - saved; \ - retry; nop; nop; \ - b,a,pt %xcc, spill_fixup_dax; \ - b,a,pt %xcc, spill_fixup_mna; \ - b,a,pt %xcc, spill_fixup; - -/* Normal 32bit spill */ -#define SPILL_2_GENERIC(ASI) \ - srl %sp, 0, %sp; \ - stwa %l0, [%sp + %g0] ASI; \ - mov 0x04, %g3; \ - stwa %l1, [%sp + %g3] ASI; \ - add %sp, 0x08, %g1; \ - stwa %l2, [%g1 + %g0] ASI; \ - stwa %l3, [%g1 + %g3] ASI; \ - add %g1, 0x08, %g1; \ - stwa %l4, [%g1 + %g0] ASI; \ - stwa %l5, [%g1 + %g3] ASI; \ - add %g1, 0x08, %g1; \ - stwa %l6, [%g1 + %g0] ASI; \ - stwa %l7, [%g1 + %g3] ASI; \ - add %g1, 0x08, %g1; \ - stwa %i0, [%g1 + %g0] ASI; \ - stwa %i1, [%g1 + %g3] ASI; \ - add %g1, 0x08, %g1; \ - stwa %i2, [%g1 + %g0] ASI; \ - stwa %i3, [%g1 + %g3] ASI; \ - add %g1, 0x08, %g1; \ - stwa %i4, [%g1 + %g0] ASI; \ - stwa %i5, [%g1 + %g3] ASI; \ - add %g1, 0x08, %g1; \ - stwa %i6, [%g1 + %g0] ASI; \ - stwa %i7, [%g1 + %g3] ASI; \ - saved; \ - retry; nop; nop; \ - b,a,pt %xcc, spill_fixup_dax; \ - b,a,pt %xcc, spill_fixup_mna; \ - b,a,pt %xcc, spill_fixup; - -#define SPILL_1_NORMAL SPILL_1_GENERIC(ASI_AIUP) -#define SPILL_2_NORMAL SPILL_2_GENERIC(ASI_AIUP) -#define SPILL_3_NORMAL SPILL_0_NORMAL -#define SPILL_4_NORMAL SPILL_0_NORMAL -#define SPILL_5_NORMAL SPILL_0_NORMAL -#define SPILL_6_NORMAL SPILL_0_NORMAL -#define SPILL_7_NORMAL SPILL_0_NORMAL - -#define SPILL_0_OTHER SPILL_0_NORMAL -#define SPILL_1_OTHER SPILL_1_GENERIC(ASI_AIUS) -#define SPILL_2_OTHER SPILL_2_GENERIC(ASI_AIUS) -#define SPILL_3_OTHER SPILL_3_NORMAL -#define SPILL_4_OTHER SPILL_4_NORMAL -#define SPILL_5_OTHER SPILL_5_NORMAL -#define SPILL_6_OTHER SPILL_6_NORMAL -#define SPILL_7_OTHER SPILL_7_NORMAL - -/* Normal kernel fill */ -#define FILL_0_NORMAL \ - ldx [%sp + STACK_BIAS + 0x00], %l0; \ - ldx [%sp + STACK_BIAS + 0x08], %l1; \ - ldx [%sp + STACK_BIAS + 0x10], %l2; \ - ldx [%sp + STACK_BIAS + 0x18], %l3; \ - ldx [%sp + STACK_BIAS + 0x20], %l4; \ - ldx [%sp + STACK_BIAS + 0x28], %l5; \ - ldx [%sp + STACK_BIAS + 0x30], %l6; \ - ldx [%sp + STACK_BIAS + 0x38], %l7; \ - ldx [%sp + STACK_BIAS + 0x40], %i0; \ - ldx [%sp + STACK_BIAS + 0x48], %i1; \ - ldx [%sp + STACK_BIAS + 0x50], %i2; \ - ldx [%sp + STACK_BIAS + 0x58], %i3; \ - ldx [%sp + STACK_BIAS + 0x60], %i4; \ - ldx [%sp + STACK_BIAS + 0x68], %i5; \ - ldx [%sp + STACK_BIAS + 0x70], %i6; \ - ldx [%sp + STACK_BIAS + 0x78], %i7; \ - restored; retry; nop; nop; nop; nop; nop; nop; \ - nop; nop; nop; nop; nop; nop; nop; nop; - -/* Normal 64bit fill */ -#define FILL_1_GENERIC(ASI) \ - add %sp, STACK_BIAS + 0x00, %g1; \ - ldxa [%g1 + %g0] ASI, %l0; \ - mov 0x08, %g2; \ - mov 0x10, %g3; \ - ldxa [%g1 + %g2] ASI, %l1; \ - mov 0x18, %g5; \ - ldxa [%g1 + %g3] ASI, %l2; \ - ldxa [%g1 + %g5] ASI, %l3; \ - add %g1, 0x20, %g1; \ - ldxa [%g1 + %g0] ASI, %l4; \ - ldxa [%g1 + %g2] ASI, %l5; \ - ldxa [%g1 + %g3] ASI, %l6; \ - ldxa [%g1 + %g5] ASI, %l7; \ - add %g1, 0x20, %g1; \ - ldxa [%g1 + %g0] ASI, %i0; \ - ldxa [%g1 + %g2] ASI, %i1; \ - ldxa [%g1 + %g3] ASI, %i2; \ - ldxa [%g1 + %g5] ASI, %i3; \ - add %g1, 0x20, %g1; \ - ldxa [%g1 + %g0] ASI, %i4; \ - ldxa [%g1 + %g2] ASI, %i5; \ - ldxa [%g1 + %g3] ASI, %i6; \ - ldxa [%g1 + %g5] ASI, %i7; \ - restored; \ - retry; nop; nop; nop; nop; \ - b,a,pt %xcc, fill_fixup_dax; \ - b,a,pt %xcc, fill_fixup_mna; \ - b,a,pt %xcc, fill_fixup; - -/* Normal 32bit fill */ -#define FILL_2_GENERIC(ASI) \ - srl %sp, 0, %sp; \ - lduwa [%sp + %g0] ASI, %l0; \ - mov 0x04, %g2; \ - mov 0x08, %g3; \ - lduwa [%sp + %g2] ASI, %l1; \ - mov 0x0c, %g5; \ - lduwa [%sp + %g3] ASI, %l2; \ - lduwa [%sp + %g5] ASI, %l3; \ - add %sp, 0x10, %g1; \ - lduwa [%g1 + %g0] ASI, %l4; \ - lduwa [%g1 + %g2] ASI, %l5; \ - lduwa [%g1 + %g3] ASI, %l6; \ - lduwa [%g1 + %g5] ASI, %l7; \ - add %g1, 0x10, %g1; \ - lduwa [%g1 + %g0] ASI, %i0; \ - lduwa [%g1 + %g2] ASI, %i1; \ - lduwa [%g1 + %g3] ASI, %i2; \ - lduwa [%g1 + %g5] ASI, %i3; \ - add %g1, 0x10, %g1; \ - lduwa [%g1 + %g0] ASI, %i4; \ - lduwa [%g1 + %g2] ASI, %i5; \ - lduwa [%g1 + %g3] ASI, %i6; \ - lduwa [%g1 + %g5] ASI, %i7; \ - restored; \ - retry; nop; nop; nop; nop; \ - b,a,pt %xcc, fill_fixup_dax; \ - b,a,pt %xcc, fill_fixup_mna; \ - b,a,pt %xcc, fill_fixup; - -#define FILL_1_NORMAL FILL_1_GENERIC(ASI_AIUP) -#define FILL_2_NORMAL FILL_2_GENERIC(ASI_AIUP) -#define FILL_3_NORMAL FILL_0_NORMAL -#define FILL_4_NORMAL FILL_0_NORMAL -#define FILL_5_NORMAL FILL_0_NORMAL -#define FILL_6_NORMAL FILL_0_NORMAL -#define FILL_7_NORMAL FILL_0_NORMAL - -#define FILL_0_OTHER FILL_0_NORMAL -#define FILL_1_OTHER FILL_1_GENERIC(ASI_AIUS) -#define FILL_2_OTHER FILL_2_GENERIC(ASI_AIUS) -#define FILL_3_OTHER FILL_3_NORMAL -#define FILL_4_OTHER FILL_4_NORMAL -#define FILL_5_OTHER FILL_5_NORMAL -#define FILL_6_OTHER FILL_6_NORMAL -#define FILL_7_OTHER FILL_7_NORMAL - -#endif /* !(_SPARC64_TTABLE_H) */ Modified: openbios-devel/arch/sparc64/vectors.S =================================================================== --- openbios-devel/arch/sparc64/vectors.S 2008-07-16 16:51:39 UTC (rev 204) +++ openbios-devel/arch/sparc64/vectors.S 2008-07-17 12:48:11 UTC (rev 205) @@ -26,7 +26,6 @@ #define __ASSEMBLY__ #include "pstate.h" #include "asi.h" -#include "ttable.h" #define ASI_BP ASI_PHYS_BYPASS_EC_E #define SER_ADDR 0x1fe020003f8 @@ -39,13 +38,66 @@ .register %g6, #scratch .register %g7, #scratch trap_table: -#undef TRAP_IRQ -#define TRAP_IRQ(routine, level) \ - ba routine; nop; nop; nop; nop; nop; nop; nop; -#undef BTRAP -#define BTRAP(lvl) \ - ba bug; mov lvl, %g1; nop; nop; nop; nop; nop; nop; -#undef BTRAPTL1 +#define SPILL_WINDOW \ + btst 1, %sp; \ + be spill_32bit; \ + nop; \ + stx %l0, [%sp + STACK_BIAS + 0x00]; \ + stx %l1, [%sp + STACK_BIAS + 0x08]; \ + stx %l2, [%sp + STACK_BIAS + 0x10]; \ + stx %l3, [%sp + STACK_BIAS + 0x18]; \ + stx %l4, [%sp + STACK_BIAS + 0x20]; \ + stx %l5, [%sp + STACK_BIAS + 0x28]; \ + stx %l6, [%sp + STACK_BIAS + 0x30]; \ + stx %l7, [%sp + STACK_BIAS + 0x38]; \ + stx %i0, [%sp + STACK_BIAS + 0x40]; \ + stx %i1, [%sp + STACK_BIAS + 0x48]; \ + stx %i2, [%sp + STACK_BIAS + 0x50]; \ + stx %i3, [%sp + STACK_BIAS + 0x58]; \ + stx %i4, [%sp + STACK_BIAS + 0x60]; \ + stx %i5, [%sp + STACK_BIAS + 0x68]; \ + stx %i6, [%sp + STACK_BIAS + 0x70]; \ + stx %i7, [%sp + STACK_BIAS + 0x78]; \ + saved; retry; nop; nop; nop; nop; nop; nop; \ + nop; nop; nop; nop; nop; + +#define FILL_WINDOW \ + btst 1, %sp; \ + be fill_32bit; \ + nop; \ + ldx [%sp + STACK_BIAS + 0x00], %l0; \ + ldx [%sp + STACK_BIAS + 0x08], %l1; \ + ldx [%sp + STACK_BIAS + 0x10], %l2; \ + ldx [%sp + STACK_BIAS + 0x18], %l3; \ + ldx [%sp + STACK_BIAS + 0x20], %l4; \ + ldx [%sp + STACK_BIAS + 0x28], %l5; \ + ldx [%sp + STACK_BIAS + 0x30], %l6; \ + ldx [%sp + STACK_BIAS + 0x38], %l7; \ + ldx [%sp + STACK_BIAS + 0x40], %i0; \ + ldx [%sp + STACK_BIAS + 0x48], %i1; \ + ldx [%sp + STACK_BIAS + 0x50], %i2; \ + ldx [%sp + STACK_BIAS + 0x58], %i3; \ + ldx [%sp + STACK_BIAS + 0x60], %i4; \ + ldx [%sp + STACK_BIAS + 0x68], %i5; \ + ldx [%sp + STACK_BIAS + 0x70], %i6; \ + ldx [%sp + STACK_BIAS + 0x78], %i7; \ + restored; retry; nop; nop; nop; nop; nop; nop; \ + nop; nop; nop; nop; nop; + +#define CLEAN_WINDOW \ + rdpr %cleanwin, %l0; add %l0, 1, %l0; \ + wrpr %l0, 0x0, %cleanwin; \ + clr %o0; clr %o1; clr %o2; clr %o3; \ + clr %o4; clr %o5; clr %o6; clr %o7; \ + clr %l0; clr %l1; clr %l2; clr %l3; \ + clr %l4; clr %l5; clr %l6; clr %l7; \ + retry; \ + nop;nop;nop;nop;nop;nop;nop;nop;nop;nop;nop;nop; + +#define TRAP_IRQ(routine, level) \ + ba routine; nop; nop; nop; nop; nop; nop; nop; +#define BTRAP(lvl) \ + ba bug; mov lvl, %g1; nop; nop; nop; nop; nop; nop; #define BTRAPTL1(lvl) BTRAP(lvl) #define BTRAPS(x) BTRAP(x) BTRAP(x+1) BTRAP(x+2) BTRAP(x+3) BTRAP(x+4) BTRAP(x+5) BTRAP(x+6) BTRAP(x+7) @@ -76,38 +128,38 @@ BTRAPS(0x50) BTRAPS(0x58) BTRAPS(0x60) BTRAPS(0x68) BTRAPS(0x70) BTRAPS(0x78) -tl0_s0n: SPILL_0_NORMAL -tl0_s1n: SPILL_1_NORMAL -tl0_s2n: SPILL_2_NORMAL -tl0_s3n: SPILL_3_NORMAL -tl0_s4n: SPILL_4_NORMAL -tl0_s5n: SPILL_5_NORMAL -tl0_s6n: SPILL_6_NORMAL -tl0_s7n: SPILL_7_NORMAL -tl0_s0o: SPILL_0_OTHER -tl0_s1o: SPILL_1_OTHER -tl0_s2o: SPILL_2_OTHER -tl0_s3o: SPILL_3_OTHER -tl0_s4o: SPILL_4_OTHER -tl0_s5o: SPILL_5_OTHER -tl0_s6o: SPILL_6_OTHER -tl0_s7o: SPILL_7_OTHER -tl0_f0n: FILL_0_NORMAL -tl0_f1n: FILL_1_NORMAL -tl0_f2n: FILL_2_NORMAL -tl0_f3n: FILL_3_NORMAL -tl0_f4n: FILL_4_NORMAL -tl0_f5n: FILL_5_NORMAL -tl0_f6n: FILL_6_NORMAL -tl0_f7n: FILL_7_NORMAL -tl0_f0o: FILL_0_OTHER -tl0_f1o: FILL_1_OTHER -tl0_f2o: FILL_2_OTHER -tl0_f3o: FILL_3_OTHER -tl0_f4o: FILL_4_OTHER -tl0_f5o: FILL_5_OTHER -tl0_f6o: FILL_6_OTHER -tl0_f7o: FILL_7_OTHER +tl0_s0n: SPILL_WINDOW +tl0_s1n: SPILL_WINDOW +tl0_s2n: SPILL_WINDOW +tl0_s3n: SPILL_WINDOW +tl0_s4n: SPILL_WINDOW +tl0_s5n: SPILL_WINDOW +tl0_s6n: SPILL_WINDOW +tl0_s7n: SPILL_WINDOW +tl0_s0o: SPILL_WINDOW +tl0_s1o: SPILL_WINDOW +tl0_s2o: SPILL_WINDOW +tl0_s3o: SPILL_WINDOW +tl0_s4o: SPILL_WINDOW +tl0_s5o: SPILL_WINDOW +tl0_s6o: SPILL_WINDOW +tl0_s7o: SPILL_WINDOW +tl0_f0n: FILL_WINDOW +tl0_f1n: FILL_WINDOW +tl0_f2n: FILL_WINDOW +tl0_f3n: FILL_WINDOW +tl0_f4n: FILL_WINDOW +tl0_f5n: FILL_WINDOW +tl0_f6n: FILL_WINDOW +tl0_f7n: FILL_WINDOW +tl0_f0o: FILL_WINDOW +tl0_f1o: FILL_WINDOW +tl0_f2o: FILL_WINDOW +tl0_f3o: FILL_WINDOW +tl0_f4o: FILL_WINDOW +tl0_f5o: FILL_WINDOW +tl0_f6o: FILL_WINDOW +tl0_f7o: FILL_WINDOW tl0_resv100: BTRAPS(0x100) BTRAPS(0x108) tl0_resv110: BTRAPS(0x110) BTRAPS(0x118) tl0_resv120: BTRAPS(0x120) BTRAPS(0x128) @@ -151,38 +203,38 @@ BTRAPS(0x50) BTRAPS(0x58) BTRAPS(0x60) BTRAPS(0x68) BTRAPS(0x70) BTRAPS(0x78) -tl1_s0n: SPILL_0_NORMAL -tl1_s1n: SPILL_1_NORMAL -tl1_s2n: SPILL_2_NORMAL -tl1_s3n: SPILL_3_NORMAL -tl1_s4n: SPILL_4_NORMAL -tl1_s5n: SPILL_5_NORMAL -tl1_s6n: SPILL_6_NORMAL -tl1_s7n: SPILL_7_NORMAL -tl1_s0o: SPILL_0_OTHER -tl1_s1o: SPILL_1_OTHER -tl1_s2o: SPILL_2_OTHER -tl1_s3o: SPILL_3_OTHER -tl1_s4o: SPILL_4_OTHER -tl1_s5o: SPILL_5_OTHER -tl1_s6o: SPILL_6_OTHER -tl1_s7o: SPILL_7_OTHER -tl1_f0n: FILL_0_NORMAL -tl1_f1n: FILL_1_NORMAL -tl1_f2n: FILL_2_NORMAL -tl1_f3n: FILL_3_NORMAL -tl1_f4n: FILL_4_NORMAL -tl1_f5n: FILL_5_NORMAL -tl1_f6n: FILL_6_NORMAL -tl1_f7n: FILL_7_NORMAL -tl1_f0o: FILL_0_OTHER -tl1_f1o: FILL_1_OTHER -tl1_f2o: FILL_2_OTHER -tl1_f3o: FILL_3_OTHER -tl1_f4o: FILL_4_OTHER -tl1_f5o: FILL_5_OTHER -tl1_f6o: FILL_6_OTHER -tl1_f7o: FILL_7_OTHER +tl1_s0n: SPILL_WINDOW +tl1_s1n: SPILL_WINDOW +tl1_s2n: SPILL_WINDOW +tl1_s3n: SPILL_WINDOW +tl1_s4n: SPILL_WINDOW +tl1_s5n: SPILL_WINDOW +tl1_s6n: SPILL_WINDOW +tl1_s7n: SPILL_WINDOW +tl1_s0o: SPILL_WINDOW +tl1_s1o: SPILL_WINDOW +tl1_s2o: SPILL_WINDOW +tl1_s3o: SPILL_WINDOW +tl1_s4o: SPILL_WINDOW +tl1_s5o: SPILL_WINDOW +tl1_s6o: SPILL_WINDOW +tl1_s7o: SPILL_WINDOW +tl1_f0n: FILL_WINDOW +tl1_f1n: FILL_WINDOW +tl1_f2n: FILL_WINDOW +tl1_f3n: FILL_WINDOW +tl1_f4n: FILL_WINDOW +tl1_f5n: FILL_WINDOW +tl1_f6n: FILL_WINDOW +tl1_f7n: FILL_WINDOW +tl1_f0o: FILL_WINDOW +tl1_f1o: FILL_WINDOW +tl1_f2o: FILL_WINDOW +tl1_f3o: FILL_WINDOW +tl1_f4o: FILL_WINDOW +tl1_f5o: FILL_WINDOW +tl1_f6o: FILL_WINDOW +tl1_f7o: FILL_WINDOW tl1_resv100: BTRAPS(0x100) BTRAPS(0x108) tl1_resv110: BTRAPS(0x110) BTRAPS(0x118) tl1_resv120: BTRAPS(0x120) BTRAPS(0x128) @@ -200,12 +252,48 @@ tl1_resv1e0: BTRAPS(0x1e0) BTRAPS(0x1e8) tl1_resv1f0: BTRAPS(0x1f0) BTRAPS(0x1f8) -spill_fixup: -spill_fixup_dax: -spill_fixup_mna: -fill_fixup: -fill_fixup_dax: -fill_fixup_mna: +spill_32bit: + srl %sp, 0, %sp + stw %l0, [%sp + 0x00] + stw %l1, [%sp + 0x04] + stw %l2, [%sp + 0x08] + stw %l3, [%sp + 0x0c] + stw %l4, [%sp + 0x10] + stw %l5, [%sp + 0x14] + stw %l6, [%sp + 0x18] + stw %l7, [%sp + 0x1c] + stw %i0, [%sp + 0x20] + stw %i1, [%sp + 0x24] + stw %i2, [%sp + 0x28] + stw %i3, [%sp + 0x2c] + stw %i4, [%sp + 0x30] + stw %i5, [%sp + 0x34] + stw %i6, [%sp + 0x38] + stw %i7, [%sp + 0x3c] + saved + retry + +fill_32bit: + srl %sp, 0, %sp + lduw [%sp + 0x00], %l0 + lduw [%sp + 0x04], %l1 + lduw [%sp + 0x08], %l2 + lduw [%sp + 0x0c], %l3 + lduw [%sp + 0x10], %l4 + lduw [%sp + 0x14], %l5 + lduw [%sp + 0x18], %l6 + lduw [%sp + 0x1c], %l7 + lduw [%sp + 0x20], %i0 + lduw [%sp + 0x24], %i1 + lduw [%sp + 0x28], %i2 + lduw [%sp + 0x2c], %i3 + lduw [%sp + 0x30], %i4 + lduw [%sp + 0x34], %i5 + lduw [%sp + 0x38], %i6 + lduw [%sp + 0x3c], %i7 + restored + retry + __divide_error: bug: /* Dump the exception and its context */ @@ -312,8 +400,6 @@ retl nop -//#include "winfixup.S" - .section .rodata _BUG_message_0: .string "Unhandled Exception 0x" Deleted: openbios-devel/arch/sparc64/winfixup.S =================================================================== --- openbios-devel/arch/sparc64/winfixup.S 2008-07-16 16:51:39 UTC (rev 204) +++ openbios-devel/arch/sparc64/winfixup.S 2008-07-17 12:48:11 UTC (rev 205) @@ -1,240 +0,0 @@ -/* $Id: winfixup.S,v 1.30 2002/02/09 19:49:30 davem Exp $ - * - * winfixup.S: Handle cases where user stack pointer is found to be bogus. - * - * Copyright (C) 1997 David S. Miller (davem(a)caip.rutgers.edu) - */ - -#include "asi.h" -#include "spitfire.h" -#if 0 -#include <asm/head.h> -#include <asm/page.h> -#include <asm/ptrace.h> -#include <asm/processor.h> -#include <asm/thread_info.h> -#else -#define FAULT_CODE_WRITE 0x01 /* Write access, implies D-TLB */ -#define FAULT_CODE_DTLB 0x02 /* Miss happened in D-TLB */ -#define FAULT_CODE_ITLB 0x04 /* Miss happened in I-TLB */ -#define FAULT_CODE_WINFIXUP 0x08 /* Miss happened during spill/fill */ -#define FAULT_CODE_BLKCOMMIT 0x10 /* Use blk-commit ASI in copy_page */ -#endif - .text - .align 32 - - /* Here are the rules, pay attention. - * - * The kernel is disallowed from touching user space while - * the trap level is greater than zero, except for from within - * the window spill/fill handlers. This must be followed - * so that we can easily detect the case where we tried to - * spill/fill with a bogus (or unmapped) user stack pointer. - * - * These are layed out in a special way for cache reasons, - * don't touch... - */ - .globl fill_fixup, spill_fixup -fill_fixup: - rdpr %tstate, %g1 - or %g4, FAULT_CODE_WINFIXUP, %g4 - and %g1, TSTATE_CWP, %g1 - - /* This is the extremely complex case, but it does happen from - * time to time if things are just right. Essentially the restore - * done in rtrap right before going back to user mode, with tl=1 - * and that levels trap stack registers all setup, took a fill trap, - * the user stack was not mapped in the tlb, and tlb miss occurred, - * the pte found was not valid, and a simple ref bit watch update - * could not satisfy the miss, so we got here. - * - * We must carefully unwind the state so we get back to tl=0, preserve - * all the register values we were going to give to the user. Luckily - * most things are where they need to be, we also have the address - * which triggered the fault handy as well. - * - * Also note that we must preserve %l5 and %l6. If the user was - * returning from a system call, we must make it look this way - * after we process the fill fault on the users stack. - * - * First, get into the window where the original restore was executed. - */ - - rdpr %wstate, %g2 ! Grab user mode wstate. - wrpr %g1, %cwp ! Get into the right window. - sll %g2, 3, %g2 ! NORMAL-->OTHER - - wrpr %g0, 0x0, %canrestore ! Standard etrap stuff. - wrpr %g2, 0x0, %wstate ! This must be consistent. - wrpr %g0, 0x0, %otherwin ! We know this. - mov PRIMARY_CONTEXT, %g1 ! Change contexts... - stxa %g0, [%g1] ASI_DMMU ! Back into the nucleus. - flush %g6 ! Flush instruction buffers - rdpr %pstate, %l1 ! Prepare to change globals. - mov %g6, %o7 ! Get current. - - andn %l1, PSTATE_MM, %l1 ! We want to be in RMO - stb %g4, [%g6 + TI_FAULT_CODE] - stx %g5, [%g6 + TI_FAULT_ADDR] - wrpr %g0, 0x0, %tl ! Out of trap levels. - wrpr %l1, (PSTATE_IE | PSTATE_AG | PSTATE_RMO), %pstate - mov %o7, %g6 - ldx [%g6 + TI_TASK], %g4 - - /* This is the same as below, except we handle this a bit special - * since we must preserve %l5 and %l6, see comment above. - */ - call do_sparc64_fault - add %sp, PTREGS_OFF, %o0 - ba,pt %xcc, rtrap - nop ! yes, nop is correct - - /* Be very careful about usage of the alternate globals here. - * You cannot touch %g4/%g5 as that has the fault information - * should this be from usermode. Also be careful for the case - * where we get here from the save instruction in etrap.S when - * coming from either user or kernel (does not matter which, it - * is the same problem in both cases). Essentially this means - * do not touch %g7 or %g2 so we handle the two cases fine. - */ -spill_fixup: - ldx [%g6 + TI_FLAGS], %g1 - andcc %g1, _TIF_32BIT, %g0 - ldub [%g6 + TI_WSAVED], %g1 - - sll %g1, 3, %g3 - add %g6, %g3, %g3 - stx %sp, [%g3 + TI_RWIN_SPTRS] - sll %g1, 7, %g3 - bne,pt %xcc, 1f - add %g6, %g3, %g3 - stx %l0, [%g3 + TI_REG_WINDOW + 0x00] - stx %l1, [%g3 + TI_REG_WINDOW + 0x08] - - stx %l2, [%g3 + TI_REG_WINDOW + 0x10] - stx %l3, [%g3 + TI_REG_WINDOW + 0x18] - stx %l4, [%g3 + TI_REG_WINDOW + 0x20] - stx %l5, [%g3 + TI_REG_WINDOW + 0x28] - stx %l6, [%g3 + TI_REG_WINDOW + 0x30] - stx %l7, [%g3 + TI_REG_WINDOW + 0x38] - stx %i0, [%g3 + TI_REG_WINDOW + 0x40] - stx %i1, [%g3 + TI_REG_WINDOW + 0x48] - - stx %i2, [%g3 + TI_REG_WINDOW + 0x50] - stx %i3, [%g3 + TI_REG_WINDOW + 0x58] - stx %i4, [%g3 + TI_REG_WINDOW + 0x60] - stx %i5, [%g3 + TI_REG_WINDOW + 0x68] - stx %i6, [%g3 + TI_REG_WINDOW + 0x70] - b,pt %xcc, 2f - stx %i7, [%g3 + TI_REG_WINDOW + 0x78] -1: stw %l0, [%g3 + TI_REG_WINDOW + 0x00] - - stw %l1, [%g3 + TI_REG_WINDOW + 0x04] - stw %l2, [%g3 + TI_REG_WINDOW + 0x08] - stw %l3, [%g3 + TI_REG_WINDOW + 0x0c] - stw %l4, [%g3 + TI_REG_WINDOW + 0x10] - stw %l5, [%g3 + TI_REG_WINDOW + 0x14] - stw %l6, [%g3 + TI_REG_WINDOW + 0x18] - stw %l7, [%g3 + TI_REG_WINDOW + 0x1c] - stw %i0, [%g3 + TI_REG_WINDOW + 0x20] - - stw %i1, [%g3 + TI_REG_WINDOW + 0x24] - stw %i2, [%g3 + TI_REG_WINDOW + 0x28] - stw %i3, [%g3 + TI_REG_WINDOW + 0x2c] - stw %i4, [%g3 + TI_REG_WINDOW + 0x30] - stw %i5, [%g3 + TI_REG_WINDOW + 0x34] - stw %i6, [%g3 + TI_REG_WINDOW + 0x38] - stw %i7, [%g3 + TI_REG_WINDOW + 0x3c] -2: add %g1, 1, %g1 - - stb %g1, [%g6 + TI_WSAVED] - rdpr %tstate, %g1 - saved - and %g1, TSTATE_CWP, %g1 - mov FAULT_CODE_WRITE | FAULT_CODE_DTLB | FAULT_CODE_WINFIXUP, %g4 - retry - - .globl winfix_mna, fill_fixup_mna, spill_fixup_mna -winfix_mna: - andn %g3, 0x7f, %g3 - add %g3, 0x78, %g3 - wrpr %g3, %tnpc - done -fill_fixup_mna: - rdpr %tstate, %g1 - and %g1, TSTATE_CWP, %g1 - - /* Please, see fill_fixup commentary about why we must preserve - * %l5 and %l6 to preserve absolute correct semantics. - */ - rdpr %wstate, %g2 ! Grab user mode wstate. - wrpr %g1, %cwp ! Get into the right window. - sll %g2, 3, %g2 ! NORMAL-->OTHER - wrpr %g0, 0x0, %canrestore ! Standard etrap stuff. - - wrpr %g2, 0x0, %wstate ! This must be consistent. - wrpr %g0, 0x0, %otherwin ! We know this. - mov PRIMARY_CONTEXT, %g1 ! Change contexts... - stxa %g0, [%g1] ASI_DMMU ! Back into the nucleus. - flush %g6 ! Flush instruction buffers - rdpr %pstate, %l1 ! Prepare to change globals. - mov %g4, %o2 ! Setup args for - mov %g5, %o1 ! final call to mem_address_unaligned. - andn %l1, PSTATE_MM, %l1 ! We want to be in RMO - - mov %g6, %o7 ! Stash away current. - wrpr %g0, 0x0, %tl ! Out of trap levels. - wrpr %l1, (PSTATE_IE | PSTATE_AG | PSTATE_RMO), %pstate - mov %o7, %g6 ! Get current back. - ldx [%g6 + TI_TASK], %g4 ! Finish it. - call mem_address_unaligned - add %sp, PTREGS_OFF, %o0 - - b,pt %xcc, rtrap - nop ! yes, the nop is correct -spill_fixup_mna: - ldx [%g6 + TI_FLAGS], %g1 - andcc %g1, _TIF_32BIT, %g0 - ldub [%g6 + TI_WSAVED], %g1 - sll %g1, 3, %g3 - add %g6, %g3, %g3 - stx %sp, [%g3 + TI_RWIN_SPTRS] - - sll %g1, 7, %g3 - bne,pt %xcc, 1f - add %g6, %g3, %g3 - stx %l0, [%g3 + TI_REG_WINDOW + 0x00] - stx %l1, [%g3 + TI_REG_WINDOW + 0x08] - stx %l2, [%g3 + TI_REG_WINDOW + 0x10] - stx %l3, [%g3 + TI_REG_WINDOW + 0x18] - stx %l4, [%g3 + TI_REG_WINDOW + 0x20] - - stx %l5, [%g3 + TI_REG_WINDOW + 0x28] - stx %l6, [%g3 + TI_REG_WINDOW + 0x30] - stx %l7, [%g3 + TI_REG_WINDOW + 0x38] - stx %i0, [%g3 + TI_REG_WINDOW + 0x40] - stx %i1, [%g3 + TI_REG_WINDOW + 0x48] - stx %i2, [%g3 + TI_REG_WINDOW + 0x50] - stx %i3, [%g3 + TI_REG_WINDOW + 0x58] - stx %i4, [%g3 + TI_REG_WINDOW + 0x60] - - stx %i5, [%g3 + TI_REG_WINDOW + 0x68] - stx %i6, [%g3 + TI_REG_WINDOW + 0x70] - stx %i7, [%g3 + TI_REG_WINDOW + 0x78] - b,pt %xcc, 2f - add %g1, 1, %g1 -1: std %l0, [%g3 + TI_REG_WINDOW + 0x00] - std %l2, [%g3 + TI_REG_WINDOW + 0x08] - std %l4, [%g3 + TI_REG_WINDOW + 0x10] - - std %l6, [%g3 + TI_REG_WINDOW + 0x18] - std %i0, [%g3 + TI_REG_WINDOW + 0x20] - std %i2, [%g3 + TI_REG_WINDOW + 0x28] - std %i4, [%g3 + TI_REG_WINDOW + 0x30] - std %i6, [%g3 + TI_REG_WINDOW + 0x38] - add %g1, 1, %g1 -2: stb %g1, [%g6 + TI_WSAVED] - - saved - retry -

1 0

r204 - openbios-devel/arch/sparc64
by svn＠openbios.org 16 Jul '08

16 Jul '08

Author: blueswirl Date: 2008-07-16 18:51:39 +0200 (Wed, 16 Jul 2008) New Revision: 204 Modified: openbios-devel/arch/sparc64/openbios.c Log: Fix MMU translation Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-07-16 11:48:43 UTC (rev 203) +++ openbios-devel/arch/sparc64/openbios.c 2008-07-16 16:51:39 UTC (rev 204) @@ -83,8 +83,9 @@ : "=r"(phys) : "r" (virt), "i" (ASI_DTLB_TAG_READ)); if (phys & 0x8000000000000000) { // Valid entry? + phys &= 0x000001fffffff000; + PUSH(phys & 0xffffffff); PUSH(phys >> 32); - PUSH(phys & 0xffffffff); PUSH(0); // XXX PUSH(-1); } else {

1 0

r203 - openbios-devel/arch/sparc64
by svn＠openbios.org 16 Jul '08

16 Jul '08

Author: blueswirl Date: 2008-07-16 13:48:43 +0200 (Wed, 16 Jul 2008) New Revision: 203 Modified: openbios-devel/arch/sparc64/openbios.c Log: Add trap table setting function to client interface Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-07-16 11:47:23 UTC (rev 202) +++ openbios-devel/arch/sparc64/openbios.c 2008-07-16 11:48:43 UTC (rev 203) @@ -179,6 +179,19 @@ { "map", mmu_map }, }; +/* + ( addr -- ? ) +*/ +static void +set_trap_table(void) +{ + unsigned long addr; + + addr = POP(); + asm("wrpr %0, %%tba\n" + : : "r" (addr)); +} + static void cpu_generic_init(const struct cpudef *cpu) { unsigned long iu_version; @@ -244,6 +257,11 @@ fword("encode-int"); push_str("mmu"); fword("property"); + + // Trap table + push_str("/packages/client-iface"); + fword("find-device"); + bind_func("SUNW,set-trap-table", set_trap_table); } static const struct cpudef sparc_defs[] = {

1 0

r202 - openbios-devel/arch/sparc64
by svn＠openbios.org 16 Jul '08

16 Jul '08

Author: blueswirl Date: 2008-07-16 13:47:23 +0200 (Wed, 16 Jul 2008) New Revision: 202 Modified: openbios-devel/arch/sparc64/init.fs openbios-devel/arch/sparc64/openbios.c Log: Add MMU node and ops Modified: openbios-devel/arch/sparc64/init.fs =================================================================== --- openbios-devel/arch/sparc64/init.fs 2008-07-15 15:04:02 UTC (rev 201) +++ openbios-devel/arch/sparc64/init.fs 2008-07-16 11:47:23 UTC (rev 202) @@ -32,7 +32,6 @@ \ preopen device nodes (and store the ihandles under /chosen) :noname " memory" " /memory" preopen - " mmu" " /cpus/@0" preopen ; SYSTEM-initializer Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-07-15 15:04:02 UTC (rev 201) +++ openbios-devel/arch/sparc64/openbios.c 2008-07-16 11:47:23 UTC (rev 202) @@ -21,7 +21,22 @@ #include "openbios/firmware_abi.h" #include "boot.h" #include "../../drivers/timer.h" // XXX +#include "asi.h" +#include "libc/vsprintf.h" +#define REGISTER_NAMED_NODE( name, path ) do { \ + bind_new_node( name##_flags_, name##_size_, \ + path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ + } while(0) + +#define REGISTER_NODE_METHODS( name, path ) do { \ + const char *paths[1]; \ + \ + paths[0] = path; \ + bind_node( name##_flags_, name##_size_, \ + paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t)); \ + } while(0) + static unsigned char intdict[256 * 1024]; // XXX @@ -42,9 +57,132 @@ const char *name; }; +static void +mmu_open(void) +{ + RET(-1); +} + +static void +mmu_close(void) +{ +} + +/* + 3.6.5 translate + ( virt -- false | phys.lo ... phys.hi mode true ) +*/ +static void +mmu_translate(void) +{ + unsigned long virt, phys; + + virt = POP(); + + asm("ldxa [%1] %2, %0\n" + : "=r"(phys) : "r" (virt), "i" (ASI_DTLB_TAG_READ)); + + if (phys & 0x8000000000000000) { // Valid entry? + PUSH(phys >> 32); + PUSH(phys & 0xffffffff); + PUSH(0); // XXX + PUSH(-1); + } else { + PUSH(0); + } +} + +/* + ( index tte_data vaddr -- ? ) +*/ +static void +dtlb_load(void) +{ + unsigned long vaddr, tte_data, idx; + + vaddr = POP(); + tte_data = POP(); + idx = POP(); + + asm("stxa %0, [%1] %2\n" + "stxa %3, [%%g0] %4\n" + : : "r" (vaddr), "r" (48), "i" (ASI_DMMU), + "r" (tte_data), "i" (ASI_DTLB_DATA_IN)); +} + +/* + ( index tte_data vaddr -- ? ) +*/ +static void +itlb_load(void) +{ + unsigned long vaddr, tte_data, idx; + + vaddr = POP(); + tte_data = POP(); + idx = POP(); + + asm("stxa %0, [%1] %2\n" + "stxa %3, [%%g0] %4\n" + : : "r" (vaddr), "r" (48), "i" (ASI_IMMU), + "r" (tte_data), "i" (ASI_ITLB_DATA_IN)); +} + +/* + 3.6.5 map + ( phys.lo ... phys.hi virt size mode -- ) +*/ +static void +mmu_map(void) +{ + unsigned long virt, size, mode, phys, tte_data; + + mode = POP(); + size = POP(); + virt = POP(); + phys = POP(); + phys <<= 32; + phys |= POP(); + + tte_data = phys | 0x36; + switch (size) { + case 8192: + break; + case 65536: + tte_data |= 2ULL << 60; + break; + case 512 * 1024: + tte_data |= 4ULL << 60; + break; + case 4 * 1024 * 1024: + tte_data |= 6ULL << 60; + break; + } + asm("stxa %0, [%1] %2\n" + "stxa %3, [%%g0] %4\n" + : : "r" (virt), "r" (48), "i" (ASI_DMMU), + "r" (tte_data), "i" (ASI_DTLB_DATA_IN)); + asm("stxa %0, [%1] %2\n" + "stxa %3, [%%g0] %4\n" + : : "r" (virt), "r" (48), "i" (ASI_DMMU), + "r" (tte_data), "i" (ASI_DTLB_DATA_IN)); +} + +DECLARE_UNNAMED_NODE(mmu, INSTALL_OPEN, 0); + +NODE_METHODS(mmu) = { + { "open", mmu_open }, + { "close", mmu_close }, + { "translate", mmu_translate }, + { "SUNW,dtlb-load", dtlb_load }, + { "SUNW,itlb-load", itlb_load }, + { "map", mmu_map }, +}; + static void cpu_generic_init(const struct cpudef *cpu) { unsigned long iu_version; + char nodebuff[256]; push_str("/"); fword("find-device"); @@ -81,6 +219,31 @@ fword("property"); fword("finish-device"); + + // MMU node + sprintf(nodebuff, "/%s", cpu->name); + push_str(nodebuff); + fword("find-device"); + + fword("new-device"); + + push_str("mmu"); + fword("device-name"); + + fword("finish-device"); + + sprintf(nodebuff, "/%s/mmu", cpu->name); + + REGISTER_NODE_METHODS(mmu, nodebuff); + + push_str("/chosen"); + fword("find-device"); + + push_str(nodebuff); + fword("open-dev"); + fword("encode-int"); + push_str("mmu"); + fword("property"); } static const struct cpudef sparc_defs[] = {

1 0

r201 - openbios-devel/arch/sparc64
by svn＠openbios.org 15 Jul '08

15 Jul '08

Author: blueswirl Date: 2008-07-15 17:04:02 +0200 (Tue, 15 Jul 2008) New Revision: 201 Modified: openbios-devel/arch/sparc64/boot.h openbios-devel/arch/sparc64/console.c openbios-devel/arch/sparc64/init.fs openbios-devel/arch/sparc64/openbios.c Log: Make serial console usable Modified: openbios-devel/arch/sparc64/boot.h =================================================================== --- openbios-devel/arch/sparc64/boot.h 2008-07-15 14:59:53 UTC (rev 200) +++ openbios-devel/arch/sparc64/boot.h 2008-07-15 15:04:02 UTC (rev 201) @@ -21,3 +21,4 @@ extern uint64_t cmdline_size; extern char boot_device; extern struct sys_info sys_info; +void ob_su_init(uint64_t base, uint64_t offset, int intr); Modified: openbios-devel/arch/sparc64/console.c =================================================================== --- openbios-devel/arch/sparc64/console.c 2008-07-15 14:59:53 UTC (rev 200) +++ openbios-devel/arch/sparc64/console.c 2008-07-15 15:04:02 UTC (rev 201) @@ -6,17 +6,32 @@ */ #include "openbios/config.h" +#include "openbios/bindings.h" #include "openbios/kernel.h" #include "openbios.h" #include "video_subr.h" +#include "libc/vsprintf.h" +#include "sys_info.h" +#include "boot.h" -#ifdef CONFIG_DEBUG_CONSOLE +#define REGISTER_NAMED_NODE( name, path ) do { \ + bind_new_node( name##_flags_, name##_size_, \ + path, name##_m, sizeof(name##_m)/sizeof(method_t)); \ + } while(0) +#define REGISTER_NODE_METHODS( name, path ) do { \ + const char *paths[1]; \ + \ + paths[0] = path; \ + bind_node( name##_flags_, name##_size_, \ + paths, 1, name##_m, sizeof(name##_m)/sizeof(method_t)); \ + } while(0) + /* ****************************************************************** * serial console functions * ****************************************************************** */ -#ifdef CONFIG_DEBUG_CONSOLE_SERIAL +#define SER_SIZE 8 #define RBR(x) x==2?0x2f8:0x3f8 #define THR(x) x==2?0x2f8:0x3f8 @@ -85,6 +100,9 @@ } } +#ifdef CONFIG_DEBUG_CONSOLE +#ifdef CONFIG_DEBUG_CONSOLE_SERIAL + static void serial_cls(void); static void serial_putchar(int c); @@ -414,5 +432,147 @@ #endif } +#endif // CONFIG_DEBUG_CONSOLE -#endif // CONFIG_DEBUG_CONSOLE +/* ( addr len -- actual ) */ +static void +su_read(unsigned long *address) +{ + char *addr; + int len; + + len = POP(); + addr = (char *)POP(); + + if (len != 1) + printk("su_read: bad len, addr %lx len %x\n", (unsigned long)addr, len); + + if (uart_charav(*address)) { + *addr = (char)uart_getchar(*address); + PUSH(1); + } else { + PUSH(0); + } +} + +/* ( addr len -- actual ) */ +static void +su_read_keyboard(void) +{ + unsigned char *addr; + int len; + + len = POP(); + addr = (unsigned char *)POP(); + + if (len != 1) + printk("su_read: bad len, addr %lx len %x\n", (unsigned long)addr, len); + + if (keyboard_dataready()) { + *addr = keyboard_readdata(); + PUSH(1); + } else { + PUSH(0); + } +} + +/* ( addr len -- actual ) */ +static void +su_write(unsigned long *address) +{ + unsigned char *addr; + int i, len; + + len = POP(); + addr = (unsigned char *)POP(); + + for (i = 0; i < len; i++) { + uart_putchar(*address, addr[i]); + } + PUSH(len); +} + +static void +su_close(void) +{ +} + +static void +su_open(unsigned long *address) +{ + int len; + phandle_t ph; + unsigned long *prop; + char *args; + + fword("my-self"); + fword("ihandle>phandle"); + ph = (phandle_t)POP(); + prop = (unsigned long *)get_property(ph, "address", &len); + *address = *prop; + fword("my-args"); + args = pop_fstr_copy(); + + RET ( -1 ); +} + +DECLARE_UNNAMED_NODE(su, INSTALL_OPEN, sizeof(unsigned long)); + +NODE_METHODS(su) = { + { "open", su_open }, + { "close", su_close }, + { "read", su_read }, + { "write", su_write }, +}; + +DECLARE_UNNAMED_NODE(su_keyboard, INSTALL_OPEN, sizeof(unsigned long)); + +NODE_METHODS(su_keyboard) = { + { "open", su_open }, + { "close", su_close }, + { "read", su_read_keyboard }, +}; + +void +ob_su_init(uint64_t base, uint64_t offset, int intr) +{ + push_str("/pci/isa"); + fword("find-device"); + fword("new-device"); + + push_str("su"); + fword("device-name"); + + push_str("serial"); + fword("device-type"); + + PUSH((base + offset) >> 32); + fword("encode-int"); + PUSH((base + offset) & 0xffffffff); + fword("encode-int"); + fword("encode+"); + PUSH(SER_SIZE); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + + fword("finish-device"); + + REGISTER_NODE_METHODS(su, "/pci/isa/su"); + + push_str("/chosen"); + fword("find-device"); + + push_str("/pci/isa/su"); + fword("open-dev"); + fword("encode-int"); + push_str("stdin"); + fword("property"); + + push_str("/pci/isa/su"); + fword("open-dev"); + fword("encode-int"); + push_str("stdout"); + fword("property"); +} Modified: openbios-devel/arch/sparc64/init.fs =================================================================== --- openbios-devel/arch/sparc64/init.fs 2008-07-15 14:59:53 UTC (rev 200) +++ openbios-devel/arch/sparc64/init.fs 2008-07-15 15:04:02 UTC (rev 201) @@ -33,8 +33,6 @@ :noname " memory" " /memory" preopen " mmu" " /cpus/@0" preopen - " stdout" " /builtin/console" preopen - " stdin" " /builtin/console" preopen ; SYSTEM-initializer Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-07-15 14:59:53 UTC (rev 200) +++ openbios-devel/arch/sparc64/openbios.c 2008-07-15 15:04:02 UTC (rev 201) @@ -345,8 +345,10 @@ #endif nvram_init(); - device_end(); + ob_su_init(0x1fe02000000ULL, 0x3f8ULL, 0); + device_end(); + bind_func("platform-boot", boot ); }

1 0

r200 - openbios-devel/arch/sparc64
by svn＠openbios.org 15 Jul '08

15 Jul '08

Author: blueswirl Date: 2008-07-15 16:59:53 +0200 (Tue, 15 Jul 2008) New Revision: 200 Modified: openbios-devel/arch/sparc64/openbios.c Log: Add idprom node Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-07-15 14:57:07 UTC (rev 199) +++ openbios-devel/arch/sparc64/openbios.c 2008-07-15 14:59:53 UTC (rev 200) @@ -35,6 +35,8 @@ #define OBIO_CMDLINE_MAX 256 static char obio_cmdline[OBIO_CMDLINE_MAX]; +static uint8_t idprom[32]; + struct cpudef { unsigned long iu_version; const char *name; @@ -211,6 +213,22 @@ cpu_generic_init(cpu); printk(" x %s\n", cpu->name); + // Add /idprom + push_str("/"); + fword("find-device"); + + for (i = 0; i < 32; i++) { + outb((i + 0x1fd8) & 0xff, 0x74); + outb((i + 0x1fd8) >> 8, 0x75); + idprom[i] = inb(0x77); + } + + PUSH((long)&idprom); + PUSH(32); + fword("encode-bytes"); + push_str("idprom"); + fword("property"); + push_str("/memory"); fword("find-device");

1 0

r199 - openbios-devel/arch/sparc64
by svn＠openbios.org 15 Jul '08

15 Jul '08

Author: blueswirl Date: 2008-07-15 16:57:07 +0200 (Tue, 15 Jul 2008) New Revision: 199 Modified: openbios-devel/arch/sparc64/openbios.c Log: Add (bogus) memory nodes Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-07-12 09:41:08 UTC (rev 198) +++ openbios-devel/arch/sparc64/openbios.c 2008-07-15 14:57:07 UTC (rev 199) @@ -210,6 +210,64 @@ //cpu->initfn(); cpu_generic_init(cpu); printk(" x %s\n", cpu->name); + + push_str("/memory"); + fword("find-device"); + + PUSH(0); + fword("encode-int"); + PUSH((int)(nv_info.RAM0_size >> 32)); + fword("encode-int"); + fword("encode+"); + PUSH((int)(nv_info.RAM0_size & 0xffffffff)); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + + PUSH(0); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH((unsigned long)&_start - 4096); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(va2pa((unsigned long)&_iomem)); + fword("encode-int"); + fword("encode+"); + PUSH(-va2pa((unsigned long)&_iomem)); + fword("encode-int"); + fword("encode+"); + push_str("available"); + fword("property"); + + // XXX + push_str("/virtual-memory"); + fword("find-device"); + + PUSH(0); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + push_str("translations"); + fword("property"); } void arch_nvram_put(char *data)

1 0

r198 - openbios-devel/arch/sparc64
by svn＠openbios.org 12 Jul '08

12 Jul '08

Author: blueswirl Date: 2008-07-12 11:41:08 +0200 (Sat, 12 Jul 2008) New Revision: 198 Modified: openbios-devel/arch/sparc64/openbios.c openbios-devel/arch/sparc64/tree.fs Log: Add a CPU node Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-07-11 23:21:43 UTC (rev 197) +++ openbios-devel/arch/sparc64/openbios.c 2008-07-12 09:41:08 UTC (rev 198) @@ -40,6 +40,47 @@ const char *name; }; +static void cpu_generic_init(const struct cpudef *cpu) +{ + unsigned long iu_version; + + push_str("/"); + fword("find-device"); + + fword("new-device"); + + push_str(cpu->name); + fword("device-name"); + + push_str("cpu"); + fword("device-type"); + + asm("rdpr %%ver, %0\n" + : "=r"(iu_version) :); + + PUSH((iu_version >> 48) & 0xff); + fword("encode-int"); + push_str("manufacturer#"); + fword("property"); + + PUSH((iu_version >> 32) & 0xff); + fword("encode-int"); + push_str("implementation#"); + fword("property"); + + PUSH((iu_version >> 24) & 0xff); + fword("encode-int"); + push_str("mask#"); + fword("property"); + + PUSH(9); + fword("encode-int"); + push_str("sparc-version"); + fword("property"); + + fword("finish-device"); +} + static const struct cpudef sparc_defs[] = { { .iu_version = (0x04ULL << 48) | (0x02ULL << 32), @@ -166,6 +207,8 @@ printk("CPUs: %x", nv_info.nb_cpus); cpu = id_cpu(); + //cpu->initfn(); + cpu_generic_init(cpu); printk(" x %s\n", cpu->name); } Modified: openbios-devel/arch/sparc64/tree.fs =================================================================== --- openbios-devel/arch/sparc64/tree.fs 2008-07-11 23:21:43 UTC (rev 197) +++ openbios-devel/arch/sparc64/tree.fs 2008-07-12 09:41:08 UTC (rev 198) @@ -2,6 +2,7 @@ " /" find-device 2 encode-int " #address-cells" property 1 encode-int " #size-cells" property + " sun4u" encode-string " compatible" property \ : encode-unit encode-unit-sbus ; \ : decode-unit decode-unit-sbus ;

1 0

r197 - fcode-utils/documentation
by svn＠openbios.org 12 Jul '08

12 Jul '08

Author: stepan Date: 2008-07-12 01:21:43 +0200 (Sat, 12 Jul 2008) New Revision: 197 Modified: fcode-utils/documentation/localvalues.html fcode-utils/documentation/toke.html Log: some documentation fixes in the fcode suite documentation Modified: fcode-utils/documentation/localvalues.html =================================================================== --- fcode-utils/documentation/localvalues.html 2008-07-08 16:02:43 UTC (rev 196) +++ fcode-utils/documentation/localvalues.html 2008-07-11 23:21:43 UTC (rev 197) @@ -185,7 +185,7 @@ body of the word is not recommended, but is permitted.  A Local Values Declaration that occurs inside a Flow-Control Structure will be -reported as an <a href="TokenizerNewFeatures.htm#An_ERROR">Error</a>. +reported as an <a href="toke.html#An_ERROR">Error</a>. A Local Values Declaration may include comments and may continue across @@ -225,18 +225,18 @@ Vertical-Bar. The User may suppress this message by means of a <a - href="TokenizerNewFeatures.htm#Command-Line_options_">Command-line + href="toke.html#Command-Line_options_">Command-line switch</a>, known as the -<a href="TokenizerNewFeatures.htm#Special_Feature_Flags">Special-Feature -Flag</a> named <a href="TokenizerNewFeatures.htm#SF_Flag_LV_Leg_Mssg">Special-Feature +Flag</a> named <a href="toke.html#SF_Flag_LV_Leg_Mssg">NoLV-Legacy-Message</a> -, which is described in the <a href="TokenizerNewFeatures.htm">Tokenizer +, which is described in the <a href="toke.html">Tokenizer User's Guide</a>. <a name="Disallow_Legacy"></a>Conversely, the User who wishes to disallow the use of Semicolon as an alternative separator may do so by means of the Special-Feature Flag named <a - href="TokenizerNewFeatures.htm#SF_Flag_LV_Leg_Sep">NoLV-Legacy-Separator</a> .  When the Legacy Local Values Separator is thus disallowed, occurrences will be treated as an @@ -757,9 +757,9 @@ style="font-family: courier new,courier,monospace; font-weight: bold;">instance data. -The <a href="TokenizerNewFeatures.htm#INSTANCE_at_run_time">consequence</a> +The <a href="toke.html#INSTANCE_at_run_time">consequence</a> of this is that, in device-drivers that are configured -with <a href="TokenizerNewFeatures.htm#Multiple_device_nodes">multiple +with <a href="toke.html#Multiple_device_nodes">multiple device-nodes</a>, the Local Values Support Functions file must be re-floaded for each device-node that uses Local Values.  That is to say, every @@ -770,18 +770,18 @@ Functions file must be floaded again. The Tokenizer is sophisticated enough to keep a <a - href="TokenizerNewFeatures.htm#device-node_vocabularies">separate + href="toke.html#device-node_vocabularies">separate vocabulary for each device-node</a>, and will flag an <a href="#Error_handling">Error</a> if Local Values are used in a device-node for which the Local Values Support Functions file has not been floaded. However, should the user so choose, a <a - href="TokenizerNewFeatures.htm#Example_4">means</a> is available + href="toke.html#Example_4">means</a> is available whereby a single floading of the Local Values Support Functions can become <a - href="TokenizerNewFeatures.htm#Global_Definitions">accessible to all + href="toke.html#Global_Definitions">accessible to all Device Nodes</a> in a driver, trading off economy of System-memory for convenience of programming. <h4><a class="mozTocH4" name="mozTocId684194"></a><a @@ -833,7 +833,7 @@ the scope of that FCode program, and the question of synchronizing Local Values will be rendered irrelevant. -An <a href="TokenizerNewFeatures.htm#The_OVERLOAD_Directive">overloaded</a> +An <a href="toke.html#The_OVERLOAD_Directive">overloaded</a> catch in the Local Values Support Functions file does the job. Modified: fcode-utils/documentation/toke.html =================================================================== --- fcode-utils/documentation/toke.html 2008-07-08 16:02:43 UTC (rev 196) +++ fcode-utils/documentation/toke.html 2008-07-11 23:21:43 UTC (rev 197) @@ -347,7 +347,7 @@ messages.</li> <li>A complete list of FATAL conditions. </li> - <li>Support for <a href="TokenizerLocalValues.htm">IBM-Style Local + <li>Support for <a href="localvalues.html">IBM-Style Local Values</a>. That is the subject of a separate writeup.</li> </ul> @@ -416,8 +416,8 @@ generated into the Binary Output.  If a PCI Header is in effect, the position relative to the end of that PCI Header will also be shown; this is to maintain consistency with the <a - href="DeTokenizer.htm#with_offsets">"offsets</a>" displayed be the <a - href="DeTokenizer.htm">DeTokenizer</a> + href="detok.html#with_offsets">"offsets</a>" displayed by the <a + href="detok.html">DeTokenizer</a> <a name="Errors_Ignored"></a> The Tokenizer typically runs through to completion of the source file, @@ -786,7 +786,7 @@ </ul> </ul> Support IBM-style <a - href="TokenizerLocalValues.htm">Local Values</a> ("LV"s).  + href="localvalues.html">Local Values</a> ("LV"s).  Initially disabled. <ul> @@ -797,8 +797,8 @@ </ul> Allow Semicolon for Local Values <a - href="TokenizerLocalValues.htm#Separation_Character_between_Initialized">Separator</a> -("<a href="TokenizerLocalValues.htm#Disallow_Legacy">Legacy</a>"). + href="localvalues.html#Separation_Character_between_Initialized">Separator</a> +("<a href="localvalues.html#Disallow_Legacy">Legacy</a>"). <ul> <ul> @@ -807,7 +807,7 @@ </ul> </ul> Display a <a - href="TokenizerLocalValues.htm#Legacy_Separator">Warning + href="localvalues.html#Legacy_Separator">Warning Message</a> when Semicolon is used as the Local Values Separator. @@ -3462,7 +3462,7 @@ Support File can be incorporated at a <a href="#Global_Definitions">Global</a> level.  Normally, <a href="#Multiple_device_nodes">that would be problematical</a> because -the <a href="TokenizerLocalValues.htm#Instance_Data_in_L_V_Support">Local +the <a href="localvalues.html#Instance_Data_in_L_V_Support">Local Values Support functions</a> are written to use instance

1 0

r196 - openbios-devel/arch/sparc64
by svn＠openbios.org 08 Jul '08

08 Jul '08

Author: blueswirl Date: 2008-07-08 18:02:43 +0200 (Tue, 08 Jul 2008) New Revision: 196 Added: openbios-devel/arch/sparc64/aoutload.c Modified: openbios-devel/arch/sparc64/boot.c openbios-devel/arch/sparc64/boot.h openbios-devel/arch/sparc64/build.xml Log: Add a.out support for SILO Added: openbios-devel/arch/sparc64/aoutload.c =================================================================== --- openbios-devel/arch/sparc64/aoutload.c (rev 0) +++ openbios-devel/arch/sparc64/aoutload.c 2008-07-08 16:02:43 UTC (rev 196) @@ -0,0 +1,146 @@ +/* a.out boot loader + * As we have seek, this implementation can be straightforward. + * 2003-07 by SONE Takeshi + */ + +#include "openbios/config.h" +#include "openbios/kernel.h" +#define CONFIG_SPARC64_PAGE_SIZE_8KB +#include "a.out.h" +#include "sys_info.h" +#include "loadfs.h" +#include "boot.h" +#define printf printk +#define debug printk + +#define addr_fixup(addr) ((addr) & 0x00ffffff) + +static char *image_name, *image_version; +const char *program_name, *program_version; + +static int check_mem_ranges(struct sys_info *info, + unsigned long start, + unsigned long size) +{ + int j; + unsigned long end; + unsigned long prog_start, prog_end; + struct memrange *mem; + + prog_start = virt_to_phys(&_start); + prog_end = virt_to_phys(&_end); + + end = start + size; + + if (start < prog_start && end > prog_start) + goto conflict; + if (start < prog_end && end > prog_end) + goto conflict; + mem = info->memrange; + for (j = 0; j < info->n_memranges; j++) { + if (mem[j].base <= start && mem[j].base + mem[j].size >= end) + break; + } + if (j >= info->n_memranges) + goto badseg; + return 1; + + conflict: + printf("%s occupies [%#lx-%#lx]\n", program_name, prog_start, prog_end); + + badseg: + printf("A.out file [%#lx-%#lx] doesn't fit into memory\n", start, end - 1); + return 0; +} + +int aout_load(struct sys_info *info, const char *filename, const char *cmdline) +{ + int retval = -1; + int image_retval; + struct exec ehdr; + unsigned long start, size; + unsigned int offset; + + image_name = image_version = 0; + + if (!file_open(filename)) + goto out; + + for (offset = 0; offset < 16 * 512; offset += 512) { + file_seek(offset); + if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { + debug("Can't read a.out header\n"); + retval = LOADER_NOT_SUPPORT; + goto out; + } + if (!N_BADMAG(ehdr)) + break; + } + + if (N_BADMAG(ehdr)) { + debug("Not a bootable a.out image\n"); + retval = LOADER_NOT_SUPPORT; + goto out; + } + + if (ehdr.a_text == 0x30800007) + ehdr.a_text=64*1024; + + if (N_MAGIC(ehdr) == NMAGIC) { + size = addr_fixup(N_DATADDR(ehdr)) + addr_fixup(ehdr.a_data); + } else { + size = addr_fixup(ehdr.a_text) + addr_fixup(ehdr.a_data); + } + + if (size < 7680) + size = 7680; + + + start = 0x4000; // N_TXTADDR(ehdr); + + if (!check_mem_ranges(info, start, size)) + goto out; + + printf("Loading a.out %s...\n", image_name ? image_name : "image"); + + file_seek(offset + N_TXTOFF(ehdr)); + + if (N_MAGIC(ehdr) == NMAGIC) { + if ((unsigned long)lfile_read((void *)start, ehdr.a_text) != ehdr.a_text) { + printf("Can't read program text segment (size 0x%lx)\n", ehdr.a_text); + goto out; + } + if ((unsigned long)lfile_read((void *)(start + N_DATADDR(ehdr)), ehdr.a_data) != ehdr.a_data) { + printf("Can't read program data segment (size 0x%lx)\n", ehdr.a_data); + goto out; + } + } else { + if ((unsigned long)lfile_read((void *)start, size) != size) { + printf("Can't read program (size 0x%lx)\n", size); + goto out; + } + } + + debug("Loaded %lu bytes\n", size); + + debug("entry point is %#lx\n", start); + printf("Jumping to entry point...\n"); + +#if 1 + { + int (*entry)(unsigned long p1, unsigned long p2, unsigned long p3, + unsigned long p4, unsigned long p5); + extern int of_client_interface( int *params ); + + entry = (void *) addr_fixup(start); + image_retval = entry(0, 0, 0, 0, (unsigned long)&of_client_interface); + } +#endif + + printf("Image returned with return value %#x\n", image_retval); + retval = 0; + +out: + file_close(); + return retval; +} Modified: openbios-devel/arch/sparc64/boot.c =================================================================== --- openbios-devel/arch/sparc64/boot.c 2008-07-08 15:59:40 UTC (rev 195) +++ openbios-devel/arch/sparc64/boot.c 2008-07-08 16:02:43 UTC (rev 196) @@ -67,13 +67,15 @@ if (elf_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) - if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) { + if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) + if (aout_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) { sprintf(altpath, "%s:d", path); if (elf_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT) if (linux_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT) - printk("Unsupported image format\n"); + if (aout_load(&sys_info, altpath, param) == LOADER_NOT_SUPPORT) + printk("Unsupported image format\n"); } free(path); Modified: openbios-devel/arch/sparc64/boot.h =================================================================== --- openbios-devel/arch/sparc64/boot.h 2008-07-08 15:59:40 UTC (rev 195) +++ openbios-devel/arch/sparc64/boot.h 2008-07-08 16:02:43 UTC (rev 196) @@ -9,6 +9,7 @@ int forth_load(struct sys_info *info, const char *filename, const char *cmdline); int elf_load(struct sys_info *info, const char *filename, const char *cmdline); int linux_load(struct sys_info *info, const char *file, const char *cmdline); +int aout_load(struct sys_info *info, const char *filename, const char *cmdline); uint64_t start_elf(uint64_t entry_point, uint64_t param); Modified: openbios-devel/arch/sparc64/build.xml =================================================================== --- openbios-devel/arch/sparc64/build.xml 2008-07-08 15:59:40 UTC (rev 195) +++ openbios-devel/arch/sparc64/build.xml 2008-07-08 16:02:43 UTC (rev 196) @@ -15,6 +15,7 @@ <object source="linux_load.c"/> <object source="sys_info.c"/> <object source="elfload.c"/> + <object source="aoutload.c"/> <object source="forthload.c"/> <object source="loadfs.c"/> </library>

1 0

r195 - in openbios-devel: Documentation config/examples
by svn＠openbios.org 08 Jul '08

08 Jul '08

Author: blueswirl Date: 2008-07-08 17:59:40 +0200 (Tue, 08 Jul 2008) New Revision: 195 Modified: openbios-devel/Documentation/TODO.sparc openbios-devel/config/examples/cross-sparc64_config.xml openbios-devel/config/examples/sparc64_config.xml Log: Remove debug messages Modified: openbios-devel/Documentation/TODO.sparc =================================================================== --- openbios-devel/Documentation/TODO.sparc 2008-07-08 15:57:45 UTC (rev 194) +++ openbios-devel/Documentation/TODO.sparc 2008-07-08 15:59:40 UTC (rev 195) @@ -24,9 +24,6 @@ - BPP parallel - Diagnostic switch -- Optimizations/improvements: - - Remove debug messages - Sparc64: - Unimplemented features/bugs: - Debug direct kernel boot Modified: openbios-devel/config/examples/cross-sparc64_config.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_config.xml 2008-07-08 15:57:45 UTC (rev 194) +++ openbios-devel/config/examples/cross-sparc64_config.xml 2008-07-08 15:59:40 UTC (rev 195) @@ -18,7 +18,7 @@  <option name="CONFIG_DEBUG" type="boolean" value="true"/> - <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> <option name="CONFIG_DEBUG_DSTACK" type="boolean" value="false"/> <option name="CONFIG_DEBUG_RSTACK" type="boolean" value="false"/> <option name="CONFIG_DEBUG_DICTIONARY" type="boolean" value="false"/> @@ -69,7 +69,7 @@ <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/> <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> - <option name="CONFIG_DEBUG_IDE" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> Modified: openbios-devel/config/examples/sparc64_config.xml =================================================================== --- openbios-devel/config/examples/sparc64_config.xml 2008-07-08 15:57:45 UTC (rev 194) +++ openbios-devel/config/examples/sparc64_config.xml 2008-07-08 15:59:40 UTC (rev 195) @@ -18,7 +18,7 @@  <option name="CONFIG_DEBUG" type="boolean" value="true"/> - <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> <option name="CONFIG_DEBUG_DSTACK" type="boolean" value="false"/> <option name="CONFIG_DEBUG_RSTACK" type="boolean" value="false"/> <option name="CONFIG_DEBUG_DICTIONARY" type="boolean" value="false"/> @@ -69,7 +69,7 @@ <option name="CONFIG_DEBUG_PCI" type="boolean" value="true"/> <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> - <option name="CONFIG_DEBUG_IDE" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="true"/> <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/>

1 0

r194 - in openbios-devel: Documentation arch/sparc32 arch/sparc64
by svn＠openbios.org 08 Jul '08

08 Jul '08

Author: blueswirl Date: 2008-07-08 17:57:45 +0200 (Tue, 08 Jul 2008) New Revision: 194 Modified: openbios-devel/Documentation/TODO.sparc openbios-devel/arch/sparc32/build.xml openbios-devel/arch/sparc64/build.xml Log: Add Make dependencies for some files, unify Sparc32/64 build.xml files Modified: openbios-devel/Documentation/TODO.sparc =================================================================== --- openbios-devel/Documentation/TODO.sparc 2008-07-08 15:52:55 UTC (rev 193) +++ openbios-devel/Documentation/TODO.sparc 2008-07-08 15:57:45 UTC (rev 194) @@ -3,7 +3,6 @@ Sparc common: - Unimplemented features/bugs: - Send keycode on keypress - - Add Make dependencies for .S files - Remove compiler warnings - Clean up Modified: openbios-devel/arch/sparc32/build.xml =================================================================== --- openbios-devel/arch/sparc32/build.xml 2008-07-08 15:52:55 UTC (rev 193) +++ openbios-devel/arch/sparc32/build.xml 2008-07-08 15:57:45 UTC (rev 194) @@ -23,14 +23,12 @@ </library> <executable name="target/arch/sparc32/entry.o" target="target"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/entry.S - ]]></rule> + <rule><![CDATA[ arch/sparc32/entry.S + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> <executable name="target/arch/sparc32/vectors.o" target="target"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/vectors.S - ]]></rule> + <rule><![CDATA[ arch/sparc32/vectors.S + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> @@ -38,8 +36,7 @@ $(LD) -N -T arch/sparc32/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-plain.syms cp $@.nostrip $@ - $(STRIP) $@ - </rule> + $(STRIP) $@</rule> <object source="plainboot.c"/> <external-object source="target/arch/sparc32/vectors.o"/> <external-object source="target/arch/sparc32/entry.o"/> @@ -59,16 +56,13 @@ @echo "static const char forth_dictionary[] = {" > $@ @cat $< | hexdump -ve '1/0 "\t" 8/1 "0x%02x, " 1/0 "\n"' \ | sed 's/0x ,//g' >> $@ - @echo "};" >> $@ - ]]></rule> + @echo "};" >> $@]]></rule> <external-object source="openbios-sparc32.dict"/> </executable> <executable name="target/arch/sparc32/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> - <rule><![CDATA[ - $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/builtin.c - ]]></rule> - <external-object source="target/include/static-dict.h"/> + <rule><![CDATA[ arch/sparc32/builtin.c + $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable>  @@ -78,8 +72,7 @@ $(LD) -N -T arch/sparc32/ldscript -o $@.nostrip $^ $(NM) $@.nostrip | sort > $(ODIR)/openbios-builtin.syms cp $@.nostrip $@ - $(STRIP) $@ - </rule> + $(STRIP) $@</rule> <external-object source="target/arch/sparc32/vectors.o"/> <external-object source="target/arch/sparc32/entry.o"/> <external-object source="target/arch/sparc32/builtin.o"/> Modified: openbios-devel/arch/sparc64/build.xml =================================================================== --- openbios-devel/arch/sparc64/build.xml 2008-07-08 15:52:55 UTC (rev 193) +++ openbios-devel/arch/sparc64/build.xml 2008-07-08 15:57:45 UTC (rev 194) @@ -28,7 +28,6 @@ $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> - <executable name="openbios-plain.elf" target="target" condition="IMAGE_ELF"> <rule> $(LD) -T arch/sparc64/ldscript -o $@.nostrip $^

1 0

r193 - openbios-devel/arch/sparc32
by svn＠openbios.org 08 Jul '08

08 Jul '08

Author: blueswirl Date: 2008-07-08 17:52:55 +0200 (Tue, 08 Jul 2008) New Revision: 193 Modified: openbios-devel/arch/sparc32/init.fs Log: Implement obmem for NetBSD loader Modified: openbios-devel/arch/sparc32/init.fs =================================================================== --- openbios-devel/arch/sparc32/init.fs 2008-07-07 18:38:30 UTC (rev 192) +++ openbios-devel/arch/sparc32/init.fs 2008-07-08 15:52:55 UTC (rev 193) @@ -56,3 +56,7 @@ drop 0 ; +\ D5.3 SBus specific on-board memory address space +: obmem ( -- space ) + 0 + ;

1 0

r192 - openbios-devel/libgcc
by svn＠openbios.org 07 Jul '08

07 Jul '08

Author: blueswirl Date: 2008-07-07 20:38:30 +0200 (Mon, 07 Jul 2008) New Revision: 192 Added: openbios-devel/libgcc/libgcc.h Modified: openbios-devel/libgcc/__divdi3.c openbios-devel/libgcc/__divti3.c openbios-devel/libgcc/__lshrdi3.c openbios-devel/libgcc/__udivdi3.c openbios-devel/libgcc/__udivmoddi4.c openbios-devel/libgcc/__udivmodti4.c openbios-devel/libgcc/__udivti3.c openbios-devel/libgcc/__umoddi3.c openbios-devel/libgcc/__umodti3.c openbios-devel/libgcc/ashldi3.c openbios-devel/libgcc/ashrdi3.c openbios-devel/libgcc/multi3.c Log: Add a common header file for libgcc functions Modified: openbios-devel/libgcc/__divdi3.c =================================================================== --- openbios-devel/libgcc/__divdi3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__divdi3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -2,11 +2,8 @@ * arch/i386/libgcc/__divdi3.c */ -#include <stdint.h> -#include <stddef.h> +#include "libgcc.h" -extern uint64_t __udivmoddi4(uint64_t num, uint64_t den, uint64_t *rem); - int64_t __divdi3(int64_t num, int64_t den) { int minus = 0; Modified: openbios-devel/libgcc/__divti3.c =================================================================== --- openbios-devel/libgcc/__divti3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__divti3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -2,11 +2,8 @@ * arch/i386/libgcc/__divti3.c */ -#include "asm/types.h" -#define NULL ((void *)0) +#include "libgcc.h" -extern __uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem); - __int128_t __divti3(__int128_t num, __int128_t den) { int minus = 0; Modified: openbios-devel/libgcc/__lshrdi3.c =================================================================== --- openbios-devel/libgcc/__lshrdi3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__lshrdi3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -18,13 +18,10 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "libgcc.h" + #define BITS_PER_UNIT 8 -typedef int SItype __attribute__ ((mode (SI))); -typedef unsigned int USItype __attribute__ ((mode (SI))); -typedef int DItype __attribute__ ((mode (DI))); -typedef int word_type __attribute__ ((mode (__word__))); - struct DIstruct {SItype high, low;}; typedef union Modified: openbios-devel/libgcc/__udivdi3.c =================================================================== --- openbios-devel/libgcc/__udivdi3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__udivdi3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -2,11 +2,8 @@ * arch/i386/libgcc/__divdi3.c */ -#include <stdint.h> -#include <stddef.h> +#include "libgcc.h" -extern uint64_t __udivmoddi4(uint64_t num, uint64_t den, uint64_t *rem); - uint64_t __udivdi3(uint64_t num, uint64_t den) { return __udivmoddi4(num, den, NULL); Modified: openbios-devel/libgcc/__udivmoddi4.c =================================================================== --- openbios-devel/libgcc/__udivmoddi4.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__udivmoddi4.c 2008-07-07 18:38:30 UTC (rev 192) @@ -1,7 +1,5 @@ -#include <stdint.h> +#include "libgcc.h" -extern void __divide_error(); - uint64_t __udivmoddi4(uint64_t num, uint64_t den, uint64_t *rem_p) { uint64_t quot = 0, qbit = 1; Modified: openbios-devel/libgcc/__udivmodti4.c =================================================================== --- openbios-devel/libgcc/__udivmodti4.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__udivmodti4.c 2008-07-07 18:38:30 UTC (rev 192) @@ -1,7 +1,5 @@ -#include "asm/types.h" +#include "libgcc.h" -extern void __divide_error(); - __uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem_p) { __uint128_t quot = 0, qbit = 1; Modified: openbios-devel/libgcc/__udivti3.c =================================================================== --- openbios-devel/libgcc/__udivti3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__udivti3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -2,11 +2,8 @@ * arch/i386/libgcc/__divdi3.c */ -#include "asm/types.h" -#define NULL ((void *)0) +#include "libgcc.h" -extern __uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem); - __uint128_t __udivti3(__uint128_t num, __uint128_t den) { return __udivmodti4(num, den, NULL); Modified: openbios-devel/libgcc/__umoddi3.c =================================================================== --- openbios-devel/libgcc/__umoddi3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__umoddi3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -2,11 +2,8 @@ * arch/i386/libgcc/__umoddi3.c */ -#include <stdint.h> -#include <stddef.h> +#include "libgcc.h" -extern uint64_t __udivmoddi4(uint64_t num, uint64_t den, uint64_t *rem); - uint64_t __umoddi3(uint64_t num, uint64_t den) { uint64_t v; Modified: openbios-devel/libgcc/__umodti3.c =================================================================== --- openbios-devel/libgcc/__umodti3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/__umodti3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -2,10 +2,8 @@ * arch/i386/libgcc/__umoddi3.c */ -#include "asm/types.h" +#include "libgcc.h" -extern __uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem); - __uint128_t __umodti3(__uint128_t num, __uint128_t den) { __uint128_t v; Modified: openbios-devel/libgcc/ashldi3.c =================================================================== --- openbios-devel/libgcc/ashldi3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/ashldi3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -18,13 +18,10 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "libgcc.h" + #define BITS_PER_UNIT 8 -typedef int SItype __attribute__ ((mode (SI))); -typedef unsigned int USItype __attribute__ ((mode (SI))); -typedef int DItype __attribute__ ((mode (DI))); -typedef int word_type __attribute__ ((mode (__word__))); - struct DIstruct {SItype high, low;}; typedef union Modified: openbios-devel/libgcc/ashrdi3.c =================================================================== --- openbios-devel/libgcc/ashrdi3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/ashrdi3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -18,13 +18,10 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "libgcc.h" + #define BITS_PER_UNIT 8 -typedef int SItype __attribute__ ((mode (SI))); -typedef unsigned int USItype __attribute__ ((mode (SI))); -typedef int DItype __attribute__ ((mode (DI))); -typedef int word_type __attribute__ ((mode (__word__))); - struct DIstruct {SItype high, low;}; typedef union Added: openbios-devel/libgcc/libgcc.h =================================================================== --- openbios-devel/libgcc/libgcc.h (rev 0) +++ openbios-devel/libgcc/libgcc.h 2008-07-07 18:38:30 UTC (rev 192) @@ -0,0 +1,37 @@ +#ifndef _LIBGCC_H +#define _LIBGCC_H + +#include "asm/types.h" + +#ifndef NULL +#define NULL ((void *)0) +#endif + +typedef int SItype __attribute__ ((mode (SI))); +typedef unsigned int USItype __attribute__ ((mode (SI))); +typedef int DItype __attribute__ ((mode (DI))); +typedef unsigned int UDItype __attribute__ ((mode (DI))); +typedef int TItype __attribute__ ((mode (TI))); +typedef int word_type __attribute__ ((mode (__word__))); + +uint64_t __udivmoddi4(uint64_t num, uint64_t den, uint64_t *rem); +__uint128_t __udivmodti4(__uint128_t num, __uint128_t den, __uint128_t *rem); + +int64_t __divdi3(int64_t num, int64_t den); +uint64_t __udivdi3(uint64_t num, uint64_t den); +__int128_t __divti3(__int128_t num, __int128_t den); +__uint128_t __udivti3(__uint128_t num, __uint128_t den); + +uint64_t __umoddi3(uint64_t num, uint64_t den); +__uint128_t __umodti3(__uint128_t num, __uint128_t den); + +DItype __ashldi3 (DItype u, word_type b); +DItype __lshrdi3 (DItype u, word_type b); +DItype __ashrdi3 (DItype u, word_type b); + +TItype __multi3 (TItype u, TItype v); + +// Must be implemented outside: +void __divide_error(void); + +#endif /* _LIBGCC_H */ Modified: openbios-devel/libgcc/multi3.c =================================================================== --- openbios-devel/libgcc/multi3.c 2008-07-07 18:37:24 UTC (rev 191) +++ openbios-devel/libgcc/multi3.c 2008-07-07 18:38:30 UTC (rev 192) @@ -1,4 +1,4 @@ -/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and +/* muldi3.c extracted from gcc-2.7.2.3/libgcc2.c and gcc-2.7.2.3/longlong.h which is: */ /* Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. @@ -19,6 +19,8 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "libgcc.h" + #define BITS_PER_UNIT 8 #define DI_TYPE_SIZE 64 @@ -56,11 +58,6 @@ umul_ppmm (__w.s.high, __w.s.low, u, v); \ __w.ll; }) -typedef int DItype __attribute__ ((mode (DI))); -typedef unsigned int UDItype __attribute__ ((mode (DI))); -typedef int TItype __attribute__ ((mode (TI))); -typedef int word_type __attribute__ ((mode (__word__))); - struct TIstruct {DItype high, low;}; typedef union

1 0

r191 - openbios-devel/include/libc
by svn＠openbios.org 07 Jul '08

07 Jul '08

Author: blueswirl Date: 2008-07-07 20:37:24 +0200 (Mon, 07 Jul 2008) New Revision: 191 Modified: openbios-devel/include/libc/vsprintf.h Log: Add prototypes for [v]snprintf Modified: openbios-devel/include/libc/vsprintf.h =================================================================== --- openbios-devel/include/libc/vsprintf.h 2008-07-07 18:36:16 UTC (rev 190) +++ openbios-devel/include/libc/vsprintf.h 2008-07-07 18:37:24 UTC (rev 191) @@ -18,7 +18,11 @@ #define _H_VSPRINTF #include <stdarg.h> +#include "openbios/config.h" + extern int vsprintf(char *buf, const char *fmt, va_list args ); extern int sprintf(char * buf, const char *fmt, ...); +extern int vsnprintf(char *buf, size_t size, const char *fmt, va_list args); +extern int snprintf(char * buf, size_t size, const char *fmt, ...); #endif /* _H_VSPRINTF */

1 0

r190 - in openbios-devel: arch/sparc64 include/sparc64
by svn＠openbios.org 07 Jul '08

07 Jul '08

Author: blueswirl Date: 2008-07-07 20:36:16 +0200 (Mon, 07 Jul 2008) New Revision: 190 Modified: openbios-devel/arch/sparc64/boot.c openbios-devel/arch/sparc64/boot.h openbios-devel/arch/sparc64/build.xml openbios-devel/arch/sparc64/context.c openbios-devel/arch/sparc64/elfload.c openbios-devel/arch/sparc64/entry.S openbios-devel/arch/sparc64/forthload.c openbios-devel/arch/sparc64/init.fs openbios-devel/arch/sparc64/ldscript openbios-devel/arch/sparc64/lib.c openbios-devel/arch/sparc64/linux_load.c openbios-devel/arch/sparc64/loadfs.c openbios-devel/arch/sparc64/loadfs.h openbios-devel/arch/sparc64/multiboot.c openbios-devel/arch/sparc64/multiboot.h openbios-devel/arch/sparc64/openbios.c openbios-devel/arch/sparc64/openbios.h openbios-devel/arch/sparc64/switch.S openbios-devel/arch/sparc64/sys_info.c openbios-devel/arch/sparc64/ttable.h openbios-devel/arch/sparc64/vectors.S openbios-devel/include/sparc64/io.h Log: Fix some Sparc64 compile warnings Modified: openbios-devel/arch/sparc64/boot.c =================================================================== --- openbios-devel/arch/sparc64/boot.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/boot.c 2008-07-07 18:36:16 UTC (rev 190) @@ -7,18 +7,14 @@ #include "openbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" +#include "libc/vsprintf.h" #include "sys_info.h" +#include "boot.h" -int elf_load(struct sys_info *, const char *filename, const char *cmdline); -int aout_load(struct sys_info *, const char *filename, const char *cmdline); -int linux_load(struct sys_info *, const char *filename, const char *cmdline); - -void boot(void); - -struct sys_info sys_info; +struct sys_info sys_info; uint64_t kernel_image; uint64_t kernel_size; -uint64_t cmdline; +uint64_t qemu_cmdline; uint64_t cmdline_size; char boot_device; @@ -60,11 +56,11 @@ *param = '\0'; param++; } else if (cmdline_size) { - param = (char *)cmdline; + param = (char *)qemu_cmdline; } printk("[sparc64] Booting file '%s' ", path); - if(param) + if (param) printk("with parameters '%s'\n", param); else printk("without parameters.\n"); Modified: openbios-devel/arch/sparc64/boot.h =================================================================== --- openbios-devel/arch/sparc64/boot.h 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/boot.h 2008-07-07 18:36:16 UTC (rev 190) @@ -10,11 +10,13 @@ int elf_load(struct sys_info *info, const char *filename, const char *cmdline); int linux_load(struct sys_info *info, const char *file, const char *cmdline); -unsigned int start_elf(unsigned long entry_point, unsigned long param); +uint64_t start_elf(uint64_t entry_point, uint64_t param); +void boot(void); + extern uint64_t kernel_image; extern uint64_t kernel_size; -extern uint64_t cmdline; +extern uint64_t qemu_cmdline; extern uint64_t cmdline_size; extern char boot_device; extern struct sys_info sys_info; Modified: openbios-devel/arch/sparc64/build.xml =================================================================== --- openbios-devel/arch/sparc64/build.xml 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/build.xml 2008-07-07 18:36:16 UTC (rev 190) @@ -18,7 +18,7 @@ <object source="forthload.c"/> <object source="loadfs.c"/> </library> - + <executable name="target/arch/sparc64/entry.o" target="target"> <rule><![CDATA[ arch/sparc64/entry.S $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> @@ -48,7 +48,7 @@ </executable>  - + <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ @echo "static const char forth_dictionary[] = {" > $@ @@ -57,12 +57,12 @@ @echo "};" >> $@]]></rule> <external-object source="openbios-sparc64.dict"/> </executable> - + <executable name="target/arch/sparc64/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ arch/sparc64/builtin.c $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </executable> - +  <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED"> @@ -83,5 +83,5 @@ <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable> - + </build> Modified: openbios-devel/arch/sparc64/context.c =================================================================== --- openbios-devel/arch/sparc64/context.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/context.c 2008-07-07 18:36:16 UTC (rev 190) @@ -6,6 +6,8 @@ #include "openbios/config.h" #include "openbios/kernel.h" #include "context.h" +#include "sys_info.h" +#include "boot.h" #define MAIN_STACK_SIZE 16384 #define IMAGE_STACK_SIZE 4096 @@ -16,11 +18,11 @@ void __exit_context(void); /* assembly routine */ /* - * Main context structure + * Main context structure * It is placed at the bottom of our stack, and loaded by assembly routine * to start us up. */ -const struct context main_ctx = { +struct context main_ctx = { .regs[REG_SP] = (uint64_t) &_estack - 2047 - 96, .pc = (uint64_t) start_main, .npc = (uint64_t) start_main + 4, Modified: openbios-devel/arch/sparc64/elfload.c =================================================================== --- openbios-devel/arch/sparc64/elfload.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/elfload.c 2008-07-07 18:36:16 UTC (rev 190) @@ -11,10 +11,10 @@ #include "sys_info.h" #include "ipchecksum.h" #include "loadfs.h" +#include "boot.h" #define printf printk #define debug printk -extern unsigned int start_elf(unsigned long entry_point, unsigned long param); #define addr_fixup(addr) ((addr) & 0x00ffffff) static char *image_name, *image_version; @@ -92,7 +92,7 @@ continue; buf = malloc(phdr[i].p_filesz); file_seek(offset + phdr[i].p_offset); - if (lfile_read(buf, phdr[i].p_filesz) != phdr[i].p_filesz) { + if ((uint64_t)lfile_read(buf, phdr[i].p_filesz) != phdr[i].p_filesz) { printf("Can't read note segment\n"); goto out; } @@ -150,14 +150,14 @@ i, addr_fixup(phdr[i].p_paddr), phdr[i].p_filesz, phdr[i].p_memsz); file_seek(offset + phdr[i].p_offset); debug("loading... "); - if (lfile_read(phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_filesz) + if ((uint64_t)lfile_read(phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_filesz) != phdr[i].p_filesz) { printf("Can't read program segment %d\n", i); return 0; } bytes += phdr[i].p_filesz; debug("clearing... "); - memset(phys_to_virt(addr_fixup(phdr[i].p_paddr) + phdr[i].p_filesz), 0, + memset(phys_to_virt(addr_fixup(phdr[i].p_paddr) + phdr[i].p_filesz), 0, phdr[i].p_memsz - phdr[i].p_filesz); if (phdr[i].p_offset <= checksum_offset && phdr[i].p_offset + phdr[i].p_filesz >= checksum_offset+2) { @@ -320,7 +320,7 @@ goto out; for (offset = 0; offset < 16 * 512; offset += 512) { - if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { + if ((size_t)lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { debug("Can't read ELF header\n"); retval = LOADER_NOT_SUPPORT; goto out; @@ -351,7 +351,7 @@ phdr_size = ehdr.e_phnum * sizeof *phdr; phdr = malloc(phdr_size); file_seek(offset + ehdr.e_phoff); - if (lfile_read(phdr, phdr_size) != phdr_size) { + if ((unsigned long)lfile_read(phdr, phdr_size) != phdr_size) { printf("Can't read program header\n"); goto out; } @@ -368,7 +368,7 @@ if (!load_segments(phdr, ehdr.e_phnum, checksum_offset, offset)) goto out; - + if (checksum_offset) { if (!verify_image(&ehdr, phdr, ehdr.e_phnum, checksum)) goto out; Modified: openbios-devel/arch/sparc64/entry.S =================================================================== --- openbios-devel/arch/sparc64/entry.S 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/entry.S 2008-07-07 18:36:16 UTC (rev 190) @@ -100,8 +100,8 @@ lduba [%g1] ASI_PHYS_BYPASS_EC_E, %g3 or %g3, %g4, %g1 ! %g1 contains end of memory - - + + setx _end, %g7, %g3 set 0xffff, %g2 add %g3, %g2, %g3 @@ -280,7 +280,7 @@ setx qemu_mem_size, %g7, %g1 stx %g3, [%g1] - + setx _data, %g7, %g1 ! Store va->pa conversion factor sub %g1, %l0, %g2 setx va_shift, %g7, %g1 Modified: openbios-devel/arch/sparc64/forthload.c =================================================================== --- openbios-devel/arch/sparc64/forthload.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/forthload.c 2008-07-07 18:36:16 UTC (rev 190) @@ -38,10 +38,10 @@ } forthsize = file_size(); - + forthtext = malloc(forthsize+1); file_seek(0); - + printk("Loading forth source ..."); if ((unsigned long)lfile_read(forthtext, forthsize) != forthsize) { printk("Can't read forth text\n"); Modified: openbios-devel/arch/sparc64/init.fs =================================================================== --- openbios-devel/arch/sparc64/init.fs 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/init.fs 2008-07-07 18:36:16 UTC (rev 190) @@ -1,4 +1,4 @@ -:noname +:noname ." Type 'help' for detailed information" cr \ ." boot secondary slave cdrom: " cr \ ." 0 > boot hd:2,\boot\vmlinuz root=/dev/hda2" cr @@ -16,7 +16,7 @@ : preopen ( chosen-str node-path ) 2dup make-openable - + " /chosen" find-device open-dev ?dup if encode-int 2swap property @@ -24,7 +24,7 @@ 2drop then ; - + :noname set-defaults ; SYSTEM-initializer @@ -45,11 +45,11 @@ " /builtin/console" " output-device" $setenv then ; SYSTEM-initializer - + :noname " keyboard" input ; CONSOLE-IN-initializer - + device-end : rmap@ ( virt -- rmentry ) Modified: openbios-devel/arch/sparc64/ldscript =================================================================== --- openbios-devel/arch/sparc64/ldscript 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/ldscript 2008-07-07 18:36:16 UTC (rev 190) @@ -20,7 +20,7 @@ { . = BASE_ADDR; - /* Start of the program. + /* Start of the program. * Now the version string is in the note, we must include it * in the program. Otherwise we lose the string after relocation. */ _start = .; Modified: openbios-devel/arch/sparc64/lib.c =================================================================== --- openbios-devel/arch/sparc64/lib.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/lib.c 2008-07-07 18:36:16 UTC (rev 190) @@ -15,7 +15,7 @@ #include "openbios/kernel.h" /* Format a string and print it on the screen, just like the libc - * function printf. + * function printf. */ int printk( const char *fmt, ... ) { @@ -50,7 +50,7 @@ if(memsize>=size) { memsize-=size; ret=memptr; - memptr+=size; + memptr = (void *)((unsigned long)memptr + size); } return ret; } @@ -59,7 +59,3 @@ { /* Nothing yet */ } - -unsigned long map_page(unsigned long va, unsigned long epa, int type) -{ -} Modified: openbios-devel/arch/sparc64/linux_load.c =================================================================== --- openbios-devel/arch/sparc64/linux_load.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/linux_load.c 2008-07-07 18:36:16 UTC (rev 190) @@ -14,6 +14,7 @@ #include "sys_info.h" #include "context.h" #include "loadfs.h" +#include "boot.h" #define printf printk #define debug printk @@ -355,7 +356,7 @@ printf("Garbage after mem=<size>, ignored\n"); forced_memsize = 0; } - debug("mem=%Lu\n", forced_memsize); + debug("mem=%llu\n", (unsigned long long)forced_memsize); } /* mem= is for both loader and kernel */ to_kern = 1; @@ -424,7 +425,7 @@ #endif printf("Loading kernel... "); - if (lfile_read(phys_to_virt(kern_addr), kern_size) != kern_size) { + if ((uint32_t)lfile_read(phys_to_virt(kern_addr), kern_size) != kern_size) { printf("Can't read kernel\n"); return 0; } @@ -433,8 +434,8 @@ return kern_size; } -static int load_initrd(struct linux_header *hdr, struct sys_info *info, - uint32_t kern_end, struct linux_params *params, const char *initrd_file) +static int load_initrd(struct linux_header *hdr, uint32_t kern_end, + struct linux_params *params, const char *initrd_file) { uint32_t max; uint32_t start, end, size; @@ -462,7 +463,7 @@ max = hdr->initrd_addr_max; else max = 0x38000000; /* Hardcoded value for older kernels */ - + /* FILO itself is at the top of RAM. (relocated) * So, try putting initrd just below us. */ end = virt_to_phys(_start); @@ -497,7 +498,7 @@ } printf("Loading initrd... "); - if (lfile_read(phys_to_virt(start), size) != size) { + if ((uint32_t)lfile_read(phys_to_virt(start), size) != size) { printf("Can't read initrd\n"); return -1; } @@ -518,9 +519,9 @@ outb(0, 0xf0); outb(0, 0xf1); - /* we're getting screwed again and again by this problem of the 8259. - * so we're going to leave this lying around for inclusion into - * crt0.S on an as-needed basis. + /* we're getting screwed again and again by this problem of the 8259. + * so we're going to leave this lying around for inclusion into + * crt0.S on an as-needed basis. * * well, that went ok, I hope. Now we have to reprogram the interrupts :-( * we put them right after the intel-reserved hardware interrupts, at @@ -548,7 +549,7 @@ } /* Start Linux */ -static int start_linux(uint32_t kern_addr, struct linux_params *params) +static int start_linux(uint32_t kern_addr) { struct context *ctx; //extern int cursor_x, cursor_y; @@ -568,12 +569,12 @@ params->orig_x = cursor_x; params->orig_y = cursor_y; #endif - + /* Go... */ ctx = switch_to(ctx); /* It's impossible but... */ - printf("Returned with o0=%#x\n", ctx->regs[REG_O0]); + printf("Returned with o0=%#lx\n", ctx->regs[REG_O0]); return ctx->regs[REG_O0]; } @@ -608,7 +609,7 @@ } if (initrd_file) { - if (load_initrd(&hdr, info, kern_addr+kern_size, params, initrd_file) + if (load_initrd(&hdr, kern_addr+kern_size, params, initrd_file) != 0) { free(initrd_file); return -1; @@ -618,6 +619,6 @@ hardware_setup(); - start_linux(kern_addr, params); + start_linux(kern_addr); return 0; } Modified: openbios-devel/arch/sparc64/loadfs.c =================================================================== --- openbios-devel/arch/sparc64/loadfs.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/loadfs.c 2008-07-07 18:36:16 UTC (rev 190) @@ -15,7 +15,7 @@ void file_close(void) { - if(load_fd==-1) + if(load_fd==-1) return; close_io(load_fd); Modified: openbios-devel/arch/sparc64/loadfs.h =================================================================== --- openbios-devel/arch/sparc64/loadfs.h 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/loadfs.h 2008-07-07 18:36:16 UTC (rev 190) @@ -2,6 +2,4 @@ int lfile_read(void *buf, unsigned long len); int file_seek(unsigned long offset); unsigned long file_size(void); - - - +void file_close(void); Modified: openbios-devel/arch/sparc64/multiboot.c =================================================================== --- openbios-devel/arch/sparc64/multiboot.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/multiboot.c 2008-07-07 18:36:16 UTC (rev 190) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "openbios/config.h" #include "asm/io.h" #include "sys_info.h" #include "multiboot.h" @@ -9,7 +9,7 @@ #ifdef CONFIG_DEBUG_BOOT #define debug printk #else -#define debug(x...) +#define debug(x...) #endif struct mbheader { @@ -62,11 +62,11 @@ printf("Multiboot: no dictionary\n"); return; } - + mod = (module_t *) mbinfo->mods_addr; info->dict_start=(unsigned long *)mod->mod_start; info->dict_end=(unsigned long *)mod->mod_end; - + if (mbinfo->flags & MULTIBOOT_MMAP_VALID) { /* convert mmap records */ mbmem = phys_to_virt(mbinfo->mmap_addr); Modified: openbios-devel/arch/sparc64/multiboot.h =================================================================== --- openbios-devel/arch/sparc64/multiboot.h 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/multiboot.h 2008-07-07 18:36:16 UTC (rev 190) @@ -1,5 +1,5 @@ -/* multiboot.h - * tag: header for multiboot +/* multiboot.h + * tag: header for multiboot * * Copyright (C) 2003-2004 Stefan Reinauer * Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/openbios.c 2008-07-07 18:36:16 UTC (rev 190) @@ -13,13 +13,15 @@ #include "dict.h" #include "openbios/kernel.h" #include "openbios/stack.h" +#include "openbios/nvram.h" #include "sys_info.h" #include "openbios.h" +#include "libc/byteorder.h" +#define cpu_to_be16(x) __cpu_to_be16(x) #include "openbios/firmware_abi.h" #include "boot.h" +#include "../../drivers/timer.h" // XXX -void boot(void); - static unsigned char intdict[256 * 1024]; // XXX @@ -122,9 +124,9 @@ void arch_nvram_get(char *data) { unsigned short i; - unsigned char *nvptr = &nv_info; + unsigned char *nvptr = (unsigned char *)&nv_info; uint32_t size; - struct cpudef *cpu; + const struct cpudef *cpu; for (i = 0; i < sizeof(ohwcfg_v3_t); i++) { outb(i & 0xff, 0x74); @@ -146,13 +148,13 @@ size = nv_info.cmdline_size; if (size > OBIO_CMDLINE_MAX - 1) size = OBIO_CMDLINE_MAX - 1; - memcpy(obio_cmdline, (void *)nv_info.cmdline, size); + memcpy(&obio_cmdline, (void *)(long)nv_info.cmdline, size); obio_cmdline[size] = '\0'; - cmdline = obio_cmdline; + qemu_cmdline = (uint64_t)obio_cmdline; cmdline_size = size; boot_device = nv_info.boot_devices[0]; - printk("kernel addr %x size %x\n", kernel_image, kernel_size); + printk("kernel addr %lx size %lx\n", kernel_image, kernel_size); if (size) printk("kernel cmdline %s\n", obio_cmdline); @@ -178,16 +180,16 @@ } } -int arch_nvram_size() +int arch_nvram_size(void) { return NVRAM_OB_SIZE; } -void setup_timers() +void setup_timers(void) { } -void udelay() +void udelay(unsigned int usecs) { } @@ -195,7 +197,7 @@ { /* push start and end of available memory to the stack - * so that the forth word QUIT can initialize memory + * so that the forth word QUIT can initialize memory * management. For now we use hardcoded memory between * 0x10000 and 0x9ffff (576k). If we need more memory * than that we have serious bloat. @@ -208,8 +210,6 @@ static void arch_init( void ) { - void setup_timers(void); - modules_init(); #ifdef CONFIG_DRIVER_PCI ob_pci_init(); @@ -249,7 +249,7 @@ dict=intdict; load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end + (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); #ifdef CONFIG_DEBUG_BOOT Modified: openbios-devel/arch/sparc64/openbios.h =================================================================== --- openbios-devel/arch/sparc64/openbios.h 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/openbios.h 2008-07-07 18:36:16 UTC (rev 190) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2004/01/15 16:14:05 samuel> * Time-stamp: <2004/01/15 16:14:05 samuel> - * + * * <openbios.h> * * - * + * * Copyright (C) 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef _H_OPENBIOS Modified: openbios-devel/arch/sparc64/switch.S =================================================================== --- openbios-devel/arch/sparc64/switch.S 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/switch.S 2008-07-07 18:36:16 UTC (rev 190) @@ -18,7 +18,7 @@ * switches the stack, and restores everything from the new stack. * This function takes no argument. New stack pointer is * taken from global variable __context, and old stack pointer - * is also saved to __context. This way we can just jump to + * is also saved to __context. This way we can just jump to * this routine to get back to the original context. */ @@ -99,7 +99,7 @@ ldx [%g1 + 232], %i5 ldx [%g1 + 240], %i6 ldx [%g1 + 248], %i7 - + ldx [%g1 + 256], %g1 /* Finally, load new %pc */ jmp %g1 Modified: openbios-devel/arch/sparc64/sys_info.c =================================================================== --- openbios-devel/arch/sparc64/sys_info.c 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/sys_info.c 2008-07-07 18:36:16 UTC (rev 190) @@ -8,7 +8,7 @@ #ifdef CONFIG_DEBUG_BOOT #define debug printk #else -#define debug(x...) +#define debug(x...) #endif uint64_t qemu_mem_size; Modified: openbios-devel/arch/sparc64/ttable.h =================================================================== --- openbios-devel/arch/sparc64/ttable.h 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/ttable.h 2008-07-07 18:36:16 UTC (rev 190) @@ -175,7 +175,7 @@ stx %l1, [%sp + PTREGS_OFF + PT_V9_TPC]; \ ba,pt %xcc, rtrap_clr_l6; \ stx %l2, [%sp + PTREGS_OFF + PT_V9_TNPC]; - + #ifdef CONFIG_KPROBES #define KPROBES_TRAP(lvl) TRAP_IRQ(kprobe_trap, lvl) #else Modified: openbios-devel/arch/sparc64/vectors.S =================================================================== --- openbios-devel/arch/sparc64/vectors.S 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/arch/sparc64/vectors.S 2008-07-07 18:36:16 UTC (rev 190) @@ -4,7 +4,7 @@ * Sparc V9 Trap Table(s) with SpitFire/Cheetah extensions. * * Copyright (C) 1996, 2001 David S. Miller (davem(a)caip.rutgers.edu) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 as published by the Free Software Foundation. @@ -13,7 +13,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, Modified: openbios-devel/include/sparc64/io.h =================================================================== --- openbios-devel/include/sparc64/io.h 2008-07-07 18:35:51 UTC (rev 189) +++ openbios-devel/include/sparc64/io.h 2008-07-07 18:36:16 UTC (rev 190) @@ -20,7 +20,7 @@ static inline unsigned long pa2va(unsigned long pa) { - if ((pa + va_shift >= (unsigned long)&_data) && + if ((pa + va_shift >= (unsigned long)&_data) && (pa + va_shift< (unsigned long)&_end)) return pa + va_shift; else

1 0

r189 - in openbios-devel: arch/sparc32 drivers include/openbios
by svn＠openbios.org 07 Jul '08

07 Jul '08

Author: blueswirl Date: 2008-07-07 20:35:51 +0200 (Mon, 07 Jul 2008) New Revision: 189 Modified: openbios-devel/arch/sparc32/aoutload.c openbios-devel/arch/sparc32/boot.c openbios-devel/arch/sparc32/boot.h openbios-devel/arch/sparc32/build.xml openbios-devel/arch/sparc32/console.c openbios-devel/arch/sparc32/context.c openbios-devel/arch/sparc32/elfload.c openbios-devel/arch/sparc32/entry.S openbios-devel/arch/sparc32/forthload.c openbios-devel/arch/sparc32/init.fs openbios-devel/arch/sparc32/ldscript openbios-devel/arch/sparc32/lib.c openbios-devel/arch/sparc32/linux_load.c openbios-devel/arch/sparc32/loadfs.c openbios-devel/arch/sparc32/loadfs.h openbios-devel/arch/sparc32/multiboot.c openbios-devel/arch/sparc32/multiboot.h openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/sparc32/openbios.h openbios-devel/arch/sparc32/openprom.h openbios-devel/arch/sparc32/romvec.c openbios-devel/arch/sparc32/switch.S openbios-devel/arch/sparc32/sys_info.c openbios-devel/arch/sparc32/tree.fs openbios-devel/arch/sparc32/vectors.S openbios-devel/arch/sparc32/wof.S openbios-devel/arch/sparc32/wuf.S openbios-devel/drivers/esp.c openbios-devel/drivers/iommu.c openbios-devel/drivers/obio.c openbios-devel/drivers/pgtsrmmu.h openbios-devel/drivers/sbus.c openbios-devel/include/openbios/drivers.h Log: Fix some Sparc32 compile warnings Modified: openbios-devel/arch/sparc32/aoutload.c =================================================================== --- openbios-devel/arch/sparc32/aoutload.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/aoutload.c 2008-07-07 18:35:51 UTC (rev 189) @@ -8,6 +8,7 @@ #include "a.out.h" #include "sys_info.h" #include "loadfs.h" +#include "boot.h" #define printf printk #define debug printk @@ -84,7 +85,7 @@ if (ehdr.a_text == 0x30800007) ehdr.a_text=64*1024; - + if (N_MAGIC(ehdr) == NMAGIC) { size = addr_fixup(N_DATADDR(ehdr)) + addr_fixup(ehdr.a_data); } else { @@ -105,21 +106,21 @@ file_seek(offset + N_TXTOFF(ehdr)); if (N_MAGIC(ehdr) == NMAGIC) { - if (lfile_read(start, ehdr.a_text) != ehdr.a_text) { + if ((unsigned long)lfile_read((void *)start, ehdr.a_text) != ehdr.a_text) { printf("Can't read program text segment (size 0x%lx)\n", ehdr.a_text); goto out; } - if (lfile_read(start + N_DATADDR(ehdr), ehdr.a_data) != ehdr.a_data) { + if ((unsigned long)lfile_read((void *)(start + N_DATADDR(ehdr)), ehdr.a_data) != ehdr.a_data) { printf("Can't read program data segment (size 0x%lx)\n", ehdr.a_data); goto out; } } else { - if (lfile_read(start, size) != size) { + if ((unsigned long)lfile_read((void *)start, size) != size) { printf("Can't read program (size 0x%lx)\n", size); goto out; } } - + debug("Loaded %lu bytes\n", size); debug("entry point is %#lx\n", start); @@ -127,7 +128,7 @@ #if 1 { - int (*entry)(const void *romvec, int p2, int p3, int p4, int p5); + int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); entry = (void *) addr_fixup(start); image_retval = entry(romvec, 0, 0, 0, 0); Modified: openbios-devel/arch/sparc32/boot.c =================================================================== --- openbios-devel/arch/sparc32/boot.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/boot.c 2008-07-07 18:35:51 UTC (rev 189) @@ -7,30 +7,23 @@ #include "openbios/elfload.h" #include "openbios/nvram.h" #include "libc/diskio.h" +#include "libc/vsprintf.h" #include "sys_info.h" #include "openprom.h" +#include "boot.h" -int elf_load(struct sys_info *, const char *filename, const char *cmdline, const void *romvec); -int aout_load(struct sys_info *, const char *filename, const char *cmdline, const void *romvec); -int linux_load(struct sys_info *, const char *filename, const char *cmdline, const void *romvec); - -void boot(void); - -struct sys_info sys_info; +struct sys_info sys_info; uint32_t kernel_image; uint32_t kernel_size; -uint32_t cmdline; +uint32_t qemu_cmdline; uint32_t cmdline_size; char boot_device; -extern unsigned int qemu_mem_size; -void *init_openprom(unsigned long memsize); -extern struct linux_arguments_v0 obp_arg; void boot(void) { char *path = pop_fstr_copy(), *param, *oldpath = path; char altpath[256]; - int unit; + int unit = 0; const void *romvec; if(!path) { @@ -41,18 +34,15 @@ fword("get-package-property"); if (!POP()) { path = pop_fstr_copy(); - unit = 0; } else { switch (boot_device) { case 'a': path = strdup("/obio/SUNW,fdtwo"); oldpath = "fd()"; - unit = 0; break; case 'c': path = strdup("disk"); oldpath = "sd(0,0,0):d"; - unit = 0; break; default: case 'd': @@ -66,7 +56,6 @@ case 'n': path = strdup("net"); oldpath = "le()"; - unit = 0; break; } } @@ -78,14 +67,14 @@ obp_arg.boot_dev[0] = oldpath[0]; obp_arg.boot_dev[1] = oldpath[1]; obp_arg.argv[0] = oldpath; - obp_arg.argv[1] = cmdline; + obp_arg.argv[1] = (void *)(long)qemu_cmdline; param = strchr(path, ' '); if(param) { *param = '\0'; param++; } else if (cmdline_size) { - param = (char *)cmdline; + param = (char *)qemu_cmdline; } else { push_str("boot-args"); push_str("/options"); @@ -100,7 +89,7 @@ romvec = init_openprom(qemu_mem_size); if (kernel_size) { - int (*entry)(const void *romvec, int p2, int p3, int p4, int p5); + int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); printk("[sparc] Kernel already loaded\n"); entry = (void *) kernel_image; @@ -108,7 +97,7 @@ } printk("[sparc] Booting file '%s' ", path); - if(param) + if (param) printk("with parameters '%s'\n", param); else printk("without parameters.\n"); Modified: openbios-devel/arch/sparc32/boot.h =================================================================== --- openbios-devel/arch/sparc32/boot.h 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/boot.h 2008-07-07 18:35:51 UTC (rev 189) @@ -15,3 +15,16 @@ const void *romvec); unsigned int start_elf(unsigned long entry_point, unsigned long param); + +void *init_openprom(unsigned long memsize); +void boot(void); + +extern struct sys_info sys_info; +extern uint32_t kernel_image; +extern uint32_t kernel_size; +extern uint32_t qemu_cmdline; +extern uint32_t cmdline_size; +extern char boot_device; +extern unsigned int qemu_mem_size; +extern struct linux_arguments_v0 obp_arg; +extern int qemu_machine_type; Modified: openbios-devel/arch/sparc32/build.xml =================================================================== --- openbios-devel/arch/sparc32/build.xml 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/build.xml 2008-07-07 18:35:51 UTC (rev 189) @@ -21,7 +21,7 @@ <object source="loadfs.c"/> <object source="romvec.c"/> </library> - + <executable name="target/arch/sparc32/entry.o" target="target"> <rule><![CDATA[ $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/entry.S @@ -53,7 +53,7 @@ </executable>  - + <executable name="target/include/static-dict.h" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ @echo "static const char forth_dictionary[] = {" > $@ @@ -63,14 +63,14 @@ ]]></rule> <external-object source="openbios-sparc32.dict"/> </executable> - + <executable name="target/arch/sparc32/builtin.o" target="target" condition="IMAGE_ELF_EMBEDDED"> <rule><![CDATA[ $(CC) $$EXTRACFLAGS $(CFLAGS) $(INCLUDES) -c -o $@ arch/sparc32/builtin.c ]]></rule> <external-object source="target/include/static-dict.h"/> </executable> - +  <executable name="openbios-builtin.elf" target="target" condition="IMAGE_ELF_EMBEDDED"> @@ -91,5 +91,5 @@ <external-object source="libfs.a"/> <external-object source="libgcc.a"/> </executable> - + </build> Modified: openbios-devel/arch/sparc32/console.c =================================================================== --- openbios-devel/arch/sparc32/console.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/console.c 2008-07-07 18:35:51 UTC (rev 189) @@ -7,6 +7,7 @@ #include "openbios/config.h" #include "openbios/kernel.h" +#include "openbios/drivers.h" #include "openbios.h" #ifdef CONFIG_DEBUG_CONSOLE @@ -148,13 +149,13 @@ int rb, w, h, depth; } osi_fb_info_t; -int TCX_GetFBInfo( osi_fb_info_t *fb ) +static int TCX_GetFBInfo( osi_fb_info_t *fb ) { fb->w = 1024; fb->h = 768; fb->depth = 8; fb->rb = 1024; - fb->mphys = vmem; + fb->mphys = (unsigned long)vmem; return 0; } Modified: openbios-devel/arch/sparc32/context.c =================================================================== --- openbios-devel/arch/sparc32/context.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/context.c 2008-07-07 18:35:51 UTC (rev 189) @@ -6,6 +6,8 @@ #include "openbios/config.h" #include "openbios/kernel.h" #include "context.h" +#include "sys_info.h" +#include "boot.h" #define MAIN_STACK_SIZE 16384 #define IMAGE_STACK_SIZE 4096 @@ -16,7 +18,7 @@ void __exit_context(void); /* assembly routine */ /* - * Main context structure + * Main context structure * It is placed at the bottom of our stack, and loaded by assembly routine * to start us up. */ @@ -93,7 +95,7 @@ } /* Start ELF Boot image */ -uint32_t start_elf(uint32_t entry_point, uint32_t param) +unsigned int start_elf(unsigned long entry_point, unsigned long param) { struct context *ctx; Modified: openbios-devel/arch/sparc32/elfload.c =================================================================== --- openbios-devel/arch/sparc32/elfload.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/elfload.c 2008-07-07 18:35:51 UTC (rev 189) @@ -11,10 +11,10 @@ #include "sys_info.h" #include "ipchecksum.h" #include "loadfs.h" +#include "boot.h" #define printf printk #define debug printk -extern unsigned int start_elf(unsigned long entry_point, unsigned long param); #define addr_fixup(addr) ((addr) & 0x00ffffff) static char *image_name, *image_version; @@ -92,7 +92,7 @@ continue; buf = malloc(phdr[i].p_filesz); file_seek(offset + phdr[i].p_offset); - if (lfile_read(buf, phdr[i].p_filesz) != phdr[i].p_filesz) { + if ((uint32_t)lfile_read(buf, phdr[i].p_filesz) != phdr[i].p_filesz) { printf("Can't read note segment\n"); goto out; } @@ -150,14 +150,14 @@ i, addr_fixup(phdr[i].p_paddr), phdr[i].p_filesz, phdr[i].p_memsz); file_seek(offset + phdr[i].p_offset); debug("loading... "); - if (lfile_read(phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_filesz) + if ((uint32_t)lfile_read(phys_to_virt(addr_fixup(phdr[i].p_paddr)), phdr[i].p_filesz) != phdr[i].p_filesz) { printf("Can't read program segment %d\n", i); return 0; } bytes += phdr[i].p_filesz; debug("clearing... "); - memset(phys_to_virt(addr_fixup(phdr[i].p_paddr) + phdr[i].p_filesz), 0, + memset(phys_to_virt(addr_fixup(phdr[i].p_paddr) + phdr[i].p_filesz), 0, phdr[i].p_memsz - phdr[i].p_filesz); if (phdr[i].p_offset <= checksum_offset && phdr[i].p_offset + phdr[i].p_filesz >= checksum_offset+2) { @@ -352,7 +352,7 @@ phdr_size = ehdr.e_phnum * sizeof *phdr; phdr = malloc(phdr_size); file_seek(offset + ehdr.e_phoff); - if (lfile_read(phdr, phdr_size) != phdr_size) { + if ((uint32_t)lfile_read(phdr, phdr_size) != phdr_size) { printf("Can't read program header\n"); goto out; } @@ -369,7 +369,7 @@ if (!load_segments(phdr, ehdr.e_phnum, checksum_offset, offset)) goto out; - + if (checksum_offset) { if (!verify_image(&ehdr, phdr, ehdr.e_phnum, checksum)) goto out; @@ -384,7 +384,7 @@ #if 1 { - int (*entry)(const void *romvec, int p2, int p3, int p4, int p5); + int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); entry = (void *) addr_fixup(ehdr.e_entry); image_retval = entry(romvec, 0, 0, 0, 0); Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/entry.S 2008-07-07 18:35:51 UTC (rev 189) @@ -120,7 +120,7 @@ lduba [%g1] ASI_M_CTL, %g2 cmp %g2, 'U' bne ss2 - + ! Ok, this is SS-10 or SS-600MP set PHYS_SS10_EEPROM + SPARC_MACHINE_ID, %g1 lduba [%g1] ASI_M_CTL, %g2 @@ -359,7 +359,7 @@ set qemu_mem_size, %g1 st %g6, [%g1] - + sll %g7, 4, %g7 ! Store va->pa conversion factor set _start - 0x1000, %g1 sub %g1, %g7, %g7 @@ -369,7 +369,7 @@ set qemu_machine_type, %g1 mov %y, %g2 st %g2, [%g1] - + /* Finally, turn on traps so that we can call c-code. */ rd %psr, %g3 wr %g3, 0x0, %psr Modified: openbios-devel/arch/sparc32/forthload.c =================================================================== --- openbios-devel/arch/sparc32/forthload.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/forthload.c 2008-07-07 18:35:51 UTC (rev 189) @@ -38,10 +38,10 @@ } forthsize = file_size(); - + forthtext = malloc(forthsize+1); file_seek(0); - + printk("Loading forth source ..."); if ((unsigned long)lfile_read(forthtext, forthsize) != forthsize) { printk("Can't read forth text\n"); Modified: openbios-devel/arch/sparc32/init.fs =================================================================== --- openbios-devel/arch/sparc32/init.fs 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/init.fs 2008-07-07 18:35:51 UTC (rev 189) @@ -1,4 +1,4 @@ -:noname +:noname ." Type 'help' for detailed information" cr \ ." boot secondary slave cdrom: " cr \ ." 0 > boot hd:2,\boot\vmlinuz root=/dev/hda2" cr @@ -16,7 +16,7 @@ : preopen ( chosen-str node-path ) 2dup make-openable - + " /chosen" find-device open-dev ?dup if encode-int 2swap property @@ -24,7 +24,7 @@ 2drop then ; - + :noname set-defaults ; PREPOST-initializer @@ -45,11 +45,11 @@ " /builtin/console" " output-device" $setenv then ; SYSTEM-initializer - + :noname " keyboard" input ; CONSOLE-IN-initializer - + device-end : rmap@ ( virt -- rmentry ) Modified: openbios-devel/arch/sparc32/ldscript =================================================================== --- openbios-devel/arch/sparc32/ldscript 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/ldscript 2008-07-07 18:35:51 UTC (rev 189) @@ -20,7 +20,7 @@ { . = BASE_ADDR; - /* Start of the program. + /* Start of the program. * Now the version string is in the note, we must include it * in the program. Otherwise we lose the string after relocation. */ _start = .; Modified: openbios-devel/arch/sparc32/lib.c =================================================================== --- openbios-devel/arch/sparc32/lib.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/lib.c 2008-07-07 18:35:51 UTC (rev 189) @@ -15,7 +15,7 @@ #include "openbios/kernel.h" /* Format a string and print it on the screen, just like the libc - * function printf. + * function printf. */ int printk( const char *fmt, ... ) { @@ -92,12 +92,13 @@ if (size > ALLOC_BLOCK) alloc_size = size; // Recover possible leftover - if (ofmem.left > sizeof(alloc_desc_t) + 4) { - alloc_desc_t *d; + if ((size_t)ofmem.left > sizeof(alloc_desc_t) + 4) { + alloc_desc_t *d_leftover; - d = (alloc_desc_t*)ofmem.next_malloc; - d->size = ofmem.left - sizeof(alloc_desc_t); - free((unsigned long)d + sizeof(alloc_desc_t)); + d_leftover = (alloc_desc_t*)ofmem.next_malloc; + d_leftover->size = ofmem.left - sizeof(alloc_desc_t); + free((void *)((unsigned long)d_leftover + + sizeof(alloc_desc_t))); } ofmem.next_malloc = mem_alloc(&cmem, alloc_size, 4); Modified: openbios-devel/arch/sparc32/linux_load.c =================================================================== --- openbios-devel/arch/sparc32/linux_load.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/linux_load.c 2008-07-07 18:35:51 UTC (rev 189) @@ -14,6 +14,7 @@ #include "sys_info.h" #include "context.h" #include "loadfs.h" +#include "boot.h" #define printf printk #define debug printk @@ -424,7 +425,7 @@ #endif printf("Loading kernel... "); - if (lfile_read(phys_to_virt(kern_addr), kern_size) != kern_size) { + if ((uint32_t)lfile_read(phys_to_virt(kern_addr), kern_size) != kern_size) { printf("Can't read kernel\n"); return 0; } @@ -462,7 +463,7 @@ max = hdr->initrd_addr_max; else max = 0x38000000; /* Hardcoded value for older kernels */ - + /* FILO itself is at the top of RAM. (relocated) * So, try putting initrd just below us. */ end = virt_to_phys(_start); @@ -497,7 +498,7 @@ } printf("Loading initrd... "); - if (lfile_read(phys_to_virt(start), size) != size) { + if ((uint32_t)lfile_read(phys_to_virt(start), size) != size) { printf("Can't read initrd\n"); return -1; } @@ -518,9 +519,9 @@ outb(0, 0xf0); outb(0, 0xf1); - /* we're getting screwed again and again by this problem of the 8259. - * so we're going to leave this lying around for inclusion into - * crt0.S on an as-needed basis. + /* we're getting screwed again and again by this problem of the 8259. + * so we're going to leave this lying around for inclusion into + * crt0.S on an as-needed basis. * * well, that went ok, I hope. Now we have to reprogram the interrupts :-( * we put them right after the intel-reserved hardware interrupts, at @@ -568,7 +569,7 @@ params->orig_x = cursor_x; params->orig_y = cursor_y; #endif - + /* Go... */ ctx = switch_to(ctx); Modified: openbios-devel/arch/sparc32/loadfs.c =================================================================== --- openbios-devel/arch/sparc32/loadfs.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/loadfs.c 2008-07-07 18:35:51 UTC (rev 189) @@ -15,7 +15,7 @@ void file_close(void) { - if(load_fd==-1) + if(load_fd==-1) return; close_io(load_fd); Modified: openbios-devel/arch/sparc32/loadfs.h =================================================================== --- openbios-devel/arch/sparc32/loadfs.h 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/loadfs.h 2008-07-07 18:35:51 UTC (rev 189) @@ -2,6 +2,4 @@ int lfile_read(void *buf, unsigned long len); int file_seek(unsigned long offset); unsigned long file_size(void); - - - +void file_close(void); Modified: openbios-devel/arch/sparc32/multiboot.c =================================================================== --- openbios-devel/arch/sparc32/multiboot.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/multiboot.c 2008-07-07 18:35:51 UTC (rev 189) @@ -1,6 +1,6 @@ /* Support for Multiboot */ -#include "openbios/config.h" +#include "openbios/config.h" #include "asm/io.h" #include "sys_info.h" #include "multiboot.h" @@ -9,7 +9,7 @@ #ifdef CONFIG_DEBUG_BOOT #define debug printk #else -#define debug(x...) +#define debug(x...) #endif struct mbheader { @@ -62,11 +62,11 @@ printf("Multiboot: no dictionary\n"); return; } - + mod = (module_t *) mbinfo->mods_addr; info->dict_start=(unsigned long *)mod->mod_start; info->dict_end=(unsigned long *)mod->mod_end; - + if (mbinfo->flags & MULTIBOOT_MMAP_VALID) { /* convert mmap records */ mbmem = phys_to_virt(mbinfo->mmap_addr); Modified: openbios-devel/arch/sparc32/multiboot.h =================================================================== --- openbios-devel/arch/sparc32/multiboot.h 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/multiboot.h 2008-07-07 18:35:51 UTC (rev 189) @@ -1,5 +1,5 @@ -/* multiboot.h - * tag: header for multiboot +/* multiboot.h + * tag: header for multiboot * * Copyright (C) 2003-2004 Stefan Reinauer * Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/openbios.c 2008-07-07 18:35:51 UTC (rev 189) @@ -13,14 +13,11 @@ #include "dict.h" #include "openbios/kernel.h" #include "openbios/stack.h" +#include "openbios/nvram.h" #include "sys_info.h" #include "openbios.h" +#include "boot.h" -void boot(void); -void ob_ide_init(void); -void tcx_init(uint64_t base); -void kbd_init(uint64_t base); - int qemu_machine_type; struct hwdef { @@ -97,7 +94,7 @@ { /* push start and end of available memory to the stack - * so that the forth word QUIT can initialize memory + * so that the forth word QUIT can initialize memory * management. For now we use hardcoded memory between * 0x10000 and 0x9ffff (576k). If we need more memory * than that we have serious bloat. @@ -133,8 +130,6 @@ int openbios(void) { - extern struct sys_info sys_info; - extern struct mem cmem; unsigned int i; for (i = 0; i < sizeof(hwdefs) / sizeof(struct hwdef); i++) { @@ -164,10 +159,10 @@ #endif collect_sys_info(&sys_info); - + dict=intdict; load_dictionary((char *)sys_info.dict_start, - (unsigned long)sys_info.dict_end + (unsigned long)sys_info.dict_end - (unsigned long)sys_info.dict_start); #ifdef CONFIG_DEBUG_BOOT @@ -183,7 +178,7 @@ PUSH_xt( bind_noname_func(arch_init) ); fword("PREPOST-initializer"); - + PC = (ucell)findword("initialize-of"); if (!PC) { Modified: openbios-devel/arch/sparc32/openbios.h =================================================================== --- openbios-devel/arch/sparc32/openbios.h 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/openbios.h 2008-07-07 18:35:51 UTC (rev 189) @@ -1,17 +1,17 @@ -/* +/* * Creation Date: <2004/01/15 16:14:05 samuel> * Time-stamp: <2004/01/15 16:14:05 samuel> - * + * * <openbios.h> - * - * - * + * + * + * * Copyright (C) 2004 Samuel Rydh (samuel(a)ibrium.se) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 - * + * */ #ifndef _H_OPENBIOS Modified: openbios-devel/arch/sparc32/openprom.h =================================================================== --- openbios-devel/arch/sparc32/openprom.h 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/openprom.h 2008-07-07 18:35:51 UTC (rev 189) @@ -205,7 +205,7 @@ /* Ranges and reg properties are a bit different for PCI. */ struct linux_prom_pci_registers { - /* + /* * We don't know what information this field contain. * We guess, PCI device function is in bits 15:8 * So, ... Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/romvec.c 2008-07-07 18:35:51 UTC (rev 189) @@ -14,8 +14,11 @@ #include "libc/vsprintf.h" #include "openbios/config.h" #include "openbios/bindings.h" +#include "openbios/drivers.h" #include "openbios/kernel.h" #include "openbios/sysinclude.h" +#include "sys_info.h" +#include "boot.h" #ifdef CONFIG_DEBUG_OBP #define DPRINTF(fmt, args...) \ @@ -178,7 +181,7 @@ int i; DPRINTF("obp_getprop(0x%x, %s) = ", node, name); for (i = 0; i < len; i++) { - DPRINTF("%02x%s", str[i] & 0xFF, + DPRINTF("%02x%s", str[i] & 0xFF, (len == 4 || i == len-1) ? "" : " "); } DPRINTF("\n"); @@ -210,7 +213,7 @@ } else { int len; char *str; - + len = POP(); str = (char *) POP(); @@ -437,7 +440,7 @@ // ROM. if (va == NULL) { - va = next_free_address - size; + va = (char *)(next_free_address - size); next_free_address -= size; DPRINTF("obp_dumb_memalloc req null -> 0x%x\n", va); } @@ -447,9 +450,6 @@ return va; } -extern int start_cpu(unsigned int pc, unsigned int context_ptr, - unsigned int context, int cpu); - static int obp_cpustart(__attribute__((unused))unsigned int whichcpu, __attribute__((unused))int ctxtbl_ptr, __attribute__((unused))int thiscontext, @@ -497,7 +497,7 @@ // don't get a stack underrun. // // FIXME: find out why solaris doesnt put its stuff on the stack - // + // fword("0"); fword("0"); Modified: openbios-devel/arch/sparc32/switch.S =================================================================== --- openbios-devel/arch/sparc32/switch.S 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/switch.S 2008-07-07 18:35:51 UTC (rev 189) @@ -14,7 +14,7 @@ * switches the stack, and restores everything from the new stack. * This function takes no argument. New stack pointer is * taken from global variable __context, and old stack pointer - * is also saved to __context. This way we can just jump to + * is also saved to __context. This way we can just jump to * this routine to get back to the original context. */ @@ -104,7 +104,7 @@ ld [%g1 + 116], %i5 ld [%g1 + 120], %i6 ld [%g1 + 124], %i7 - + ld [%g1 + 128], %g1 /* Finally, load new %pc */ jmp %g1 Modified: openbios-devel/arch/sparc32/sys_info.c =================================================================== --- openbios-devel/arch/sparc32/sys_info.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/sys_info.c 2008-07-07 18:35:51 UTC (rev 189) @@ -8,7 +8,7 @@ #ifdef CONFIG_DEBUG_BOOT #define debug printk #else -#define debug(x...) +#define debug(x...) #endif unsigned int qemu_mem_size; Modified: openbios-devel/arch/sparc32/tree.fs =================================================================== --- openbios-devel/arch/sparc32/tree.fs 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/tree.fs 2008-07-07 18:35:51 UTC (rev 189) @@ -5,7 +5,7 @@ " sun4m" encode-string " compatible" property h# 0a21fe80 encode-int " clock-frequency" property - + : encode-unit encode-unit-sbus ; : decode-unit decode-unit-sbus ; Modified: openbios-devel/arch/sparc32/vectors.S =================================================================== --- openbios-devel/arch/sparc32/vectors.S 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/vectors.S 2008-07-07 18:35:51 UTC (rev 189) @@ -4,7 +4,7 @@ * Sparc V9 Trap Table(s) with SpitFire/Cheetah extensions. * * Copyright (C) 1996, 2001 David S. Miller (davem(a)caip.rutgers.edu) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 as published by the Free Software Foundation. @@ -13,7 +13,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, Modified: openbios-devel/arch/sparc32/wof.S =================================================================== --- openbios-devel/arch/sparc32/wof.S 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/wof.S 2008-07-07 18:35:51 UTC (rev 189) @@ -3,7 +3,7 @@ * because we have no user windows. * * Copyright (C) 1995 David S. Miller (davem(a)caip.rutgers.edu) - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 as published by the Free Software Foundation. @@ -12,7 +12,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, @@ -96,7 +96,7 @@ * nop */ - .globl spill_window_entry + .globl spill_window_entry .globl spnwin_patch1, spnwin_patch2 spill_window_entry: /* LOCATION: Trap Window */ Modified: openbios-devel/arch/sparc32/wuf.S =================================================================== --- openbios-devel/arch/sparc32/wuf.S 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/arch/sparc32/wuf.S 2008-07-07 18:35:51 UTC (rev 189) @@ -11,7 +11,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/drivers/esp.c 2008-07-07 18:35:51 UTC (rev 189) @@ -1,6 +1,6 @@ /* * OpenBIOS ESP driver - * + * * Copyright (C) 2004 Jens Axboe <axboe(a)suse.de> * Copyright (C) 2005 Stefan Reinauer <stepan(a)openbios.org> * @@ -122,7 +122,7 @@ if ((status & ESP_STAT_TCNT) != ESP_STAT_TCNT || (status & ESP_STAT_PMASK) == ESP_STATP) return status; - + // Get reply // Set DMA address esp->espdma.regs->st_addr = esp->buffer_dvma; @@ -211,7 +211,7 @@ } sd->present = 1; sd->media = esp->buffer[0]; - + switch (sd->media) { case TYPE_DISK: media = "disk"; @@ -271,7 +271,7 @@ phandle_t ph; fword("my-unit"); - id = POP(); + id = POP(); //POP(); // unit id is 2 ints but we only need one. *sd = &global_esp->sd[id]; @@ -463,7 +463,7 @@ // Chip reset esp->ll->regs[ESP_CMD] = ESP_CMD_RC; - + DPRINTF("ESP at 0x%lx, buffer va 0x%lx dva 0x%lx\n", (unsigned long)esp, (unsigned long)esp->buffer, (unsigned long)esp->buffer_dvma); DPRINTF("done\n"); Modified: openbios-devel/drivers/iommu.c =================================================================== --- openbios-devel/drivers/iommu.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/drivers/iommu.c 2008-07-07 18:35:51 UTC (rev 189) @@ -92,7 +92,7 @@ pa = va2pa((unsigned long)t->curp) + (align - 1); pa &= ~(align - 1); p = (char *)pa2va(pa); - + if ((unsigned long)p >= (unsigned long)t->uplim || (unsigned long)p + size > (unsigned long)t->uplim) return 0; Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/drivers/obio.c 2008-07-07 18:35:51 UTC (rev 189) @@ -1,9 +1,9 @@ /* * OpenBIOS Sparc OBIO driver - * + * * (C) 2004 Stefan Reinauer <stepan(a)openbios.org> * (C) 2005 Ed Schouten <ed(a)fxq.nl> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 @@ -19,6 +19,7 @@ #include "openbios/drivers.h" #include "openbios/nvram.h" #include "obio.h" +#define cpu_to_be16(x) __cpu_to_be16(x) #include "openbios/firmware_abi.h" #define REGISTER_NAMED_NODE( name, path ) do { \ @@ -50,7 +51,7 @@ * mapped memory. */ #define OBIO_CMDLINE_MAX 256 -char obio_cmdline[OBIO_CMDLINE_MAX]; +static char obio_cmdline[OBIO_CMDLINE_MAX]; /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_obio, INSTALL_OPEN, sizeof(int) ); @@ -171,12 +172,9 @@ } } -int keyboard_dataready(void); -unsigned char keyboard_readdata(void); - /* ( addr len -- actual ) */ static void -zs_read_keyboard(unsigned long *address) +zs_read_keyboard(void) { unsigned char *addr; int len; @@ -314,7 +312,7 @@ push_str("width"); fword("property"); - regs = map_reg(ECC_BASE, 0, ECC_SIZE, 1, ECC_BASE >> 32); + regs = (uint32_t *)map_reg(ECC_BASE, 0, ECC_SIZE, 1, ECC_BASE >> 32); version = regs[0]; switch (version) { @@ -723,7 +721,7 @@ { extern uint32_t kernel_image; extern uint32_t kernel_size; - extern uint32_t cmdline; + extern uint32_t qemu_cmdline; extern uint32_t cmdline_size; extern char boot_device; extern char obp_stdin, obp_stdout; @@ -735,7 +733,7 @@ char nographic; uint32_t size; unsigned int machine_id; - struct cpudef *cpu; + const struct cpudef *cpu; ohwcfg_v3_t *header; ob_new_obio_device("eeprom", NULL); @@ -746,7 +744,7 @@ fword("encode-int"); push_str("address"); fword("property"); - + memcpy(&nv_info, nvram, sizeof(nv_info)); machine_id = (unsigned int)nvram[0x1fd9] & 0xff; printk("Nvram id %s, version %d, machine id 0x%2.2x\n", @@ -763,9 +761,9 @@ size = nv_info.cmdline_size; if (size > OBIO_CMDLINE_MAX - 1) size = OBIO_CMDLINE_MAX - 1; - memcpy(obio_cmdline, nv_info.cmdline, size); + memcpy(&obio_cmdline, (void *)(long)nv_info.cmdline, size); obio_cmdline[size] = '\0'; - cmdline = obio_cmdline; + qemu_cmdline = (uint32_t) &obio_cmdline; cmdline_size = size; header = (ohwcfg_v3_t *)nvram; header->kernel_image = 0; @@ -785,7 +783,7 @@ // Add /idprom push_str("/"); fword("find-device"); - + PUSH((long)&nvram[NVRAM_IDPROM]); PUSH(32); fword("encode-bytes"); @@ -940,7 +938,7 @@ fword("encode-int"); push_str("ecache-associativity"); fword("property"); - + PUSH(2); fword("encode-int"); push_str("ncaches"); @@ -973,7 +971,7 @@ fword("encode-int"); push_str("mid"); fword("property"); - + cpu->initfn(); fword("finish-device"); @@ -1055,7 +1053,7 @@ { ob_new_obio_device("power", NULL); - power_reg = ob_reg(base, offset, AUXIO2_REGS, 1); + power_reg = (void *)ob_reg(base, offset, AUXIO2_REGS, 1); // Not in device tree reset_reg = map_io(base + (uint64_t)SLAVIO_RESET, RESET_REGS); @@ -1187,7 +1185,7 @@ if (!cpu) return -1; - sparc_header = &nvram[header->nvram_arch_ptr]; + sparc_header = (struct sparc_arch_cfg *)&nvram[header->nvram_arch_ptr]; sparc_header->smp_entry = pc; sparc_header->smp_ctxtbl = context_ptr; sparc_header->smp_ctx = context; Modified: openbios-devel/drivers/pgtsrmmu.h =================================================================== --- openbios-devel/drivers/pgtsrmmu.h 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/drivers/pgtsrmmu.h 2008-07-07 18:35:51 UTC (rev 189) @@ -218,7 +218,7 @@ srmmu_get_pte (unsigned long addr) { register unsigned long entry; - + __asm__ __volatile__("\n\tlda [%1] %2,%0\n\t" : "=r" (entry): "r" ((addr & 0xfffff000) | 0x400), "i" (ASI_M_FLUSH_PROBE)); Modified: openbios-devel/drivers/sbus.c =================================================================== --- openbios-devel/drivers/sbus.c 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/drivers/sbus.c 2008-07-07 18:35:51 UTC (rev 189) @@ -1,9 +1,9 @@ /* * OpenBIOS SBus driver - * + * * (C) 2004 Stefan Reinauer <stepan(a)openbios.org> * (C) 2005 Ed Schouten <ed(a)fxq.nl> - * + * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * version 2 @@ -57,8 +57,7 @@ } static void -ob_le_init(unsigned int slot, unsigned long base, unsigned long leoffset, - unsigned long dmaoffset) +ob_le_init(unsigned int slot, unsigned long leoffset, unsigned long dmaoffset) { push_str("/iommu/sbus/ledma"); fword("find-device"); @@ -90,7 +89,7 @@ uint16_t graphic_depth; static void -ob_tcx_init(unsigned int slot, unsigned long base) +ob_tcx_init(unsigned int slot) { push_str("/iommu/sbus/SUNW,tcx"); fword("find-device"); @@ -305,7 +304,7 @@ } static void -ob_cs4231_init(unsigned int slot, unsigned long base) +ob_cs4231_init(unsigned int slot) { push_str("/iommu/sbus"); fword("find-device"); @@ -362,7 +361,7 @@ #endif // NCR 92C990, Am7990, Lance. See http://www.amd.com - ob_le_init(slot, base, offset + 0x00c00000, offset + 0x00400010); + ob_le_init(slot, offset + 0x00c00000, offset + 0x00400010); // Parallel port //ob_bpp_init(base); @@ -374,11 +373,11 @@ // OpenBIOS and Qemu don't know how to do Sbus probing switch(slot) { case 3: // SUNW,tcx - ob_tcx_init(slot, base); + ob_tcx_init(slot); break; case 4: // SUNW,CS4231 - ob_cs4231_init(slot, base); + ob_cs4231_init(slot); // Power management (APC) ob_apc_init(slot, APC_OFFSET); break; @@ -396,7 +395,7 @@ // OpenBIOS and Qemu don't know how to do Sbus probing switch(slot) { case 2: // SUNW,tcx - ob_tcx_init(slot, base); + ob_tcx_init(slot); break; case 0xf: // le, esp, bpp, power-management ob_macio_init(slot, base, 0); @@ -414,14 +413,14 @@ // OpenBIOS and Qemu don't know how to do Sbus probing switch(slot) { case 2: // SUNW,tcx - ob_tcx_init(slot, base); + ob_tcx_init(slot); break; case 0xf: // le, esp, bpp, power-management #ifdef CONFIG_DRIVER_ESP ob_esp_init(slot, base, SS600MP_ESP, SS600MP_ESPDMA); #endif // NCR 92C990, Am7990, Lance. See http://www.amd.com - ob_le_init(slot, base, 0x00060000, SS600MP_LEBUFFER); + ob_le_init(slot, 0x00060000, SS600MP_LEBUFFER); // Power management (APC) XXX should not exist ob_apc_init(slot, APC_OFFSET); break; @@ -431,20 +430,20 @@ } static void -ob_sbus_open(int *idx) +ob_sbus_open(void) { int ret=1; RET ( -ret ); } static void -ob_sbus_close(int *idx) +ob_sbus_close(void) { selfword("close-deblocker"); } static void -ob_sbus_initialize(int *idx) +ob_sbus_initialize(void) { } @@ -505,7 +504,7 @@ } static int -ob_sbus_init_ss5(uint64_t base) +ob_sbus_init_ss5(void) { unsigned int slot; int notfirst = 0; @@ -526,7 +525,7 @@ } static int -ob_sbus_init_ss10(uint64_t base) +ob_sbus_init_ss10(void) { unsigned int slot; int notfirst = 0; @@ -547,7 +546,7 @@ } static int -ob_sbus_init_ss600mp(uint64_t base) +ob_sbus_init_ss600mp(void) { unsigned int slot; int notfirst = 0; @@ -573,11 +572,11 @@ switch (machine_id) { case 0x71: - return ob_sbus_init_ss600mp(base); + return ob_sbus_init_ss600mp(); case 0x72: - return ob_sbus_init_ss10(base); + return ob_sbus_init_ss10(); case 0x80: - return ob_sbus_init_ss5(base); + return ob_sbus_init_ss5(); default: return -1; } Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2008-07-05 18:02:18 UTC (rev 188) +++ openbios-devel/include/openbios/drivers.h 2008-07-07 18:35:51 UTC (rev 189) @@ -16,7 +16,14 @@ #endif #ifdef CONFIG_DRIVER_SBUS int ob_sbus_init(uint64_t base, int machine_id); +void tcx_init(uint64_t base); +void kbd_init(uint64_t base); +int keyboard_dataready(void); +unsigned char keyboard_readdata(void); +#ifdef CONFIG_DEBUG_CONSOLE_VIDEO +void init_video(void); #endif +#endif #ifdef CONFIG_DRIVER_IDE int ob_ide_init(void); #endif @@ -28,5 +35,10 @@ int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, unsigned long counter_offset, unsigned long intr_offset, unsigned long aux1_offset, unsigned long aux2_offset); +int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, + int cpu); +extern struct mem cmem; #endif - +#ifdef CONFIG_DRIVER_FLOPPY +int ob_floppy_init(void); +#endif

1 0

r188 - openbios-devel/Documentation
by svn＠openbios.org 05 Jul '08

05 Jul '08

Author: blueswirl Date: 2008-07-05 20:02:18 +0200 (Sat, 05 Jul 2008) New Revision: 188 Added: openbios-devel/Documentation/TODO.sparc Log: Add a TODO for Sparc Added: openbios-devel/Documentation/TODO.sparc =================================================================== --- openbios-devel/Documentation/TODO.sparc (rev 0) +++ openbios-devel/Documentation/TODO.sparc 2008-07-05 18:02:18 UTC (rev 188) @@ -0,0 +1,68 @@ +TODO-list: + +Sparc common: +- Unimplemented features/bugs: + - Send keycode on keypress + - Add Make dependencies for .S files + - Remove compiler warnings + - Clean up + +- Optimizations/improvements: + - Merge allocators (lib.c malloc, romvec opb_, iommu, OF /memory, Sparc64) + - Warm reset detection + - Boot logo + +Sparc32: +- Unimplemented features/bugs: + - Some console escape codes (Debian 3.1R1, NetBSD) + - Arbitrary resolution support + - Add cg6, bwtwo + - Probe devices (like Proll?) + - Less fixed hardware choices, conditional HW + - SBus slot probing, FCode ROM support + - Compile for least capable CPU + - DBRI audio (Am7930) + - BPP parallel + - Diagnostic switch + +- Optimizations/improvements: + - Remove debug messages + +Sparc64: +- Unimplemented features/bugs: + - Debug direct kernel boot + - Boot from drive, cdrom or floppy + +- Optimizations/improvements: + - Hypervisor + +Sun4: +- Support to be added + +Sun4c: +- Support to be added + +Sun4m: +- Unimplemented features/bugs: + - JavaStation machines + - Realistic SMP probing + - SS600MP ledma -> lebuffer + +Sun4d: +- Support to be added + +Sun4u: +- Unimplemented features/bugs: + - Interrupt controller setup + - PCI/IOMMU support (Simba, JIO, Tomatillo, Psycho, Schizo, Safari...) + - SMP/CMT + - Happy Meal Ethernet, flash, I2C, GPIO + - A lot of real machine types + +Sun4v: +- Support to be added + +Ideas: + - Real machine test with special entry.S + - Unix compile with uClibc + - Sparc64: Emulate hypervisor so that OpenBoot image can be used

1 0

r187 - in openbios-devel: arch/sparc32 drivers
by svn＠openbios.org 05 Jul '08

05 Jul '08

Author: blueswirl Date: 2008-07-05 18:57:17 +0200 (Sat, 05 Jul 2008) New Revision: 187 Modified: openbios-devel/arch/sparc32/romvec.c openbios-devel/drivers/obio.c Log: Fix NetBSD reset problem Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2008-04-24 15:26:13 UTC (rev 186) +++ openbios-devel/arch/sparc32/romvec.c 2008-07-05 16:57:17 UTC (rev 187) @@ -254,7 +254,7 @@ static void obp_reboot(char *str) { - extern volatile unsigned char *reset_reg; + extern volatile unsigned int *reset_reg; printk("rebooting (%s)\n", str); *reset_reg = 1; Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2008-04-24 15:26:13 UTC (rev 186) +++ openbios-devel/drivers/obio.c 2008-07-05 16:57:17 UTC (rev 187) @@ -1040,7 +1040,8 @@ fword("finish-device"); } -volatile unsigned char *power_reg, *reset_reg; +volatile unsigned char *power_reg; +volatile unsigned int *reset_reg; static void sparc32_reset_all(void)

1 0

SPARC Solaris 10 on QEMU
by Mike Clarke 26 Jun '08

26 Jun '08

Hi, I hopeing somebody can help me. I'm trying to get Solaris 10 SPARC to run in QEMU running on Windows XP SP2 (x32) and I'm getting nowhere. Has anybody been able to get this to work? I've read QEMU manual, and looked high and low on the forums. I've googled tons of stuff and I'm still completely lost. The only thing I found was this: http://osdir.com/ml/bios.openbios/2006-06/msg00019.html Which looks like somebody else has tried to do this too. Please help. Thanks Mike

2 1

[administrative] openfirmware commit messages
by Stefan Reinauer 29 May '08

29 May '08

Dear OpenFirmware enthusiasts, we recently created a new mailing list around Firmworks' OpenFirmware implementation (the one that is used on OLPC for example): https://www.openfirmware.info/mailman/listinfo/openfirmware Due to this new mailing list, commit messages to Mitch's OpenFirmware repository will go to the new mailing list from now on. Best regards, Stefan Reinauer -- 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/ Registergericht: Amtsgericht Freiburg • HRB 7656 Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866

1 0

r830 - cpu/x86/pc/olpc
by svn＠openbios.org 28 May '08

28 May '08

Author: wmb Date: 2008-05-28 21:15:45 +0200 (Wed, 28 May 2008) New Revision: 830 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC - made the "enter" client service check the security state, so you can only get to the ok prompt that way if you have security disabled or a developer key. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2008-05-28 19:13:34 UTC (rev 829) +++ cpu/x86/pc/olpc/security.fth 2008-05-28 19:15:45 UTC (rev 830) @@ -571,6 +571,10 @@ stand-init-io " wp" find-tag if 2drop true to secure? then ; + +dev /client-services +: enter ( -- ) secure? 0= security-off? or if visible enter then ; +dend warning ! : message-and-off ( -- )

1 0

r829 - cpu/x86/pc/olpc
by svn＠openbios.org 28 May '08

28 May '08

Author: wmb Date: 2008-05-28 21:13:34 +0200 (Wed, 28 May 2008) New Revision: 829 Modified: cpu/x86/pc/olpc/memtest.fth Log: OLPC - memtest didn't work on secure machines with a developer key because the screen was frozen at the DCON level. Modified: cpu/x86/pc/olpc/memtest.fth =================================================================== --- cpu/x86/pc/olpc/memtest.fth 2008-05-28 18:26:14 UTC (rev 828) +++ cpu/x86/pc/olpc/memtest.fth 2008-05-28 19:13:34 UTC (rev 829) @@ -7,6 +7,7 @@ over h# 10000 = if ( vaddr size ) \ Map the frame buffer (virtual=physical) h# 910 config-l@ dup 100.0000 -1 mmu-map + unfreeze then \ If it's not memtest, chain to the linux recognizer

1 0

r828 - cpu/x86/pc/olpc
by svn＠openbios.org 28 May '08

28 May '08

Author: wmb Date: 2008-05-28 20:26:14 +0200 (Wed, 28 May 2008) New Revision: 828 Modified: cpu/x86/pc/olpc/devices.fth cpu/x86/pc/olpc/security.fth Log: OLPC trac 7114 - ensure indexed-I/O is disabled during early interaction. Modified: cpu/x86/pc/olpc/devices.fth =================================================================== --- cpu/x86/pc/olpc/devices.fth 2008-05-27 18:24:54 UTC (rev 827) +++ cpu/x86/pc/olpc/devices.fth 2008-05-28 18:26:14 UTC (rev 828) @@ -232,7 +232,7 @@ fload ${BP}/dev/olpc/kb3700/ecspi.fth \ EC chip SPI FLASH access warning @ warning off -: stand-init stand-init h# fff0.0000 to flash-base ; +: stand-init-io stand-init-io h# fff0.0000 to flash-base ; warning ! fload ${BP}/dev/olpc/kb3700/ecserial.fth \ Serial access to EC chip Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2008-05-27 18:24:54 UTC (rev 827) +++ cpu/x86/pc/olpc/security.fth 2008-05-28 18:26:14 UTC (rev 828) @@ -566,9 +566,12 @@ false value in-factory? -stand-init: wp +warning @ warning off +: stand-init-io + stand-init-io " wp" find-tag if 2drop true to secure? then ; +warning ! : message-and-off ( -- ) aborted? @ if

1 0

r827 - in cpu/x86/pc: . olpc
by svn＠openbios.org 27 May '08

27 May '08

Author: wmb Date: 2008-05-27 20:24:54 +0200 (Tue, 27 May 2008) New Revision: 827 Added: cpu/x86/pc/olpc/memtest.fth Removed: cpu/x86/pc/memtest.fth Modified: cpu/x86/pc/olpc/fw.bth Log: Moved memtest.fth from pc/ to pc/olpc/ because it is OLPC-specific. Deleted: cpu/x86/pc/memtest.fth =================================================================== --- cpu/x86/pc/memtest.fth 2008-05-21 21:23:30 UTC (rev 826) +++ cpu/x86/pc/memtest.fth 2008-05-27 18:24:54 UTC (rev 827) @@ -1,41 +0,0 @@ -purpose: Interface to memtest86 - -: ?memtest-elf-map-in ( vaddr size -- ) - \ We recognize memtest by its virtual address of 0x10000 - \ It expects that virtual = physical; we depend on the fact - \ that we have low memory mapped V=P - over h# 10000 = if ( vaddr size ) - \ Map the frame buffer (virtual=physical) - h# 910 config-l@ dup 100.0000 -1 mmu-map - then - - \ If it's not memtest, chain to the linux recognizer - ?linux-elf-map-in -; -' ?memtest-elf-map-in is elf-map-in - -: memtest ( -- ) " rom:memtest" $boot ; - -\ LICENSE_BEGIN -\ Copyright (c) 2008 FirmWorks -\ -\ Permission is hereby granted, free of charge, to any person obtaining -\ a copy of this software and associated documentation files (the -\ "Software"), to deal in the Software without restriction, including -\ without limitation the rights to use, copy, modify, merge, publish, -\ distribute, sublicense, and/or sell copies of the Software, and to -\ permit persons to whom the Software is furnished to do so, subject to -\ the following conditions: -\ -\ The above copyright notice and this permission notice shall be -\ included in all copies or substantial portions of the Software. -\ -\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -\ -\ LICENSE_END Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-05-21 21:23:30 UTC (rev 826) +++ cpu/x86/pc/olpc/fw.bth 2008-05-27 18:24:54 UTC (rev 827) @@ -337,7 +337,7 @@ fload ${BP}/cpu/x86/pc/olpc/lzip.fth \ Access zip images from memory fload ${BP}/cpu/x86/pc/olpc/gamekeys.fth fload ${BP}/cpu/x86/pc/linux.fth -fload ${BP}/cpu/x86/pc/memtest.fth +fload ${BP}/cpu/x86/pc/olpc/memtest.fth fload ${BP}/cpu/x86/pc/olpc/setwp.fth fload ${BP}/cpu/x86/pc/olpc/security.fth fload ${BP}/cpu/x86/pc/olpc/fsupdate.fth Copied: cpu/x86/pc/olpc/memtest.fth (from rev 826, cpu/x86/pc/memtest.fth) =================================================================== --- cpu/x86/pc/olpc/memtest.fth (rev 0) +++ cpu/x86/pc/olpc/memtest.fth 2008-05-27 18:24:54 UTC (rev 827) @@ -0,0 +1,41 @@ +purpose: Interface to memtest86 + +: ?memtest-elf-map-in ( vaddr size -- ) + \ We recognize memtest by its virtual address of 0x10000 + \ It expects that virtual = physical; we depend on the fact + \ that we have low memory mapped V=P + over h# 10000 = if ( vaddr size ) + \ Map the frame buffer (virtual=physical) + h# 910 config-l@ dup 100.0000 -1 mmu-map + then + + \ If it's not memtest, chain to the linux recognizer + ?linux-elf-map-in +; +' ?memtest-elf-map-in is elf-map-in + +: memtest ( -- ) " rom:memtest" $boot ; + +\ LICENSE_BEGIN +\ Copyright (c) 2008 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

r826 - cpu/x86/pc/olpc
by svn＠openbios.org 21 May '08

21 May '08

Author: wmb Date: 2008-05-21 23:23:30 +0200 (Wed, 21 May 2008) New Revision: 826 Modified: cpu/x86/pc/olpc/resume.bth cpu/x86/pc/olpc/romstart.bth Log: Fixed of couple of "fload" lines to reflect the recent move of the file "startmacros.fth". Modified: cpu/x86/pc/olpc/resume.bth =================================================================== --- cpu/x86/pc/olpc/resume.bth 2008-05-21 21:16:50 UTC (rev 825) +++ cpu/x86/pc/olpc/resume.bth 2008-05-21 21:23:30 UTC (rev 826) @@ -15,7 +15,7 @@ fload ${BP}/cpu/x86/pc/olpc/config.fth \ Configuration defines -fload ${BP}/cpu/x86/pc/olpc/startmacros.fth +fload ${BP}/dev/geode/startmacros.fth \ This code will be copied to RAM at suspend-base Modified: cpu/x86/pc/olpc/romstart.bth =================================================================== --- cpu/x86/pc/olpc/romstart.bth 2008-05-21 21:16:50 UTC (rev 825) +++ cpu/x86/pc/olpc/romstart.bth 2008-05-21 21:23:30 UTC (rev 826) @@ -18,7 +18,7 @@ \ startmacros.fth defines some assembler macros that make MSR and I/O port \ access very easy by hiding the details of register use. -fload ${BP}/cpu/x86/pc/olpc/startmacros.fth +fload ${BP}/dev/geode/startmacros.fth \ This creates and dismisses a floating point exception, which causes \ the IRQ13 to go high then low.

1 0

r825 - in cpu/x86/pc: lxdevel olpc
by svn＠openbios.org 21 May '08

21 May '08

Author: wmb Date: 2008-05-21 23:16:50 +0200 (Wed, 21 May 2008) New Revision: 825 Removed: cpu/x86/pc/lxdevel/usb8388.bth cpu/x86/pc/olpc/draminit.fth cpu/x86/pc/olpc/gpio.fth cpu/x86/pc/olpc/linux.fth cpu/x86/pc/olpc/startmacros.fth cpu/x86/pc/olpc/usb.fth Log: Deleted files that the previous checkin moved to more generic locations. Deleted: cpu/x86/pc/lxdevel/usb8388.bth =================================================================== --- cpu/x86/pc/lxdevel/usb8388.bth 2008-05-21 21:12:54 UTC (rev 824) +++ cpu/x86/pc/lxdevel/usb8388.bth 2008-05-21 21:16:50 UTC (rev 825) @@ -1,25 +0,0 @@ -purpose: Fetch the firmware for the Marvell 8388 wireless LAN module - -command: &builder &this -build-now - -fload ${BP}/cpu/x86/pc/olpc/versions.fth - -" wget -O - http://www.laptop.org/teamwiki/images/6/60/Libertas-firmware.tgz | tar xfz -" $sh -" grep version: libertas-fw-${WLAN_DATE}/RELEASE_NOTES | cut -d ' ' -f 3 | tr -d \\n >libertas.version" expand$ $sh - -reading libertas.version -here dup d# 50 ifd @ fgets ( adr len ) -ifd @ fclose ( adr len ) - -" ${WLAN_VERSION}" expand$ $= 0= [if] -.( Wrong Libertas version ) cr -error-exit -[then] - -" cp libertas-fw-${WLAN_DATE}/usb8388.bin ." expand$ $sh - -\ This forces the creation of an .log file, so we don't re-fetch -writing usb8388.version -" ${WLAN_VERSION}"n" expand$ ofd @ fputs -ofd @ fclose Deleted: cpu/x86/pc/olpc/draminit.fth =================================================================== --- cpu/x86/pc/olpc/draminit.fth 2008-05-21 21:12:54 UTC (rev 824) +++ cpu/x86/pc/olpc/draminit.fth 2008-05-21 21:16:50 UTC (rev 825) @@ -1,117 +0,0 @@ - h# 18 # al mov al h# 80 # out - h# 1430 # dx mov dx ax in h# 9999 # ax cmp = if - h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 - h# 18 # al mov al h# 71 # out \ Write value 01 - then - - \ Enable DLL, load Extended Mode Register by set and clear PROG_DRAM - 20000018 rmsr - 10000001 bitset 20000018 wmsr - 10000001 bitclr 20000018 wmsr - - \ Reset DLL (bit 27 is undocumented in GX datasheet, but is in the LX one) - 08000001 bitset 20000018 wmsr - 08000001 bitclr 20000018 wmsr - - \ Here we are supposed to wait 200 SDCLK cycles to let the DLL settle. - \ That is approximately 2 uS. The ROM instruction access is so slow that - \ anything we do will take quite a bit longer than that, so we just let the - \ "rmsr, bitset" sequence take care of the time delay for us. - - \ In the following sequence of writes the 2000.0018 MSR, we - \ take advantage of the fact that the existing value stays - \ in EAX/EDX, so we don't have to re-read the value. - - \ Generate 2 refresh requests. The refresh queue is 8 deep, and we - \ need to make sure 2 refreshes hit the chips, so we have to issue - \ 10 requests to the queue. According to the GX datasheet, we don't - \ have to clear the REF_TST bit (8) explicitly between writes - 20000018 rmsr 8 bitset - wrmsr wrmsr wrmsr wrmsr wrmsr wrmsr wrmsr wrmsr wrmsr wrmsr - 8 bitclr - -\ LinuxBIOS LX raminit.c has a big delay here, using Port 61 - - \ Load Mode Register - 1 bitset 20000018 wmsr - 1 bitclr 20000018 wmsr - - \ Set up a descriptor to give access to memory - \ GLIU0 P2D Base Mask Descriptors - page 85 - 20000000.000fff00. 10000020 set-msr \ memory - 0..fffff - - \ The RAM DLL needs a write to lock on - ax h# ffff0 #) mov - - h# 19 # al mov al h# 80 # out - h# 1430 # dx mov dx ax in h# 9999 # ax cmp = if - h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 - h# 19 # al mov al h# 71 # out \ Write value 01 - then - - \ Turn on the cache - cr0 ax mov - 6000.0000 bitclr \ Cache-disable off, coherent - ax cr0 mov - invd - - h# 1a # al mov al h# 80 # out - h# 1430 # dx mov dx ax in h# 9999 # ax cmp = if - h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 - h# 1a # al mov al h# 71 # out \ Write value 01 - then - - 0000f001.00001400. 5140000f set-msr \ PMS BAR - - \ It is tempting to test bit 0 of PM register 5c, but a 5536 erratum - \ prevents that bit from working. Bit 1 works, but LX errata 34 - \ sometimes requires that we reset the system to fix the memory DLL, - \ which destroys all the bits of PM register 5c. So we put a breadcrumb - \ in a PM register that we don't otherwise use. - 1430 port-rl h# 9999 # ax cmp = if \ Wakeup event flag - 0 1430 port-wl - h# 1b # al mov al h# 80 # out - h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 - h# 1b # al mov al h# 71 # out \ Write value 01 - - char r 3f8 port-wb begin 3fd port-rb 40 bitand 0<> until - - resume-data # sp mov - resume-entry # ax mov ax call \ This might return if checksumming fails - char x 3f8 port-wb begin 3fd port-rb 40 bitand 0<> until - then - - h# 1c # al mov al h# 80 # out - h# 1808 rmsr \ Default region configuration properties MSR - h# 0fffff00 # ax and \ Top of System Memory field - 4 # ax shl \ Shift into place - ax mem-info-pa 4 + #) mov \ Put it where resetend.fth can find it - - \ char D 3f8 port-wb begin 3fd port-rb 40 bitand 0<> until - - \ Memory is now on - h# 8.0000 # sp mov \ Setup a stack pointer for later code - - h# 1d # al mov al h# 80 # out -\ Some optional debugging stuff ... -[ifdef] debug-startup -init-com1 - -carret report -linefeed report -ascii F report -ascii o report -ascii r report -[then] - -\ fload ${BP}/cpu/x86/pc/ramtest.fth - -0 [if] -ax ax xor -h# 12345678 # bx mov -bx 0 [ax] mov -h# 5555aaaa # 4 [ax] mov -0 [ax] dx mov -dx bx cmp <> if ascii B report ascii A report ascii D report begin again then -[then] - Deleted: cpu/x86/pc/olpc/gpio.fth =================================================================== --- cpu/x86/pc/olpc/gpio.fth 2008-05-21 21:12:54 UTC (rev 824) +++ cpu/x86/pc/olpc/gpio.fth 2008-05-21 21:16:50 UTC (rev 825) @@ -1,61 +0,0 @@ -\ See license at end of file -purpose: Access to GPIO registers - -\ GPIO registers -h# 00 constant OUT_VAL -h# 04 constant OUT_EN -h# 08 constant OUT_OD_EN -h# 0c constant OUT_INVRT_EN -h# 10 constant OUT_AUX1 -h# 14 constant OUT_AUX2 -h# 18 constant PU_EN -h# 1c constant PD_EN -h# 20 constant IN_EN -h# 24 constant INV_EN -h# 28 constant IN_FLTR_EN -h# 2c constant EVNTCNT_EN -h# 30 constant READ_BACK -h# 38 constant EVNT_EN - -h# 1000 value gpio-base \ stand-init sets this from an MSR -: gpio@ ( offset -- 0 ) gpio-base + pl@ ; -: gpio! ( l offset -- ) gpio-base + pl! ; - -alias >set noop ( mask -- mask' ) -: >clr ( mask -- mask' ) d# 16 lshift ; - -: >hi ( reg# -- reg#' ) h# 80 + ; \ High bank for GPIO bits 16..31 - -: gpio-data@ ( -- l ) h# 30 gpio@ ; - - -h# 5140000C constant MSR_LBAR_GPIO - -stand-init: gpio - MSR_LBAR_GPIO rdmsr ( lo hi ) - h# 0000f001 <> abort" GPIO not enabled" - h# ff00 and to gpio-base -; -\ 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 Deleted: cpu/x86/pc/olpc/linux.fth =================================================================== --- cpu/x86/pc/olpc/linux.fth 2008-05-21 21:12:54 UTC (rev 824) +++ cpu/x86/pc/olpc/linux.fth 2008-05-21 21:16:50 UTC (rev 825) @@ -1,534 +0,0 @@ -\ See license at end of file -purpose: Linux bzImage program loading - -\ \needs ramdisk " disk:\boot\initrd.img" d# 128 config-string ramdisk -\ " ro root=LABEL=OLPCRoot rootfstype=ext3 console=ttyS0,115200 console=tty0 fbcon=font:SUN12x22" ' boot-file set-config-string-default -\ " disk:\boot\vmlinuz" ' boot-device set-config-string-default - -\ \needs ramdisk " " d# 128 config-string ramdisk -\ " nand:\boot\vmlinuz" ' boot-device set-config-string-default -\ " ro root=mtd0 rootfstype=jffs2 console=ttyS0,115200 console=tty0 fbcon=font:SUN12x22" ' boot-file set-config-string-default - -\needs ramdisk " " d# 128 config-string ramdisk -" " ' boot-file set-config-string-default \ Let the olpcboot.fth file set the cmdline -" disk:\boot\olpc.fth sd:\boot\olpc.fth nand:\boot\olpc.fth /prober /usb/ethernet /usb/wlan" ' boot-device set-config-string-default - -0 value ramdisk-adr -0 value /ramdisk - -0 [if] \ From include/asm-i386/setup.h -#define PARAM (boot_params) -#define SCREEN_INFO (*(struct screen_info *) (PARAM+0)) -#define EXT_MEM_K (*(unsigned short *) (PARAM+2)) -#define ALT_MEM_K (*(unsigned long *) (PARAM+0x1e0)) -#define E820_MAP_NR (*(char*) (PARAM+E820NR)) -#define E820_MAP ((struct e820entry *) (PARAM+E820MAP)) -#define APM_BIOS_INFO (*(struct apm_bios_info *) (PARAM+0x40)) -#define IST_INFO (*(struct ist_info *) (PARAM+0x60)) -#define DRIVE_INFO (*(struct drive_info_struct *) (PARAM+0x80)) -#define SYS_DESC_TABLE (*(struct sys_desc_table_struct*)(PARAM+0xa0)) -#define EFI_SYSTAB ((efi_system_table_t *) *((unsigned long *)(PARAM+0x1c4))) -#define EFI_MEMDESC_SIZE (*((unsigned long *) (PARAM+0x1c8))) -#define EFI_MEMDESC_VERSION (*((unsigned long *) (PARAM+0x1cc))) -#define EFI_MEMMAP ((void *) *((unsigned long *)(PARAM+0x1d0))) -#define EFI_MEMMAP_SIZE (*((unsigned long *) (PARAM+0x1d4))) -#define MOUNT_ROOT_RDONLY (*(unsigned short *) (PARAM+0x1F2)) -#define RAMDISK_FLAGS (*(unsigned short *) (PARAM+0x1F8)) -#define VIDEO_MODE (*(unsigned short *) (PARAM+0x1FA)) -#define ORIG_ROOT_DEV (*(unsigned short *) (PARAM+0x1FC)) -#define AUX_DEVICE_INFO (*(unsigned char *) (PARAM+0x1FF)) -#define LOADER_TYPE (*(unsigned char *) (PARAM+0x210)) -#define KERNEL_START (*(unsigned long *) (PARAM+0x214)) -#define INITRD_START (*(unsigned long *) (PARAM+0x218)) -#define INITRD_SIZE (*(unsigned long *) (PARAM+0x21c)) -#define EDID_INFO (*(struct edid_info *) (PARAM+0x140)) -#define EDD_NR (*(unsigned char *) (PARAM+EDDNR)) -#define EDD_MBR_SIG_NR (*(unsigned char *) (PARAM+EDD_MBR_SIG_NR_BUF)) -#define EDD_MBR_SIGNATURE ((unsigned int *) (PARAM+EDD_MBR_SIG_BUF)) -#define EDD_BUF ((struct edd_info *) (PARAM+EDDBUF)) - -#define PARAM_SIZE 4096 -#define COMMAND_LINE_SIZE 256 - -#define OLD_CL_MAGIC_ADDR 0x90020 -#define OLD_CL_MAGIC 0xA33F -#define OLD_CL_BASE_ADDR 0x90000 -#define OLD_CL_OFFSET 0x90022 -#define NEW_CL_POINTER 0x228 /* Relative to real mode data */ - -\ From arch/i386/kernel/setup.c -#define RAMDISK_IMAGE_START_MASK 0x07FF -#define RAMDISK_PROMPT_FLAG 0x8000 -#define RAMDISK_LOAD_FLAG 0x4000 -[then] - -create screen-info \ See struct screen_info in include/linux/tty.h - 0 c, \ 0 x position - 0 c, \ 1 y position - 0 w, \ 2 plug in memory size here - 0 w, \ 4 video page - 0 c, \ 6 video mode - 7 means monochrome, anything else is color - d# 80 c, \ 7 columns - 0 w, \ 8 unused - 0 w, \ a ega_bx - anything but 0x10 - 0 w, \ c unused - d# 25 c, \ e lines - 0 c, \ f isVGA? - d# 16 w, \ 10 font height -here screen-info - constant /screen-info - - -h# 9.0000 constant linux-params -h# 10.0000 value linux-base -: code16-size ( -- #bytes ) load-base h# 1f1 + c@ 1+ d# 512 * ; -0 value cmdline-offset - -\ Find the end of the largest piece of memory -: memory-limit ( -- limit ) - " /memory" find-package 0= abort" No /memory node" ( phandle ) - " available" rot get-package-property abort" No memory node available property" ( $ ) - \ Find the memory piece that starts at 1 Meg - begin dup 8 >= while ( $ ) - decode-int h# 10.0000 = if ( $ ) \ Found the one we want - decode-int h# 10.0000 + ( $ limit ) - nip nip exit - then ( $ ) - decode-int drop ( $ ) - repeat ( $ ) - 2drop true abort" No suitable memory piece" -; - -d# 20 constant /root-dev-buf -/root-dev-buf buffer: root-dev-buf - -: make-root-dev$ ( idx -- root-dev$ ) - root-dev-buf /root-dev-buf 0 fill - " root=/dev/hda" rot - 1+ base @ >r d# 10 base ! (.) r> base ! - $cat2 - 2dup 2>r root-dev-buf swap move - 2r> free-mem - root-dev-buf /root-dev-buf -; -: +lp ( offset -- adr ) linux-params + ; - -0 [if] -: add-root-dev ( cmdline$ -- cmdline$' ) - 2>r " root=" 2r@ sindex -1 = if - 2r> - " disk:root,\" $partition-idx dup -1 <> if - make-root-dev$ $cat2 - else - drop - then - else - 2r> - then -; -[else] -: add-root-dev ( cmdline$ -- cmdline$' ) -; -[then] - -: set-parameters ( cmdline$ -- ) - screen-info linux-params /screen-info move \ Ostensibly screen info - - memory-limit ( #bytes ) - d# 1023 invert and d# 1024 / ( #kbytes ) - d# 1024 - h# 002 +lp w! \ Kbytes of extended (not the 1st meg) memory - - memory-limit ( #bytes ) - d# 1023 invert and d# 1024 / ( #kbytes ) - d# 1024 - h# 1e0 +lp l! \ Alternate amount of extended memory - - 0 h# 1f2 +lp w! \ root flags - non0 to mount root read-only - 0 h# 1f8 +lp w! \ Ramdisk flags - -\ 301 for /dev/hda, 100 for /dev/ram0, 0 for nothing (set it from cmdline) -\ h# 301 h# 1fc +lp w! \ root_dev - see init/main.c:parse_root_dev -\ h# 100 h# 1fc +lp w! \ root_dev - see init/main.c:parse_root_dev - h# 0 h# 1fc +lp w! \ root_dev - see init/main.c:parse_root_dev - - 0 h# 1ff +lp c! \ Aux device - set to AA if PS2 mouse present - /ramdisk 0<> h# 210 +lp w! \ loader type - set non0 to enable ramdisk info -\ h# 100000 h# 214 +lp l! \ kernel start - unused - ramdisk-adr h# 218 +lp l! \ initrd start - /ramdisk h# 21c +lp l! \ initrd size - - \ Put Open Firmware signature and IDT pointer in the params area - " OFW " drop @ h# b0 +lp l! \ Validator for this area - 1 h# b4 +lp l! \ Number of additional items (version#) - cif-handler h# b8 +lp l! \ Client interface handler - idt drop h# bc +lp l! \ So Linux can preserve our debug vectors - - \ Command line goes after the 16-bit wad - ( cmdline$ ) add-root-dev - ( cmdline$ ) cmdline-offset +lp swap 1+ move - h# a33f h# 20 +lp w! \ Command line validator (magic number) - cmdline-offset h# 22 +lp w! \ Command line offset - cmdline-offset +lp h# 228 +lp l! \ New command line address -; - -: linux-fixup ( -- ) -[ifdef] linux-logo linux-logo [then] - args-buf cscount set-parameters ( ) - h# ff h# 21 pc! \ Squelch the timer interrupt and others - - linux-base linux-params (init-program) - linux-params to %esi -; - -d# 256 buffer: ramdisk-buf -' ramdisk-buf " ramdisk" chosen-string - -defer load-ramdisk -: $load-ramdisk ( name$ -- ) - 0 to /ramdisk ( name$ ) - - ['] load-path behavior >r ( name$ r: xt ) - ['] ramdisk-buf to load-path ( name$ r: xt ) - - ." Loading ramdisk image from " 2dup type ." ..." ( name$ r: xt ) - ['] boot-read catch ( throw-code r: xt ) - cr ( throw-code r: xt ) - r> to load-path ( throw-code ) - throw - loaded to /ramdisk to ramdisk-adr -; -: cv-load-ramdisk ( -- ) - " ramdisk" eval dup 0= if 2drop exit then ( name$ ) - $load-ramdisk -; -' cv-load-ramdisk to load-ramdisk - -: claim-params ( -- ) -[ifdef] virtual-mode - 0 0 1meg -1 mmu-map ( ) \ Make the parameter area accessible -[then] - 0 +lp h# 1000 0 mem-claim drop \ Play nice with memory reporting - 0 +lp h# 1000 erase -; - -0 value linux-loaded? -: ?linux-elf-map-in ( va size -- ) - \ The Linux startup code really wants the physical address to be - \ virtual_address AND 0x0fff.ffff. We recognize Linux by the virtual - \ address range that it uses (0xc0xx.xxxx) - over h# f000.0000 and h# c000.0000 = if - h# 40.0000 to linux-base - h# 800 to cmdline-offset - true to linux-loaded? - over h# 0fff.ffff and ( va size pa ) - -rot -1 ( pa va size mode ) - mmu-map - exit - then - (elf-map-in) -; -' ?linux-elf-map-in is elf-map-in - -: init-bzimage? ( -- flag ) - loaded ( adr len ) - h# 202 /string ( adr' len' ) - 4 < if drop false exit then ( adr ) - " HdrS" comp if false exit then ( ) - h# 10.0000 to linux-base - code16-size to cmdline-offset \ Save in case we clobber load-base - load-base 0 +lp code16-size move \ Copy the 16-bit stuff - loaded code16-size /string linux-base swap move \ Copy the 32-bit stuff - true to linux-loaded? - true -; - -warning @ warning off -: init-program ( -- ) - init-bzimage? if exit then - init-program -; - -: ?memtest-elf-map-in ( vaddr size -- ) - \ We recognize memtest by its virtual address of 0x10000 - \ It expects that virtual = physical; we depend on the fact - \ that we have low memory mapped V=P - over h# 10000 = if ( vaddr size ) - \ Map the frame buffer (virtual=physical) - h# 910 config-l@ dup 100.0000 -1 mmu-map - then - - \ If it's not memtest, chain to the linux recognizer - ?linux-elf-map-in -; -' ?memtest-elf-map-in is elf-map-in - -: memtest ( -- ) unfreeze " rom:memtest" $boot ; - -: sym ( "name" -- adr ) - parse-word $sym> 0= if err-sym-not-found throw then -; -warning ! - -warning @ warning off -: init-program ( -- ) - false to linux-loaded? - init-program - linux-loaded? if - claim-params - ['] load-ramdisk guarded - linux-fixup - then -; -warning ! - -: mcr ( -- ) cr exit? throw ; -: help-debug ( -- ) - red-letters - ." Debugging the Linux kernel requires a few patches to keep Linux from" mcr - ." overwriting the firmware debug vector." mcr mcr - black-letters - - ." COMMAND STACK EFFECT DESCRIPTION" mcr - ." .registers ( -- ) Display registers" mcr - ." go ( -- ) Resume execution" mcr - ." step ( -- ) Single-step" mcr - ." ^T ( -- ) (Control-T) Keystroke shortcut for 'step'" mcr - ." steps ( n -- ) Single-step n times" mcr - ." hop ( -- ) Step over subroutine calls" mcr - ." hops ( n -- ) Hop n times" mcr - ." dis ( addr -- ) Disassemble starting at given address" mcr - ." +dis ( -- ) Continue disassembling" mcr - ." bp ( addr -- ) Set breakpoint at given address" mcr - ." till ( addr -- ) Set breakpoint at given address and go" mcr - ." -bp ( addr -- ) Delete breakpoint at given address" mcr - ." --bp ( -- ) Delete last breakpoint" mcr - ." .bp ( -- ) Show breakpoints" mcr - ." return ( -- ) Finish execution of current subroutine" mcr - ." finish-loop ( -- ) Finish execution of current loop" mcr - ." %eax ( -- n ) Push EAX (etc.) register value on stack" mcr - ." %eip ( -- n ) Push EIP register value on stack" mcr - ." %pc ( -- n ) Same as %eip" mcr - ." to %eax ( n -- ) Set EAX (etc.) register value from stack" mcr - ." to %eip ( n -- ) Set EIP register value from stack" mcr - ." sym <name> ( -- n ) Push value of named kernel symbol on stack" mcr - ." .adr ( n -- ) Display symbol name closest to n" mcr - ." Examples: " mcr - ." %pc dis Disassemble starting at program counter" mcr - ." %ebx u. Display saved value of EBX register" mcr - ." step Single step once" mcr - ." 10 hops Step 10 times, don't go down into subroutines" mcr - ." 1234 to %ebp Set EBP register to (hex) 1234" mcr - ." sym kbd_init dis Disassemble starting at kbd_init" mcr - ." sym kbd_init till Set breakpoint at kbd_init and go" mcr - ." %pc 5 + to %pc Add 5 to the program counter register" mcr - - mcr - ." 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 ! - -0 [if] - -: linux ( "cmdline" -- ) - load-ramdisk - load - ." Linux start address at " %eip u. cr - ." Type 'go' to start it or 'help-debug' to see debugger commands." cr -; - -\ " load_ramdisk=1 root=/dev/ram0 console=/dev/ttyS0,9600 console=/dev/tty0" - - -: uint8_t ( offset -- offset' ) - create dup , /c + does> @ the-struct + c@ ( b ) -; -: uint16_t ( offset -- offset' ) - create dup , /w + does> @ the-struct + w@ ( w ) -; -: uint32_t ( offset -- offset' ) - create dup , /l + does> @ the-struct + l@ ( l ) -; -: uint8s ( offset size -- offset' ) sfield ; - -: reserved + ; -: ends-at ( offset n -- ) nip ; -struct \ x86_linux_header - h# 1f1 reserved \ 0x000 - uint8_t setup_sects \ 0x1f1 - uint16_t root_flags \ 0x1f2 - uint16_t syssize \ 0x1f4 - uint16_t swapdev \ 0x1f6 - uint16_t ramdisk_flags \ 0x1f8 - uint16_t vid_mode \ 0x1fa - uint16_t root_dev \ 0x1fc - uint16_t boot_sector_magic \ 0x1fe - \ 2.00+ - 2 reserved \ 0x200 - 4 uint8s header_magic \ 0x202 - uint16_t protocol_version \ 0x206 - uint32_t realmode_swtch \ 0x208 - uint16_t start_sys \ 0x20c - uint16_t kver_addr \ 0x20e - uint8_t type_of_loader \ 0x210 - uint8_t loadflags \ 0x211 - uint16_t setup_move_size \ 0x212 - uint32_t code32_start \ 0x214 - uint32_t ramdisk_image \ 0x218 - uint32_t ramdisk_size \ 0x21c - 4 reserved \ 0x220 - \ 2.01+ - uint16_t heap_end_ptr \ 0x224 - 2 reserved \ 0x226 - \ 2.02+ - uint32_t cmd_line_ptr \ 0x228 - \ 2.03+ - uint32_t initrd_addr_max \ 0x22c -[ifdef] TENATIVE - \ 2.04+ - uint16_t entry32_off \ 0x230 - uint16_t internal_cmdline_off \ 0x232 - uint32_t low_base \ 0x234 - uint32_t low_memsz \ 0x238 - uint32_t low_filesz \ 0x23c - uint32_t real_base \ 0x240 - uint32_t real_memsz \ 0x244 - uint32_t real_filesz \ 0x248 - uint32_t high_base \ 0x24C - uint32_t high_memsz \ 0x250 - uint32_t high_filesz \ 0x254 - 0 field tail \ 0x258 -[else] - 0 field tail \ 0x230 -[then] - d# 32 d# 1024 * ends-at - -constant /x86-linux-header - -\ Not used, but possibly interesting to know -: kernel-version ( -- cstr ) load-base d# 512 + kver_addr + ; - -Where stuff wants to load: - -16-bit segment at h# 9.0000 -32-bit segment at h# 10.0000 -ramdisk at h# 80.0000 - -command line goes in 16-bit segment at command_line_off (first location after kern16_size) -start16 code goes in 16-bit segment at setup16_off -start32 code goes in 16-bit segment at setup32_off - -h# 90000 constant rm-seg -h# 10.0000 constant seg32 -: +rm ( n -- adr ) rm-seg + ; - -: setup-linux ( -- ) - XXX need descriptors at GDT 60 and 68 - - load-base rm-seg kern16-size move \ Copy real-mode code - - cmdline kern16-size +rm swap 1+ move \ Copy command line - h# a33f h# 20 +rm w! \ CL_MAGIC_VALUE -> cl_magic - kern16-size h# 22 w! \ cl_offset - - protocol_version h# 0202 >= if - kern16-size +rm h# 228 +rm l! - then - - h# ff h# 210 +rm c! \ LOADER_TYPE_UNKNOWN - - \ XXX ramdisk must have been copied to h# 800000 already - ramdisk h# 21c +rm l! h# 218 l! \ address and length - - 0 to %eax 0 to %ebx 0 to %ecx 0 to %edx - 0 +rm to %esi 0 to %edi 0 +rm to %esp seg32 to %eip - - loaded kern16-size /string seg32 swap move - - set-fb-info - set-mem-info -; - - -What x86-setup-32.S does: - -finds the actual address of its data structures because -it has been loaded at somewhere other than its link address - -calls x86_setup_state (might be unnecessary) - -Load a GDT with - 0 - pointer to GDT - 0x10 4GB flat code segment - 0x18 4GB flat data segment - 0x60 4GB flat code segment - 0x68 4GB flat data segment - .. other descriptors empty - - sets CS to 0x10 - sets DS,ES,SS,FS,GS to 0x18 - - loads the general registers with values from the array - jumps to the eip from the array - -[then] - -\ 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 Deleted: cpu/x86/pc/olpc/startmacros.fth =================================================================== --- cpu/x86/pc/olpc/startmacros.fth 2008-05-21 21:12:54 UTC (rev 824) +++ cpu/x86/pc/olpc/startmacros.fth 2008-05-21 21:16:50 UTC (rev 825) @@ -1,131 +0,0 @@ -\ See license at end of file - -\ Some x86 assembler macros for writing Geode early startup code -\ in a clean, compact way. Most of the Geode initialization is -\ done with 64-bit MSRs (Machine Specific Registers). These -\ macros make it easy to set MSRs to specific values and to -\ set and clear individual bits. - -\ The code keeps the MSR register number in %ecx, the low 32 bits -\ of the value in %eax, and the high 32 bits in %edx, consistent -\ with the way the rdmsr and wrmsr machine instructions work. -\ The bitset and bitclr operations work on %eax, and the -hi versions -\ work on %edx. -\ In addition to the MSR operations, there are similar ones for -\ I/O ports. They leave the data in %eax, so you can use bitset -\ and bitclr with them too. - --1 value last-cx -also 386-assembler definitions - -: forget-msr -1 to last-cx ; - -\ set-cx is an internal implementation factor used by wmsr and rmsr. -\ It assembles code to put an MSR number in %ecx, optimizing out -\ unnecessary code by remembering what was last put there. -: set-cx ( reg# -- ) - [ also forth ] - dup last-cx = if - drop - else - dup to last-cx - [ previous ] # cx mov [ also forth ] - then - [ previous ] -; - -\ Read/write an MSR to/from %edx,%eax -: rmsr ( reg# -- ) set-cx h# 0f c, h# 32 c, ; -: wmsr ( reg# -- ) set-cx h# 0f c, h# 30 c, ; - -\ These bit operations can be used between "rmsr" and "wmsr" - -\ Bit operations on the low 32-bit value in %eax -: bitset ( mask -- ) # ax or ; -: bitand ( mask -- ) # ax and ; -: bitclr ( mask -- ) invert bitand ; - -\ Bit operations on the high 32-bit value in %edx -: bitset-hi ( mask -- ) # dx or ; -: bitand-hi ( mask -- ) # dx and ; -: bitclr-hi ( mask -- ) invert bitand-hi ; - -\ Set an MSR to a verbatim 64-bit value -: set-msr ( d.val reg# -- ) -rot # dx mov # ax mov wmsr ; - -\ Set or clear bits in an MSR (read-modify-write the register) -: bitset-msr ( mask reg# -- ) tuck rmsr bitset wmsr ; -: bitclr-msr ( mask reg# -- ) tuck rmsr bitclr wmsr ; - -\ Some I/O port operations -\ These could be optimized to generate the immediate forms of in and out -\ for 8-bit port numbers, but it's not worth the trouble because we -\ access very few low-numbered ports. -: port-wb ( b port# -- ) swap # al mov # dx mov al dx out ; -: port-rb ( port# -- ) # dx mov dx al in ; -: port-ww ( w port# -- ) swap # ax mov # dx mov op: ax dx out ; -: port-rw ( port# -- ) ax ax xor # dx mov op: dx ax in ; -: port-wl ( l port# -- ) swap # ax mov # dx mov ax dx out ; -: port-rl ( port# -- ) # dx mov dx ax in ; - -: config-setup ( config-adr -- ) - [ also forth ] - dup 3 invert and h# 8000.0000 or ( config-adr cf8-value ) - [ previous ] - # ax mov ( config-adr ) - h# cf8 # dx mov ( config-adr ) - ax dx out ( config-adr ) - [ also forth ] - 3 and h# cfc or ( data-port ) - [ previous ] - # dx mov -; -: config-wl ( l config-adr -- ) - config-setup ( l ) - # ax mov - ax dx out -; -: config-rl ( config-adr -- ) \ Returns value in EAX - config-setup - dx ax in -; -: config-ww ( w config-adr -- ) - config-setup ( w ) - op: # ax mov ( ) - op: ax dx out -; -: config-rw ( config-adr -- ) \ Returns value AX - config-setup ( ) - ax ax xor - op: dx ax in -; - -: set-base ( adr -- ) # bx mov ; -: reg-save ( offset -- ) [bx] ax mov ax stos ; -: reg-restore ( offset -- ) ax lods ax swap [bx] mov ; - -previous definitions - -\ 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 Deleted: cpu/x86/pc/olpc/usb.fth =================================================================== --- cpu/x86/pc/olpc/usb.fth 2008-05-21 21:12:54 UTC (rev 824) +++ cpu/x86/pc/olpc/usb.fth 2008-05-21 21:16:50 UTC (rev 825) @@ -1,156 +0,0 @@ -purpose: USB elaborations for the OLPC platform -\ See license at end of file - -0 config-int usb-delay \ Milliseconds to wait before set-address - -devalias usb1 /usb@f,4 -devalias usb2 /usb@f,5 -devalias u /usb/disk -devalias net /usb/wlan - -\ If there is a USB ethernet adapter, use it as the default net device. -: report-net ( -- ) - " /usb/ethernet" 2dup find-package if ( name$ phandle ) - drop ( name$ ) - " net" 2swap $devalias ( ) - else ( name$ ) - 2drop ( ) - then -; - -[ifdef] notdef \ We have the graphical penguin -: linux-logo ( -- ) - " penguin.txt" find-drop-in if page type then -; -[then] - -\ Like $show-devs, but ignores pagination keystrokes -: $nopage-show-devs ( nodename$ -- ) - ['] exit? behavior >r ['] false to exit? - $show-devs - r> to exit? -; - -: probe-usb ( -- ) - ." USB2 devices:" cr - " /usb@f,5" open-dev ?dup if close-dev then - " /usb@f,5" $nopage-show-devs - - ." USB1 devices:" cr - " /usb@f,4" open-dev ?dup if close-dev then - " /usb@f,4" $nopage-show-devs - - report-disk - report-net - report-keyboard -; -alias probe-usb2 probe-usb -alias p2 probe-usb2 - -: ?usb-keyboard ( -- ) - " keyboard" expand-alias if ( devspec$ ) - drop " /usb" comp 0= if ( ) - red-letters ." Using USB keyboard." cr black-letters - " keyboard" input - then - then -; - -\ Unlink every node whose phys.hi component matches port -: port-match? ( port -- flag ) - get-unit if drop false exit then - get-encoded-int = -; -: rm-usb-children ( port -- ) - device-context? 0= if drop exit then - also ( port ) - 'child ( port prev ) - first-child begin while ( port prev ) - over port-match? if ( port prev ) - 'peer link@ over link! ( port prev ) \ Disconnect - else ( port prev ) - drop 'peer ( port prev' ) - then ( port prev ) - next-child repeat ( port prev ) - 2drop ( ) - previous definitions -; - -0 value usb-power-done-time - -\ This version assumes that power has been applied already, and -\ all we have to do is wait enough time for the devices to be ready. -: wait-usb-power ( -- ) - begin usb-power-done-time get-msecs - 0<= until ( ) -; - -: usb-quiet ( -- ) - [ ' go-hook behavior compile, ] \ Chain to old behavior - " usb1" " reset-usb" execute-device-method drop - " usb2" " reset-usb" execute-device-method drop -; -' usb-quiet to go-hook - -0 0 " " " /" begin-package - " prober" device-name - : open - " /usb@f,5" open-dev ?dup if close-dev then - " /usb@f,4" open-dev ?dup if close-dev then - report-disk - report-net - report-keyboard - false - ; - : close ; -end-package - -stand-init: USB setup - \ Set up an address routing to the USB Option Controller - h# efc00000.efc00001. h# 5100.0029 wrmsr - h# 400000ef.c00fffff. h# 5101.0020 wrmsr - h# 00000002.efc00000. h# 5120.000b wrmsr -[ifdef] virtual-mode - h# efc00000 h# 1000 0 mmu-claim drop \ UOC - h# efc00000 dup h# 1000 -1 mmu-map \ UOC - h# fe01a000 h# 1000 0 mmu-claim drop \ OHCI - h# fe01a000 dup h# 1000 -1 mmu-map \ OHCI -[then] - \ Configure the assignment of 2 USB Power Enable pins to USB ports - \ to correspond to the way they are wired on the board. - \ USB port 1 is PWR_EN2, USB ports 2-4 are PWR_EN1 - usb-port-power-map h# efc00000 l! - 2 h# efc00004 l! - h# 1 h# fe01a008 l! \ Reset OHCI host controller - h# 1e.0000 h# fe01a04c l! \ Configure ports for individual power - h# 100 h# fe01a058 l! \ Power-on ports 2 and 3 - d# 10 ms \ Stagger for glitch-prevention - h# 100 h# fe01a054 l! \ Power-on port 1 - h# 100 h# fe01a05c l! \ Power-on port 3 - h# 100 h# fe01a060 l! \ Power-on port 4 - get-msecs d# 1000 + to usb-power-done-time -; - - -\ LICENSE_BEGIN -\ Copyright (c) 2007 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

r824 - cpu/x86/pc cpu/x86/pc/lxdevel cpu/x86/pc/olpc dev/geode dev/geode/nandflash
by svn＠openbios.org 21 May '08

21 May '08

Author: wmb Date: 2008-05-21 23:12:54 +0200 (Wed, 21 May 2008) New Revision: 824 Added: cpu/x86/pc/linux.fth cpu/x86/pc/lxdevel/addrs.fth cpu/x86/pc/lxdevel/banner.fth cpu/x86/pc/lxdevel/loaddropins.fth cpu/x86/pc/lxdevel/rmstart.fth cpu/x86/pc/memtest.fth dev/geode/draminit.fth dev/geode/gpio.fth dev/geode/startmacros.fth dev/geode/usb.fth Modified: cpu/x86/pc/lxdevel/config.fth cpu/x86/pc/lxdevel/devices.fth cpu/x86/pc/lxdevel/fw.bth cpu/x86/pc/lxdevel/lxdevel.bth cpu/x86/pc/lxdevel/msrinit.fth cpu/x86/pc/lxdevel/pcinode.fth cpu/x86/pc/lxdevel/rmstart.bth cpu/x86/pc/lxdevel/romreset.bth cpu/x86/pc/lxdevel/versions.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/romreset.bth cpu/x86/pc/olpc/versions.fth dev/geode/nandflash/methods.fth dev/geode/nandflash/nand5536.fth dev/geode/nandflash/nandflash.bth Log: Fixed the lxdevel build by: Moved some files that aren't really OLPC-specific from cpu/x86/pc/olpc into cpu/x86/pc and dev/geode, doing a little refactoring (mostly just moving code into different files) in the process. Made lxdevel-specific versions of some files that contained OLPC dependencies Removed spurious OLPC dependencies from the lxdevel build. This change is intended to be functionally neutral for the OLPC build. Added: cpu/x86/pc/linux.fth =================================================================== --- cpu/x86/pc/linux.fth (rev 0) +++ cpu/x86/pc/linux.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -0,0 +1,331 @@ +\ See license at end of file +purpose: Linux bzImage program loading + +\ Example boot configuration variable settings: + +\ Example default values for a system that boots primarily from hard disk: + +\ \needs ramdisk " disk:\boot\initrd.img" d# 128 config-string ramdisk +\ " ro root=LABEL=OLPCRoot rootfstype=ext3 console=ttyS0,115200 console=tty0" +\ ' boot-file set-config-string-default +\ " disk:\boot\vmlinuz" ' boot-device set-config-string-default + +\ Example default values for a system that boots primarily from JFFS2 on NAND: + +\ " nand:\boot\vmlinuz" ' boot-device set-config-string-default +\ " ro root=mtd0 rootfstype=jffs2 console=ttyS0,115200 console=tty0" +\ ' boot-file set-config-string-default + +0 value ramdisk-adr +0 value /ramdisk + +create screen-info \ See struct screen_info in include/linux/tty.h + 0 c, \ 0 x position + 0 c, \ 1 y position + 0 w, \ 2 plug in memory size here + 0 w, \ 4 video page + 0 c, \ 6 video mode - 7 means monochrome, anything else is color + d# 80 c, \ 7 columns + 0 w, \ 8 unused + 0 w, \ a ega_bx - anything but 0x10 + 0 w, \ c unused + d# 25 c, \ e lines + 0 c, \ f isVGA? + d# 16 w, \ 10 font height +here screen-info - constant /screen-info + + +h# 9.0000 constant linux-params +h# 10.0000 value linux-base +: code16-size ( -- #bytes ) load-base h# 1f1 + c@ 1+ d# 512 * ; +0 value cmdline-offset + +\ Find the end of the largest piece of memory +: memory-limit ( -- limit ) + " /memory" find-package 0= abort" No /memory node" ( phandle ) + " available" rot get-package-property abort" No memory node available property" ( $ ) + \ Find the memory piece that starts at 1 Meg + begin dup 8 >= while ( $ ) + decode-int h# 10.0000 = if ( $ ) \ Found the one we want + decode-int h# 10.0000 + ( $ limit ) + nip nip exit + then ( $ ) + decode-int drop ( $ ) + repeat ( $ ) + 2drop true abort" No suitable memory piece" +; + +d# 20 constant /root-dev-buf +/root-dev-buf buffer: root-dev-buf + +: make-root-dev$ ( idx -- root-dev$ ) + root-dev-buf /root-dev-buf 0 fill + " root=/dev/hda" rot + 1+ base @ >r d# 10 base ! (.) r> base ! + $cat2 + 2dup 2>r root-dev-buf swap move + 2r> free-mem + root-dev-buf /root-dev-buf +; +: +lp ( offset -- adr ) linux-params + ; + +0 [if] +: add-root-dev ( cmdline$ -- cmdline$' ) + 2>r " root=" 2r@ sindex -1 = if + 2r> + " disk:root,\" $partition-idx dup -1 <> if + make-root-dev$ $cat2 + else + drop + then + else + 2r> + then +; +[else] +: add-root-dev ( cmdline$ -- cmdline$' ) +; +[then] + +: set-parameters ( cmdline$ -- ) + screen-info linux-params /screen-info move \ Ostensibly screen info + + memory-limit ( #bytes ) + d# 1023 invert and d# 1024 / ( #kbytes ) + d# 1024 - h# 002 +lp w! \ Kbytes of extended (not the 1st meg) memory + + memory-limit ( #bytes ) + d# 1023 invert and d# 1024 / ( #kbytes ) + d# 1024 - h# 1e0 +lp l! \ Alternate amount of extended memory + + 0 h# 1f2 +lp w! \ root flags - non0 to mount root read-only + 0 h# 1f8 +lp w! \ Ramdisk flags + +\ 301 for /dev/hda, 100 for /dev/ram0, 0 for nothing (set it from cmdline) +\ h# 301 h# 1fc +lp w! \ root_dev - see init/main.c:parse_root_dev +\ h# 100 h# 1fc +lp w! \ root_dev - see init/main.c:parse_root_dev + h# 0 h# 1fc +lp w! \ root_dev - see init/main.c:parse_root_dev + + 0 h# 1ff +lp c! \ Aux device - set to AA if PS2 mouse present + /ramdisk 0<> h# 210 +lp w! \ loader type - set non0 to enable ramdisk info +\ h# 100000 h# 214 +lp l! \ kernel start - unused + ramdisk-adr h# 218 +lp l! \ initrd start + /ramdisk h# 21c +lp l! \ initrd size + + \ Put Open Firmware signature and IDT pointer in the params area + " OFW " drop @ h# b0 +lp l! \ Validator for this area + 1 h# b4 +lp l! \ Number of additional items (version#) + cif-handler h# b8 +lp l! \ Client interface handler + idt drop h# bc +lp l! \ So Linux can preserve our debug vectors + + \ Command line goes after the 16-bit wad + ( cmdline$ ) add-root-dev + ( cmdline$ ) cmdline-offset +lp swap 1+ move + h# a33f h# 20 +lp w! \ Command line validator (magic number) + cmdline-offset h# 22 +lp w! \ Command line offset + cmdline-offset +lp h# 228 +lp l! \ New command line address +; + +: linux-fixup ( -- ) +[ifdef] linux-logo linux-logo [then] + args-buf cscount set-parameters ( ) + h# ff h# 21 pc! \ Squelch the timer interrupt and others + + linux-base linux-params (init-program) + linux-params to %esi +; + +d# 256 buffer: ramdisk-buf +' ramdisk-buf " ramdisk" chosen-string + +defer load-ramdisk +: $load-ramdisk ( name$ -- ) + 0 to /ramdisk ( name$ ) + + ['] load-path behavior >r ( name$ r: xt ) + ['] ramdisk-buf to load-path ( name$ r: xt ) + + ." Loading ramdisk image from " 2dup type ." ..." ( name$ r: xt ) + ['] boot-read catch ( throw-code r: xt ) + cr ( throw-code r: xt ) + r> to load-path ( throw-code ) + throw + loaded to /ramdisk to ramdisk-adr +; +: cv-load-ramdisk ( -- ) + " ramdisk" eval dup 0= if 2drop exit then ( name$ ) + $load-ramdisk +; +' cv-load-ramdisk to load-ramdisk + +: claim-params ( -- ) +[ifdef] virtual-mode + 0 0 1meg -1 mmu-map ( ) \ Make the parameter area accessible +[then] + 0 +lp h# 1000 0 mem-claim drop \ Play nice with memory reporting + 0 +lp h# 1000 erase +; + +0 value linux-loaded? +: ?linux-elf-map-in ( va size -- ) + \ The Linux startup code really wants the physical address to be + \ virtual_address AND 0x0fff.ffff. We recognize Linux by the virtual + \ address range that it uses (0xc0xx.xxxx) + over h# f000.0000 and h# c000.0000 = if + h# 40.0000 to linux-base + h# 800 to cmdline-offset + true to linux-loaded? + over h# 0fff.ffff and ( va size pa ) + -rot -1 ( pa va size mode ) + mmu-map + exit + then + (elf-map-in) +; +' ?linux-elf-map-in is elf-map-in + +: init-bzimage? ( -- flag ) + loaded ( adr len ) + h# 202 /string ( adr' len' ) + 4 < if drop false exit then ( adr ) + " HdrS" comp if false exit then ( ) + h# 10.0000 to linux-base + code16-size to cmdline-offset \ Save in case we clobber load-base + load-base 0 +lp code16-size move \ Copy the 16-bit stuff + loaded code16-size /string linux-base swap move \ Copy the 32-bit stuff + true to linux-loaded? + true +; + +warning @ warning off +: init-program ( -- ) + init-bzimage? if exit then + init-program +; + +: sym ( "name" -- adr ) + parse-word $sym> 0= if err-sym-not-found throw then +; +warning ! + +warning @ warning off +: init-program ( -- ) + false to linux-loaded? + init-program + linux-loaded? if + claim-params + ['] load-ramdisk guarded + linux-fixup + then +; +warning ! + +: mcr ( -- ) cr exit? throw ; +: help-debug ( -- ) + red-letters + ." Debugging the Linux kernel requires a few patches to keep Linux from" mcr + ." overwriting the firmware debug vector." mcr mcr + black-letters + + ." COMMAND STACK EFFECT DESCRIPTION" mcr + ." .registers ( -- ) Display registers" mcr + ." go ( -- ) Resume execution" mcr + ." step ( -- ) Single-step" mcr + ." ^T ( -- ) (Control-T) Keystroke shortcut for 'step'" mcr + ." steps ( n -- ) Single-step n times" mcr + ." hop ( -- ) Step over subroutine calls" mcr + ." hops ( n -- ) Hop n times" mcr + ." dis ( addr -- ) Disassemble starting at given address" mcr + ." +dis ( -- ) Continue disassembling" mcr + ." bp ( addr -- ) Set breakpoint at given address" mcr + ." till ( addr -- ) Set breakpoint at given address and go" mcr + ." -bp ( addr -- ) Delete breakpoint at given address" mcr + ." --bp ( -- ) Delete last breakpoint" mcr + ." .bp ( -- ) Show breakpoints" mcr + ." return ( -- ) Finish execution of current subroutine" mcr + ." finish-loop ( -- ) Finish execution of current loop" mcr + ." %eax ( -- n ) Push EAX (etc.) register value on stack" mcr + ." %eip ( -- n ) Push EIP register value on stack" mcr + ." %pc ( -- n ) Same as %eip" mcr + ." to %eax ( n -- ) Set EAX (etc.) register value from stack" mcr + ." to %eip ( n -- ) Set EIP register value from stack" mcr + ." sym <name> ( -- n ) Push value of named kernel symbol on stack" mcr + ." .adr ( n -- ) Display symbol name closest to n" mcr + ." Examples: " mcr + ." %pc dis Disassemble starting at program counter" mcr + ." %ebx u. Display saved value of EBX register" mcr + ." step Single step once" mcr + ." 10 hops Step 10 times, don't go down into subroutines" mcr + ." 1234 to %ebp Set EBP register to (hex) 1234" mcr + ." sym kbd_init dis Disassemble starting at kbd_init" mcr + ." sym kbd_init till Set breakpoint at kbd_init and go" mcr + ." %pc 5 + to %pc Add 5 to the program counter register" mcr + + mcr + ." 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 +\ +\ 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 Added: cpu/x86/pc/lxdevel/addrs.fth =================================================================== --- cpu/x86/pc/lxdevel/addrs.fth (rev 0) +++ cpu/x86/pc/lxdevel/addrs.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -0,0 +1,109 @@ +\ See license at end of file +purpose: Establish address and I/O configuration definitions + +[ifdef] use-meg0 +h# f0.0000 constant dropin-base +h# 08.0000 constant dropin-size +h# 0.4000 constant fw-pa +h# f.c000 constant /fw-ram +[then] + +[ifdef] rom-loaded +[ifdef] lx-devel +h# fff8.0000 constant rom-pa \ Physical address of boot ROM +h# 8.0000 constant /rom \ Size of boot ROM +rom-pa constant dropin-base +[else] +h# fff0.0000 constant rom-pa \ Physical address of boot ROM +h# 10.0000 constant /rom \ Size of boot ROM +rom-pa h# 1.0000 + constant dropin-base +[then] + +h# 8.0000 constant dropin-size + +dropin-base h# 20 + constant ResetBase \ Location of "reset" dropin in ROM + +h# 1c0.0000 constant fw-pa +h# 20.0000 constant /fw-ram +[then] + +[ifdef] linuxbios-loaded +\ h# d8.0000 constant dropin-base +h# fff2.0000 constant dropin-base \ Location of payload in FLASH +\ h# fff8.0000 constant dropin-base \ Location of payload in FLASH +dropin-base h# 80 + h# 20 + constant ResetBase \ Location of "reset" dropin in ROM +h# 08.0000 constant dropin-size +h# 1e0.0000 constant fw-pa +h# 20.0000 constant /fw-ram +h# fff0.0000 constant rom-pa +h# 10.0000 constant /rom +[then] + +[ifdef] old-bzimage-loaded +\ h# d8.0000 constant dropin-base +h# 10.0020 constant dropin-base \ RAM address where Linux normally loads +h# 08.0000 constant dropin-size +h# 20.0000 constant fw-pa +h# 20.0000 constant /fw-ram +[then] + +[ifdef] bzimage-loaded +h# 1d8.0020 constant dropin-base \ RAM address where we want to end up +h# 08.0000 constant dropin-size +h# 1e0.0000 constant fw-pa +h# 20.0000 constant /fw-ram +[then] + +[ifdef] syslinux-loaded +h# 10.1020 constant dropin-base +h# 07.e0e0 constant dropin-size +h# 20.0000 constant fw-pa +h# 20.0000 constant /fw-ram +[then] + +[ifdef] grub-loaded +h# 1b8.0000 constant dropin-base +h# 08.0000 constant dropin-size +h# 1c0.0000 constant fw-pa +h# 20.0000 constant /fw-ram +[then] + +h# 80.0000 constant def-load-base \ Convenient for initrd + +\ The heap starts at RAMtop, which on this system is "fw-pa /fw-ram +" +h# 20.0000 constant heap-size + +h# 300.0000 constant jffs2-dirent-base +h# 500.0000 constant jffs2-inode-base +h# 700.0000 constant dma-base +h# 900.0000 constant dma-size + +h# f.0000 constant suspend-base \ In the DOS hole +h# f.0008 constant resume-entry +h# f.0800 constant resume-data + +fload ${BP}/cpu/x86/pc/virtaddr.fth + +\ LICENSE_BEGIN +\ Copyright (c) 2006 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Added: cpu/x86/pc/lxdevel/banner.fth =================================================================== --- cpu/x86/pc/lxdevel/banner.fth (rev 0) +++ cpu/x86/pc/lxdevel/banner.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -0,0 +1,56 @@ +\ See license at end of file +purpose: Banner customization for this system + +headerless + +: .rom ( -- ) + ." OpenFirmware " + push-decimal + major-release (.) type ." ." minor-release (.) type sub-release type + pop-base +[ifdef] bzimage-loaded + ." booted from disk - " .built +[then] +; + +: (xbanner-basics) ( -- ) + ?spaces cpu-model type ." , " .memory + ?spaces .rom +; +' (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 +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Modified: cpu/x86/pc/lxdevel/config.fth =================================================================== --- cpu/x86/pc/lxdevel/config.fth 2008-05-21 21:05:04 UTC (rev 823) +++ cpu/x86/pc/lxdevel/config.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -1,8 +1,6 @@ \ See license at end of file purpose: Establish configuration definitions -create olpc-gui \ Use OLPC graphics - create use-lx create lx-devel @@ -43,7 +41,7 @@ create use-null-nvram -fload ${BP}/cpu/x86/pc/olpc/addrs.fth +fload ${BP}/cpu/x86/pc/lxdevel/addrs.fth \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks Modified: cpu/x86/pc/lxdevel/devices.fth =================================================================== --- cpu/x86/pc/lxdevel/devices.fth 2008-05-21 21:05:04 UTC (rev 823) +++ cpu/x86/pc/lxdevel/devices.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -1,9 +1,8 @@ \ See license at end of file purpose: Load device drivers according to configuration definitions -: board-revision ( -- n ) - h# 4c00.0014 rdmsr drop 4 rshift 7 and -; +: gx? ( -- flag ) h# 4c000017 msr@ drop 4 rshift 2 = ; +: lx? ( -- flag ) h# 4c000017 msr@ drop 4 rshift 3 = ; fload ${BP}/cpu/x86/pc/isaio.fth @@ -221,12 +220,12 @@ dend ; -fload ${BP}/cpu/x86/pc/olpc/mfgdata.fth \ Manufacturing data - \ fload ${BP}/dev/geode/lpcflash.fth \ Reflasher for PLCC FLASH on A-test : +i encode-int encode+ ; : 0+i 0 +i ; +false config-int tft-mode? + fload ${BP}/cpu/x86/fb16-ops.fth fload ${BP}/ofw/termemu/fb16.fth 0 0 " 1,1" " /pci" begin-package Modified: cpu/x86/pc/lxdevel/fw.bth =================================================================== --- cpu/x86/pc/lxdevel/fw.bth 2008-05-21 21:05:04 UTC (rev 823) +++ cpu/x86/pc/lxdevel/fw.bth 2008-05-21 21:12:54 UTC (rev 824) @@ -83,7 +83,7 @@ alias lmove lmove \ Needed by CS5536 NAND FLASH driver dend -fload ${BP}/cpu/x86/pc/olpc/gpio.fth \ Rudimentary GPIO driver +fload ${BP}/dev/geode/gpio.fth \ Rudimentary GPIO driver fload ${BP}/cpu/x86/pc/lxdevel/probemem.fth \ Memory probing [ifdef] virtual-mode @@ -117,12 +117,14 @@ [then] [ifdef] linux-support +\needs unix-seconds> fload ${BP}/ofw/fs/unixtime.fth \ Unix time calculation support-package: ext2-file-system fload ${BP}/ofw/fs/ext2fs/ext2fs.fth \ Linux file system end-support-package [then] [ifdef] jffs2-support +\needs unix-seconds> fload ${BP}/ofw/fs/unixtime.fth \ Unix time calculation support-package: jffs2-file-system fload ${BP}/ofw/fs/jffs2/jffs2.fth \ Journaling flash file system 2 end-support-package @@ -224,7 +226,7 @@ fload ${BP}/cpu/x86/pc/boot.fth h# 3ea constant usb-port-power-map \ USB4:PWR2 USB3:PWR1 USB2:PWR1 USB1:PWR1 -fload ${BP}/cpu/x86/pc/olpc/usb.fth +fload ${BP}/dev/geode/usb.fth false to stand-init-debug? \ true to stand-init-debug? @@ -277,33 +279,27 @@ ; [ifdef] linux-support -fload ${BP}/cpu/x86/pc/olpc/linux.fth +fload ${BP}/cpu/x86/pc/linux.fth +\ Use values like these if you want to boot directly instead of through an intermediate script +\ " disk:\vmlinuz" ' boot-device set-config-string-default +\ " disk:\initrd" 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 [then] +" disk:\boot\boot.fth nand:\boot\boot.fth /prober /usb/ethernet" ' boot-device set-config-string-default + + fload ${BP}/ofw/gui/bmptools.fth fload ${BP}/dev/null.fth fload ${BP}/ofw/core/bailout.fth -[ifdef] olpc-gui -\ GUI -false value gui-safeboot? +fload ${BP}/cpu/x86/pc/lxdevel/banner.fth -\ FIXME need to implement user-ok to lockout ok prompt -: 2tuck ( d1 d2 -- d2 d1 d2 ) 2swap 2over ; -false value fru-test? -: user-ok "ok" ; \ This is supposed to check for authorization -true value user-mode? - -fload ${BP}/cpu/x86/pc/olpc/banner.fth -[then] - fload ${BP}/ofw/gui/loadmenu.fth \ fload ${BP}/ofw/gui/insticon.fth -[ifdef] olpc-gui -fload ${BP}/cpu/x86/pc/olpc/gui.fth -[then] - \ Eliminate 4 second delay in install console for the case where \ there is no keyboard. The delay is unnecessary because the screen \ does not go blank when the device is closed. @@ -349,14 +345,6 @@ fload ${BP}/ofw/ppp/loadppp.fth [then] -[ifdef] pc-linux -" a:\initrd.imz" d# 128 config-string ramdisk -" root=/dev/ram0 mount_ramdisk=1" ' boot-file set-config-string-default -" a:\vmlinuz" ' boot-device set-config-string-default -true ' client-symbols? set-config-int-default -\ Also try " console=/dev/ttyS0,9600 console=/dev/tty0" in boot-file -[then] - " dhcp" ' ip-address set-config-string-default \ fload ${BP}/cpu/x86/pc/report.fth @@ -492,15 +480,11 @@ quit ; -fload ${BP}/cpu/x86/pc/olpc/copynand.fth - -[ifndef] olpc \ This sometimes helps with VGA/EGA boards, enabling I/O space access \ to the CRT registers that control the hardware cursor. : cursor ( -- ) " begin-select /display 3 my-space 4 + config-w! unselect" evaluate ; -[then] \ This helps with TeraTerm, which sends ESC-O as the arrow key prefix also hidden also keys-forth definitions Added: cpu/x86/pc/lxdevel/loaddropins.fth =================================================================== --- cpu/x86/pc/lxdevel/loaddropins.fth (rev 0) +++ cpu/x86/pc/lxdevel/loaddropins.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -0,0 +1,22 @@ +\ Loads the set of drivers that is common to different output formats + + " paging.di" $add-file + " ${BP}/cpu/x86/build/inflate.bin" " inflate" $add-dropin + " fw.img" " firmware" $add-deflated-dropin + + " ${BP}/dev/usb2/hcd/ohci/build/ohci.fc" " class0c0310" $add-deflated-dropin + " ${BP}/dev/usb2/hcd/ehci/build/ehci.fc" " class0c0320" $add-deflated-dropin + " ${BP}/dev/usb2/device/hub/build/hub.fc" " usb,class9" $add-dropin + " ${BP}/dev/usb2/device/net/build/usbnet.fc" " usbnet" $add-deflated-dropin + " ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc" " usb,class3,1" $add-dropin + " ${BP}/dev/usb2/device/serial/build/usbserial.fc" " usbserial" $add-deflated-dropin + " ${BP}/dev/usb2/device/storage/build/usbstorage.fc" " usbstorage" $add-deflated-dropin + + " ${BP}/dev/geode/ac97/build/ac97.fc" " pci1022,2093" $add-deflated-dropin + + " builton.fth" " probe-" $add-dropin + " ${BP}/ofw/fcode/memtest.fth" " memtest.fth" $add-deflated-dropin + + " ${BP}/ofw/inet/telnetd.fth" " telnetd" $add-deflated-dropin + + " ${BP}/ofw/termemu/gallant.obf" " font" $add-deflated-dropin Modified: cpu/x86/pc/lxdevel/lxdevel.bth =================================================================== --- cpu/x86/pc/lxdevel/lxdevel.bth 2008-05-21 21:05:04 UTC (rev 823) +++ cpu/x86/pc/lxdevel/lxdevel.bth 2008-05-21 21:12:54 UTC (rev 824) @@ -7,8 +7,6 @@ in: ${BP}/cpu/x86/pc/lxdevel/build/paging.di in: ${BP}/cpu/x86/pc/lxdevel/build/fw.dic in: ${BP}/dev/geode/nandflash/build/nandflash.fc -in: ${BP}/dev/mmc/sdhci/build/sdhci.fc -in: ${BP}/dev/mmc/sdhci/build/sdmmc.fc in: ${BP}/dev/geode/ac97/build/ac97.fc in: ${BP}/dev/usb2/hcd/ohci/build/ohci.fc in: ${BP}/dev/usb2/hcd/ehci/build/ehci.fc @@ -17,11 +15,7 @@ in: ${BP}/dev/usb2/device/serial/build/usbserial.fc in: ${BP}/dev/usb2/device/storage/build/usbstorage.fc in: ${BP}/dev/usb2/device/keyboard/build/usbkbd.fc -in: ${BP}/dev/usb2/device/wlan/build/usb8388.fc -in: ${BP}/dev/olpc/cafenand/build/cafenand.fc -in: ${BP}/dev/olpc/cafecamera/build/cafecamera.fc in: ${BP}/dev/pci/build/pcibridg.fc -in: usb8388.bin build-now @@ -48,7 +42,7 @@ " romreset.di" $add-file \ " resume.di" $add-file - fload ${BP}/cpu/x86/pc/olpc/loaddropins.fth + fload ${BP}/cpu/x86/pc/lxdevel/loaddropins.fth " ${BP}/dev/pci/build/pcibridg.fc" " class060400" $add-deflated-dropin /rom h# 400 - pad-file \ rmstart image must start 0x400 from end Modified: cpu/x86/pc/lxdevel/msrinit.fth =================================================================== --- cpu/x86/pc/lxdevel/msrinit.fth 2008-05-21 21:05:04 UTC (rev 823) +++ cpu/x86/pc/lxdevel/msrinit.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -193,7 +193,7 @@ msr: 5100.0023 0189c001.01880001. \ IRQ mapper msr: 5100.0024 0147c001.01400001. \ PMS msr: 5100.0025 0187c001.01840001. \ ACPI - msr: 5100.0026 014fc001.01480001. \ What?? 128 bytes (0x80) + msr: 5100.0026 014fc001.01480001. \ AC97 msr: 5100.0027 fe01a000.fe01a001. \ OHCI msr: 5100.0028 fe01b000.fe01b001. \ EHCI msr: 5100.0029 efc00000.efc00001. \ UOC Modified: cpu/x86/pc/lxdevel/pcinode.fth =================================================================== --- cpu/x86/pc/lxdevel/pcinode.fth 2008-05-21 21:05:04 UTC (rev 823) +++ cpu/x86/pc/lxdevel/pcinode.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -9,6 +9,7 @@ patch nonvirtual-probe-state? probe-state? map-in \ patch noop assign-all-addresses prober +warning @ warning off : assign-pci-addr ( phys.lo phys.mid phys.hi len | -1 -- phys.hi paddr size ) 2dup -1 <> swap virtual-pci-slot? and if ( phys.lo phys.mid phys.hi len ) 2swap 2drop >r ( phys.hi r: len ) @@ -17,6 +18,7 @@ then assign-pci-addr ; +warning ! : ?clear-addresses ( -- ) my-space virtual-pci-slot? if exit then clear-addresses Modified: cpu/x86/pc/lxdevel/rmstart.bth =================================================================== --- cpu/x86/pc/lxdevel/rmstart.bth 2008-05-21 21:05:04 UTC (rev 823) +++ cpu/x86/pc/lxdevel/rmstart.bth 2008-05-21 21:12:54 UTC (rev 824) @@ -8,4 +8,4 @@ \ create debug-reset fload ${BP}/cpu/x86/pc/lxdevel/config.fth -fload ${BP}/cpu/x86/pc/olpc/rmstart.fth +fload ${BP}/cpu/x86/pc/lxdevel/rmstart.fth Added: cpu/x86/pc/lxdevel/rmstart.fth =================================================================== --- cpu/x86/pc/lxdevel/rmstart.fth (rev 0) +++ cpu/x86/pc/lxdevel/rmstart.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -0,0 +1,277 @@ +\ See license at end of file +purpose: x86 real mode startup code. + +command: &native &this +build-now + +\ 386/486 processors begin executing at address ffff.fff0 in real mode +\ when they come out of reset. Normally, that address would not be +\ accessable in real mode, but the processor does some magic things to +\ the Code Segment register so that the high order address lines are +\ "boosted" up to the ffff.xxxx range just after reset. The "boosting" +\ persists until the CS register is modified (i.e. with a far jump). + +\ The other segment register are not "boosted", so they can only access +\ the normal real mode range, essentially just the first megabyte. + +\ The startup code must establish a Global Descriptor Table containing +\ suitable mappings, and then enter protected mode. The space between +\ ffff.fff0 and the end of the ROM is insufficient to do this, so the +\ first few instructions must jump elsewhere, to a place where there +\ is enough room. + +\ The code below is rather tricky, especially since the Forth assembler +\ always assumes 32-bit operand size and 32-bit addressing modes. +\ The code is executing in 16-bit mode, so the assembler must be used +\ carefully to ensure generation of the correct opcodes, and override +\ prefixes where necessary. + + +\needs start-assembling fload ${BP}/cpu/x86/asmtools.fth +\needs write-dropin fload ${BP}/forth/lib/mkdropin.fth + +hex + +start-assembling +protected-mode +hex + +\ Addresses where the following items will be located in the processor's +\ physical address space: + +\ ffff.fc00: GDT ( 3 entries ) + padding +\ ffff.fc20: GDT address + size ( 6 bytes ) plus padding +\ ffff.fc28: Startup code plus padding +\ ffff.fff0: Reset entry point - jump to startup code plus padding to end + +\ Assembler macros for startup diagnostics + +\ write a byte to an ISA port +: risa-c! ( n a - ) " # dx mov # al mov al dx out " evaluate ; + +: num>asc ( al: b -- al: low ah: hi ) + " al ah mov " evaluate + " h# f # al and " evaluate + " h# 9 # al cmp > if h# 57 # al add else h# 30 # al add then " evaluate + + " ah shr ah shr ah shr ah shr " evaluate \ shift down four bits + " h# f # ah and " evaluate + " h# 9 # ah cmp > if h# 57 # ah add else h# 30 # ah add then " evaluate + + " al bl mov ah al mov bl ah mov " evaluate + +; + +[ifdef] debug-reset +.( debug reports enabled ) cr +\ Assembler macro to assemble code to send the character "char" to COM1 +: report ( char -- ) + " begin 3fd # dx mov dx al in 20 # al and 0<> until" evaluate + ( char ) " # al mov 3f8 # dx mov al dx out " evaluate + " begin 3fd # dx mov dx al in 20 # al and 0<> until" evaluate +; +\ Put character in al +: reportc + " al ah mov " eval + " begin 3fd # dx mov dx al in 20 # al and 0<> until" evaluate + ( char ) " ah al mov 3f8 # dx mov al dx out " evaluate + " begin 3fd # dx mov dx al in 20 # al and 0<> until" evaluate +; +: init-com1 ( -- ) + 1 3fc risa-c! \ DTR on + 80 3fb risa-c! \ Switch to bank 1 to program baud rate + 01 3f8 risa-c! \ Baud rate divisor low - 115200 baud + 0 3f9 risa-c! \ Baud rate divisor high - 115200 baud + 3 3fb risa-c! \ 8 bits, no parity, switch to bank 0 +; + +[else] +: report ( char -- ) drop ; +: reportc ( -- ) ; +[then] + +hex + +\ odds for testing, evens for release +d# 8 constant loader-version# \ monotonic +2 constant loader-format# \ >1 when crc present + +.( ROM loader: version# ) loader-version# .d +.( , format# ) loader-format# .d cr + +\ Real Mode Startup + +hex + +label rm-startup \ Executes in real mode with 16-bit operand forms + + \ ffff.fc00 GDT + + 0 w, 0 l, 0 w, \ 0 Mandatory null descriptor + 0 w, 0 l, 0 w, \ * Another null descriptor + ffff w, 9b.000000 l, 00.c.f w, \ 10 Code, linear=physical, full 4Gbytes + ffff w, 93.000000 l, 00.c.f w, \ 18 Data, linear=physical, full 4Gbytes + + \ ffff.fc20 GDT limit + address + + 1f w, ffff.fc00 l, \ # slots (4 * 8 - 1) , starting address + 0 w, \ Padding + + \ ------->>>>> Startup code, reached by branch from main entry point below + \ + \ ffff.fc28 + + here \ Mark the beginning of this code so its size may be determined + \ and so that a jump to it may be assembled later. + + real-mode + + h# 01 # al mov al h# 80 # out + + \ This code is highly optimized because it runs when the CPU is in + \ it slowest operation mode, so we want to get it done fast. + \ GLCP_SYS_RSTPLL - page 406 + \ If the PLL is already set up, we don't redo the 5536 setup + op: h# 4c000014 # cx mov rdmsr \ MSR value in dx,ax + al bl mov + op: h# fc00.0000 # ax and 0= if \ Start the PLL if not already on + rdmsr \ Get base MSR value with divisors + op: h# 04de.0000 # ax or \ Set the startup time (de) and breadcrumb (4) + op: h# 0000.04d9 # dx mov \ PLL value for 333 MB clk, 433 CPU + wrmsr \ Put in the base value + op: h# 0000.1800 invert # ax and \ Turn off the BYPASS bits + + h# 6001 # ax or \ Set PD, RESETPLL + wrmsr \ Start the PLL and reset the CPU + then + + \ Return to here after the reset + h# 02 # al mov al h# 80 # out + + +[ifdef] init-com1 init-com1 [then] + +[ifdef] debug-reset +carret report \ send it to com1 if you can... +linefeed report \ send it to com1 if you can... +ascii F report \ send it to com1 if you can... +[then] + + \ The following instruction uses the CS: segment override because + \ that segment is currently "boosted" up into the ROM space. + \ It uses the operation size override to load a 32-bit pointer. + \ The address override is not used; the GDT limit/address data structure + \ above is reachable with a 16-bit address and through the "boosted" + \ code segment. + + op: cs: 0f c, 01 c, 16 c, fc20 w, \ lgdte cs:[fc20] Setup GDT + + op: cr0 bx mov \ Get existing CR0 value + + 1 # bl or \ Set "protected mode" bit + + bx cr0 mov \ Enter protected mode + eb c, 0 c, \ jmp to next location to flush prefetch queue + \ note: CPL is now 0 + + h# 03 # al mov al h# 80 # out + + \ We are in protected mode, but we are still executing from old + \ 16-bit code segment, and will continue to do so until the far jump + \ below + +[ifdef] debug-reset +ascii o report +[then] + + \ set segment registers + bx bx xor \ Clear high byte + 18 # bl mov \ Data segment selector + bx ds mov \ Set segment register + bx es mov \ Set segment register + bx fs mov \ Set segment register + bx gs mov \ Set segment register + +[ifdef] debug-reset +ascii r report +[then] + + bx ss mov \ Set segment register + +[ifdef] debug-reset +ascii t report +ascii h report +[then] + + h# 0f # al mov al h# 80 # out + + op: h# 1430 # dx mov op: dx ax in op: h# 9999 # ax cmp = if + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 0f # al mov al h# 71 # out \ Write value 01 + then + + op: ad: ResetBase h# 10 #) far jmp \ Jump to Forth startup + + real-mode + + \ Pad the startup code so that the main entry point ends up at the + \ correct address. + + here over - ( adr , size-of-preceding-code ) + + \ ffff.fc28 is the location of the code that follows the GDT + ffff.fff0 ffff.fc28 - swap - ( address #bytes-to-pad ) + + \ The code mustn't extend past ffff.ffc0, because that is where PC + \ manufacturers put the 0x10-byte BIOS version string. + dup h# 30 - also forth 0< previous abort" Real mode startup code is too big" + + also forth here over h# ff fill previous \ fill with FFs + ( #bytes-to-pad ) allot \ Pad out to ffff.fff0 + + \ ------->>>>> Main Entry Point + \ + \ ffff.fff0 - This is the hardwired address where the processor jumps + \ when it comes out of reset + + cli cld \ Turn off interrupts (does not affect NMI) + #) jmp \ Relative jump back to ffff.fc28 + 0 w, 0 c, \ align "pad" to end of ROM + loader-version# l, \ version# + loader-format# w, \ "format" (>1 when crc present) + ffff w, \ placeholder for crc + +end-code + +end-assembling + +writing rmstart.img +rm-startup here over - ofd @ fputs +ofd @ fclose + +here rm-startup - constant /rm-startup +/rm-startup h# 400 <> abort" Real mode startup code is not the right size" + +\ LICENSE_BEGIN +\ Copyright (c) 2006 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Modified: cpu/x86/pc/lxdevel/romreset.bth =================================================================== --- cpu/x86/pc/lxdevel/romreset.bth 2008-05-21 21:05:04 UTC (rev 823) +++ cpu/x86/pc/lxdevel/romreset.bth 2008-05-21 21:12:54 UTC (rev 824) @@ -17,7 +17,7 @@ \ startmacros.fth defines some assembler macros that make MSR and I/O port \ access very easy by hiding the details of register use. -fload ${BP}/cpu/x86/pc/olpc/startmacros.fth +fload ${BP}/dev/geode/startmacros.fth hex @@ -62,6 +62,9 @@ \ setup CPU interface serial to mode C on both sides 44000020.00200013. 51000010 set-msr \ 5536 p 229 + \ Set up GPIO base register + 0000f001.00001000. 5140000c set-msr \ GPIO BAR + \ Init UART \ uart_init,serial.c \ This is a garden-variety 8250 UART setup sequence @@ -123,8 +126,17 @@ \ char b 3f8 port-wb begin 3fd port-rb 40 bitand 0<> until h# 12 # al mov al h# 80 # out -fload ${BP}/cpu/x86/pc/olpc/draminit.fth +fload ${BP}/dev/geode/draminit.fth + \ Last-minute check for LX erratum 34 - reset if the DLL didn't start correctly + h# 4c000017 rmsr h# 10 bitand 0<> if \ LX branch + h# 4c00000f rmsr h# 7ff bitclr h# 4 bitset h# 4c00000f wmsr \ Set DLL_OV + h# 4c00000f rmsr h# 7ff # ax and h# 104 # ax cmp = if \ Check the result + \ The value 104 indicates that the DLL did not start, so we must reset + 1. 5140.0017 set-msr + then + then + \ Now we can use the stack and do conventional subroutine calls h# 1f # al mov al h# 80 # out Modified: cpu/x86/pc/lxdevel/versions.fth =================================================================== --- cpu/x86/pc/lxdevel/versions.fth 2008-05-21 21:05:04 UTC (rev 823) +++ cpu/x86/pc/lxdevel/versions.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -3,11 +3,3 @@ \ The overall firmware revision macro: FW_MAJOR C macro: FW_MINOR 02 - -\ The EC microcode -macro: EC_VERSION b87 - -\ The wireless LAN module firmware -macro: WLAN_RPM 5.220.10.p5-1.olpc1 -macro: WLAN_VERSION 5.220.10.p5 -macro: WLAN_DATE 2007-03-30 Added: cpu/x86/pc/memtest.fth =================================================================== --- cpu/x86/pc/memtest.fth (rev 0) +++ cpu/x86/pc/memtest.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -0,0 +1,41 @@ +purpose: Interface to memtest86 + +: ?memtest-elf-map-in ( vaddr size -- ) + \ We recognize memtest by its virtual address of 0x10000 + \ It expects that virtual = physical; we depend on the fact + \ that we have low memory mapped V=P + over h# 10000 = if ( vaddr size ) + \ Map the frame buffer (virtual=physical) + h# 910 config-l@ dup 100.0000 -1 mmu-map + then + + \ If it's not memtest, chain to the linux recognizer + ?linux-elf-map-in +; +' ?memtest-elf-map-in is elf-map-in + +: memtest ( -- ) " rom:memtest" $boot ; + +\ LICENSE_BEGIN +\ Copyright (c) 2008 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-05-21 21:05:04 UTC (rev 823) +++ cpu/x86/pc/olpc/fw.bth 2008-05-21 21:12:54 UTC (rev 824) @@ -104,7 +104,7 @@ ; [then] -fload ${BP}/cpu/x86/pc/olpc/gpio.fth \ Rudimentary GPIO driver +fload ${BP}/dev/geode/gpio.fth \ Rudimentary GPIO driver fload ${BP}/cpu/x86/pc/olpc/probemem.fth \ Memory probing [ifdef] virtual-mode @@ -244,7 +244,7 @@ h# 3aa \ USB4:PWR1 USB3:PWR1 USB2:PWR1 USB1:PWR1 then ; -fload ${BP}/cpu/x86/pc/olpc/usb.fth +fload ${BP}/dev/geode/usb.fth \ false to stand-init-debug? true to stand-init-debug? @@ -336,7 +336,8 @@ fload ${BP}/cpu/x86/pc/olpc/crypto.fth \ Cryptographic image validation fload ${BP}/cpu/x86/pc/olpc/lzip.fth \ Access zip images from memory fload ${BP}/cpu/x86/pc/olpc/gamekeys.fth -fload ${BP}/cpu/x86/pc/olpc/linux.fth +fload ${BP}/cpu/x86/pc/linux.fth +fload ${BP}/cpu/x86/pc/memtest.fth fload ${BP}/cpu/x86/pc/olpc/setwp.fth fload ${BP}/cpu/x86/pc/olpc/security.fth fload ${BP}/cpu/x86/pc/olpc/fsupdate.fth @@ -350,6 +351,13 @@ ' gx-power-off to power-off [then] +" disk:\boot\olpc.fth sd:\boot\olpc.fth nand:\boot\olpc.fth /prober /usb/ethernet /usb/wlan" + ' boot-device set-config-string-default + +\needs ramdisk " " d# 128 config-string ramdisk +" " ' boot-file set-config-string-default \ Let the boot script set the cmdline + + : dimmer ( -- ) screen-ih if " dimmer" screen-ih $call-method then ; : brighter ( -- ) screen-ih if " brighter" screen-ih $call-method then ; Modified: cpu/x86/pc/olpc/romreset.bth =================================================================== --- cpu/x86/pc/olpc/romreset.bth 2008-05-21 21:05:04 UTC (rev 823) +++ cpu/x86/pc/olpc/romreset.bth 2008-05-21 21:12:54 UTC (rev 824) @@ -17,7 +17,7 @@ \ startmacros.fth defines some assembler macros that make MSR and I/O port \ access very easy by hiding the details of register use. -fload ${BP}/cpu/x86/pc/olpc/startmacros.fth +fload ${BP}/dev/geode/startmacros.fth hex @@ -346,7 +346,7 @@ h# 12 # al mov al h# 71 # out \ Write value 01 then -fload ${BP}/cpu/x86/pc/olpc/draminit.fth +fload ${BP}/dev/geode/draminit.fth \ Last-minute check for LX erratum 34 - reset if the DLL didn't start correctly h# 4c000017 rmsr h# 10 bitand 0<> if \ LX branch Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-05-21 21:05:04 UTC (rev 823) +++ cpu/x86/pc/olpc/versions.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 14 +macro: FW_MINOR 14b \ The EC microcode macro: EC_VERSION d13 Added: dev/geode/draminit.fth =================================================================== --- dev/geode/draminit.fth (rev 0) +++ dev/geode/draminit.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -0,0 +1,117 @@ + h# 18 # al mov al h# 80 # out + h# 1430 # dx mov dx ax in h# 9999 # ax cmp = if + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 18 # al mov al h# 71 # out \ Write value 01 + then + + \ Enable DLL, load Extended Mode Register by set and clear PROG_DRAM + 20000018 rmsr + 10000001 bitset 20000018 wmsr + 10000001 bitclr 20000018 wmsr + + \ Reset DLL (bit 27 is undocumented in GX datasheet, but is in the LX one) + 08000001 bitset 20000018 wmsr + 08000001 bitclr 20000018 wmsr + + \ Here we are supposed to wait 200 SDCLK cycles to let the DLL settle. + \ That is approximately 2 uS. The ROM instruction access is so slow that + \ anything we do will take quite a bit longer than that, so we just let the + \ "rmsr, bitset" sequence take care of the time delay for us. + + \ In the following sequence of writes the 2000.0018 MSR, we + \ take advantage of the fact that the existing value stays + \ in EAX/EDX, so we don't have to re-read the value. + + \ Generate 2 refresh requests. The refresh queue is 8 deep, and we + \ need to make sure 2 refreshes hit the chips, so we have to issue + \ 10 requests to the queue. According to the GX datasheet, we don't + \ have to clear the REF_TST bit (8) explicitly between writes + 20000018 rmsr 8 bitset + wrmsr wrmsr wrmsr wrmsr wrmsr wrmsr wrmsr wrmsr wrmsr wrmsr + 8 bitclr + +\ LinuxBIOS LX raminit.c has a big delay here, using Port 61 + + \ Load Mode Register + 1 bitset 20000018 wmsr + 1 bitclr 20000018 wmsr + + \ Set up a descriptor to give access to memory + \ GLIU0 P2D Base Mask Descriptors - page 85 + 20000000.000fff00. 10000020 set-msr \ memory - 0..fffff + + \ The RAM DLL needs a write to lock on + ax h# ffff0 #) mov + + h# 19 # al mov al h# 80 # out + h# 1430 # dx mov dx ax in h# 9999 # ax cmp = if + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 19 # al mov al h# 71 # out \ Write value 01 + then + + \ Turn on the cache + cr0 ax mov + 6000.0000 bitclr \ Cache-disable off, coherent + ax cr0 mov + invd + + h# 1a # al mov al h# 80 # out + h# 1430 # dx mov dx ax in h# 9999 # ax cmp = if + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 1a # al mov al h# 71 # out \ Write value 01 + then + + 0000f001.00001400. 5140000f set-msr \ PMS BAR + + \ It is tempting to test bit 0 of PM register 5c, but a 5536 erratum + \ prevents that bit from working. Bit 1 works, but LX errata 34 + \ sometimes requires that we reset the system to fix the memory DLL, + \ which destroys all the bits of PM register 5c. So we put a breadcrumb + \ in a PM register that we don't otherwise use. + 1430 port-rl h# 9999 # ax cmp = if \ Wakeup event flag + 0 1430 port-wl + h# 1b # al mov al h# 80 # out + h# 34 # al mov al h# 70 # out \ Write to CMOS 0x34 + h# 1b # al mov al h# 71 # out \ Write value 01 + + char r 3f8 port-wb begin 3fd port-rb 40 bitand 0<> until + + resume-data # sp mov + resume-entry # ax mov ax call \ This might return if checksumming fails + char x 3f8 port-wb begin 3fd port-rb 40 bitand 0<> until + then + + h# 1c # al mov al h# 80 # out + h# 1808 rmsr \ Default region configuration properties MSR + h# 0fffff00 # ax and \ Top of System Memory field + 4 # ax shl \ Shift into place + ax mem-info-pa 4 + #) mov \ Put it where resetend.fth can find it + + \ char D 3f8 port-wb begin 3fd port-rb 40 bitand 0<> until + + \ Memory is now on + h# 8.0000 # sp mov \ Setup a stack pointer for later code + + h# 1d # al mov al h# 80 # out +\ Some optional debugging stuff ... +[ifdef] debug-startup +init-com1 + +carret report +linefeed report +ascii F report +ascii o report +ascii r report +[then] + +\ fload ${BP}/cpu/x86/pc/ramtest.fth + +0 [if] +ax ax xor +h# 12345678 # bx mov +bx 0 [ax] mov +h# 5555aaaa # 4 [ax] mov +0 [ax] dx mov +dx bx cmp <> if ascii B report ascii A report ascii D report begin again then +[then] + Added: dev/geode/gpio.fth =================================================================== --- dev/geode/gpio.fth (rev 0) +++ dev/geode/gpio.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -0,0 +1,61 @@ +\ See license at end of file +purpose: Access to GPIO registers + +\ GPIO registers +h# 00 constant OUT_VAL +h# 04 constant OUT_EN +h# 08 constant OUT_OD_EN +h# 0c constant OUT_INVRT_EN +h# 10 constant OUT_AUX1 +h# 14 constant OUT_AUX2 +h# 18 constant PU_EN +h# 1c constant PD_EN +h# 20 constant IN_EN +h# 24 constant INV_EN +h# 28 constant IN_FLTR_EN +h# 2c constant EVNTCNT_EN +h# 30 constant READ_BACK +h# 38 constant EVNT_EN + +h# 1000 value gpio-base \ stand-init sets this from an MSR +: gpio@ ( offset -- 0 ) gpio-base + pl@ ; +: gpio! ( l offset -- ) gpio-base + pl! ; + +alias >set noop ( mask -- mask' ) +: >clr ( mask -- mask' ) d# 16 lshift ; + +: >hi ( reg# -- reg#' ) h# 80 + ; \ High bank for GPIO bits 16..31 + +: gpio-data@ ( -- l ) h# 30 gpio@ ; + + +h# 5140000C constant MSR_LBAR_GPIO + +stand-init: gpio + MSR_LBAR_GPIO rdmsr ( lo hi ) + h# 0000f001 <> abort" GPIO not enabled" + h# ff00 and to gpio-base +; +\ LICENSE_BEGIN +\ Copyright (c) 2006 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END Modified: dev/geode/nandflash/methods.fth =================================================================== --- dev/geode/nandflash/methods.fth 2008-05-21 21:05:04 UTC (rev 823) +++ dev/geode/nandflash/methods.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -10,6 +10,27 @@ external +: dma-alloc ( len -- adr ) " dma-alloc" $call-parent ; + +: dma-free ( adr len -- ) " dma-free" $call-parent ; + +: close ( -- ) ; + +: size ( -- d ) partition-size /page um* ; + +: $set-partition ( $ -- error? ) + dup 0= if 2drop false exit then ( $ ) + over c@ ascii 0 ascii 9 between if ( $ ) \ number + base @ >r decimal $number r> base ! if true exit then ( ) + set-partition-number ( error? ) + else ( $ ) \ name + set-partition-name ( error? ) + then ( error? ) + dup if ( error? ) + ." NAND: No such partition" cr ( error? ) + then +; + : open ( -- okay? ) \ We assume that LinuxBIOS has already set up the address map \ and the timing MSRs. @@ -17,40 +38,34 @@ h# 51400010 msr@ drop h# 1000 " map-in" $call-parent to nand-base + 0 to partition# + 0 to partition-start configure 0= if false exit then get-bbt + usable-page-limit to partition-size + read-partmap my-args dup if ( arg$ ) ascii , left-parse-string ( arg2$ arg1$ ) - 2dup " zip" $= if ( arg2$ arg1$ ) - 2drop ( arg2$ ) - map-reserved ( arg2$ ) - init-deblocker 0= if 2drop ?free-resmap false exit then ( arg2$ ) - \ If no file is specified, open the raw archive - dup 0= if 2drop true exit then ( arg2$ ) - - \ Otherwise interpose the filesystem handler - " zip-file-system" find-package if ( arg2$ xt ) - interpose true ( true ) - else ( arg2$ ) - ." Can't find zip-file-system package" cr ( arg2$ ) - 2drop deblocker close-package ?free-resmap ( ) - false ( false ) - then - exit - then ( arg2$ arg1$ ) - - \ Accept either "path" or "jffs2,path" - 2dup " jffs2" $= if ( arg2$ arg1$ ) - 2drop ( arg2$ ) + \ Handle partitions ( arg2$ arg1$ ) + 2dup 1 min " \" $= if ( arg2$ arg1$ ) + 2swap 2drop ( arg1$ ) + \ If there is no "mtd" specifier and there is a partition map, + \ select the boot partition. + #partitions 0>= if ( arg1$ ) + " boot" $set-partition if 2drop false exit then + then ( arg2$ arg1$ ) else ( arg2$ arg1$ ) - \ XXX probably should check that arg$2 is empty... - 2swap 2drop ( arg1$ ) - then ( arg$ ) + \ The argument is not a file so it must be a partition spec + #partitions 0< if 2drop 2drop false exit then ( arg2$ arg1$ ) + $set-partition if 2drop false exit then ( arg2$ ) + then ( arg$ ) - " jffs2-file-system" find-package if ( arg$ xt ) + dup 0= if 2drop true exit then ( arg$ ) + + " jffs2-file-system" find-package if ( arg$ xt ) interpose true ( okay? ) else ( arg$ ) ." Can't find jffs2-file-system package" cr @@ -60,14 +75,7 @@ 2drop true ( okay? ) then ( okay? ) ; -: close ( -- ) ?free-resmap ; -: size ( -- d ) pages/chip /page um* ; - -: dma-alloc ( len -- adr ) " dma-alloc" $call-parent ; - -: dma-free ( adr len -- ) " dma-free" $call-parent ; - headers [then] Modified: dev/geode/nandflash/nand5536.fth =================================================================== --- dev/geode/nandflash/nand5536.fth 2008-05-21 21:05:04 UTC (rev 823) +++ dev/geode/nandflash/nand5536.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -42,8 +42,12 @@ : data ( -- ) 0 h# 800 nand! ; : wait-ready ( -- ) data begin h# 810 nand@ 8 and until ; +0 instance value partition# +0 instance value partition-start \ Boundary between chip 0 and chip 1 +0 instance value partition-size \ Boundary between chip 0 and chip 1 +0 instance value usable-page-limit \ #pages excluding bad block tables -: page-adr ( page# -- ) dup adr 8 rshift dup adr 8 rshift adr ; +: page-adr ( page# -- ) partition-start + dup adr 8 rshift dup adr 8 rshift adr ; : start-io ( page# offset cmd -- ) cmd ( page# offset ) wbsplit swap adr adr ( page# ) Modified: dev/geode/nandflash/nandflash.bth =================================================================== --- dev/geode/nandflash/nandflash.bth 2008-05-21 21:05:04 UTC (rev 823) +++ dev/geode/nandflash/nandflash.bth 2008-05-21 21:12:54 UTC (rev 824) @@ -12,6 +12,7 @@ fload ${BP}/dev/geode/nandflash/nand5536.fth fload ${BP}/dev/olpc/cafenand/configure.fth fload ${BP}/dev/olpc/cafenand/badblock.fth +fload ${BP}/dev/olpc/cafenand/redboot.fth fload ${BP}/dev/geode/nandflash/methods.fth end0 Added: dev/geode/startmacros.fth =================================================================== --- dev/geode/startmacros.fth (rev 0) +++ dev/geode/startmacros.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -0,0 +1,131 @@ +\ See license at end of file + +\ Some x86 assembler macros for writing Geode early startup code +\ in a clean, compact way. Most of the Geode initialization is +\ done with 64-bit MSRs (Machine Specific Registers). These +\ macros make it easy to set MSRs to specific values and to +\ set and clear individual bits. + +\ The code keeps the MSR register number in %ecx, the low 32 bits +\ of the value in %eax, and the high 32 bits in %edx, consistent +\ with the way the rdmsr and wrmsr machine instructions work. +\ The bitset and bitclr operations work on %eax, and the -hi versions +\ work on %edx. +\ In addition to the MSR operations, there are similar ones for +\ I/O ports. They leave the data in %eax, so you can use bitset +\ and bitclr with them too. + +-1 value last-cx +also 386-assembler definitions + +: forget-msr -1 to last-cx ; + +\ set-cx is an internal implementation factor used by wmsr and rmsr. +\ It assembles code to put an MSR number in %ecx, optimizing out +\ unnecessary code by remembering what was last put there. +: set-cx ( reg# -- ) + [ also forth ] + dup last-cx = if + drop + else + dup to last-cx + [ previous ] # cx mov [ also forth ] + then + [ previous ] +; + +\ Read/write an MSR to/from %edx,%eax +: rmsr ( reg# -- ) set-cx h# 0f c, h# 32 c, ; +: wmsr ( reg# -- ) set-cx h# 0f c, h# 30 c, ; + +\ These bit operations can be used between "rmsr" and "wmsr" + +\ Bit operations on the low 32-bit value in %eax +: bitset ( mask -- ) # ax or ; +: bitand ( mask -- ) # ax and ; +: bitclr ( mask -- ) invert bitand ; + +\ Bit operations on the high 32-bit value in %edx +: bitset-hi ( mask -- ) # dx or ; +: bitand-hi ( mask -- ) # dx and ; +: bitclr-hi ( mask -- ) invert bitand-hi ; + +\ Set an MSR to a verbatim 64-bit value +: set-msr ( d.val reg# -- ) -rot # dx mov # ax mov wmsr ; + +\ Set or clear bits in an MSR (read-modify-write the register) +: bitset-msr ( mask reg# -- ) tuck rmsr bitset wmsr ; +: bitclr-msr ( mask reg# -- ) tuck rmsr bitclr wmsr ; + +\ Some I/O port operations +\ These could be optimized to generate the immediate forms of in and out +\ for 8-bit port numbers, but it's not worth the trouble because we +\ access very few low-numbered ports. +: port-wb ( b port# -- ) swap # al mov # dx mov al dx out ; +: port-rb ( port# -- ) # dx mov dx al in ; +: port-ww ( w port# -- ) swap # ax mov # dx mov op: ax dx out ; +: port-rw ( port# -- ) ax ax xor # dx mov op: dx ax in ; +: port-wl ( l port# -- ) swap # ax mov # dx mov ax dx out ; +: port-rl ( port# -- ) # dx mov dx ax in ; + +: config-setup ( config-adr -- ) + [ also forth ] + dup 3 invert and h# 8000.0000 or ( config-adr cf8-value ) + [ previous ] + # ax mov ( config-adr ) + h# cf8 # dx mov ( config-adr ) + ax dx out ( config-adr ) + [ also forth ] + 3 and h# cfc or ( data-port ) + [ previous ] + # dx mov +; +: config-wl ( l config-adr -- ) + config-setup ( l ) + # ax mov + ax dx out +; +: config-rl ( config-adr -- ) \ Returns value in EAX + config-setup + dx ax in +; +: config-ww ( w config-adr -- ) + config-setup ( w ) + op: # ax mov ( ) + op: ax dx out +; +: config-rw ( config-adr -- ) \ Returns value AX + config-setup ( ) + ax ax xor + op: dx ax in +; + +: set-base ( adr -- ) # bx mov ; +: reg-save ( offset -- ) [bx] ax mov ax stos ; +: reg-restore ( offset -- ) ax lods ax swap [bx] mov ; + +previous definitions + +\ 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 Added: dev/geode/usb.fth =================================================================== --- dev/geode/usb.fth (rev 0) +++ dev/geode/usb.fth 2008-05-21 21:12:54 UTC (rev 824) @@ -0,0 +1,156 @@ +purpose: USB elaborations for the OLPC platform +\ See license at end of file + +0 config-int usb-delay \ Milliseconds to wait before set-address + +devalias usb1 /usb@f,4 +devalias usb2 /usb@f,5 +devalias u /usb/disk +devalias net /usb/wlan + +\ If there is a USB ethernet adapter, use it as the default net device. +: report-net ( -- ) + " /usb/ethernet" 2dup find-package if ( name$ phandle ) + drop ( name$ ) + " net" 2swap $devalias ( ) + else ( name$ ) + 2drop ( ) + then +; + +[ifdef] notdef \ We have the graphical penguin +: linux-logo ( -- ) + " penguin.txt" find-drop-in if page type then +; +[then] + +\ Like $show-devs, but ignores pagination keystrokes +: $nopage-show-devs ( nodename$ -- ) + ['] exit? behavior >r ['] false to exit? + $show-devs + r> to exit? +; + +: probe-usb ( -- ) + ." USB2 devices:" cr + " /usb@f,5" open-dev ?dup if close-dev then + " /usb@f,5" $nopage-show-devs + + ." USB1 devices:" cr + " /usb@f,4" open-dev ?dup if close-dev then + " /usb@f,4" $nopage-show-devs + + report-disk + report-net + report-keyboard +; +alias probe-usb2 probe-usb +alias p2 probe-usb2 + +: ?usb-keyboard ( -- ) + " keyboard" expand-alias if ( devspec$ ) + drop " /usb" comp 0= if ( ) + red-letters ." Using USB keyboard." cr black-letters + " keyboard" input + then + then +; + +\ Unlink every node whose phys.hi component matches port +: port-match? ( port -- flag ) + get-unit if drop false exit then + get-encoded-int = +; +: rm-usb-children ( port -- ) + device-context? 0= if drop exit then + also ( port ) + 'child ( port prev ) + first-child begin while ( port prev ) + over port-match? if ( port prev ) + 'peer link@ over link! ( port prev ) \ Disconnect + else ( port prev ) + drop 'peer ( port prev' ) + then ( port prev ) + next-child repeat ( port prev ) + 2drop ( ) + previous definitions +; + +0 value usb-power-done-time + +\ This version assumes that power has been applied already, and +\ all we have to do is wait enough time for the devices to be ready. +: wait-usb-power ( -- ) + begin usb-power-done-time get-msecs - 0<= until ( ) +; + +: usb-quiet ( -- ) + [ ' go-hook behavior compile, ] \ Chain to old behavior + " usb1" " reset-usb" execute-device-method drop + " usb2" " reset-usb" execute-device-method drop +; +' usb-quiet to go-hook + +0 0 " " " /" begin-package + " prober" device-name + : open + " /usb@f,5" open-dev ?dup if close-dev then + " /usb@f,4" open-dev ?dup if close-dev then + report-disk + report-net + report-keyboard + false + ; + : close ; +end-package + +stand-init: USB setup + \ Set up an address routing to the USB Option Controller + h# efc00000.efc00001. h# 5100.0029 wrmsr + h# 400000ef.c00fffff. h# 5101.0020 wrmsr + h# 00000002.efc00000. h# 5120.000b wrmsr +[ifdef] virtual-mode + h# efc00000 h# 1000 0 mmu-claim drop \ UOC + h# efc00000 dup h# 1000 -1 mmu-map \ UOC + h# fe01a000 h# 1000 0 mmu-claim drop \ OHCI + h# fe01a000 dup h# 1000 -1 mmu-map \ OHCI +[then] + \ Configure the assignment of 2 USB Power Enable pins to USB ports + \ to correspond to the way they are wired on the board. + \ USB port 1 is PWR_EN2, USB ports 2-4 are PWR_EN1 + usb-port-power-map h# efc00000 l! + 2 h# efc00004 l! + h# 1 h# fe01a008 l! \ Reset OHCI host controller + h# 1e.0000 h# fe01a04c l! \ Configure ports for individual power + h# 100 h# fe01a058 l! \ Power-on ports 2 and 3 + d# 10 ms \ Stagger for glitch-prevention + h# 100 h# fe01a054 l! \ Power-on port 1 + h# 100 h# fe01a05c l! \ Power-on port 3 + h# 100 h# fe01a060 l! \ Power-on port 4 + get-msecs d# 1000 + to usb-power-done-time +; + + +\ LICENSE_BEGIN +\ Copyright (c) 2007 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

r823 - cpu/x86/pc/olpc
by svn＠openbios.org 21 May '08

21 May '08

Author: wmb Date: 2008-05-21 23:05:04 +0200 (Wed, 21 May 2008) New Revision: 823 Modified: cpu/x86/pc/olpc/rmstart.fth cpu/x86/pc/olpc/romreset.bth Log: Put "[ifdef] cmos-startup-control" around the startup code that changes memory and clock timing settings based on CMOS RAM values. That symbol is not defined by default, so with this change, bad CMOS RAM contents won't prevent the system from starting. The CMOS override feature can be reinstated for test builds by defining that symbol in config.fth . Modified: cpu/x86/pc/olpc/rmstart.fth =================================================================== --- cpu/x86/pc/olpc/rmstart.fth 2008-04-18 08:20:31 UTC (rev 822) +++ cpu/x86/pc/olpc/rmstart.fth 2008-05-21 21:05:04 UTC (rev 823) @@ -183,17 +183,21 @@ h# 0017 # cx mov rdmsr \ Read CHIP_REVID h# 0014 # cx mov \ Restore RSTPLL MSR number h# 30 # al cmp >= if \ LX CPU +[ifdef] cmos-startup-control h# 60 # al mov al h# 70 # out h# 71 # al in \ Read CMOS 0x60 al al test 0= if +[then] rdmsr \ Get base MSR value with divisors op: h# 04de.0000 # ax or \ Set the startup time (de) and breadcrumb (4) op: h# 0000.04d9 # dx mov \ PLL value for 333 MB clk, 433 CPU +[ifdef] cmos-startup-control else al dec al h# 71 # out \ Decrement safety counter rdmsr \ Get base MSR value with divisors op: h# 04de.0000 # ax or \ Set the startup time (de) and breadcrumb (4) op: h# 0000.04d3 # dx mov \ PLL value for 333 MB clk, 333 CPU then +[then] wrmsr \ Put in the base value op: h# 0000.1800 invert # ax and \ Turn off the BYPASS bits Modified: cpu/x86/pc/olpc/romreset.bth =================================================================== --- cpu/x86/pc/olpc/romreset.bth 2008-04-18 08:20:31 UTC (rev 822) +++ cpu/x86/pc/olpc/romreset.bth 2008-05-21 21:05:04 UTC (rev 823) @@ -147,8 +147,10 @@ 00000106.83104104. 00001983 set-msr \ Memory delay values 00000000.00000001. 00001980 set-msr \ Enable memory delays +[ifdef] cmos-startup-control h# 61 # al mov al h# 70 # out h# 71 # al in \ Read CMOS 0x61 al al test 0= if +[then] 18000100.6a7332a0. 20000019 set-msr \ The RAM controller is now set up @@ -163,6 +165,7 @@ \ Delay on exit from power mode 1, use unbuffered RAM 130cd801. 2000001a set-msr \ MC_CF1017_DATA LX p 231 +[ifdef] cmos-startup-control else al dec al h# 71 # out \ Decrement safety counter @@ -193,6 +196,7 @@ dx dx xor bx ax mov 2000001a wmsr \ MC_CF1017_DATA LX p 231 then +[then] 00000200.00000000. 20000020 set-msr \ Power mode entry and exit delays

1 0

Questions
by José Luis Brisa 18 May '08

18 May '08

Dear People, I communicate with you for the purpose of obtaining advice or software sales OpenBios, I need to recover three bios chip whose mother had been adulterated by viruses. Try rewritable anyway but I was impossible, then I would buy a CD or what they deem to have and use them whenever necessary. I am look forward to your answers and congratulations on the achievements, I'm Argentine and I devote myself to teach computing to Disabled Motrices including Blind, the new version of ubuntu 8.04 to excellent result so far. Ate. Jose Luis Brisa _________________________________________________________________ ¿Aburrido? Ingresá ya y divertite como nunca en MSN Juegos. http://juegos.ar.msn.com/

1 0

INFORMACION
by José Luis Brisa 03 May '08

03 May '08

Estimados Usuarios de Linux, soy usuario de LInux desde hace ya un año y no logro terminar de sorprenderme por los resultados obtenidos. Me comunico con Uds. porque necesito instalar o al menos intentarlo, la BIOS de Linux, vivo en un pequeño Pueblo de Argentina y enseño computación a un Centro de Jubilados donde tiene maquinas antiguas que por borrado del BIOS ya no funcionan. Creo que la única alternativa es instalar este Firmware y desde ya Linux. Descargue los archivos necesarios pero no logro descomprimirlos, quizás como todo esta en Ingles, estos no sean los correctos y es la razón por la cual les estoy molestando. Si pudieran darme algún mensaje, alguna solución, se los agradecería muchisimo y desde ya ellos también. Ate. José Luis Brisa PD Les cuesta aprender a usar Linux, pero de a poco y sabiendo que es el futuro, siguen intentando. Dear Linux users, I am Linux users from a year ago and can not finish amaze me by the results. Me communicate with you. because I need to install or at least try, the BIOS Linux, live in a small village Argentina and taught a computer center Retired where has that old machines by erasing the BIOS no longer work. I believe that the only alternative is to install this firmware and now Linux. Download the files necessary but not achieving decompressed, perhaps as everything is in English, these are not correct and is why I am bother. If they could give me any message, any solution, and they would appreciate much from them and too. Ate. Jose Luis Brisa The PD is learning to use Linux, but little by little and knowing that is the future, still trying. _________________________________________________________________ Descargá GRATIS el poder del nuevo Internet Explorer 7. http://optimized.msn.com/Default.aspx?mkt=es-ar

1 0

open bios work with motherboard P4SD
by jean-christophe 25 Apr '08

25 Apr '08

hello i would like know if openbios work with P4SD i join chipset specification and motherboard specification give with ada32 Propriétés du chipset: Chipset de la carte mère Intel Springdale-G i865G In-Order Queue Depth 12 CAS Latency 2T RAS To CAS Delay 3T RAS Precharge 3T RAS Active Time 6T PAT Activé Contrôleur graphique intégré: Type du contrôleur graphique Intel Extreme Graphics 2 État du contrôleur graphique Activé Taille du frame buffer graphique 8 Mo Contrôleur audio AC'97: Type du contrôleur audio Intel 82801EB(M) ICH5 Nom du codec Analog Devices AD1981B Identifiant du codec 41445374h Slots mémoire: Slot DRAM nº1 512 Mo (DDR SDRAM) Slot DRAM nº2 512 Mo (DDR SDRAM) Fabricant du chipset: Nom de l'entreprise Intel Corporation Information sur le produit http://www.intel.com/products/browse/chipsets.htm Télécharger le pilote http://support.intel.com/support/chipsets/index.htm ==================================================== Propriétés de la carte mère: Identifiant de la carte mère <DMI> Nom de la carte mère Hewlett-Packard 085Ch Propriétés du bus principal: Type du bus Intel NetBurst Largeur du bus 64 bits Horloge réelle 100 MHz (QDR) Horloge effective 400 MHz Bande passante 3200 Mo/s Propriétés du bus mémoire: Type du bus DDR SDRAM Largeur du bus 64 bits Horloge réelle 133 MHz (DDR) Horloge effective 267 MHz Bande passante 2133 Mo/s Propriétés du bus chipset: Type du bus Intel Hub Interface Largeur du bus 8 bits Horloge réelle 67 MHz (QDR) Horloge effective 267 MHz Bande passante 267 Mo/s ================================================ and pci specification B00 D00 F00: Intel 82848P/865G/865GV/865P/865PE Memory Controller Hub [A-2] B00 D02 F00: Intel 82865G(V) Graphics Controller B00 D06 F00: Intel 82848P/865G/865GV/865P/865PE I/O Memory Interface B00 D1D F00: Intel 82801EB ICH5 - USB Universal Host Controller B00 D1D F01: Intel 82801EB ICH5 - USB Universal Host Controller B00 D1D F07: Intel 82801EB(M) ICH5(-M) - Enhanced USB2 Controller B00 D1E F00: Intel 82801EB I/O Controller Hub 5 (ICH5) B00 D1F F00: Intel 82801EB ICH5 - LPC Bridge B00 D1F F01: Intel 82801EB ICH5 - ATA-100 IDE Controller B00 D1F F02: Intel 82801EB ICH5 - Serial-ATA/150 IDE Controller B00 D1F F03: Intel 82801EB ICH5 - SMBus Controller B00 D1F F05: Intel 82801EB ICH5 - AC'97 Audio Controller B05 D02 F00: Broadcom NetXtreme BCM5782 Gigabit Ethernet Controller i don't paste the hexadecimal information of this device, if you need say me tanks for your awnser bye, mystifs.

1 0

broken qemu-system-sparc64 ide cdrom after r161 "Fix Sparc64 insw and outsw"
by Igor Kovalenko 24 Apr '08

24 Apr '08

Seems like that r161 commit broke qemu-system-sparc64 ability to access ide cdrom (that is what I test now), because it makes ide i/o port word transfers byteswapped wrt what ide.c expects. If I revert r161 then cdrom becomes visible. I also need the following patch to unswap drive identification string for printk display. Now I have: "drive0 [ATAPI cdrom]: QEMU DVD-ROM" Index: drivers/ide.c =================================================================== --- drivers/ide.c (revision 185) +++ drivers/ide.c (working copy) @@ -861,10 +868,10 @@ /* * if little endian arch, byte swap the string */ -#ifdef CONFIG_LITTLE_ENDIAN +#ifdef CONFIG_BIG_ENDIAN for (p = end ; p != s;) { unsigned short *pp = (unsigned short *) (p -= 2); - *pp = __be16_to_cpu(*pp); + *pp = __le16_to_cpu(*pp); } #endif -- Kind regards, Igor V. Kovalenko

2 1

r186 - in openbios-devel: drivers include/sparc64
by svn＠openbios.org 24 Apr '08

24 Apr '08

Author: blueswirl Date: 2008-04-24 17:26:13 +0200 (Thu, 24 Apr 2008) New Revision: 186 Modified: openbios-devel/drivers/ide.c openbios-devel/include/sparc64/io.h Log: Revert broken r161, fix identification string printing (Igor Kovalenko) Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2008-02-01 19:58:56 UTC (rev 185) +++ openbios-devel/drivers/ide.c 2008-04-24 15:26:13 UTC (rev 186) @@ -859,12 +859,12 @@ unsigned char *p = s, *end = &s[len & ~1]; /* - * if little endian arch, byte swap the string + * if big endian arch, byte swap the string */ -#ifdef CONFIG_LITTLE_ENDIAN +#ifdef CONFIG_BIG_ENDIAN for (p = end ; p != s;) { unsigned short *pp = (unsigned short *) (p -= 2); - *pp = __be16_to_cpu(*pp); + *pp = __le16_to_cpu(*pp); } #endif Modified: openbios-devel/include/sparc64/io.h =================================================================== --- openbios-devel/include/sparc64/io.h 2008-02-01 19:58:56 UTC (rev 185) +++ openbios-devel/include/sparc64/io.h 2008-04-24 15:26:13 UTC (rev 186) @@ -43,8 +43,8 @@ * are arrays of bytes, and byte-swapping is not appropriate in * that case. - paulus */ -#define insw(port, buf, ns) _insw((uint16_t *)((port)+_IO_BASE), (buf), (ns)) -#define outsw(port, buf, ns) _outsw((uint16_t *)((port)+_IO_BASE), (buf), (ns)) +#define insw(port, buf, ns) _insw_ns((uint16_t *)((port)+_IO_BASE), (buf), (ns)) +#define outsw(port, buf, ns) _outsw_ns((uint16_t *)((port)+_IO_BASE), (buf), (ns)) #define inb(port) in_8((uint8_t *)((port)+_IO_BASE)) #define outb(val, port) out_8((uint8_t *)((port)+_IO_BASE), (val))

1 0

Newbie question..
by Giridhar L V 22 Apr '08

22 Apr '08

Hi, I am new to OpenBios, so pardon my newbie question. Are there any issues when using OpenBios to boot Windows? Thanks, Giridhar DISCLAIMER: This message (including attachment if any) is confidential and may be privileged. If you have received this message by mistake please notify the sender by return e-mail and delete this message from your system. Any unauthorized use or dissemination of this message in whole or in part is strictly prohibited. E-mail may contain viruses. Before opening attachments please check them for viruses and defects. While MindTree Limited (MindTree) has put in place checks to minimize the risks, MindTree will not be responsible for any viruses or defects or any forwarded attachments emanating either from within MindTree or outside. Please note that e-mails are susceptible to change and MindTree shall not be liable for any improper, untimely or incomplete transmission. MindTree reserves the right to monitor and review the content of all messages sent to or from MindTree e-mail address. Messages sent to or from this e-mail address may be stored on the MindTree e-mail system or else where.

1 0

r822 - cpu/x86/pc/olpc
by svn＠openbios.org 18 Apr '08

18 Apr '08

Author: wmb Date: 2008-04-18 10:20:31 +0200 (Fri, 18 Apr 2008) New Revision: 822 Modified: cpu/x86/pc/olpc/parsexkb.py Log: Fixed to handle variants of the XKB form as in the 2008-04-17 version of http://wiki.laptop.org/go/OLPC_Brasil_Keyboard Modified: cpu/x86/pc/olpc/parsexkb.py =================================================================== --- cpu/x86/pc/olpc/parsexkb.py 2008-03-13 07:58:09 UTC (rev 821) +++ cpu/x86/pc/olpc/parsexkb.py 2008-04-18 08:20:31 UTC (rev 822) @@ -24,6 +24,7 @@ keys = 128*[0] modifiers = 128*[0] +# Map from xkb key names to scanset 1 "make" codes keynames = { 'AB01':44, 'AB02':45, @@ -36,6 +37,7 @@ 'AB09':52, 'AB10':53, 'AB11':115, +'I219':115, 'AC01':30, 'AC02':31, 'AC03':32, @@ -174,15 +176,16 @@ def collect_line(line): global seenlines try: - s = split("\W+",sub("\t|{|}|\[|]|\,|<|>|;", "", line)) + s = split("\W+",sub("\t|{|}|\[|]|\,|<|>|;", " ", line)) except: return - if s[1] != 'key': - return + if s[1] == 'key': + seenlines[s[2]] = s[3:6] + else: + if s[0] == 'key': + seenlines[s[1]] = s[2:5] - seenlines[s[2]] = s[3:6] - def process_keys(): global seenlines

1 0

r821 - cpu/x86/pc/olpc
by svn＠openbios.org 13 Mar '08

13 Mar '08

Author: rsmith Date: 2008-03-13 08:58:09 +0100 (Thu, 13 Mar 2008) New Revision: 821 Modified: cpu/x86/pc/olpc/security.fth Log: OLPC: Tweak do-firmware-update so that it does not print the buffer@<address> message when it skips the firmware update due to an error. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2008-03-10 17:39:13 UTC (rev 820) +++ cpu/x86/pc/olpc/security.fth 2008-03-13 07:58:09 UTC (rev 821) @@ -653,8 +653,13 @@ ; : do-firmware-update ( img$ -- ) - visible +\ Keep .error from printing an input sream position report +\ which makes a buffer@<address> show up in the error message + ['] noop to show-error + + visible + tuck flash-buf swap move ( len ) ['] ?image-valid catch ?dup if ( )

1 0

r820 - cpu/x86/pc/olpc
by svn＠openbios.org 10 Mar '08

10 Mar '08

Author: wmb Date: 2008-03-10 18:39:13 +0100 (Mon, 10 Mar 2008) New Revision: 820 Modified: cpu/x86/pc/olpc/parsekbd0.py Log: OLPC parsekbd0 - fixed a bug in one of the keyboard table parsers. It was claiming to replace a key entry with a better choice, but not actually doing it. Test case: python parsekbd0.py OLPC_Thailand_Keyboard resulted in a keymap that used the wrong stations for - and / . Modified: cpu/x86/pc/olpc/parsekbd0.py =================================================================== --- cpu/x86/pc/olpc/parsekbd0.py 2008-03-06 16:29:11 UTC (rev 819) +++ cpu/x86/pc/olpc/parsekbd0.py 2008-03-10 17:39:13 UTC (rev 820) @@ -103,6 +103,8 @@ if (ascii >= 0x20) & (((modifier & 1) == 0) & (keys[ascii] != keyid)): if modifier < modifiers[ascii]: print "Replacing", chr(ascii), "at keyid", keys[ascii], "modifier", modifiers[ascii], "with keyid", keyid, "modifier", modifier + modifiers[ascii] = modifier + keys[ascii] = keyid else: print "Discarding", chr(ascii), "at keyid", keyid, "modifier", modifier, "because keyid", keys[ascii], "modifier", modifiers[ascii], "is better" return

1 0

r819 - forth/lib
by svn＠openbios.org 06 Mar '08

06 Mar '08

Author: wmb Date: 2008-03-06 17:29:11 +0100 (Thu, 06 Mar 2008) New Revision: 819 Modified: forth/lib/editcmd.fth Log: Added an error handler to do-command so that the system won't crash if one of the keystroke commands aborts. Modified: forth/lib/editcmd.fth =================================================================== --- forth/lib/editcmd.fth 2008-03-06 05:28:23 UTC (rev 818) +++ forth/lib/editcmd.fth 2008-03-06 16:29:11 UTC (rev 819) @@ -44,7 +44,7 @@ name-buf "copy name-buf lastchar @ add-char-to-name name-buf count keys token@ search-wordlist ( false | cfa true ) - if execute else not-found then + if catch drop else not-found then ; defer printable-char

1 0

r818 - cpu/x86/pc/olpc
by svn＠openbios.org 06 Mar '08

06 Mar '08

Author: rsmith Date: 2008-03-06 06:28:23 +0100 (Thu, 06 Mar 2008) New Revision: 818 Modified: cpu/x86/pc/olpc/versions.fth Log: Bump version to q2d14 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-03-05 20:50:35 UTC (rev 817) +++ cpu/x86/pc/olpc/versions.fth 2008-03-06 05:28:23 UTC (rev 818) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 13 +macro: FW_MINOR 14 \ The EC microcode macro: EC_VERSION d13

1 0

r817 - cpu/x86/pc/olpc dev/olpc/kb3700
by svn＠openbios.org 05 Mar '08

05 Mar '08

Author: wmb Date: 2008-03-05 21:50:35 +0100 (Wed, 05 Mar 2008) New Revision: 817 Modified: cpu/x86/pc/olpc/security.fth dev/olpc/kb3700/battery.fth Log: OLPC Trac #5422 - continue booting if the firmware update is deferred due to insufficient power. Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2008-02-27 04:40:24 UTC (rev 816) +++ cpu/x86/pc/olpc/security.fth 2008-03-05 20:50:35 UTC (rev 817) @@ -652,6 +652,51 @@ drop ; +: do-firmware-update ( img$ -- ) + visible + + tuck flash-buf swap move ( len ) + + ['] ?image-valid catch ?dup if ( ) + visible + red-letters + ." Bad firmware image file - " .error + ." Continuing with old firmware" cr + black-letters + exit + then + + true to file-loaded? + + d# 12,000 wait-until \ Wait for EC to notice the battery + + ['] ?enough-power catch ?dup if + visible + red-letters + ." Unsafe to update firmware now - " .error + ." Continuing with old firmware" cr + black-letters + exit + then + + " Updating firmware" ?lease-debug-cr + + ec-indexed-io-off? if + visible + ." Restarting to enable SPI FLASH writing." cr + d# 3000 ms + ec-ixio-reboot + security-failure + then + + \ Latch alternate? flag for next startup + alternate? if [char] A h# 82 cmos! then + + reflash \ Should power-off and reboot + show-x + " Reflash returned, unexpectedly" .security-failure +; + : load-from-device ( devname$ -- done? ) d# 16 0 +icon-xy show-dot @@ -667,36 +712,7 @@ " new - " ?lease-debug fwkey$ to pubkey$ img$ sig$ fw-valid? if - visible - - img$ tuck flash-buf swap move ( len ) - - ?image-valid ( ) - true to file-loaded? - " Updating firmware" ?lease-debug-cr - - ec-indexed-io-off? if - visible - ." Restarting to enable SPI FLASH writing." cr - d# 3000 ms - ec-ixio-reboot - security-failure - then - - d# 12,000 wait-until \ Wait for EC to notice the battery - - ['] ?enough-power catch ?dup if - visible - red-letters .error black-letters - security-failure - then - - \ Latch alternate? flag for next startup - alternate? if [char] A h# 82 cmos! then - - reflash \ Should power-off and reboot - show-x - " Reflash returned, unexpectedly" .security-failure + img$ do-firmware-update then show-lock then Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2008-02-27 04:40:24 UTC (rev 816) +++ dev/olpc/kb3700/battery.fth 2008-03-05 20:50:35 UTC (rev 817) @@ -105,9 +105,9 @@ ; : ?enough-power ( ) - bat-status@ ( stat ) - dup h# 10 and 0= abort" AC not present" ( stat ) - dup 1 and 0= abort" Battery not present" ( stat ) + bat-status@ ( stat ) + dup h# 10 and 0= abort" No external power" ( stat ) + dup 1 and 0= abort" No battery" ( stat ) 4 and abort" Battery low" ;

1 0

Probe missing on W49F002U
by Jun Ma 29 Feb '08

29 Feb '08

Hi, all. I downloaded flashrom from http://www.openbios.org/viewvc/trunk/util/flashrom.tar.gz?view=tar, also it was built correctly, when I scp it to an SIS530/SIS5595 board with debian-4.0r2, it just can't recognize my Winbond W49G002U EEPROM, here comes the verbose log: Sis530:~# ./flashrom -c W49F002U Calibrating delay loop... OK. No coreboot table found. Found chipset "SIS5595", enabling flash write... OK. No EEPROM/flash device found. Sis530:~# ./flashrom -R flashrom r Sis530:~# ./flashrom --version flashrom r Sis530:~# ./flashrom -V -r Calibrating delay loop... 59M loops per second. OK. No coreboot table found. Found chipset "SIS5595", enabling flash write... OK. Probing for Am29F040B, 512 KB probe_29f040b: id1 0xff, id2 0xff Probing for Am29LV040B, 512 KB probe_29f040b: id1 0xff, id2 0xff Probing for Am29F016D, 2048 KB probe_29f040b: id1 0xff, id2 0xff Probing for AE49F2008, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for At29C040A, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for At29C020, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for At49F002(N), 256 KB probe_jedec: id1 0xff, id2 0xff Probing for At49F002(N)T, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for EN29F002(A)(N)T, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for EN29F002(A)(N)B, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for MBM29F400TC, 512 KB probe_m29f400bt: id1 0xff, id2 0xff Probing for MX29F002, 256 KB probe_29f002: id1 0xff, id2 0xff Probing for MX25L4005, 512 KB generic_spi_command called, but no SPI chipset detected Probing for MX25L8005, 1024 KB generic_spi_command called, but no SPI chipset detected Probing for MX25L3205, 4096 KB generic_spi_command called, but no SPI chipset detected Probing for S25FL016A, 2048 KB generic_spi_command called, but no SPI chipset detected Probing for SST25VF040B, 512 KB generic_spi_command called, but no SPI chipset detected Probing for SST25VF016B, 2048 KB generic_spi_command called, but no SPI chipset detected Probing for SST29EE020A, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for SST28SF040A, 512 KB probe_28sf040: id1 0xff, id2 0xff Probing for SST39SF010A, 128 KB probe_jedec: id1 0xff, id2 0xff Probing for SST39SF020A, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for SST39SF040, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for SST39VF020, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF040B, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF040, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF020A, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF080A, 1024 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF002A/B, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF003A/B, 384 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF004A/B, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF008A, 1024 KB probe_jedec: id1 0xff, id2 0xff Probing for SST49LF004C, 512 KB probe_49lfxxxc: id1 0xff, id2 0xff Probing for SST49LF008C, 1024 KB probe_49lfxxxc: id1 0xff, id2 0xff Probing for SST49LF016C, 2048 KB probe_49lfxxxc: id1 0xff, id2 0xff Probing for SST49LF160C, 2048 KB probe_49lfxxxc: id1 0xff, id2 0xff Probing for Pm49FL002, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for Pm49FL004, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for Pm25LV512, 64 KB generic_spi_command called, but no SPI chipset detected Probing for Pm25LV010, 128 KB generic_spi_command called, but no SPI chipset detected Probing for Pm25LV020, 256 KB generic_spi_command called, but no SPI chipset detected Probing for Pm25LV040, 512 KB generic_spi_command called, but no SPI chipset detected Probing for Pm25LV080B, 1024 KB generic_spi_command called, but no SPI chipset detected Probing for Pm25LV016B, 2048 KB generic_spi_command called, but no SPI chipset detected Probing for W29C011, 128 KB probe_jedec: id1 0xff, id2 0xff Probing for W29C040P, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for W29C020C, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for W29EE011, 128 KB probe_w29ee011: id1 0xff, id2 0xff Probing for W49F002U, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for W49V002A, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for W49V002FA, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for W39V040FA, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for W39V040A, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for W39V040B, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for W39V080A, 1024 KB probe_jedec: id1 0xff, id2 0xff Probing for W25x10, 128 KB generic_spi_command called, but no SPI chipset detected Probing for W25x20, 256 KB generic_spi_command called, but no SPI chipset detected Probing for W25x40, 512 KB generic_spi_command called, but no SPI chipset detected Probing for W25x80, 1024 KB generic_spi_command called, but no SPI chipset detected Probing for M29F002B, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for M50FW040, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for M29W040B, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for M29F002T/NT, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for M29F400BT, 512 KB probe_m29f400bt: id1 0xff, id2 0xff Probing for M50FLW040A, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for M50FLW040B, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for M50FLW080A, 1024 KB probe_jedec: id1 0xff, id2 0xff Probing for M50FLW080B, 1024 KB probe_jedec: id1 0xff, id2 0xff Probing for M50FW080, 1024 KB probe_jedec: id1 0xff, id2 0xff Probing for M50FW016, 2048 KB probe_jedec: id1 0xff, id2 0xff Probing for M50LPW116, 2048 KB probe_jedec: id1 0xff, id2 0xff Probing for M29W010B, 128 KB probe_jedec: id1 0xff, id2 0xff Probing for M29F040B, 512 KB probe_29f040b: id1 0xff, id2 0xff Probing for M25P05-A, 64 KB generic_spi_command called, but no SPI chipset detected Probing for M25P10-A, 128 KB generic_spi_command called, but no SPI chipset detected Probing for M25P20, 256 KB generic_spi_command called, but no SPI chipset detected Probing for M25P40, 512 KB generic_spi_command called, but no SPI chipset detected Probing for M25P80, 1024 KB generic_spi_command called, but no SPI chipset detected Probing for M25P16, 2048 KB generic_spi_command called, but no SPI chipset detected Probing for M25P32, 4096 KB generic_spi_command called, but no SPI chipset detected Probing for M25P64, 8192 KB generic_spi_command called, but no SPI chipset detected Probing for M25P128, 16384 KB generic_spi_command called, but no SPI chipset detected Probing for 82802ab, 512 KB probe_82802ab: id1 0xff, id2 0xff Probing for 82802ac, 1024 KB probe_82802ab: id1 0xff, id2 0xff Probing for F49B002UA, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for LHF00L04, 1024 KB probe_lhf00l04: id1 0xff, id2 0xff Probing for S29C51001T, 128 KB probe_jedec: id1 0xff, id2 0xff Probing for S29C51002T, 256 KB probe_jedec: id1 0xff, id2 0xff Probing for S29C51004T, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for S29C31004T, 512 KB probe_jedec: id1 0xff, id2 0xff Probing for EON unknown SPI chip, 0 KB WARNING: size: 0 -> 4096 (page size) generic_spi_command called, but no SPI chipset detected Probing for MX unknown SPI chip, 0 KB WARNING: size: 0 -> 4096 (page size) generic_spi_command called, but no SPI chipset detected Probing for PMC unknown SPI chip, 0 KB WARNING: size: 0 -> 4096 (page size) generic_spi_command called, but no SPI chipset detected Probing for SST unknown SPI chip, 0 KB WARNING: size: 0 -> 4096 (page size) generic_spi_command called, but no SPI chipset detected Probing for ST unknown SPI chip, 0 KB WARNING: size: 0 -> 4096 (page size) generic_spi_command called, but no SPI chipset detected No EEPROM/flash device found. Sis530:~# After quick reading of your source code, I saw this probing function: int probe_jedec(struct flashchip *flash) { volatile uint8_t *bios = flash->virtual_memory; uint8_t id1, id2; uint32_t largeid1, largeid2; /* Issue JEDEC Product ID Entry command */ *(volatile uint8_t *)(bios + 0x5555) = 0xAA; myusec_delay(10); *(volatile uint8_t *)(bios + 0x2AAA) = 0x55; myusec_delay(10); *(volatile uint8_t *)(bios + 0x5555) = 0x90; /* Older chips may need up to 100 us to respond. The ATMEL 29C020 * needs 10 ms according to the data sheet, but it has been tested * to work reliably with 20 us. Allow a factor of 2 safety margin. */ myusec_delay(40); /* Read product ID */ id1 = *(volatile uint8_t *)bios; id2 = *(volatile uint8_t *)(bios + 0x01); largeid1 = id1; largeid2 = id2; /* Check if it is a continuation ID, this should be a while loop. */ if (id1 == 0x7F) { largeid1 <<= 8; id1 = *(volatile uint8_t *)(bios + 0x100); largeid1 |= id1; } if (id2 == 0x7F) { largeid2 <<= 8; id2 = *(volatile uint8_t *)(bios + 0x101); largeid2 |= id2; } /* Issue JEDEC Product ID Exit command */ *(volatile uint8_t *)(bios + 0x5555) = 0xAA; myusec_delay(10); *(volatile uint8_t *)(bios + 0x2AAA) = 0x55; myusec_delay(10); *(volatile uint8_t *)(bios + 0x5555) = 0xF0; myusec_delay(40); printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, largeid1, largeid2); if (largeid1 == flash->manufacture_id && largeid2 == flash->model_id) return 1; return 0; } Seems flashrom routing got 0xff, 0xff on largeid1, largeid2. Has anybody tested this routing on SIS530? Thanks. Jun. -- FIXME if it is wrong.

2 2

r816 - cpu/x86/pc/olpc
by svn＠openbios.org 27 Feb '08

27 Feb '08

Author: wmb Date: 2008-02-27 05:40:24 +0100 (Wed, 27 Feb 2008) New Revision: 816 Added: cpu/x86/pc/olpc/parsekbd0.py Log: New file parsekbd0.py makes KA tags from old-style tables in Libya and Thailand keyboard wiki pages. Added: cpu/x86/pc/olpc/parsekbd0.py =================================================================== --- cpu/x86/pc/olpc/parsekbd0.py (rev 0) +++ cpu/x86/pc/olpc/parsekbd0.py 2008-02-27 04:40:24 UTC (rev 816) @@ -0,0 +1,262 @@ +#!/usr/bin/python +# parsekbd.py +# Usage: python parsekbd.py OLPC_Nigeria_Keyboard +# +# Gets the wiki page (e.g.) http://wiki.laptop.org/go/OLPC_Nigeria_Keyboard +# Parses the keyboard table contained therein and converts it to a KA +# tag per http://wiki.laptop.org/go/Manufacturing_Data#Keyboard_ASCII_Map. +# +# The output is stored in a file named (e.g.) OLPC_Nigeria_Keyboard.ka +# +# Warnings on standard output tell you if duplicate entries are discarded +# or if some ASCII characters are not present. +# +# In a few cases, this program substitutes dead_{grave,circumflex,tilde} +# for {grave,asciicircumflex,asciitilde} because the ascii versions are +# in inaccessible locations (the firmware has only shift, unshift, AltGr +# maps, so a Shift-AltGr symbol is inaccessible). + +from sys import * +from urllib import * +from HTMLParser import HTMLParser + +lastdata = "" +indent = 0 +tableseen = False +keys = 128*[0] +modifiers = 128*[0] +column = 0 +keyid = 0 + +# Convert from textual names of punctuation characters to the ASCII character +punctuation = { + 'exclam':ord('!'), + 'at':ord('@'), + 'numbersign':ord('#'), + 'dollar':ord('$'), + 'percent':ord('%'), + 'asciicircum':ord('^'), + 'dead_circumflex':ord('^'), + 'ampersand':ord('&'), + 'asterisk':ord('*'), + 'parenleft':ord('('), + 'parenright':ord(')'), + 'underscore':ord('_'), + 'plus':ord('+'), + 'minus':ord('-'), + 'equal':ord('='), + 'semicolon':ord(';'), + 'colon':ord(':'), + 'apostrophe':ord('\''), + 'grave':ord('`'), + 'dead_grave':ord('`'), + 'quotedbl':ord('"'), + 'dblquote':ord('"'), + 'bar':ord('|'), + 'less':ord('<'), + 'greater':ord('>'), + 'period':ord('.'), + 'slash':ord('/'), + 'backslash':ord('\\'), + 'question':ord('?'), + 'comma':ord(','), + 'bracketleft':ord('['), + 'bracketright':ord(']'), + 'braceleft':ord('{'), + 'braceright':ord('}'), + 'asciitilde':ord('~') , + 'dead_tilde':ord('~') , + 'backspace':8, + 'space':32, + 'tab':9, + 'linefeed':10, + 'enter':13, + 'esc':27, + 'escape':27, + 'del':127, + 'delete':127, + '&':ord('&'), + '<':ord('<'), + '>':ord('>'), +} + +def string_to_ascii(s): + if len(s) == 0: + return -1 + if len(s) == 1: + return ord(s) + try: + i = punctuation[s] + return i + except: + pass + if (len(s) == 3) & (s[:2] == 'C-'): + return ord(s[2]) & 0x1f + return -1 + +def handle_key(modifier, s): + global keyid + ascii = string_to_ascii(s) + if ascii == -1: + return + if keys[ascii] != 0: + if (ascii >= 0x20) & (((modifier & 1) == 0) & (keys[ascii] != keyid)): + if modifier < modifiers[ascii]: + print "Replacing", chr(ascii), "at keyid", keys[ascii], "modifier", modifiers[ascii], "with keyid", keyid, "modifier", modifier + else: + print "Discarding", chr(ascii), "at keyid", keyid, "modifier", modifier, "because keyid", keys[ascii], "modifier", modifiers[ascii], "is better" + return + if ascii < 0x20: + if (modifier & 2) != 0: # ctrl + if keys[ascii + 0x60] == keyid: + return + if keys[ascii + 0x40] == keyid: + return + keys[ascii] = keyid + modifiers[ascii] = modifier + +def do_key(): + global column, keyid, lastdata + s = lastdata.strip() + if column == 1: # row + pass + elif column == 2: # Key + if s.isdigit(): + keyid = int(s) + elif column == 3: # Unmodified + handle_key(0,s) + elif column == 4: # Shift + handle_key(1,s) + elif column == 5: # AltGR + handle_key(4,s) + elif column == 6: # Shift AltGr + # handle_key(5,s) + pass + elif column == 7: # Ctrl + handle_key(2,s) + elif column == 8: # Ctrl Shift + handle_key(6,s) + elif column == 9: # Fn + handle_key(8,s) + elif column == 10: # comment + pass + elif column == 11: # another comment + pass + +class MyHTMLParser(HTMLParser): + def handle_starttag(self, tag, attrs): + global column, keyid, indent, lastdata + #for i in range(indent): + # print "", + #print "<", tag + #indent = indent+2 + if tag == 'tr': + column = 0 + keyid = 0 + elif tag == 'td': + lastdata = "" + column = column + 1; + + def handle_endtag(self, tag): + global tableseen, column, keyid, indent + #for i in range(indent): + # print "", + #print tag,">" + #indent = indent - 2 + #if indent < 0: + # indent = 0 + + if tag == 'table': + tableseen = True + elif (tag == 'td') & tableseen: + do_key() + + def handle_data(self, data): + global lastdata, indent + #for i in range(indent): + # print "", + #print "{", data, "}" + lastdata = lastdata + data.strip() + if lastdata.startswith("There is currently no text"): + print "No such Wiki page" + raise + + def handle_entityref(self, data): + global lastdata, indent + #for i in range(indent): + # print "", + #print "{", data, "}" + # print "Entity", data.strip() + lastdata = lastdata + "&" + data.strip() + ";" + +# This table converts from the IBM physical keystation number to +# the corresponding scancode value in scan set 1. + +# 0 1 3 3 4 5 6 7 8 9 +scan1_map = [ + 0x00, 0x29, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, # 0x + 0x0a, 0x0b, 0x0c, 0x0d, 0x00, 0x0e, 0x0f, 0x10, 0x11, 0x12, # 1x + 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x2b, # 2x + 0x3a, 0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, # 3x + 0x27, 0x28, 0x2b, 0x1c, 0x2a, 0x56, 0x2c, 0x2d, 0x2e, 0x2f, # 4x + 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x73, 0x36, 0x1d, 0x00, # 5x + 0x38, 0x39, 0x38, 0x00, 0x1d, 0x00, 0x00, 0x00, 0x00, 0x00, # 6x + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # 7x + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # 8x + 0x45, 0x47, 0x4B, 0x4F, 0x00, 0x00, 0x48, 0x4C, 0x50, 0x52, # 9x + 0x37, 0x49, 0x4D, 0x51, 0x53, 0x4A, 0x4E, 0x00, 0x1c, 0x00, # 10x + 0x01, 0x00, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, # 11x + 0x43, 0x44, 0x57, 0x58, 0x00, 0x46, 0x00, 0x00, 0x00, 0x00, # 12x + 0x79, 0x01, 0x00, 0x5c, 0x73, 0x6e, 0x00, 0x00, 0x00, 0x00, # 13x (analog intermediates) + 0x00, 0x00, 0x00, 0x00, 0x00, # 14x +] + +def put_ka_format(outfile): + global keys, modifiers + # a-z - output scancode only; unshifted map is implied + # and shifted map is derived automatically + for i in range(ord('a'),ord('a')+26): + if (keys[i] == 0): + print "Missing",chr(i) + if modifiers[i] != 0: + print chr(i),"is modified" + outfile.write(chr(scan1_map[keys[i]])) + + # Numbers and punctuation - output scancode and keymap number + for i in '0123456789!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~': + ascii = ord(i) + if (keys[ascii] == 0): + print "Missing",i + if (modifiers[ascii] & 0xa) != 0: + print i,"is Ctrl or Fn" + outfile.write(chr(scan1_map[keys[ascii]])) + + if (modifiers[ascii] & 0x4) != 0: + # modifier & 4 implies AltGr map + outfile.write(chr(2)) + else: + # otherwise it's either the shift (1) or unshift (0) map + outfile.write(chr(modifiers[ascii] & 1)) + + outfile.write(chr(0)) # Null terminator + + outfile.write(chr(111 ^ 0xff)) + outfile.write(chr(111)) + outfile.write('KA') + +if len(argv) != 2: + print "Usage: python parsekbd.py PageName" +else: + try: + print "Getting",'http://wiki.laptop.org/go/' + argv[1] + infile = urlopen('http://wiki.laptop.org/go/' + argv[1]) + myparser=MyHTMLParser() + myparser.feed(infile.read()) + myparser.close() + infile.close() + outfile = open(argv[1] + '.ka', 'w') + put_ka_format(outfile) + outfile.close() + print "Output at",argv[1] + '.ka' + except: + print "Failed"

1 0

r815 - cpu/x86/pc/olpc
by svn＠openbios.org 07 Feb '08

07 Feb '08

Author: rsmith Date: 2008-02-07 05:52:01 +0100 (Thu, 07 Feb 2008) New Revision: 815 Modified: cpu/x86/pc/olpc/versions.fth Log: OLPC: q2d13. Update the EC pull so string such that it pulls a versions that says PQ2D13 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-02-06 23:10:03 UTC (rev 814) +++ cpu/x86/pc/olpc/versions.fth 2008-02-07 04:52:01 UTC (rev 815) @@ -5,7 +5,7 @@ macro: FW_MINOR 13 \ The EC microcode -macro: EC_VERSION d11 +macro: EC_VERSION d13 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

r814 - cpu/x86/pc/olpc
by svn＠openbios.org 07 Feb '08

07 Feb '08

Author: rsmith Date: 2008-02-07 00:10:03 +0100 (Thu, 07 Feb 2008) New Revision: 814 Modified: cpu/x86/pc/olpc/versions.fth Log: OLPC: q2d13 release. This is a cherry picked version of 791 + 803 + 812 + WLAN firmware 5.110.22.p1 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-02-05 07:48:34 UTC (rev 813) +++ cpu/x86/pc/olpc/versions.fth 2008-02-06 23:10:03 UTC (rev 814) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 12a +macro: FW_MINOR 13 \ The EC microcode macro: EC_VERSION d11 @@ -19,4 +19,4 @@ macro: WLAN_VERSION 5.110.22.p1 \ The bios_verify image -macro: CRYPTO_VERSION 0.3 +macro: CRYPTO_VERSION 0.2

1 0

r813 - cpu/x86/pc/olpc
by svn＠openbios.org 05 Feb '08

05 Feb '08

Author: wmb Date: 2008-02-05 08:48:34 +0100 (Tue, 05 Feb 2008) New Revision: 813 Modified: cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/security.fth Log: OLPC security - block exceptions during secure startup. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-02-05 06:43:24 UTC (rev 812) +++ cpu/x86/pc/olpc/fw.bth 2008-02-05 07:48:34 UTC (rev 813) @@ -261,10 +261,10 @@ false ; -: protect-fw ( -- ) - " wp" find-tag if 2drop ec-indexed-io-off then -; +false value secure? +: protect-fw ( -- ) secure? if ec-indexed-io-off then ; + \ stand-init-debug? [if] warning @ warning off : init @@ -350,7 +350,6 @@ ' gx-power-off to power-off [then] - : dimmer ( -- ) screen-ih if " dimmer" screen-ih $call-method then ; : brighter ( -- ) screen-ih if " brighter" screen-ih $call-method then ; @@ -558,6 +557,7 @@ : startup ( -- ) standalone? 0= if exit then + block-exceptions no-page ?factory-mode @@ -585,6 +585,7 @@ ?diags ?fs-update secure-startup + unblock-exceptions ['] (interrupt-auto-boot?) to interrupt-auto-boot? text-on banner Modified: cpu/x86/pc/olpc/security.fth =================================================================== --- cpu/x86/pc/olpc/security.fth 2008-02-05 06:43:24 UTC (rev 812) +++ cpu/x86/pc/olpc/security.fth 2008-02-05 07:48:34 UTC (rev 813) @@ -564,13 +564,29 @@ r> to load-path ; -false value secure? false value in-factory? stand-init: wp " wp" find-tag if 2drop true to secure? then ; +: message-and-off ( -- ) + aborted? @ if + aborted? off + ." Keyboard interrupt" cr + else + (.exception) + then + ." Powering off ..." + d# 5000 ms + power-off +; + +: block-exceptions ( -- ) + secure? if ['] message-and-off to .exception then +; +: unblock-exceptions ( -- ) ['] .entry to .exception ; + \ check-devel-key tests the developer signature string "dev01$". \ -1 means the signature is for this machine and is invalid

1 0

r812 - dev/olpc/keyboard
by svn＠openbios.org 05 Feb '08

05 Feb '08

Author: wmb Date: 2008-02-05 07:43:24 +0100 (Tue, 05 Feb 2008) New Revision: 812 Modified: dev/olpc/keyboard/selftest.fth Log: OLPC trac 6339 - stack bug crashes selftest under some circumstances. Modified: dev/olpc/keyboard/selftest.fth =================================================================== --- dev/olpc/keyboard/selftest.fth 2008-02-04 09:39:55 UTC (rev 811) +++ dev/olpc/keyboard/selftest.fth 2008-02-05 06:43:24 UTC (rev 812) @@ -381,9 +381,9 @@ : process-raw ( scan-code -- exit? ) verbose? if dup u. then - dup h# e0 = if - true to esc? - else + dup h# e0 = if ( scan ) + drop true to esc? ( ) + else ( scan ) dup h# 7f and scan1->key# if ( scan ) drop ( ) else ( scan key# ) @@ -393,9 +393,9 @@ else ( key# ) key-down ( ) then ( ) - then - false to esc? - then + then ( ) + false to esc? ( ) + then ( ) false ;

1 0

r811 - dev/mmc/sdhci
by svn＠openbios.org 04 Feb '08

04 Feb '08

Author: wmb Date: 2008-02-04 10:39:55 +0100 (Mon, 04 Feb 2008) New Revision: 811 Modified: dev/mmc/sdhci/sdhci.fth Log: OLPC trac 6230 - Added count of simultaneous opens to sdhci.fth so that multiple files can be open without losing the host controller when one file is closed. Modified: dev/mmc/sdhci/sdhci.fth =================================================================== --- dev/mmc/sdhci/sdhci.fth 2008-02-02 20:52:14 UTC (rev 810) +++ dev/mmc/sdhci/sdhci.fth 2008-02-04 09:39:55 UTC (rev 811) @@ -587,17 +587,24 @@ dma-len /block / ; +0 value open-count : open ( -- ) - map-regs - setup-host + open-count 0= if + map-regs + setup-host + then + open-count 1+ to open-count true ; : close ( -- ) - wait-write-done - card-clock-off - card-power-off - unmap-regs + open-count 1 = if + wait-write-done + card-clock-off + card-power-off + unmap-regs + then + open-count 1- 0 max to open-count ; : init ( -- )

1 0

Openfirmware build failure
by Paul McEnery 03 Feb '08

03 Feb '08

I have just checked out r810 from subversion following these instructions: http://www.openbios.org/Open_Firmware On performing a `make' for openbios, I get the following issue: ================================================================== paulm@desktop:~/openfirmware/cpu/x86/pc/biosload/build$ make make[1]: Entering directory `/home/paulm/tmp/qemu/openfirmware/cpu/x86/Linux' cc -c -O -g -m32 -DTARGET_X86 ../../../forth/wrapper/wrapper.c -o wrapper.o cc -c -O -g -m32 -DTARGET_X86 ../../../forth/wrapper/logger.c -o logger.o cc -c -O -g -m32 -DTARGET_X86 -I../../../forth/wrapper/zip ../../../forth/wrapper/zip/zipmem.c -o zipmem.o cc -c -O -g -m32 -DTARGET_X86 -I../../../forth/wrapper/zip ../../../forth/wrapper/zip/deflate.c -o deflate.o cc -c -O -g -m32 -DTARGET_X86 -I../../../forth/wrapper/zip ../../../forth/wrapper/zip/trees.c -o trees.o cc -c -O -g -m32 -DTARGET_X86 -I../../../forth/wrapper/zip ../../../forth/wrapper/zip/bits.c -o bits.o cc -c -O -g -m32 -DTARGET_X86 -I../../../forth/wrapper/zip ../../../forth/wrapper/zip/util.c -o util.o cc -c -m32 -O0 -fpic ../../../forth/wrapper/zip/inflate.c -o inflate.o cc -m32 -o forth wrapper.o logger.o zipmem.o deflate.o trees.o bits.o util.o inflate.o make[1]: Leaving directory `/home/paulm/tmp/qemu/openfirmware/cpu/x86/Linux' make[1]: Entering directory `/home/paulm/tmp/qemu/openfirmware/cpu/x86/build' make -C ../Linux ../build/inflate.bin make[2]: Entering directory `/home/paulm/tmp/qemu/openfirmware/cpu/x86/Linux' objcopy -O binary inflate.o ../build/inflate.bin make[2]: Leaving directory `/home/paulm/tmp/qemu/openfirmware/cpu/x86/Linux' make[1]: Leaving directory `/home/paulm/tmp/qemu/openfirmware/cpu/x86/build' ./build ofw.c32 --- Rebuilding reset.di --- Cmd: ${HOSTDIR}/forth ${HOSTDIR}/../build/builder.dic ../reset.bth --- Rebuilding start.di --- Cmd: ${HOSTDIR}/forth ${HOSTDIR}/../build/builder.dic ../start.bth --- Rebuilding kernel.dic --- Cmd: ${HOSTDIR}/forth ${HOSTDIR}/../build/builder.dic ../kernel.bth --- Saving kernel.dic --- --- Rebuilding tools.dic --- Cmd: ${HOSTDIR}/x86forth ${BP}/cpu/x86/build/kernel.dic ../tools.bth --- Saving tools.dic --- --- Rebuilding basefw.dic --- Cmd: ${HOSTDIR}/x86forth ${BP}/cpu/x86/build/tools.dic ../basefw.bth --- Saving basefw.dic --- --- Rebuilding bootsec.hex --- Cmd: ${HOSTDIR}/forth ${HOSTDIR}/../build/builder.dic ../bootsec.bth 1fe 1f0 400 400 --- Rebuilding fw.img --- Cmd: ${HOSTDIR}/x86forth ${BP}/cpu/x86/build/basefw.dic ../fw.bth ${BP}/cpu/x86/pc/biosload/rmenter.fth:209: pm-cs ? make: *** [ofw.c32] Error 1 ================================================================== I am building on Ubuntu 7.10. If someone could point me in the right direction, it would be much appreciated. TIA

1 0

r810 - cpu/x86/pc/olpc
by svn＠openbios.org 02 Feb '08

02 Feb '08

Author: wmb Date: 2008-02-02 21:52:14 +0100 (Sat, 02 Feb 2008) New Revision: 810 Modified: cpu/x86/pc/olpc/versions.fth Log: OLPC versions.fth - last revision was for a cherry-picked release that uses specific older versions of bios-crypto and WLAN firmware. This revision restores the new versions of same. Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-02-02 20:48:25 UTC (rev 809) +++ cpu/x86/pc/olpc/versions.fth 2008-02-02 20:52:14 UTC (rev 810) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 12 +macro: FW_MINOR 12a \ The EC microcode macro: EC_VERSION d11 @@ -16,7 +16,7 @@ \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 -macro: WLAN_VERSION 5.110.20.p49 +macro: WLAN_VERSION 5.110.22.p1 \ The bios_verify image -macro: CRYPTO_VERSION 0.2 +macro: CRYPTO_VERSION 0.3

1 0

r809 - cpu/x86/pc/olpc
by svn＠openbios.org 02 Feb '08

02 Feb '08

Author: wmb Date: 2008-02-02 21:48:25 +0100 (Sat, 02 Feb 2008) New Revision: 809 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2D12 - SVN 791 + cherry-picked 803 to fix JFFS2 problem (trac 6291) Same as Q2D11 except for the JFFS2 fix. Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-02-01 08:03:12 UTC (rev 808) +++ cpu/x86/pc/olpc/versions.fth 2008-02-02 20:48:25 UTC (rev 809) @@ -2,10 +2,10 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 09 +macro: FW_MINOR 12 \ The EC microcode -macro: EC_VERSION d08b +macro: EC_VERSION d11 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary @@ -16,7 +16,7 @@ \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 -macro: WLAN_VERSION 5.110.22.p1 +macro: WLAN_VERSION 5.110.20.p49 \ The bios_verify image -macro: CRYPTO_VERSION 0.3 +macro: CRYPTO_VERSION 0.2

1 0

r185 - in openbios-devel: arch/sparc32 drivers include/openbios
by svn＠openbios.org 01 Feb '08

01 Feb '08

Author: blueswirl Date: 2008-02-01 20:58:56 +0100 (Fri, 01 Feb 2008) New Revision: 185 Modified: openbios-devel/arch/sparc32/openbios.c openbios-devel/drivers/obio.c openbios-devel/drivers/obio.h openbios-devel/drivers/sbus.c openbios-devel/include/openbios/drivers.h Log: Move AUX1 and AUX2 to correct locations, rename APC Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2008-02-01 19:55:39 UTC (rev 184) +++ openbios-devel/arch/sparc32/openbios.c 2008-02-01 19:58:56 UTC (rev 185) @@ -27,6 +27,7 @@ uint64_t iommu_base, slavio_base; uint64_t intctl_base, counter_base, nvram_base, ms_kb_base, serial_base; unsigned long fd_offset, counter_offset, intr_offset; + unsigned long aux1_offset, aux2_offset; uint64_t dma_base, esp_base, le_base; uint64_t tcx_base; int machine_id; @@ -44,6 +45,8 @@ .fd_offset = 0x00400000, .counter_offset = 0x00d00000, .intr_offset = 0x00e00000, + .aux1_offset = 0x00900000, + .aux2_offset = 0x00910000, .dma_base = 0x78400000, .esp_base = 0x78800000, .le_base = 0x78c00000, @@ -60,6 +63,8 @@ .fd_offset = 0x00700000, // 0xff1700000ULL, .counter_offset = 0x00300000, // 0xff1300000ULL, .intr_offset = 0x00400000, // 0xff1400000ULL, + .aux1_offset = 0x00800000, // 0xff1800000ULL, + .aux2_offset = 0x00a01000, // 0xff1a01000ULL, .dma_base = 0xef0400000ULL, .esp_base = 0xef0800000ULL, .le_base = 0xef0c00000ULL, @@ -76,6 +81,8 @@ .fd_offset = -1, .counter_offset = 0x00300000, // 0xff1300000ULL, .intr_offset = 0x00400000, // 0xff1400000ULL, + .aux1_offset = 0x00800000, // 0xff1800000ULL, + .aux2_offset = 0x00a01000, // 0xff1a01000ULL, XXX should not exist .dma_base = 0xef0081000ULL, .esp_base = 0xef0080000ULL, .le_base = 0xef0060000ULL, @@ -109,7 +116,8 @@ ob_init_mmu(hwdef->iommu_base); #ifdef CONFIG_DRIVER_OBIO ob_obio_init(hwdef->slavio_base, hwdef->fd_offset, - hwdef->counter_offset, hwdef->intr_offset); + hwdef->counter_offset, hwdef->intr_offset, + hwdef->aux1_offset, hwdef->aux2_offset); nvram_init(); #endif #ifdef CONFIG_DRIVER_SBUS Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2008-02-01 19:55:39 UTC (rev 184) +++ openbios-devel/drivers/obio.c 2008-02-01 19:58:56 UTC (rev 185) @@ -1048,12 +1048,13 @@ *reset_reg = 1; } +// AUX 2 (Software Powerdown Control) and reset static void -ob_power_init(uint64_t base, uint64_t offset, int intr) +ob_aux2_reset_init(uint64_t base, uint64_t offset, int intr) { ob_new_obio_device("power", NULL); - power_reg = ob_reg(base, offset, POWER_REGS, 1); + power_reg = ob_reg(base, offset, AUXIO2_REGS, 1); // Not in device tree reset_reg = map_io(base + (uint64_t)SLAVIO_RESET, RESET_REGS); @@ -1284,7 +1285,8 @@ int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, - unsigned long counter_offset, unsigned long intr_offset) + unsigned long counter_offset, unsigned long intr_offset, + unsigned long aux1_offset, unsigned long aux2_offset) { // All devices were integrated to NCR89C105, see @@ -1312,9 +1314,10 @@ ob_sconfig_init(slavio_base, SLAVIO_SCONFIG); - ob_auxio_init(slavio_base, SLAVIO_AUXIO); + ob_auxio_init(slavio_base, aux1_offset); - ob_power_init(slavio_base, SLAVIO_POWER, POWER_INTR); + if (aux2_offset != (unsigned long) -1) + ob_aux2_reset_init(slavio_base, aux2_offset, AUXIO2_INTR); ob_counter_init(slavio_base, counter_offset); Modified: openbios-devel/drivers/obio.h =================================================================== --- openbios-devel/drivers/obio.h 2008-02-01 19:55:39 UTC (rev 184) +++ openbios-devel/drivers/obio.h 2008-02-01 19:58:56 UTC (rev 185) @@ -16,12 +16,10 @@ #define SLAVIO_SCONFIG 0x00800000ULL #define SCONFIG_REGS 1 -#define SLAVIO_AUXIO 0x00900000ULL #define AUXIO_REGS 1 -#define SLAVIO_POWER 0x00910000ULL -#define POWER_REGS 1 -#define POWER_INTR 0x22 +#define AUXIO2_REGS 1 +#define AUXIO2_INTR 0x22 #define SLAVIO_COUNTER 0x00d00000ULL #define COUNTER_REGS 0x10 Modified: openbios-devel/drivers/sbus.c =================================================================== --- openbios-devel/drivers/sbus.c 2008-02-01 19:55:39 UTC (rev 184) +++ openbios-devel/drivers/sbus.c 2008-02-01 19:58:56 UTC (rev 185) @@ -20,8 +20,8 @@ #define SBUS_REGS 0x28 #define SBUS_SLOTS 16 -#define POWER_REGS 0x10 -#define POWER_OFFSET 0x0a000000ULL +#define APC_REGS 0x10 +#define APC_OFFSET 0x0a000000ULL #define CS4231_REGS 0x40 #define CS4231_OFFSET 0x0c000000ULL #define MACIO_ESPDMA 0x00400000ULL /* ESP DMA controller */ @@ -281,7 +281,7 @@ } static void -ob_power_init(unsigned int slot, unsigned long base) +ob_apc_init(unsigned int slot, unsigned long base) { push_str("/iommu/sbus"); fword("find-device"); @@ -295,7 +295,7 @@ PUSH(base); fword("encode-int"); fword("encode+"); - PUSH(POWER_REGS); + PUSH(APC_REGS); fword("encode-int"); fword("encode+"); push_str("reg"); @@ -366,9 +366,6 @@ // Parallel port //ob_bpp_init(base); - - // Power management - ob_power_init(slot, POWER_OFFSET); } static void @@ -379,10 +376,13 @@ case 3: // SUNW,tcx ob_tcx_init(slot, base); break; - case 4: // SUNW,CS4231 + case 4: + // SUNW,CS4231 ob_cs4231_init(slot, base); + // Power management (APC) + ob_apc_init(slot, APC_OFFSET); break; - case 5: // MACIO: le, esp, bpp, power-management + case 5: // MACIO: le, esp, bpp ob_macio_init(slot, base, 0x08000000); break; default: @@ -400,6 +400,8 @@ break; case 0xf: // le, esp, bpp, power-management ob_macio_init(slot, base, 0); + // Power management (APC) XXX should not exist + ob_apc_init(slot, APC_OFFSET); break; default: break; @@ -420,6 +422,8 @@ #endif // NCR 92C990, Am7990, Lance. See http://www.amd.com ob_le_init(slot, base, 0x00060000, SS600MP_LEBUFFER); + // Power management (APC) XXX should not exist + ob_apc_init(slot, APC_OFFSET); break; default: break; Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2008-02-01 19:55:39 UTC (rev 184) +++ openbios-devel/include/openbios/drivers.h 2008-02-01 19:58:56 UTC (rev 185) @@ -26,6 +26,7 @@ #endif #ifdef CONFIG_DRIVER_OBIO int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, - unsigned long counter_offset, unsigned long intr_offset); + unsigned long counter_offset, unsigned long intr_offset, + unsigned long aux1_offset, unsigned long aux2_offset); #endif

1 0

r184 - openbios-devel/arch/sparc64
by svn＠openbios.org 01 Feb '08

01 Feb '08

Author: blueswirl Date: 2008-02-01 20:55:39 +0100 (Fri, 01 Feb 2008) New Revision: 184 Modified: openbios-devel/arch/sparc64/lib.c Log: Enforce malloc alignment Modified: openbios-devel/arch/sparc64/lib.c =================================================================== --- openbios-devel/arch/sparc64/lib.c 2007-12-29 18:38:16 UTC (rev 183) +++ openbios-devel/arch/sparc64/lib.c 2008-02-01 19:55:39 UTC (rev 184) @@ -41,6 +41,12 @@ void *malloc(int size) { void *ret=(void *)0; + + if( !size ) + return NULL; + + size = (size + 7) & ~7; + if(memsize>=size) { memsize-=size; ret=memptr;

1 0

r808 - cpu/x86/pc/olpc
by svn＠openbios.org 01 Feb '08

01 Feb '08

Author: wmb Date: 2008-02-01 09:03:12 +0100 (Fri, 01 Feb 2008) New Revision: 808 Added: cpu/x86/pc/olpc/parsexkb.py Log: OLPC - added parsexkb.py for creating a KA tag from xkb-format data. Added: cpu/x86/pc/olpc/parsexkb.py =================================================================== --- cpu/x86/pc/olpc/parsexkb.py (rev 0) +++ cpu/x86/pc/olpc/parsexkb.py 2008-02-01 08:03:12 UTC (rev 808) @@ -0,0 +1,263 @@ +#!/usr/bin/python +# parsekbd.py +# Usage: python parsekbd.py OLPC_Nigeria_Keyboard +# +# Gets the wiki page (e.g.) http://wiki.laptop.org/go/OLPC_Nigeria_Keyboard +# Parses the keyboard table contained therein and converts it to a KA +# tag per http://wiki.laptop.org/go/Manufacturing_Data#Keyboard_ASCII_Map. +# +# The output is stored in a file named (e.g.) OLPC_Nigeria_Keyboard.ka +# +# Warnings on standard output tell you if duplicate entries are discarded +# or if some ASCII characters are not present. +# +# In a few cases, this program substitutes dead_{grave,circumflex,tilde} +# for {grave,asciicircumflex,asciitilde} because the ascii versions are +# in inaccessible locations (the firmware has only shift, unshift, AltGr +# maps, so a Shift-AltGr symbol is inaccessible). + +from sys import * +from urllib import * +from re import * + +saved_keyname = 128*[0] +keys = 128*[0] +modifiers = 128*[0] + +keynames = { +'AB01':44, +'AB02':45, +'AB03':46, +'AB04':47, +'AB05':48, +'AB06':49, +'AB07':50, +'AB08':51, +'AB09':52, +'AB10':53, +'AB11':115, +'AC01':30, +'AC02':31, +'AC03':32, +'AC04':33, +'AC05':34, +'AC06':35, +'AC07':36, +'AC08':37, +'AC09':38, +'AC10':39, +'AC11':40, +'BKSL':43, +'AD01':16, +'AD02':17, +'AD03':18, +'AD04':19, +'AD05':20, +'AD06':21, +'AD07':22, +'AD08':23, +'AD09':24, +'AD10':25, +'AD11':26, +'AD12':27, +'TLDE':41, +'AE01':2, +'AE02':3, +'AE03':4, +'AE04':5, +'AE05':6, +'AE06':7, +'AE07':8, +'AE08':9, +'AE09':10, +'AE10':11, +'AE11':12, +'AE12':13 +}; + +# Convert from textual names of punctuation characters to the ASCII character +punctuation = { + 'exclam':ord('!'), + 'at':ord('@'), + 'numbersign':ord('#'), + 'dollar':ord('$'), + 'percent':ord('%'), + 'asciicircum':ord('^'), + 'dead_circumflex':ord('^'), + 'ampersand':ord('&'), + 'asterisk':ord('*'), + 'parenleft':ord('('), + 'parenright':ord(')'), + 'underscore':ord('_'), + 'plus':ord('+'), + 'minus':ord('-'), + 'equal':ord('='), + 'semicolon':ord(';'), + 'colon':ord(':'), + 'apostrophe':ord('\''), + 'grave':ord('`'), + 'dead_grave':ord('`'), + 'quotedbl':ord('"'), + 'dblquote':ord('"'), + 'bar':ord('|'), + 'less':ord('<'), + 'greater':ord('>'), + 'period':ord('.'), + 'slash':ord('/'), + 'backslash':ord('\\'), + 'question':ord('?'), + 'comma':ord(','), + 'bracketleft':ord('['), + 'bracketright':ord(']'), + 'braceleft':ord('{'), + 'braceright':ord('}'), + 'asciitilde':ord('~') , + 'dead_tilde':ord('~') , + 'backspace':8, + 'space':32, + 'tab':9, + 'linefeed':10, + 'enter':13, + 'esc':27, + 'escape':27, + 'del':127, + 'delete':127, + '&':ord('&'), + '<':ord('<'), + '>':ord('>'), +} + +def string_to_ascii(s): + if len(s) == 0: + return -1 + if len(s) == 1: + return ord(s) + try: + i = punctuation[s] + return i + except: + pass + return -1 + +def modname(modifier): + if modifier & 4: + return "AltGr" + if modifier & 1: + return "Shift" + return "plain" + +def handle_key(modifier, s, keyname, keyid): + ascii = string_to_ascii(s) + if ascii == -1: + return + if keys[ascii] != 0: + # We already have an entry for this character + # Keep the most accessible version + # unshifted beats shifted beats altgr + if modifier < modifiers[ascii]: + if keys[ascii] != keyid: + print " Replacing ", chr(ascii), "on", modname(modifiers[ascii]), saved_keyname[ascii], "with", modname(modifier), keyname + keys[ascii] = keyid + saved_keyname[ascii] = keyname + modifiers[ascii] = modifier; + else: + if keys[ascii] != keyid: + print " Discarding", chr(ascii), "on", modname(modifier), keyname, "already have", modname(modifiers[ascii]), saved_keyname[ascii] + else: + # First time we've seen this character + saved_keyname[ascii] = keyname + keys[ascii] = keyid + modifiers[ascii] = modifier + +seenlines = {}; + +def collect_line(line): + global seenlines + try: + s = split("\W+",sub("\t|{|}|\[|]|\,|<|>|;", "", line)) + except: + return + + if s[1] != 'key': + return + + seenlines[s[2]] = s[3:6] + +def process_keys(): + global seenlines + + if len(seenlines) == 0: + print "Didn't find any key definitions" + raise ValueError + for k in seenlines: + try: + keyid = keynames[k] + except: + print "Bad key name",k + + handle_key(0,seenlines[k][0], k, keyid) # Unshift + handle_key(1,seenlines[k][1], k, keyid) # Shift + handle_key(4,seenlines[k][2], k, keyid) # AltGr + +# This table converts from the IBM physical keystation number to +# the corresponding scancode value in scan set 1. + +def put_ka_format(outfile): + global keys, modifiers + # a-z - output scancode only; unshifted map is implied + # and shifted map is derived automatically + for i in range(ord('a'),ord('a')+26): + if (keys[i] == 0): + print "Missing",chr(i) + if modifiers[i] != 0: + print chr(i),"is modified" + outfile.write(chr(keys[i])) + + # Numbers and punctuation - output scancode and keymap number + for i in '0123456789!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~': + ascii = ord(i) + if (keys[ascii] == 0): + print "Missing",i + if (modifiers[ascii] & 0xa) != 0: + print i,"is Ctrl or Fn" + outfile.write(chr(keys[ascii])) + + if (modifiers[ascii] & 0x4) != 0: + # modifier & 4 implies AltGr map + outfile.write(chr(2)) + else: + # otherwise it's either the shift (1) or unshift (0) map + outfile.write(chr(modifiers[ascii] & 1)) + + outfile.write(chr(0)) # Null terminator + + outfile.write(chr(111 ^ 0xff)) + outfile.write(chr(111)) + outfile.write('KA') + +def wiki_to_ka(argv): + try: + try: + print "Getting",'http://wiki.laptop.org/go/' + argv[1] + infile = urlopen('http://wiki.laptop.org/go/' + argv[1]) + except IOError: + print "Can't open that URL" + for line in infile: + collect_line(line) + infile.close() + process_keys() + try: + outfile = open(argv[1] + '.ka', 'w') + except IOError: + print "Can't open output file",argv[1] + '.ka' + raise + put_ka_format(outfile) + outfile.close() + print "Output at",argv[1] + '.ka' + except: + print "Failed" + +if len(argv) != 2: + print "Usage: python parsekbd.py PageName" +else: + wiki_to_ka(argv)

1 0

r807 - dev/olpc/cafenand
by svn＠openbios.org 01 Feb '08

01 Feb '08

Author: wmb Date: 2008-02-01 05:07:00 +0100 (Fri, 01 Feb 2008) New Revision: 807 Modified: dev/olpc/cafenand/selftest.fth Log: OLPC CaFe NAND driver - changed the name of the "erase" selftest method to "erase!" because there is a standard Forth word named "erase". Modified: dev/olpc/cafenand/selftest.fth =================================================================== --- dev/olpc/cafenand/selftest.fth 2008-02-01 04:05:35 UTC (rev 806) +++ dev/olpc/cafenand/selftest.fth 2008-02-01 04:07:00 UTC (rev 807) @@ -133,7 +133,7 @@ ; \ Destroy content of flash. No argument. -: erase ( subarg$ -- ) 2drop ." Erasing..." cr wipe ; +: erase! ( subarg$ -- ) 2drop ." Erasing..." cr wipe ; \ Destroy content of flash. Argument is hex byte pattern value. : .skip-bad ( page# -- ) (cr ." Skip bad block" .page-byte cr ; @@ -249,7 +249,7 @@ ." <arg> can be one of the following:" cr ." none to do nothing" cr ." help to get this usage guide" cr - ." erase to erase the flash (destructive)" cr + ." erase! to erase the flash (destructive)" cr ." fill[,<data>] to fill the flash with hex byte pattern <data> (destructive)" cr ." Default <data> is 00" cr ." fast[,<#blk>] to non-destructively test the specified <#blk> of flash" cr

1 0

r806 - ofw/fs/jffs2
by svn＠openbios.org 01 Feb '08

01 Feb '08

Author: wmb Date: 2008-02-01 05:05:35 +0100 (Fri, 01 Feb 2008) New Revision: 806 Modified: ofw/fs/jffs2/jffs2.fth Log: OLPC trac 6291 followup - faster implementation of raw node scanning in the event of large amounts of erased space. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2008-02-01 03:40:36 UTC (rev 805) +++ ofw/fs/jffs2/jffs2.fth 2008-02-01 04:05:35 UTC (rev 806) @@ -742,16 +742,26 @@ \ This assumes that the entire erase block is in memory : another-node? ( adr -- false | adr' true ) - eb-end swap ?do - i w@ jffs2-magic = if - i header-crc? if - i +raw-node eb-end u<= if - i true unloop exit + eb-end over - ( adr len ) + begin ( adr len ) + h# ff skipchar ( adr' len' ) + dup 8 >= while ( adr len ) + over w@ jffs2-magic = if ( adr len ) + over header-crc? if ( adr len ) + drop dup +raw-node ( adr end-adr ) + eb-end u<= if ( adr ) + true ( adr true ) + else ( adr ) + \ Node extends past end of erase block + drop false ( false ) then + exit then - then - loop - false + else ( adr len ) + 1 /string ( adr' len' ) + then ( adr len ) + repeat ( adr len ) + 2drop false ; : rdpino@ ( adr -- parent ) 3 j@ ;

1 0

r805 - cpu/ppc cpu/x86 forth/kernel
by svn＠openbios.org 01 Feb '08

01 Feb '08

Author: wmb Date: 2008-02-01 04:40:36 +0100 (Fri, 01 Feb 2008) New Revision: 805 Added: forth/kernel/scan.fth Modified: cpu/ppc/kernel.bth cpu/x86/kerncode.fth forth/kernel/kernel.fth Log: Forth kernel - moved high-level implementations of string scanning words into a separate file and implemented code versions of them for x86. No functional change, just a speedup. Modified: cpu/ppc/kernel.bth =================================================================== --- cpu/ppc/kernel.bth 2008-02-01 02:29:02 UTC (rev 804) +++ cpu/ppc/kernel.bth 2008-02-01 03:40:36 UTC (rev 805) @@ -57,6 +57,7 @@ fload ${BP}/forth/kernel/uservars.fth fload ${BP}/forth/kernel/double.fth +fload ${BP}/forth/kernel/scan.fth fload ${BP}/forth/lib/bitops.fth fload ${BP}/cpu/ppc/kernrel.fth Modified: cpu/x86/kerncode.fth =================================================================== --- cpu/x86/kerncode.fth 2008-02-01 02:29:02 UTC (rev 804) +++ cpu/x86/kerncode.fth 2008-02-01 03:40:36 UTC (rev 805) @@ -1397,6 +1397,93 @@ dx si mov \ Restore c; + +code skipwhite ( adr len -- adr' len' ) + si dx mov + cld + cx pop + cx cx or 0<> if + si pop + begin + al lods + h# 20 # al cmp > if + si dec si push + cx push dx si mov + next + then + loopa + si push + then + cx push + dx si mov +c; + +\ Adr2 points to the delimiter or to the end of the buffer +\ Adr3 points to the character after the delimiter or to the end of the buffer +code scantowhite ( adr1 len1 -- adr1 adr2 adr3 ) + si dx mov + cld + cx pop + 0 [sp] si mov + cx cx or 0<> if + begin + al lods + h# 20 # al cmp <= if + si dec si push + si inc si push + dx si mov + next + then + loopa + then + si push + si push + dx si mov +c; + +code skipchar ( adr len char -- adr' len' ) + si dx mov + cld + bx pop \ char in bx + cx pop + cx cx or 0<> if + si pop + begin + al lods + bl al cmp + loope + 0<> if cx inc si dec then + si push + then + cx push + dx si mov +c; + +\ Adr2 points to the delimiter or to the end of the buffer +\ Adr3 points to the character after the delimiter or to the end of the buffer +code scantochar ( adr1 len1 char -- adr1 adr2 adr3 ) + si dx mov + cld + bx pop + cx pop + 0 [sp] si mov + cx cx or 0<> if + begin + al lods + bl al cmp + loopne + = if + si dec si push + si inc si push + dx si mov + next + then + then + si push + si push + dx si mov +c; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: forth/kernel/kernel.fth =================================================================== --- forth/kernel/kernel.fth 2008-02-01 02:29:02 UTC (rev 804) +++ forth/kernel/kernel.fth 2008-02-01 03:40:36 UTC (rev 805) @@ -2763,50 +2763,6 @@ : set-input ( source-adr source-len source-id -- ) 0 0 5 restore-input drop ; -headerless -: skipwhite ( adr1 len1 -- adr2 len2 ) - begin dup 0> while ( adr len ) - over c@ bl > if exit then - 1 /string - repeat ( adr' 0 ) -; - -\ Adr2 points to the delimiter or to the end of the buffer -\ Adr3 points to the character after the delimiter or to the end of the buffer -: scantowhite ( adr1 len1 -- adr1 adr2 adr3 ) - over swap ( adr1 adr1 len1 ) - begin dup 0> while ( adr1 adr len ) - over c@ bl <= if drop dup 1+ exit then - 1 /string ( adr1 adr' len' ) - repeat ( adr1 adr2 0 ) - drop dup ( adr1 adr2 adr2 ) -; - -: skipchar ( adr1 len1 delim -- adr2 len2 ) - >r ( adr1 len1 ) ( r: delim ) - begin dup 0> while ( adr len ) - over c@ r@ <> if ( adr len ) - r> drop exit ( adr2 len2 ) - then ( adr len ) - 1 /string ( adr' len' ) - repeat ( adr' 0 ) - r> drop ( adr2 0 ) -; - -\ Adr2 points to the delimiter or to the end of the buffer -\ Adr3 points to the character after the delimiter or to the end of the buffer -: scantochar ( adr1 len1 char -- adr1 adr2 adr3 ) - >r ( adr1 len1 ) ( r: delim ) - over swap ( adr1 adr1 len1 ) - begin dup 0> while ( adr1 adr len ) - over c@ r@ = if ( adr1 adr len ) - r> 2drop dup 1+ exit ( adr1 adr2 adr3 ) - then ( adr1 adr len ) - 1 /string ( adr1 adr' len' ) - repeat ( adr1 adr2 0 ) - r> 2drop dup ( adr1 adr2 adr2 ) -; -headers : parse-word ( -- adr len ) source >in @ /string over >r ( adr1 len1 ) ( r: adr1 ) skipwhite ( adr2 len2 ) Added: forth/kernel/scan.fth =================================================================== --- forth/kernel/scan.fth (rev 0) +++ forth/kernel/scan.fth 2008-02-01 03:40:36 UTC (rev 805) @@ -0,0 +1,69 @@ +purpose: High level implementations of string scanning words +\ See license at end of file + +: skipwhite ( adr1 len1 -- adr2 len2 ) + begin dup 0> while ( adr len ) + over c@ bl > if exit then + 1 /string + repeat ( adr' 0 ) +; + +\ Adr2 points to the delimiter or to the end of the buffer +\ Adr3 points to the character after the delimiter or to the end of the buffer +: scantowhite ( adr1 len1 -- adr1 adr2 adr3 ) + over swap ( adr1 adr1 len1 ) + begin dup 0> while ( adr1 adr len ) + over c@ bl <= if drop dup 1+ exit then + 1 /string ( adr1 adr' len' ) + repeat ( adr1 adr2 0 ) + drop dup ( adr1 adr2 adr2 ) +; + +: skipchar ( adr1 len1 delim -- adr2 len2 ) + >r ( adr1 len1 ) ( r: delim ) + begin dup 0> while ( adr len ) + over c@ r@ <> if ( adr len ) + r> drop exit ( adr2 len2 ) + then ( adr len ) + 1 /string ( adr' len' ) + repeat ( adr' 0 ) + r> drop ( adr2 0 ) +; + +\ Adr2 points to the delimiter or to the end of the buffer +\ Adr3 points to the character after the delimiter or to the end of the buffer +: scantochar ( adr1 len1 char -- adr1 adr2 adr3 ) + >r ( adr1 len1 ) ( r: delim ) + over swap ( adr1 adr1 len1 ) + begin dup 0> while ( adr1 adr len ) + over c@ r@ = if ( adr1 adr len ) + r> 2drop dup 1+ exit ( adr1 adr2 adr3 ) + then ( adr1 adr len ) + 1 /string ( adr1 adr' len' ) + repeat ( adr1 adr2 0 ) + r> 2drop dup ( adr1 adr2 adr2 ) +; + +\ 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

r804 - dev/olpc/kb3700
by svn＠openbios.org 01 Feb '08

01 Feb '08

Author: wmb Date: 2008-02-01 03:29:02 +0100 (Fri, 01 Feb 2008) New Revision: 804 Modified: dev/olpc/kb3700/ecio.fth Log: OLPC EC interface - added "wlan-freeze" command that calls the new EC command number 0x35, and deleted support for command 0x23 which has never worked right, and in fact crashes the machine badly if you try it. Modified: dev/olpc/kb3700/ecio.fth =================================================================== --- dev/olpc/kb3700/ecio.fth 2008-02-01 02:26:44 UTC (rev 803) +++ dev/olpc/kb3700/ecio.fth 2008-02-01 02:29:02 UTC (rev 804) @@ -143,8 +143,9 @@ : bat-init-nimh-gp ( -- ) h# 20 ec-cmd ; : bat-init-lifepo4-byd ( -- ) h# 21 ec-cmd ; : bat-init-lifepo4-gp ( -- ) h# 22 ec-cmd ; -: wlan-off ( -- ) 0 h# 23 ec-cmd-b! ; -: wlan-on ( -- ) 1 h# 23 ec-cmd-b! ; +\ EC cmd 23 never worked right and has been deprecated +\ : wlan-off ( -- ) 0 h# 23 ec-cmd-b! ; +\ : wlan-on ( -- ) 1 h# 23 ec-cmd-b! ; : wlan-wake ( -- ) h# 24 ec-cmd ; : wlan-reset ( -- ) h# 25 ec-cmd ; : dcon-power-off ( -- ) 0 h# 26 ec-cmd-b! ; @@ -153,6 +154,7 @@ : reset-ec ( -- ) h# 28 ec-cmd ; : write-protect-fw ( -- ) 3 ec-cmd ; : ebook-mode? ( -- b ) h# 2a ec-cmd-b@ ; +: wlan-freeze ( -- ) h# 35 ec-cmd ; : ec-indexed-io-off ( -- ) h# fe95 ec@ h# 40 invert and h# fe95 ec! ;

1 0

r803 - ofw/fs/jffs2
by svn＠openbios.org 01 Feb '08

01 Feb '08

Author: wmb Date: 2008-02-01 03:26:44 +0100 (Fri, 01 Feb 2008) New Revision: 803 Modified: ofw/fs/jffs2/jffs2.fth Log: OLPC Trac 6291 - JFFS2 problem - when there is a gap of more than 0x100 ff bytes (e.g. the tail end of a partially-written page) before some active nodes in a new page, the raw dirent scanner was giving up too soon and not seeing the nodes in the following page. I changed the scanner to search the entire remainder of the erase block. Modified: ofw/fs/jffs2/jffs2.fth =================================================================== --- ofw/fs/jffs2/jffs2.fth 2008-01-31 23:34:01 UTC (rev 802) +++ ofw/fs/jffs2/jffs2.fth 2008-02-01 02:26:44 UTC (rev 803) @@ -742,8 +742,7 @@ \ This assumes that the entire erase block is in memory : another-node? ( adr -- false | adr' true ) - dup h# 100 + eb-end umin ( adr end-adr ) - swap ?do + eb-end swap ?do i w@ jffs2-magic = if i header-crc? if i +raw-node eb-end u<= if

1 0

r802 - dev/geode
by svn＠openbios.org 01 Feb '08

01 Feb '08

Author: wmb Date: 2008-02-01 00:34:01 +0100 (Fri, 01 Feb 2008) New Revision: 802 Modified: dev/geode/smi.fth Log: Geode SMI handler - Another round of tuning. Hopefully the last stylistic pass. Modified: dev/geode/smi.fth =================================================================== --- dev/geode/smi.fth 2008-01-31 19:01:35 UTC (rev 801) +++ dev/geode/smi.fth 2008-01-31 23:34:01 UTC (rev 802) @@ -9,64 +9,85 @@ previous definitions +\ The general naming convention here is that smm-* refers to +\ addresses within the memory that is set aside for SMI handling. +\ smi-* refers to stuff in the Forth domain. + h# f.f000 constant smm-base h# 1000 constant smm-size \ We use about 3K of this, 2K for stacks -: +smm ( offset -- adr ) smm-base + ; +: +smm ( segment-relative-adr -- adr ) smm-base + ; +: -smm ( adr -- segment-relative-adr ) smm-base - ; -h# 30 constant /smm-gdt +h# 28 constant /smm-gdt +h# 8 constant smm-c16 +h# 10 constant smm-d16 +h# 18 constant smm-c32 +h# 20 constant smm-d32 -\ The handler code takes about h# 140 bytes +\ For stuff that grows down - add the offset first +: rm-stack ( offset len "name" -- offset' ) + dup constant ; +: pm-stack ( offset len "name" -- offset' ) + dup +smm constant ; -\ The following save area + the SMM_HEADER (h# 30) takes about h# 100 -h# 200 -dup constant smm-save-gdt 8 + -dup constant smm-gdtp 8 + -dup constant smm-gdt /smm-gdt + -dup constant smm-pdir la1+ -dup constant smm-forth-origin la1+ -dup constant smm-forth-up la1+ -dup constant smm-forth-entry la1+ +\ For individual data items - add the offset afterwards +: pm-data ( offset len "name" -- offset' ) over +smm constant + ; +: rm-data ( offset len "name" -- offset' ) over constant + ; -\ 10 bytes for each of 6 segment registers -dup constant smm-save-seg d# 60 + -dup constant smm-save-esp la1+ -dup constant smm-sp la1+ - \ 8x 4-byte general registers + config adr + cs3 + spare -h# 38 + constant smm-stack +\ Layout of SMM memory area: +0 \ Entry/exit handler code goes here, at the origin +h# 180 rm-data smm-gdt \ The GDT is embedded in the code wad + \ The handler code takes about h# 160 bytes -h# 300 constant smm-header +\ The following locations are for saving/restoring registers +\ d# 60 rm-data smm-save-seg \ 6 10-byte segment registers +d# 50 rm-data smm-save-seg \ 6 10-byte segment registers +/l rm-data smm-save-esp \ Caller's stack pointer +6 rm-data smm-save-gdt \ Caller's GDT pointer -: set-descr ( base limit d.type sel -- ) - >r format-descriptor ( d.descr r: sel ) - r> smm-gdt + +smm d! ( ) -; +0 pm-data smm-regs \ Alternate name, for use by Forth +0 rm-data smm-sp \ Real-mode sp after saving registers +d# 10 /l* rm-stack smm-stack \ CR3, portCF8, 8 general registers -: set-smm-descs ( -- ) -\ smm-base -1 code32 format-descriptor smm-gdt 8 + +smm d! \ Boosted code32 - smm-base smm-size 1- code16 h# 10 set-descr - smm-base smm-size 1- data16 h# 18 set-descr - 0 -1 code32 h# 20 set-descr - 0 -1 data32 h# 28 set-descr - /smm-gdt 1- smm-gdtp +smm w! \ GDT limit - smm-gdt +smm smm-gdtp +smm wa1+ l! \ GDT base -; +h# 30 pm-stack smm-header \ Top address where hardware puts the SMM info frame -nuser smi-sp0 -nuser smi-rp0 +\ These locations are set once at installation time. The entry code reads them. +[ifdef] virtual-mode +/l pm-data smm-pdir \ Page directory pointer so we can enable paging +[then] +/l pm-data smm-forth-base \ Base address of the Forth dictionary +/l pm-data smm-forth-up \ Base address of the Forth user area +/l pm-data smm-forth-entry \ Entry address of Forth SMI handler +/l pm-data smm-save-sp0 \ Exchanged with sp0 user variable +/l pm-data smm-save-rp0 \ Exchanged with rp0 user variable -label smm-handler +h# 400 pm-stack smm-sp0 \ SMM Forth data stack +h# 400 pm-stack smm-rp0 \ SMM Forth return stack +drop + +label smi-handler 16-bit + + \ GDT (with jump tucked in at the beginning) + \ We put the GDT right at the beginning and use the first entry (which + \ cannot be used as a selector) for a 2-byte jmp and the 6-byte GDT pointer + here /smm-gdt + #) jmp \ Jump past GDT - 2 bytes + /smm-gdt 1- w, smm-base l, \ GDT pointer - limit.w base.l + smm-base smm-size 1- code16 format-descriptor swap l, l, \ 8 - smm-c16 + smm-base smm-size 1- data16 format-descriptor swap l, l, \ 10 - smm-d16 + 0 -1 code32 format-descriptor swap l, l, \ 18 - smm-c32 + 0 -1 data32 format-descriptor swap l, l, \ 20 - smm-d32 + \ End of GDT + cs: ds smm-save-seg d# 00 + #) svdc - cs: smm-gdt h# 18 + #) ds rsdc \ GDT reference + cs: smm-gdt smm-d16 + #) ds rsdc \ Now we can use the data segment es smm-save-seg d# 10 + #) svdc fs smm-save-seg d# 20 + #) svdc gs smm-save-seg d# 30 + #) svdc ss smm-save-seg d# 40 + #) svdc - cs smm-save-seg d# 50 + #) svdc \ So we can get back to the boost segment +\ cs smm-save-seg d# 50 + #) svdc \ So we can get back to the boost segment - smm-gdt h# 18 + #) ss rsdc \ GDT reference + smm-gdt smm-d16 + #) ss rsdc op: sp smm-save-esp #) mov smm-stack # sp mov \ Now we have a stack @@ -78,72 +99,65 @@ op: ax push cr3 ax mov op: ax push - sp smm-sp #) mov + \ The real-mode stack pointer is now at a known location \ Get into protected mode using the same segments \ Don't bother with the IDT; we won't enable interrupts op: smm-save-gdt #) sgdt - op: smm-gdtp #) lgdt + op: smm-gdt 2+ #) lgdt cr0 ax mov 1 # al or ax cr0 mov \ Enter protected mode - op: here 7 + smm-handler - +smm h# 20 #) far jmp \ GDT reference + op: here 7 + smi-handler - +smm smm-c32 #) far jmp 32-bit \ Reload segment registers with protected mode bits - op: h# 28 # ax mov \ GDT reference + op: smm-d32 # ax mov ax ds mov ax es mov ax fs mov ax gs mov ax ss mov +[ifdef] virtual-mode \ Turn on paging - smm-pdir +smm #) ax mov + smm-pdir #) ax mov ax cr3 mov \ Set Page Directory Base Register cr0 ax mov h# 8000.0000 # ax or ax cr0 mov \ Turn on Paging Enable bit +[then] \ Beginning of Forth-specific stuff - smm-forth-origin +smm #) bx mov - smm-forth-up +smm #) up mov - smm-forth-entry +smm #) ip mov + smm-forth-base #) bx mov + smm-forth-up #) up mov + smm-forth-entry #) ip mov \ Exchange the stack and return stack pointer with the smi versions - 'user sp0 sp mov - 'user rp0 rp mov + 'user sp0 sp mov smm-save-sp0 #) sp xchg sp 'user sp0 mov + 'user rp0 rp mov smm-save-rp0 #) rp xchg rp 'user rp0 mov - 'user smi-sp0 sp xchg - 'user smi-rp0 rp xchg - - sp 'user sp0 mov - rp 'user rp0 mov - - cld c; code (smi-return) \ This code field must be relocated after copying to SMM memory \ Exchange the stack and return stack pointer with the smi versions - 'user sp0 sp mov - 'user rp0 rp mov + 'user sp0 sp mov smm-save-sp0 #) sp xchg sp 'user sp0 mov + 'user rp0 rp mov smm-save-rp0 #) rp xchg rp 'user rp0 mov - 'user smi-sp0 sp xchg - 'user smi-rp0 rp xchg - - sp 'user sp0 mov - rp 'user rp0 mov - \ End of Forth-specific stuff +[ifdef] virtual-mode \ Turn off paging cr0 ax mov h# 8000.0000 invert # ax and ax cr0 mov \ Turn off Paging Enable bit +[then] - here 7 + smm-handler - h# 08 #) far jmp \ Get into the boosted segment + here 7 + smi-handler - smm-c16 #) far jmp \ Get into the boosted segment 16-bit + smm-d16 # ax mov ax ss mov ax ds mov \ Reload data and stack segments + cr0 ax mov 1 invert # al and ax cr0 mov \ Exit protected mode \ Reload data segment registers - cs: smm-gdt h# 18 + #) ss rsdc \ GDT reference - cs: smm-gdt h# 18 + #) ds rsdc \ GDT reference +\ cs: smm-gdt smm-d16 + #) ss rsdc +\ cs: smm-gdt smm-d16 + #) ds rsdc op: smm-save-gdt #) lgdt - smm-sp #) sp mov + smm-sp # sp mov op: ax pop ax cr3 mov op: ax pop @@ -162,9 +176,9 @@ rsm end-code -here smm-handler - constant /smm-handler +here smi-handler - constant /smi-handler -: smi-return ( -- ) [ ' (smi-return) smm-handler - +smm ] literal execute ; +: smi-return ( -- ) [ ' (smi-return) smi-handler - +smm ] literal execute ; defer handle-smi ' noop is handle-smi create smm-exec ] handle-smi smi-return [ @@ -192,27 +206,28 @@ \ Base Limit smm-base smm-size 1- h# 133b msr! - smm-base smm-header + 0 h# 132b msr! \ Offset of SMM Header + smm-header 0 h# 132b msr! \ Offset of SMM Header h# 18. h# 1301 msr! \ Enable IO and software SMI \ Unnecessary if already in mapped memory \ smm-base dup smm-size -1 mmu-map - smm-handler smm-base /smm-handler move + smi-handler smm-base /smi-handler move \ Relocate the code field of the code word that is embedded in the sequence - ['] (smi-return) smm-handler - +smm ( cfa-adr ) + ['] (smi-return) smi-handler - +smm ( cfa-adr ) dup ta1+ swap token! - set-smm-descs - cr3@ smm-pdir +smm l! +[ifdef] virtual-mode + cr3@ smm-pdir l! +[then] - origin smm-forth-origin +smm l! - smm-exec smm-forth-entry +smm l! - up@ smm-forth-up +smm l! - h# 800 +smm smi-sp0 ! - h# c00 +smm smi-rp0 ! + origin smm-forth-base l! + smm-exec smm-forth-entry l! + up@ smm-forth-up l! + smm-sp0 smm-save-sp0 ! + smm-rp0 smm-save-rp0 ! enable-virtual-pci ; @@ -220,18 +235,19 @@ : smi-interact ( -- ) ." In SMI" cr quit ; ' smi-interact is handle-smi -: smm-cs-base ( -- l ) smm-header h# 1c - +smm l@ ; -: smm-eip ( -- l ) smm-header h# 10 - +smm l@ ; -: smm-next-eip ( -- l ) smm-header h# 14 - +smm l@ ; -: smm-flags ( -- w ) smm-header h# 24 - +smm w@ ; -: smm-io-port ( -- port# ) smm-header h# 28 - +smm w@ ; -: smm-io-size ( -- size ) smm-header h# 26 - +smm w@ ; -: smm-io-data ( -- data ) smm-header h# 2c - +smm l@ ; +\ : smm-cs-base ( -- l ) smm-header h# 1c - l@ ; +\ : smm-eip ( -- l ) smm-header h# 10 - l@ ; +\ : smm-next-eip ( -- l ) smm-header h# 14 - l@ ; +: smm-flags ( -- w ) smm-header h# 24 - w@ ; +: smm-io-port ( -- port# ) smm-header h# 28 - w@ ; +: smm-io-size ( -- size ) smm-header h# 26 - w@ ; +: smm-io-data ( -- data ) smm-header h# 2c - l@ ; +\ Stacked registers: 0:CR3, 1:portCF8, 2:DI, 3:SI, 4:BP, 5:SP, 6:BX, 7:DX, 8:CX, 9:AX : smm-config-adr ( -- adr ) - smm-sp +smm w@ +smm la1+ @ h# 7fff.fffc and + smm-regs la1+ @ h# 7fff.fffc and smm-io-port 3 and or ; -: smm-eax ( -- adr ) smm-sp +smm w@ +smm 9 la+ ; +: smm-eax ( -- adr ) smm-regs 9 la+ ; : vr-spoof? ( -- handled? ) false ; : config-spoof? ( -- handled? )

1 0

r801 - dev/geode
by svn＠openbios.org 31 Jan '08

31 Jan '08

Author: wmb Date: 2008-01-31 20:01:35 +0100 (Thu, 31 Jan 2008) New Revision: 801 Modified: dev/geode/smi.fth Log: Geode SMI handler - Added PCI config space virtualization. Modified: dev/geode/smi.fth =================================================================== --- dev/geode/smi.fth 2008-01-31 17:27:36 UTC (rev 800) +++ dev/geode/smi.fth 2008-01-31 19:01:35 UTC (rev 801) @@ -168,6 +168,11 @@ defer handle-smi ' noop is handle-smi create smm-exec ] handle-smi smi-return [ +: enable-virtual-pci ( -- ) + h# 5000.2012 msr@ swap h# 8002 or swap h# 5000.2012 msr! \ Virtualize devices f and 1 + h# 5000.2002 msr@ swap 8 invert and swap h# 5000.2002 msr! \ Enable SSMI for config accesses +; + : setup-smi ( -- ) \ This is how you would map the SMM region to physical memory at 4000.0000 \ This is a Base Mask Offset descriptor - the base address @@ -208,14 +213,58 @@ up@ smm-forth-up +smm l! h# 800 +smm smi-sp0 ! h# c00 +smm smi-rp0 ! + + enable-virtual-pci ; : smi-interact ( -- ) ." In SMI" cr quit ; ' smi-interact is handle-smi -: enable-virtual-pci ( -- ) - h# 5000.2012 msr@ swap h# 8002 or swap h# 5000.2002 msr! \ Virtualize devices f and 1 - h# 5000.2002 msr@ swap 8 invert and swap h# 5000.2002 msr! \ Enable SSMI for config accesses +: smm-cs-base ( -- l ) smm-header h# 1c - +smm l@ ; +: smm-eip ( -- l ) smm-header h# 10 - +smm l@ ; +: smm-next-eip ( -- l ) smm-header h# 14 - +smm l@ ; +: smm-flags ( -- w ) smm-header h# 24 - +smm w@ ; +: smm-io-port ( -- port# ) smm-header h# 28 - +smm w@ ; +: smm-io-size ( -- size ) smm-header h# 26 - +smm w@ ; +: smm-io-data ( -- data ) smm-header h# 2c - +smm l@ ; +: smm-config-adr ( -- adr ) + smm-sp +smm w@ +smm la1+ @ h# 7fff.fffc and + smm-io-port 3 and or ; +: smm-eax ( -- adr ) smm-sp +smm w@ +smm 9 la+ ; +: vr-spoof? ( -- handled? ) false ; +: config-spoof? ( -- handled? ) + smm-io-port 3 invert and h# cfc <> if false exit then + + \ The existing Forth config spoofer does the hard work + smm-flags 2 and if \ Write + smm-io-data smm-config-adr ( data config-adr ) + smm-io-size case + 1 of config-b! endof + 3 of config-w! endof + f of config-l! endof + endcase + else + smm-config-adr ( config-adr ) + smm-io-size case + 1 of config-b@ smm-eax c! endof + 3 of config-w@ smm-eax w! endof + f of config-l@ smm-eax l! endof + endcase + then + true +; +: virtualize-io ( -- ) + smm-flags h# 80 and 0= if exit then + config-spoof? if exit then + vr-spoof? if exit then +; +: soft-smi smi-interact ; +: smi-dispatch ( -- ) + smm-flags h# 80 and if virtualize-io then + smm-flags h# 8 and if soft-smi then +; +' smi-dispatch is handle-smi + code smi smint c;

1 0

r800 - dev/geode
by svn＠openbios.org 31 Jan '08

31 Jan '08

Author: wmb Date: 2008-01-31 18:27:36 +0100 (Thu, 31 Jan 2008) New Revision: 800 Modified: dev/geode/smi.fth Log: Geode SMI handler - cleaned up the return from 32-bit to 16-bit mode. Modified: dev/geode/smi.fth =================================================================== --- dev/geode/smi.fth 2008-01-31 10:15:58 UTC (rev 799) +++ dev/geode/smi.fth 2008-01-31 17:27:36 UTC (rev 800) @@ -13,7 +13,7 @@ h# 1000 constant smm-size \ We use about 3K of this, 2K for stacks : +smm ( offset -- adr ) smm-base + ; -h# 28 constant /smm-gdt +h# 30 constant /smm-gdt \ The handler code takes about h# 140 bytes @@ -43,10 +43,10 @@ : set-smm-descs ( -- ) \ smm-base -1 code32 format-descriptor smm-gdt 8 + +smm d! \ Boosted code32 - smm-base smm-size 1- code16 h# 08 set-descr - smm-base smm-size 1- data16 h# 10 set-descr - 0 -1 code32 h# 18 set-descr - 0 -1 data32 h# 20 set-descr + smm-base smm-size 1- code16 h# 10 set-descr + smm-base smm-size 1- data16 h# 18 set-descr + 0 -1 code32 h# 20 set-descr + 0 -1 data32 h# 28 set-descr /smm-gdt 1- smm-gdtp +smm w! \ GDT limit smm-gdt +smm smm-gdtp +smm wa1+ l! \ GDT base ; @@ -58,14 +58,15 @@ 16-bit cs: ds smm-save-seg d# 00 + #) svdc - cs: smm-gdt h# 10 + #) ds rsdc \ Now we have a data segment + cs: smm-gdt h# 18 + #) ds rsdc \ GDT reference + \ Now we can use the data segment es smm-save-seg d# 10 + #) svdc fs smm-save-seg d# 20 + #) svdc gs smm-save-seg d# 30 + #) svdc ss smm-save-seg d# 40 + #) svdc cs smm-save-seg d# 50 + #) svdc \ So we can get back to the boost segment - smm-gdt h# 10 + #) ss rsdc + smm-gdt h# 18 + #) ss rsdc \ GDT reference op: sp smm-save-esp #) mov smm-stack # sp mov \ Now we have a stack @@ -85,11 +86,11 @@ op: smm-gdtp #) lgdt cr0 ax mov 1 # al or ax cr0 mov \ Enter protected mode - op: here 7 + smm-handler - +smm h# 18 #) far jmp + op: here 7 + smm-handler - +smm h# 20 #) far jmp \ GDT reference 32-bit \ Reload segment registers with protected mode bits - op: h# 20 # ax mov + op: h# 28 # ax mov \ GDT reference ax ds mov ax es mov ax fs mov ax gs mov ax ss mov \ Turn on paging @@ -131,16 +132,14 @@ \ Turn off paging cr0 ax mov h# 8000.0000 invert # ax and ax cr0 mov \ Turn off Paging Enable bit - cr0 ax mov 1 invert # al and ax cr0 mov \ Enter real mode - - \ Return to the boosted code-16 address space - smm-save-seg d# 50 + +smm #) cs rsdc + here 7 + smm-handler - h# 08 #) far jmp \ Get into the boosted segment 16-bit - op: here 5 + smm-base - #) jmp \ Decrease IP while increasing the segment register + cr0 ax mov 1 invert # al and ax cr0 mov \ Exit protected mode + \ Reload data segment registers - cs: smm-gdt h# 10 + #) ss rsdc - cs: smm-gdt h# 10 + #) ds rsdc + cs: smm-gdt h# 18 + #) ss rsdc \ GDT reference + cs: smm-gdt h# 18 + #) ds rsdc \ GDT reference op: smm-save-gdt #) lgdt @@ -186,11 +185,7 @@ h# 000ff.0.00.000ff.1.01. h# 180e msr! \ Base Limit -\ smm-base smm-size 1- h# 133b msr! - \ The limit here must be large enough to cover the code address - \ between the time that we reenter real mode and the time we - \ reestablish the boosted descriptor. - smm-base -1 h# 133b msr! \ Big limit + smm-base smm-size 1- h# 133b msr! smm-base smm-header + 0 h# 132b msr! \ Offset of SMM Header

1 0

r799 - dev/geode
by svn＠openbios.org 31 Jan '08

31 Jan '08

Author: wmb Date: 2008-01-31 11:15:58 +0100 (Thu, 31 Jan 2008) New Revision: 799 Modified: dev/geode/smi.fth Log: Geode SMI handler - the code is pretty tight now, using only one page of SMM RAM. Modified: dev/geode/smi.fth =================================================================== --- dev/geode/smi.fth 2008-01-31 05:16:56 UTC (rev 798) +++ dev/geode/smi.fth 2008-01-31 10:15:58 UTC (rev 799) @@ -9,74 +9,65 @@ previous definitions -h# 4000.0000 constant smm-base -h# 1.0000 constant smm-size +h# f.f000 constant smm-base +h# 1000 constant smm-size \ We use about 3K of this, 2K for stacks : +smm ( offset -- adr ) smm-base + ; -h# 30 constant /smm-gdt -smm-size h# 100 - -dup constant smm-stack -dup constant smm-save-gdt 8 + -dup constant smm-gdtp 8 + -dup constant smm-gdt /smm-gdt + -dup constant smm-pdir la1+ +h# 28 constant /smm-gdt + +\ The handler code takes about h# 140 bytes + +\ The following save area + the SMM_HEADER (h# 30) takes about h# 100 +h# 200 +dup constant smm-save-gdt 8 + +dup constant smm-gdtp 8 + +dup constant smm-gdt /smm-gdt + +dup constant smm-pdir la1+ dup constant smm-forth-origin la1+ dup constant smm-forth-up la1+ +dup constant smm-forth-entry la1+ -dup constant smm-code16 h# a + -dup constant smm-data16 h# a + -dup constant smm-code32 h# a + -dup constant smm-data32 h# a + -dup constant smm-ds h# a + -dup constant smm-es h# a + -dup constant smm-fs h# a + -dup constant smm-gs h# a + -dup constant smm-ss h# a + -dup constant smm-cs h# a + -dup constant smm-esp la1+ -dup constant smm-sp wa1+ -drop +\ 10 bytes for each of 6 segment registers +dup constant smm-save-seg d# 60 + +dup constant smm-save-esp la1+ +dup constant smm-sp la1+ + \ 8x 4-byte general registers + config adr + cs3 + spare +h# 38 + constant smm-stack -: set-descr ( base limit d.type sel offset -- ) - +smm 2>r format-descriptor ( d.descr r: sel adr ) - 2r@ 8 + w! ( d.descr r: sel adr ) - 2dup r> d! ( d.descr r: sel ) - r> smm-gdt + +smm d! ( ) +h# 300 constant smm-header + +: set-descr ( base limit d.type sel -- ) + >r format-descriptor ( d.descr r: sel ) + r> smm-gdt + +smm d! ( ) ; : set-smm-descs ( -- ) - smm-base -1 code32 format-descriptor smm-gdt 8 + +smm d! \ Boosted code32 - - smm-base smm-size 1- code16 h# 10 smm-code16 set-descr - smm-base smm-size 1- data16 h# 18 smm-data16 set-descr - 0 -1 code32 h# 20 smm-code32 set-descr - 0 -1 data32 h# 28 smm-data32 set-descr - /smm-gdt 1- smm-gdtp +smm w! \ GDT limit +\ smm-base -1 code32 format-descriptor smm-gdt 8 + +smm d! \ Boosted code32 + smm-base smm-size 1- code16 h# 08 set-descr + smm-base smm-size 1- data16 h# 10 set-descr + 0 -1 code32 h# 18 set-descr + 0 -1 data32 h# 20 set-descr + /smm-gdt 1- smm-gdtp +smm w! \ GDT limit smm-gdt +smm smm-gdtp +smm wa1+ l! \ GDT base ; nuser smi-sp0 nuser smi-rp0 -defer smi-return -: smi-exec ( -- ) - ." Forth SMI handler" cr - quit - smi-return -; label smm-handler 16-bit - cs: ds smm-ds #) svdc - cs: smm-data16 #) ds rsdc \ Now we have a data segment + cs: ds smm-save-seg d# 00 + #) svdc + cs: smm-gdt h# 10 + #) ds rsdc \ Now we have a data segment + es smm-save-seg d# 10 + #) svdc + fs smm-save-seg d# 20 + #) svdc + gs smm-save-seg d# 30 + #) svdc + ss smm-save-seg d# 40 + #) svdc + cs smm-save-seg d# 50 + #) svdc \ So we can get back to the boost segment - es smm-es #) svdc - fs smm-fs #) svdc - gs smm-gs #) svdc - ss smm-ss #) svdc - smm-data16 #) ss rsdc \ Now we have a data segment + smm-gdt h# 10 + #) ss rsdc - op: sp smm-esp #) mov + op: sp smm-save-esp #) mov smm-stack # sp mov \ Now we have a stack op: pusha @@ -88,30 +79,18 @@ cr3 ax mov op: ax push sp smm-sp #) mov -\ --- \ Get into protected mode using the same segments \ Don't bother with the IDT; we won't enable interrupts op: smm-save-gdt #) sgdt op: smm-gdtp #) lgdt -\ Test< - \ Get into the 4G flat code-32 address space - cs smm-cs #) svdc \ So we can get back - smm-code32 #) cs rsdc \ 4G flat address space for code + cr0 ax mov 1 # al or ax cr0 mov \ Enter protected mode + op: here 7 + smm-handler - +smm h# 18 #) far jmp 32-bit - here 5 + +smm #) jmp \ Into unboosted segment -nop nop nop nop nop nop nop - - cr0 ax mov 1 # al or ax cr0 mov \ Enter protected mode - here 2 + #) jmp - \ Reload segment registers with protected mode bits - cs: smm-data32 +smm #) ds rsdc - smm-data32 +smm #) ss rsdc - smm-data32 +smm #) es rsdc - smm-data32 +smm #) fs rsdc - smm-data32 +smm #) gs rsdc + op: h# 20 # ax mov + ax ds mov ax es mov ax fs mov ax gs mov ax ss mov \ Turn on paging smm-pdir +smm #) ax mov @@ -121,6 +100,7 @@ \ Beginning of Forth-specific stuff smm-forth-origin +smm #) bx mov smm-forth-up +smm #) up mov + smm-forth-entry +smm #) ip mov \ Exchange the stack and return stack pointer with the smi versions 'user sp0 sp mov @@ -132,13 +112,10 @@ sp 'user sp0 mov rp 'user rp0 mov - \ Set the interpreter pointer - 'body smi-exec origin - # ip mov - bx ip add \ add current origin cld c; -code (smi-return) +code (smi-return) \ This code field must be relocated after copying to SMM memory \ Exchange the stack and return stack pointer with the smi versions 'user sp0 sp mov 'user rp0 rp mov @@ -149,30 +126,24 @@ sp 'user sp0 mov rp 'user rp0 mov -\ End of Forth-specific stuff + \ End of Forth-specific stuff \ Turn off paging cr0 ax mov h# 8000.0000 invert # ax and ax cr0 mov \ Turn off Paging Enable bit cr0 ax mov 1 invert # al and ax cr0 mov \ Enter real mode - here 2 + #) jmp - - \ Reload segment registers with real mode bits - cs: smm-data16 +smm #) ss rsdc - cs: smm-data16 +smm #) ds rsdc - - \ Return to the boosted code-16 address space - smm-cs #) cs rsdc + smm-save-seg d# 50 + +smm #) cs rsdc 16-bit - here 2 + #) jmp \ 16-bit JMP zeros EIP[31:16] + op: here 5 + smm-base - #) jmp \ Decrease IP while increasing the segment register -\ >Test + \ Reload data segment registers + cs: smm-gdt h# 10 + #) ss rsdc + cs: smm-gdt h# 10 + #) ds rsdc op: smm-save-gdt #) lgdt -\ --- smm-sp #) sp mov op: ax pop ax cr3 mov @@ -182,86 +153,74 @@ op: popa - op: smm-esp #) sp mov + op: smm-save-esp #) sp mov - smm-ss #) ss rsdc - smm-gs #) gs rsdc - smm-fs #) fs rsdc - smm-es #) es rsdc - smm-ds #) ds rsdc + smm-save-seg d# 40 + #) ss rsdc + smm-save-seg d# 30 + #) gs rsdc + smm-save-seg d# 20 + #) fs rsdc + smm-save-seg d# 10 + #) es rsdc + smm-save-seg d# 00 + #) ds rsdc rsm end-code here smm-handler - constant /smm-handler +: smi-return ( -- ) [ ' (smi-return) smm-handler - +smm ] literal execute ; +defer handle-smi ' noop is handle-smi +create smm-exec ] handle-smi smi-return [ + : setup-smi ( -- ) - \ Map the SMM region to physical memory at e.0000 + \ This is how you would map the SMM region to physical memory at 4000.0000 \ This is a Base Mask Offset descriptor - the base address \ is 4000.0000 and to that is added the offset c00e.0000 \ to give the address 000e.0000 in the GLMC address space. - \ The mask is ffff.0000 , i.e. 64K - h# 2.c00e0.40000.ffff0. h# 1000.0026 msr! + \ The mask is ffff.f000 , i.e. 4K - \ Put 64K SMM memory at 4000.0000 in the processor linear address space + \ This is unnecessary if the SMM memory is in a region that is + \ already mapped with a descriptor + \ h# 2.c00e0.40000.fffff. h# 1000.0026 msr! + + \ Put 4K SMM memory at 000f.f000 in the processor linear address space \ Cacheable in SMM mode, non-cacheable otherwise - h# 4000f.0.00.40000.1.01. h# 180e msr! + \ Depends on smm-base and smm-size + h# 000ff.0.00.000ff.1.01. h# 180e msr! \ Base Limit \ smm-base smm-size 1- h# 133b msr! + \ The limit here must be large enough to cover the code address + \ between the time that we reenter real mode and the time we + \ reestablish the boosted descriptor. smm-base -1 h# 133b msr! \ Big limit - smm-base smm-size + 0 h# 132b msr! \ Offset of SMM Header + smm-base smm-header + 0 h# 132b msr! \ Offset of SMM Header h# 18. h# 1301 msr! \ Enable IO and software SMI - smm-base dup smm-size -1 mmu-map + \ Unnecessary if already in mapped memory + \ smm-base dup smm-size -1 mmu-map smm-handler smm-base /smm-handler move + \ Relocate the code field of the code word that is embedded in the sequence ['] (smi-return) smm-handler - +smm ( cfa-adr ) dup ta1+ swap token! set-smm-descs cr3@ smm-pdir +smm l! + origin smm-forth-origin +smm l! + smm-exec smm-forth-entry +smm l! up@ smm-forth-up +smm l! - h# 1000 +smm smi-sp0 ! - h# 2000 +smm smi-rp0 ! + h# 800 +smm smi-sp0 ! + h# c00 +smm smi-rp0 ! ; -: do-smi-return ( -- ) - ['] (smi-return) smm-handler - +smm execute -; -' do-smi-return is smi-return +: smi-interact ( -- ) ." In SMI" cr quit ; +' smi-interact is handle-smi + : enable-virtual-pci ( -- ) h# 5000.2012 msr@ swap h# 8002 or swap h# 5000.2002 msr! \ Virtualize devices f and 1 h# 5000.2002 msr@ swap 8 invert and swap h# 5000.2002 msr! \ Enable SSMI for config accesses ; - -code smi smint ax push c; - -\ Forth stuff -[ifdef] notyet -[then] - -[ifdef] notyet -XXX code to return from Forth -[then] - -[ifdef] notyet - \ We are running in a segment that is identity mapped - cr0 ax mov h# 8000.0000 invert # ax and ax cr0 mov \ Turn off Paging Enable bit -[then] - -label emita - op: dx dx xor dx dx xor - h# 3fd # dx mov - begin dx al in h# 20 # al and 0<> until - h# 41 # al mov h# f8 # dl mov al dx out - begin again -\ h# 3fd # dx mov -\ begin dx al in h# 20 # al and 0<> until -end-code -here emita - constant /emita -: puta ( adr -- ) emita swap /emita move ; +code smi smint c;

1 0

r798 - dev/geode
by svn＠openbios.org 31 Jan '08

31 Jan '08

Author: wmb Date: 2008-01-31 06:16:56 +0100 (Thu, 31 Jan 2008) New Revision: 798 Modified: dev/geode/smi.fth Log: Geode SMI handler - first working version. Modified: dev/geode/smi.fth =================================================================== --- dev/geode/smi.fth 2008-01-31 02:37:24 UTC (rev 797) +++ dev/geode/smi.fth 2008-01-31 05:16:56 UTC (rev 798) @@ -19,7 +19,9 @@ dup constant smm-save-gdt 8 + dup constant smm-gdtp 8 + dup constant smm-gdt /smm-gdt + -dup constant smm-pdir 4 + +dup constant smm-pdir la1+ +dup constant smm-forth-origin la1+ +dup constant smm-forth-up la1+ dup constant smm-code16 h# a + dup constant smm-data16 h# a + @@ -31,7 +33,8 @@ dup constant smm-gs h# a + dup constant smm-ss h# a + dup constant smm-cs h# a + -dup constant smm-esp 4 + +dup constant smm-esp la1+ +dup constant smm-sp wa1+ drop : set-descr ( base limit d.type sel offset -- ) @@ -48,10 +51,19 @@ smm-base smm-size 1- data16 h# 18 smm-data16 set-descr 0 -1 code32 h# 20 smm-code32 set-descr 0 -1 data32 h# 28 smm-data32 set-descr - /smm-gdt 1- smm-gdtp +smm 4 + w! \ GDT limit - smm-gdt +smm smm-gdtp +smm l! \ GDT base + /smm-gdt 1- smm-gdtp +smm w! \ GDT limit + smm-gdt +smm smm-gdtp +smm wa1+ l! \ GDT base ; +nuser smi-sp0 +nuser smi-rp0 +defer smi-return +: smi-exec ( -- ) + ." Forth SMI handler" cr + quit + smi-return +; + label smm-handler 16-bit @@ -74,6 +86,7 @@ op: ax push cr3 ax mov op: ax push + sp smm-sp #) mov \ --- \ Get into protected mode using the same segments @@ -105,21 +118,42 @@ ax cr3 mov \ Set Page Directory Base Register cr0 ax mov h# 8000.0000 # ax or ax cr0 mov \ Turn on Paging Enable bit +\ Beginning of Forth-specific stuff + smm-forth-origin +smm #) bx mov + smm-forth-up +smm #) up mov -\ op: here 7 + smm-handler - smm-base + h# 20 #) far jmp -\ op: here 7 + smm-handler - 8 #) far jmp + \ Exchange the stack and return stack pointer with the smi versions + 'user sp0 sp mov + 'user rp0 rp mov -\ Put Forth stuff here + 'user smi-sp0 sp xchg + 'user smi-rp0 rp xchg -\ smm-code16 +smm #) cs rsdc -\ smm-code16 +smm #) cs rsdc \ 64K boosted + sp 'user sp0 mov + rp 'user rp0 mov - nop nop nop nop nop nop nop nop nop nop + \ Set the interpreter pointer + 'body smi-exec origin - # ip mov + bx ip add \ add current origin + cld +c; +code (smi-return) + \ Exchange the stack and return stack pointer with the smi versions + 'user sp0 sp mov + 'user rp0 rp mov + + 'user smi-sp0 sp xchg + 'user smi-rp0 rp xchg + + sp 'user sp0 mov + rp 'user rp0 mov + +\ End of Forth-specific stuff + \ Turn off paging cr0 ax mov h# 8000.0000 invert # ax and ax cr0 mov \ Turn off Paging Enable bit - cr0 ax mov 1 invert # al and ax cr0 mov \ Enter real mode here 2 + #) jmp @@ -136,10 +170,10 @@ \ >Test - op: smm-save-gdt #) lgdt \ --- + smm-sp #) sp mov op: ax pop ax cr3 mov op: ax pop @@ -183,9 +217,21 @@ smm-base dup smm-size -1 mmu-map smm-handler smm-base /smm-handler move + + ['] (smi-return) smm-handler - +smm ( cfa-adr ) + dup ta1+ swap token! + set-smm-descs cr3@ smm-pdir +smm l! + origin smm-forth-origin +smm l! + up@ smm-forth-up +smm l! + h# 1000 +smm smi-sp0 ! + h# 2000 +smm smi-rp0 ! ; +: do-smi-return ( -- ) + ['] (smi-return) smm-handler - +smm execute +; +' do-smi-return is smi-return : enable-virtual-pci ( -- ) h# 5000.2012 msr@ swap h# 8002 or swap h# 5000.2002 msr! \ Virtualize devices f and 1 @@ -197,27 +243,9 @@ \ Forth stuff [ifdef] notyet - op: smm-forth-origin #) bx mov - op: smm-forth-up #) up mov [then] [ifdef] notyet - \ Exchange the stack and return stack pointer with the smi versions - 'user sp0 sp mov - 'user rp0 rp mov - - 'user smi-sp0 sp xchg - 'user smi-rp0 rp xchg - - sp 'user sp0 mov - rp 'user rp0 mov - - \ Set the interpreter pointer - 'body smi-exec origin - # ip mov - bx ip add \ add current origin - - cld -c; XXX code to return from Forth [then]

1 0

r797 - dev/geode
by svn＠openbios.org 31 Jan '08

31 Jan '08

Author: wmb Date: 2008-01-31 03:37:24 +0100 (Thu, 31 Jan 2008) New Revision: 797 Added: dev/geode/smi.fth Log: Geode SMI handler - first checkpoint. Added: dev/geode/smi.fth =================================================================== --- dev/geode/smi.fth (rev 0) +++ dev/geode/smi.fth 2008-01-31 02:37:24 UTC (rev 797) @@ -0,0 +1,239 @@ +purpose: SMI setup and handler for Geode LX + +also assembler definitions + +: smint ( -- ) prefix-0f h# 38 asm8, ; +: rsm ( -- ) prefix-0f h# aa asm8, ; +: svdc ( sr m80 -- ) prefix-0f h# 78 asm8, rot r/m, ; +: rsdc ( m80 sr -- ) prefix-0f h# 79 asm8, r/m, ; + +previous definitions + +h# 4000.0000 constant smm-base +h# 1.0000 constant smm-size +: +smm ( offset -- adr ) smm-base + ; + +h# 30 constant /smm-gdt +smm-size h# 100 - +dup constant smm-stack +dup constant smm-save-gdt 8 + +dup constant smm-gdtp 8 + +dup constant smm-gdt /smm-gdt + +dup constant smm-pdir 4 + + +dup constant smm-code16 h# a + +dup constant smm-data16 h# a + +dup constant smm-code32 h# a + +dup constant smm-data32 h# a + +dup constant smm-ds h# a + +dup constant smm-es h# a + +dup constant smm-fs h# a + +dup constant smm-gs h# a + +dup constant smm-ss h# a + +dup constant smm-cs h# a + +dup constant smm-esp 4 + +drop + +: set-descr ( base limit d.type sel offset -- ) + +smm 2>r format-descriptor ( d.descr r: sel adr ) + 2r@ 8 + w! ( d.descr r: sel adr ) + 2dup r> d! ( d.descr r: sel ) + r> smm-gdt + +smm d! ( ) +; + +: set-smm-descs ( -- ) + smm-base -1 code32 format-descriptor smm-gdt 8 + +smm d! \ Boosted code32 + + smm-base smm-size 1- code16 h# 10 smm-code16 set-descr + smm-base smm-size 1- data16 h# 18 smm-data16 set-descr + 0 -1 code32 h# 20 smm-code32 set-descr + 0 -1 data32 h# 28 smm-data32 set-descr + /smm-gdt 1- smm-gdtp +smm 4 + w! \ GDT limit + smm-gdt +smm smm-gdtp +smm l! \ GDT base +; + +label smm-handler + 16-bit + + cs: ds smm-ds #) svdc + cs: smm-data16 #) ds rsdc \ Now we have a data segment + + es smm-es #) svdc + fs smm-fs #) svdc + gs smm-gs #) svdc + ss smm-ss #) svdc + smm-data16 #) ss rsdc \ Now we have a data segment + + op: sp smm-esp #) mov + smm-stack # sp mov \ Now we have a stack + + op: pusha + + h# cf8 # dx mov \ Save/restore PCI config address + op: dx ax in + op: ax push + + cr3 ax mov op: ax push + +\ --- +\ Get into protected mode using the same segments +\ Don't bother with the IDT; we won't enable interrupts + op: smm-save-gdt #) sgdt + op: smm-gdtp #) lgdt + +\ Test< + \ Get into the 4G flat code-32 address space + cs smm-cs #) svdc \ So we can get back + smm-code32 #) cs rsdc \ 4G flat address space for code + 32-bit + here 5 + +smm #) jmp \ Into unboosted segment + +nop nop nop nop nop nop nop + + cr0 ax mov 1 # al or ax cr0 mov \ Enter protected mode + here 2 + #) jmp + + \ Reload segment registers with protected mode bits + cs: smm-data32 +smm #) ds rsdc + smm-data32 +smm #) ss rsdc + smm-data32 +smm #) es rsdc + smm-data32 +smm #) fs rsdc + smm-data32 +smm #) gs rsdc + + \ Turn on paging + smm-pdir +smm #) ax mov + ax cr3 mov \ Set Page Directory Base Register + cr0 ax mov h# 8000.0000 # ax or ax cr0 mov \ Turn on Paging Enable bit + + +\ op: here 7 + smm-handler - smm-base + h# 20 #) far jmp +\ op: here 7 + smm-handler - 8 #) far jmp + +\ Put Forth stuff here + +\ smm-code16 +smm #) cs rsdc +\ smm-code16 +smm #) cs rsdc \ 64K boosted + + nop nop nop nop nop nop nop nop nop nop + + \ Turn off paging + cr0 ax mov h# 8000.0000 invert # ax and ax cr0 mov \ Turn off Paging Enable bit + + + cr0 ax mov 1 invert # al and ax cr0 mov \ Enter real mode + here 2 + #) jmp + + + \ Reload segment registers with real mode bits + cs: smm-data16 +smm #) ss rsdc + cs: smm-data16 +smm #) ds rsdc + + + \ Return to the boosted code-16 address space + smm-cs #) cs rsdc + 16-bit + here 2 + #) jmp \ 16-bit JMP zeros EIP[31:16] + +\ >Test + + + op: smm-save-gdt #) lgdt + +\ --- + op: ax pop ax cr3 mov + + op: ax pop + h# cf8 # dx mov \ Save/restore PCI config address + op: ax dx out + + op: popa + + op: smm-esp #) sp mov + + smm-ss #) ss rsdc + smm-gs #) gs rsdc + smm-fs #) fs rsdc + smm-es #) es rsdc + smm-ds #) ds rsdc + + rsm +end-code +here smm-handler - constant /smm-handler + +: setup-smi ( -- ) + \ Map the SMM region to physical memory at e.0000 + \ This is a Base Mask Offset descriptor - the base address + \ is 4000.0000 and to that is added the offset c00e.0000 + \ to give the address 000e.0000 in the GLMC address space. + \ The mask is ffff.0000 , i.e. 64K + h# 2.c00e0.40000.ffff0. h# 1000.0026 msr! + + \ Put 64K SMM memory at 4000.0000 in the processor linear address space + \ Cacheable in SMM mode, non-cacheable otherwise + h# 4000f.0.00.40000.1.01. h# 180e msr! + + \ Base Limit +\ smm-base smm-size 1- h# 133b msr! + smm-base -1 h# 133b msr! \ Big limit + + smm-base smm-size + 0 h# 132b msr! \ Offset of SMM Header + + h# 18. h# 1301 msr! \ Enable IO and software SMI + + smm-base dup smm-size -1 mmu-map + + smm-handler smm-base /smm-handler move + set-smm-descs + cr3@ smm-pdir +smm l! +; + +: enable-virtual-pci ( -- ) + h# 5000.2012 msr@ swap h# 8002 or swap h# 5000.2002 msr! \ Virtualize devices f and 1 + h# 5000.2002 msr@ swap 8 invert and swap h# 5000.2002 msr! \ Enable SSMI for config accesses +; + + +code smi smint ax push c; + +\ Forth stuff +[ifdef] notyet + op: smm-forth-origin #) bx mov + op: smm-forth-up #) up mov +[then] + +[ifdef] notyet + \ Exchange the stack and return stack pointer with the smi versions + 'user sp0 sp mov + 'user rp0 rp mov + + 'user smi-sp0 sp xchg + 'user smi-rp0 rp xchg + + sp 'user sp0 mov + rp 'user rp0 mov + + \ Set the interpreter pointer + 'body smi-exec origin - # ip mov + bx ip add \ add current origin + + cld +c; +XXX code to return from Forth +[then] + +[ifdef] notyet + \ We are running in a segment that is identity mapped + cr0 ax mov h# 8000.0000 invert # ax and ax cr0 mov \ Turn off Paging Enable bit +[then] + +label emita + op: dx dx xor dx dx xor + h# 3fd # dx mov + begin dx al in h# 20 # al and 0<> until + h# 41 # al mov h# f8 # dl mov al dx out + begin again +\ h# 3fd # dx mov +\ begin dx al in h# 20 # al and 0<> until +end-code +here emita - constant /emita +: puta ( adr -- ) emita swap /emita move ;

1 0

r796 - cpu/x86/pc/olpc
by svn＠openbios.org 30 Jan '08

30 Jan '08

Author: wmb Date: 2008-01-30 22:01:55 +0100 (Wed, 30 Jan 2008) New Revision: 796 Modified: cpu/x86/pc/olpc/versions.fth Log: OLPC build - use new version of wireless firmware and newly-audited bios-crypto code. Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-01-28 11:41:18 UTC (rev 795) +++ cpu/x86/pc/olpc/versions.fth 2008-01-30 21:01:55 UTC (rev 796) @@ -16,7 +16,7 @@ \ The wireless LAN module firmware macro: WLAN_RPM ${WLAN_VERSION}-1.olpc1 -macro: WLAN_VERSION 5.110.20.p49 +macro: WLAN_VERSION 5.110.22.p1 \ The bios_verify image -macro: CRYPTO_VERSION 0.2 +macro: CRYPTO_VERSION 0.3

1 0

openfirmware entrypoint on i386
by jakllsch＠kollasch.net 30 Jan '08

30 Jan '08

Hi, I've been exploring OpenFirmware on x86, under qemu with coreboot. I've been trying to run the hello.elf example. I have trouble loading it from an ext2 file system, I get an message: ok report-disk ok boot /pci/pci-ide@1,1/ide@0/disk@0:\hello.elf Boot device: /pci/pci-ide@1,1/ide@0/disk@0:\hello.elf Arguments: root=/dev/ram0 mount_ramdisk=1 Unimplemented package interface procedure Undefined word encountered ok I also tried using using qemu's -option-rom function to throw a raw binary into the address space that i could then place in memory with 'cmove' and then tried to 'branch' or 'execute' it. This method probably isn't worth pursuing much, even thought it did get me the furthest. The problem there was that the pointer to the openfirmware interface function wasn't getting passed in %eax, but then again, I wasn't using 'boot'. Anyway, tips on this would be appreciated. Jonathan Kollasch

4 3

virtual-mode when loaded with coreboot?
by jakllsch＠kollasch.net 28 Jan '08

28 Jan '08

Hi, So, apparently 'virtual-mode' doesn't work when OFW is loaded from coreboot. Does anyone know if that's easy to fix? Jonathan Kollasch

1 0

r795 - cpu/x86/pc/biosload dev/ide dev/video/common dev/video/controlr
by svn＠openbios.org 28 Jan '08

28 Jan '08

Author: wmb Date: 2008-01-28 12:41:18 +0100 (Mon, 28 Jan 2008) New Revision: 795 Modified: cpu/x86/pc/biosload/rmenter.fth dev/ide/generic.fth dev/video/common/textmode.fth dev/video/controlr/vga.fth Log: BIOSload version - another checkpoint of BIOS gateway code. Modified: cpu/x86/pc/biosload/rmenter.fth =================================================================== --- cpu/x86/pc/biosload/rmenter.fth 2008-01-28 04:19:49 UTC (rev 794) +++ cpu/x86/pc/biosload/rmenter.fth 2008-01-28 11:41:18 UTC (rev 795) @@ -4,14 +4,36 @@ : seg:off> ( offset segment -- linear ) 4 lshift + ; : seg:off@ ( adr -- linear ) dup w@ swap wa1+ w@ seg:off> ; [then] +: >off ( linear -- 16-bit offset ) >seg:off drop ; +h# 9.0000 constant rm-base +h# 9.0000 constant rm-avail +h# ff00 constant rm-base2 +h# 9.fc00 constant 'ebda \ Extended BIOS Data Area, which we co-opt for our real-mode workspace +'ebda constant new-gdt-pa + [ifdef] syslinux-loaded h# 8 constant rm-cs h# 18 constant rm-ds h# 20 constant pm-cs h# 28 constant pm-ds -: fix-gdt ; +: fix-gdt + \ 16-bit 64K code segment starting at rm-base + rm-base lbsplit ( adr.0 adr.1 adr.2 adr.3 ) + 2swap h# ffff -rot bwjoin wljoin ( adr.2 adr.3 desc.lo ) + -rot ( desc.lo adr.2 adr.3 ) + >r h# 9a 0 r> bljoin ( desc.lo desc.hi ) + gdtr@ drop rm-cs + d! ( ) + + \ 16-bit 64K data segment starting at rm-base + rm-base lbsplit ( adr.0 adr.1 adr.2 adr.3 ) + 2swap h# ffff -rot bwjoin wljoin ( adr.2 adr.3 desc.lo ) + -rot ( desc.lo adr.2 adr.3 ) + >r h# 93 0 r> bljoin ( desc.lo desc.hi ) + gdtr@ drop rm-ds + d! ( ) +; [then] + [ifdef] preof-loaded h# 38 constant rm-cs h# 30 constant rm-ds @@ -26,31 +48,28 @@ [then] -h# 0.0000 constant rm-base -: +rm ( offset -- adr ) rm-base + ; +: +rm ( offset -- adr ) rm-base + rm-base2 + ; -\ The real-mode stack pointer will start here -h# f00 +rm constant 'rm-stack -\ h# ef0 +rm constant 'rm-dispatch - \ Place for the initial registers upon entry to real mode. -h# f00 +rm constant 'rm-regs +\ The real-mode stack pointer will start here, so the registers +\ can be loaded by popping the stack +h# 00 +rm constant 'rm-regs \ (00) 4 * 2: GS,FS,ES,DS \ (08) 8 * 4: EDI,ESI,EBP,ESP,EBX,EDX,ECX,EAX \ (28) 1 * 4: CS:IP of return address \ (2c) 1 * 2: flags \ size is 2e -h# f30 +rm constant 'rm-idt \ For loading RM IDT with LIDT -h# f36 +rm constant 'rm-int \ Incoming interrupt number -h# f38 +rm constant 'rm-sp \ SS:SP For loading RM SP with LSS -h# f3c +rm constant 'pm-sp \ Save/restore area for PM SP -h# f40 +rm constant 'pm-gdt \ For loading PM GDT with LGDT -h# f48 +rm constant 'pm-idt \ For loading PM IDT with LGDT +h# 30 +rm constant 'rm-idt \ For loading RM IDT with LIDT +h# 36 +rm constant 'rm-int \ Incoming interrupt number +h# 38 +rm constant 'rm-sp \ SS:SP For loading RM SP with LSS +h# 3c +rm constant 'pm-sp \ Save/restore area for PM SP +h# 40 +rm constant 'pm-gdt \ For loading PM GDT with LGDT +h# 48 +rm constant 'pm-idt \ For loading PM IDT with LGDT -h# f50 +rm constant 'rm-to-pm -h# fa0 +rm constant 'pm-to-rm -h# ff0 +rm constant 'rm-enter +h# 50 +rm constant 'rm-to-pm +h# a0 +rm constant 'pm-to-rm +h# f0 +rm constant 'rm-enter : caller-regs 'rm-sp seg:off@ ; struct @@ -104,6 +123,8 @@ : rm-set-cf rm-flags@ 1 or rm-flags! ; : rm-clr-cf rm-flags@ 1 invert and rm-flags! ; +: rm-int@ 'rm-int w@ h# ff and ; + true value show-rm-int? : noshow false to show-rm-int? ; variable save-eax @@ -111,7 +132,7 @@ true to show-rm-int? caller-regs >rm-eax @ save-eax ! ; : showint - ." INT " 'rm-int w@ . save-eax @ wbsplit ." AH " . ." AL " . cr + ." INT " rm-int@ . save-eax @ wbsplit ." AH " . ." AL " . cr ; : ?showint show-rm-int? if showint then ; @@ -121,19 +142,21 @@ /vectors buffer: saved-ofw-vectors -\ 80ff0 is the target address of the interrupt vector +\ 90ff0 is the target address of the interrupt vector \ We use different segment:offset representations of that address in \ the vector table, so the handler code can determine the vector \ number by inspecting the code segment register value -\ 00: 8000:0ff0 -\ 01: 8001:0fe0 +\ 00: nn00:mff0 +\ 01: nn01:mfe0 \ ... -\ ff: 80ff:0000 +\ ff: nnff:m000 : grab-rm-vector ( vector# -- ) >r - h# ff0 r@ 4 lshift - r@ /l* w! \ Set offset - rm-base 4 rshift r@ + r> /l* wa1+ w! \ Set segment + 'rm-enter lwsplit ( low16 high16 ) + swap r@ 4 lshift - swap ( vec.offset high16 ) + d# 12 lshift r@ + wljoin ( vec.seg:off ) + r> /l* l! \ Set segment ; : ungrab-rm-vector ( vector# -- ) saved-rm-vectors over la+ l@ ( vector# value ) @@ -163,20 +186,27 @@ \ (low) GS,FS,ES,DS (high) \ CS from interrupt vector, which is the interrupt number - cs: 'rm-int #) pop \ Save interrupt vector CS, i.e. the int# - cli \ This is unnecessary since we got here from an INT cs push ds pop - sp 'rm-sp #) mov - ss 'rm-sp 2+ #) mov + 'rm-int >off #) pop \ Save interrupt vector CS, i.e. the int# - op: 'pm-gdt #) lgdt + sp 'rm-sp >off #) mov + ss 'rm-sp 2+ >off #) mov + + op: 'pm-gdt >off #) lgdt cr0 ax mov 1 # al or ax cr0 mov \ Enter protected mode - here 5 + rm-to-pm - 'rm-to-pm + pm-cs #) far jmp + \ The assembler gyrations here are subtle. We need to jump to an address + \ that may be larger than 16 bits, but we are currently running from a + \ 16-bit code segment. So we have to tell the assembler to go into + \ "protected mode" (a misnomer; that assembler directive really means + \ to assemble for the 32-bit instruction set) so it will put down a + \ ptr16:32 operand. But we also need the op: prefix, so the processor + \ will interpret the operand as a ptr16:32 instead of a ptr16:16 protected-mode + op: here 7 + rm-to-pm - 'rm-to-pm + pm-cs #) far jmp ax ax xor pm-ds # al mov ax ds mov ax es mov ax gs mov ax gs mov ax ss mov 'rm-idt #) sidt @@ -227,7 +257,7 @@ cli sp sp xor - 'pm-to-rm rm-cs #) far jmp + 'pm-to-rm >off rm-cs #) far jmp end-code \ This is the common target of all the real-mode interrupt vectors. @@ -251,8 +281,7 @@ : move-gdt ( -- ) gdtr@ 1+ ( gdt-adr gdt-len ) -\ dup h# 10 + alloc-mem h# f + h# f invert and ( gdt-adr gdt-len new-gdt ) - h# 900 + new-gdt-pa ( gdt-adr gdt-len new-gdt-adr ) swap 2dup 2>r move 2r> ( new-gdt gdt-len ) 1- gdtr! @@ -270,7 +299,7 @@ : regs>bios ( -- ) caller-regs bios-regs d# 40 move rm-flags@ bios-flags l! - 'rm-int w@ /l* @ bios-target ! + rm-int@ /l* @ bios-target ! ; : bios>regs ( -- ) bios-regs caller-regs d# 40 move @@ -304,7 +333,7 @@ h# 11 grab-rm-vector \ Sysinfo h# 12 grab-rm-vector \ Low memory size h# 13 grab-rm-vector \ Disk I/O -\ h# 15 grab-rm-vector \ Various system stuff + h# 15 grab-rm-vector \ Various system stuff h# 16 grab-rm-vector \ Keyboard h# 1a grab-rm-vector \ PCI BIOS [else] @@ -327,7 +356,7 @@ prep-rm 'rm-regs h# 2e erase ( pc ) 'rm-regs h# 28 + seg:off! ( ) - 'rm-stack 'rm-sp seg:off! \ Initial stack pointer below regs + 'rm-regs 'rm-sp seg:off! \ Initial stack pointer must be below regs ; : !font ( adr -- ) @@ -335,8 +364,9 @@ h# 10 rm-cx! h# 18 rm-dx! ; : get-font ( -- ) + noshow rm-al@ h# 30 = if - ." Int 10 get-font called - BH = " rm-bh@ . cr +\ ." Int 10 get-font called - BH = " rm-bh@ . cr rm-bh@ case \ These numbers are cheats, pointing into the VIA BIOS 2 of h# c69e0 !font endof @@ -346,6 +376,7 @@ 6 of h# c77e0 !font endof 7 of h# c77e0 !font h# 10 ungrab-rm-vector +h# 15 ungrab-rm-vector endof ( default ) ." Unsupported get font - BH = " dup . cr rm-set-cf endcase @@ -574,12 +605,12 @@ [then] create memdescs - h# 0. d, h# a0000. d, 1 l, \ 0 -\ h# a0000. d, h# 60000. d, 2 l, \ 14 - h# f0000. d, h# 10000. d, 2 l, \ 14 - h# 100000. d, 0. d, 1 l, \ 28 -\ 0. d, 0. d, 2 l, \ 3c - h# ffff0000. d, h# 10000. d, 2 l, \ 40 + h# 0. d, rm-avail 0 d, 1 l, \ 0 +\ h# rm-avail 0 d, h# 60000. d, 2 l, \ 14 + h# f0000. d, h# 10000. d, 2 l, \ 14 + h# 100000. d, 0. d, 1 l, \ 28 +\ 0. d, 0. d, 2 l, \ 3c + h# ffff0000. d, h# 10000. d, 2 l, \ 40 here memdescs - constant /memdescs : system-memory-map ( -- ) @@ -648,12 +679,15 @@ rm-clr-cf rm-ah@ case h# 91 of noshow 0 rm-ah! endof \ "pause" while waiting for I/O +noop h# 53 of apm endof h# 86 of rm-dx@ rm-cx@ wljoin us endof \ Delay microseconds h# 8a of memory-limit h# 400.0000 - 0 max /1k lwsplit rm-dx! rm-ax! endof h# 88 of h# fffc rm-ax! endof \ Extended memory - at least 64 MB h# c0 of get-conf endof - h# c1 of rm-set-cf h# 86 rm-ah! endof + \ We use the extended BIOS data area as our workspace when loaded from another BIOS +\ h# c1 of rm-set-cf h# 86 rm-ah! endof \ No extended BIOS data area + h# c1 of 'ebda 4 rshift caller-regs >rm-es w! endof \ Segment address of extended BIOS data area h# c2 of handle-mouse endof h# e8 of bigmem-int endof ( default ) rm-set-cf @@ -661,10 +695,11 @@ endcase ; -h# 4800 value the-key +0 value the-key : poll-key ( -- false | scan,ascii true ) the-key ?dup if true exit then + d# 50 ms \ I don't know why this is necessary, but without it, you don't see the key 0 " get-scancode" kbd-ih $call-method if ( scancode ) dup h# 80 and if ( scancode ) \ Discard release events and escapes (e0) @@ -708,6 +743,7 @@ 0 of get-keystroke endof 1 of poll-keystroke endof 2 of 0 rm-al! endof \ Claim that no shift keys are active + 5 of rm-cx@ to the-key endof \ Put keystroke in buffer ( bit 7:sysrq 6:capslock 5:numlock 4:scrlock 3:ralt 2:rctrl 1:lalt 0:lctrl ) ( default ) ." Keyboard INT called with AH = " dup . cr endcase @@ -751,6 +787,7 @@ : int-1a ( -- ) rm-ah@ case h# 0 of get-timer-ticks noshow endof +\ h# 4 of rm-clr-cf get-rtc-date endof \ ch century cl year dh month dl day h# b1 of pcibios endof ( default ) ." Unimplemented INT 1a - AH = " dup . cr rm-set-cf endcase @@ -758,19 +795,27 @@ : handle-bios-call ( -- ) snap-int - 'rm-int w@ case + rm-int@ case h# 10 of video-int endof h# 11 of sysinfo-int endof h# 13 of noshow disk-int endof h# 16 of keyboard-int endof h# 15 of system-int endof - h# 12 of h# a0000 /1k rm-ax! endof \ Low memory size + h# 12 of rm-avail /1k rm-ax! endof \ Low memory size h# 1a of int-1a endof + h# 18 of ." Entering Open Firmware" cr interact endof + h# 19 of ." Rebooting" cr bye endof ( default ) ." Interrupt " dup . cr interact endcase ?showint ; +: get-mbr + " /pci/ide@0" open-dev >r + h# 7c00 h# 3f 1 " read-blocks" r@ $call-method 1 <> abort" Didn't read MBR" + r> close-dev +; : rm-go ( -- ) + get-mbr usb-quiet \ Load boot image at 7c00 h# 7c00 rm-init-program @@ -782,11 +827,6 @@ label xx h# 99 # al mov al h# 80 # out begin again end-code here xx - constant /xx : put-xx ( adr -- ) xx swap /xx move ; -: get-mbr - " /pci/ide@0" open-dev >r - h# 7c00 h# 3f 1 " read-blocks" r@ $call-method . - r> close-dev -; : .lreg ( adr -- adr' ) 4 - dup l@ 9 u.r ; : .wreg ( adr -- adr' ) 2 - dup w@ 5 u.r ; : .caller-regs ( -- ) Modified: dev/ide/generic.fth =================================================================== --- dev/ide/generic.fth 2008-01-28 04:19:49 UTC (rev 794) +++ dev/ide/generic.fth 2008-01-28 11:41:18 UTC (rev 795) @@ -202,10 +202,17 @@ over 0= if 2drop 2drop 0 exit then - >r dup >r r-#secs! ( addr block# ) ( R: input? #blks ) - lblk>cyl-head-sect ( addr cyl# head# sect# ) - r-sector! drive r-head! r-cyl! r> r> ( addr #blks input? ) - if rblocks else wblocks then ( actual# | error ) + >r dup >r r-#secs! ( addr block# ) ( R: input? #blks ) + /lba if ( addr block# ) ( R: input? #blks ) + lbsplit ( addr 0-7 8-15 16-23 24-32 ) + \ 4, when shifted with drive, sets the LBA bit + h# f and drive 4 or r-head! ( addr 0-7 8-15 16-23 ) + bwjoin r-cyl! r-sector! ( addr R: input? #blks ) + else ( addr block# ) ( R: input? #blks ) + lblk>cyl-head-sect ( addr cyl# head# sect# ) + r-sector! drive r-head! r-cyl! ( addr #blks input? R: input? #blks ) + then + r> r> if rblocks else wblocks then ( actual# | error ) dup 0= if ." Failed to transfer any blocks" cr @@ -244,7 +251,8 @@ scratchbuf 3 wa+ le-w@ /heads! scratchbuf 6 wa+ le-w@ /secs! - /cyls h# 3fff u>= if +\ /cyls h# 3fff u>= if + scratchbuf d# 49 wa+ w@ h# 200 and if \ LBA scratchbuf d# 60 wa+ le-w@ scratchbuf d# 61 wa+ le-w@ wljoin /lba! Modified: dev/video/common/textmode.fth =================================================================== --- dev/video/common/textmode.fth 2008-01-28 04:19:49 UTC (rev 794) +++ dev/video/common/textmode.fth 2008-01-28 11:41:18 UTC (rev 795) @@ -16,7 +16,7 @@ : next-string ( table-adr -- table-adr' adr len ) count 2dup + -rot ; -: set-mode ( table -- ) +: set-vga-mode ( table -- ) palette-off dup c@ misc! 1+ @@ -129,11 +129,12 @@ : fill-attrs ( len value -- ) ega rot 2* bounds do dup i 1+ c! 2 +loop drop ; -: pc-font ( -- ) - write-font - default-font ( 2>r ) >r >r ( adr width +-height advance r: min,#glyphs ) +defer pc-font ' default-font to pc-font +: load-vga-font ( -- ) + pc-font ( 2>r ) >r >r ( adr width +-height advance r: min,#glyphs ) 1 <> rot 8 > or over 0>= or if true " Incompatible font" type abort then ( adr -height ) + write-font negate swap ( 2r> ) r> r> bounds ?do ( height adr ) 2dup ega i h# 20 * + rot move ( height adr ) over + ( height adr' ) @@ -141,6 +142,7 @@ 2drop ( ) write-text ; + create ega-colors " "(00 00 00 00 00 aa 00 aa 00 00 aa aa)" $, " "(aa 00 00 aa 00 aa aa aa 00 aa aa aa)" $, @@ -166,16 +168,17 @@ : text-mode3 ( -- ) io-base -1 = if map-io-regs then - mode2+/3 set-mode + mode2+/3 set-vga-mode ext-textmode \ h# c00b.8000 0 h# 8200.0000 h# 8000 " map-in" $call-parent to ega h# 000b.8000 0 h# 8200.0000 h# 8000 " map-in" $call-parent to ega - pc-font + load-vga-font #text-rows #text-columns * dup bl fill-text 7 fill-attrs [ifdef] strict-ega ega-colors 0 d# 64 (set-colors) [then] ; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: dev/video/controlr/vga.fth =================================================================== --- dev/video/controlr/vga.fth 2008-01-28 04:19:49 UTC (rev 794) +++ dev/video/controlr/vga.fth 2008-01-28 11:41:18 UTC (rev 795) @@ -1,11 +1,13 @@ \ See license at end of file purpose: Generic VGA functions +hex + \ reset attribute address flip-flop : reset-attr-addr ( -- ) 3da ( input-status1 ) pc@ drop ; : video-mode! ( b -- ) reset-attr-addr 03c0 pc! ; -: attr! ( b index -- ) 03c0 pc! 03c0 pc! ; +: attr! ( b index -- ) reset-attr-addr 03c0 pc! 03c0 pc! ; : attr@ ( index -- b ) reset-attr-addr 03c0 pc! 03c1 pc@ reset-attr-addr ; @@ -58,12 +60,15 @@ ['] vga-plt! to plt! ['] vga-rindex! to rindex! ['] vga-windex! to windex! +[ifdef] rs@ ['] noop to rs@ ['] 2drop to rs! +[then] +[ifdef] idac@ ['] noop to idac@ ['] 2drop to idac! +[then] ; -use-vga-dac : palette-off ( -- ) 0 video-mode! ; : palette-on ( -- ) 20 video-mode! ; @@ -130,7 +135,13 @@ ; : hsync-on ( -- ) crt-table drop 4 + c@ 4 crt! ; \ Set hsync position -: vga-video-on ( -- ) palette-on hsync-on ; ' vga-video-on to video-on +: vga-video-on ( -- ) palette-on hsync-on ; + +: use-vga + use-vga-dac + ['] vga-video-on to video-on +; + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \

1 0

r794 - cpu/x86/pc/biosload
by svn＠openbios.org 28 Jan '08

28 Jan '08

Author: wmb Date: 2008-01-28 05:19:49 +0100 (Mon, 28 Jan 2008) New Revision: 794 Modified: cpu/x86/pc/biosload/callbios.fth cpu/x86/pc/biosload/fw.bth cpu/x86/pc/biosload/rmenter.fth Log: BIOSload version - checkpoint of BIOS gateway code. Modified: cpu/x86/pc/biosload/callbios.fth =================================================================== --- cpu/x86/pc/biosload/callbios.fth 2008-01-28 04:18:50 UTC (rev 793) +++ cpu/x86/pc/biosload/callbios.fth 2008-01-28 04:19:49 UTC (rev 794) @@ -9,42 +9,41 @@ \ We assume that we can use memory from h# 200 to h# 3ff -\ Bounce buffer at h# 90000 - h# 8 constant rm-code-desc h# 18 constant rm-data-desc h# 20 constant pm-code-desc h# 28 constant pm-data-desc -h# 002 constant rm-flagval \ Flags for IRET +h# 002 constant bios-flagval \ Flags for IRET \ Low-memory addresses -h# 200 constant rm-go \ Real mode enter code -h# 280 constant rm-return \ Real mode return code -h# 300 constant rm-idt \ For loading RM IDT with LIDT -h# 308 constant rm-sp \ For loading RM SP with LSS +h# 200 constant 'bios-call \ Real mode enter code +h# 280 constant 'bios-ret \ Real mode return code +h# 300 constant 'bios-idt \ For loading RM IDT with LIDT +h# 308 constant 'bios-sp \ For loading RM SP with LSS h# 30c constant pm-sp-save \ Save/restore area for PM SP h# 310 constant pm-gdt-save \ For loading PM GDT with LGDT h# 318 constant pm-idt-save \ For loading PM IDT with LIDT -h# 3c0 constant rm-regs \ Real-mode register buffer (in/out) -rm-regs constant rm-gs -rm-gs wa1+ constant rm-fs -rm-fs wa1+ constant rm-es -rm-es wa1+ constant rm-ds -rm-ds wa1+ constant rm-di -rm-di la1+ constant rm-si -rm-si la1+ constant rm-bp -rm-bp la1+ constant rm-xx \ Would be stack pointer -rm-xx la1+ constant rm-bx -rm-bx la1+ constant rm-dx -rm-dx la1+ constant rm-cx -rm-cx la1+ constant rm-ax -rm-ax la1+ constant rm-flags -rm-flags la1+ constant rm-target \ Full pointer for RM call target address -rm-target la1+ constant rm-retloc \ Full pointer to rm-return -rm-retloc la1+ constant rm-rflags \ Flags in case of return via IRET -label rmint-enter +h# 3c0 constant bios-regs \ Real-mode register buffer (in/out) +bios-regs constant bios-gs +bios-gs wa1+ constant bios-fs +bios-fs wa1+ constant bios-es +bios-es wa1+ constant bios-ds +bios-ds wa1+ constant bios-di \ offset decimal 8 +bios-di la1+ constant bios-si +bios-si la1+ constant bios-bp +bios-bp la1+ constant bios-xx \ Would be stack pointer +bios-xx la1+ constant bios-bx +bios-bx la1+ constant bios-dx +bios-dx la1+ constant bios-cx +bios-cx la1+ constant bios-ax +bios-ax la1+ constant bios-flags \ offset decimal 40 +bios-flags la1+ constant bios-target \ Full pointer for RM call target address +bios-target la1+ constant bios-retloc \ Full pointer to 'bios-ret +bios-retloc la1+ constant bios-rflags \ Flags in case of return via IRET + +label bios-call real-mode \ This must be copied to low memory @@ -54,25 +53,25 @@ pm-gdt-save #) sgdt \ So we can get back pm-idt-save #) sidt \ So we can get back - rm-idt #) lidt + 'bios-idt #) lidt cr0 ax mov h# fe # al and ax cr0 mov \ Enter real mode - here 5 + rmint-enter - rm-go + 0 #) far jmp \ Jump to set cs + here 5 + bios-call - 'bios-call + 0 #) far jmp \ Jump to set cs \ Now we are running in real mode; fix segments again cs ax mov ax ds mov ax es mov ax fs mov ax gs mov - rm-sp #) sp lss + 'bios-sp #) sp lss - \ Load the 16-bit registers from the rm-regs area + \ Load the 16-bit registers from the bios-regs area gs pop fs pop es pop ds pop op: popa op: popf far ret \ Now we are running the real-mode target code end-code -here rmint-enter - constant /rmint-enter +here bios-call - constant /bios-call -label rmint-exit - rm-target # sp mov \ Set the stack pointer to the top of the rm reg area +label bios-ret + bios-target # sp mov \ Set the stack pointer to the top of the rm reg area \ Copy the real-mode registers to the buffer op: pushf op: pusha ds push es push fs push gs push @@ -83,7 +82,7 @@ op: pm-gdt-save #) lgdt cr0 ax mov 1 # al or ax cr0 mov - here 5 + rmint-exit - rm-return + pm-code-desc #) far jmp + here 5 + bios-ret - 'bios-ret + pm-code-desc #) far jmp protected-mode @@ -94,10 +93,10 @@ popf popa c; -here rmint-exit - constant /rmint-exit +here bios-ret - constant /bios-ret \ Must set up the registers area with register values and the target address -code rm-call ( -- ) +code }bios ( -- ) pusha pushf @@ -105,108 +104,130 @@ cld cli sp sp xor - rm-go rm-code-desc #) far jmp + 'bios-call rm-code-desc #) far jmp c; : >seg:off ( linear -- offset segment ) lwsplit d# 12 lshift ; : seg:off! ( linear adr -- ) >r >seg:off r@ 2+ w! r> w! ; +: seg:off> ( offset segment -- linear ) 4 lshift + ; +: seg:off@ ( adr -- linear ) dup w@ swap wa1+ w@ seg:off> ; 0 value bios-prepped? : ?prep-bios-call ( -- ) bios-prepped? if exit then true to bios-prepped? - rmint-enter rm-go /rmint-enter move - rmint-exit rm-return /rmint-exit move - h# ffff rm-idt w! - 0 rm-idt 2+ l! - rm-regs rm-sp seg:off! \ Setup real-mode full pointer for lss - rm-return rm-retloc seg:off! \ Setup return address full pointer - rm-flagval rm-retloc 4 + w! \ Flags for return + bios-call 'bios-call /bios-call move + bios-ret 'bios-ret /bios-ret move + h# ffff 'bios-idt w! + 0 'bios-idt 2+ l! + bios-regs 'bios-sp seg:off! \ Setup real-mode full pointer for lss + 'bios-ret bios-retloc seg:off! \ Setup return address full pointer + bios-flagval bios-retloc 4 + w! \ Flags for return ; -: dr - ." ax: " rm-ax ? 2 spaces - ." bx: " rm-bx ? 2 spaces - ." cx: " rm-cx ? 2 spaces - ." dx: " rm-dx ? 2 spaces - ." bp: " rm-bp ? 2 spaces - ." si: " rm-si ? 2 spaces - ." di: " rm-di ? 2 spaces +: .bios-regs + ." ax: " bios-ax ? 2 spaces + ." bx: " bios-bx ? 2 spaces + ." cx: " bios-cx ? 2 spaces + ." dx: " bios-dx ? 2 spaces + ." bp: " bios-bp ? 2 spaces + ." si: " bios-si ? 2 spaces + ." di: " bios-di ? 2 spaces + cr + ." ds: " bios-ds w@ . 2 spaces + ." es: " bios-es w@ . 2 spaces + ." fs: " bios-fs w@ . 2 spaces + ." gs: " bios-gs w@ . 2 spaces + ." flags: " bios-flags ? + cr ; -: { ( int# -- ) ?prep-bios-call rm-regs d# 44 erase 4 * @ rm-target ! ; -: } rm-call ; +: bios{ ( int# -- ) ?prep-bios-call bios-regs d# 44 erase 4 * @ bios-target ! ; -: ax rm-ax ! ; -: ah rm-ax 1+ c! ; -: al rm-ax c! ; -: bx rm-bx l! ; -: cx rm-cx l! ; -: dx rm-dx l! ; -: cf@ rm-flags @ 1 and ; -: es:di >seg:off rm-es w! rm-di l! ; +: ax bios-ax ! ; +: ah bios-ax 1+ c! ; +: al bios-ax c! ; +: bx bios-bx l! ; +: cx bios-cx l! ; +: dx bios-dx l! ; +: cf@ bios-flags @ 1 and ; +: es:di >seg:off bios-es w! bios-di l! ; + +\ Video - INT 10 : video-mode ( mode# -- ) - d# 55 set-tick-limit h# 10 { 3 al bx } d# 10 set-tick-limit + d# 55 set-tick-limit h# 10 bios{ 3 al bx }bios d# 10 set-tick-limit ; : text-mode 3 video-mode ; : 1024x768x8 h# 105 video-mode ; : 1024x768x16 h# 116 video-mode ; -: apm-connect16 h# 15 { h# 5302 ax 0 bx } ; -: apm-power-off apm-connect16 h# 15 { h# 5307 ax 1 bx 3 cx } ; +: apm-connect16 h# 15 bios{ h# 5302 ax 0 bx }bios ; +: apm-power-off apm-connect16 h# 15 bios{ h# 5307 ax 1 bx 3 cx }bios ; + +\ Memory map - INT 15 : bios-memsize ( -- n ) - h# 15 { h# e801 ax } - rm-ax @ h# 400 * rm-bx @ h# 10000 * + h# 100000 + + h# 15 bios{ h# e801 ax }bios + bios-ax @ h# 400 * bios-bx @ h# 10000 * + h# 100000 + ; : .bios-memory-map ( -- ) 0 begin ( continuation ) - h# 15 { bx h# e820 ax h# 10000 es:di d# 20 cx " PAMS" drop @ dx } - rm-flags @ 1 and abort" Not supported" - rm-cx @ - h# 10000 rm-cx @ bounds ?do i @ 9 u.r 4 +loop cr - rm-bx @ ( continuation' ) + h# 15 bios{ bx h# e820 ax h# 10000 es:di d# 20 cx " PAMS" drop @ dx }bios + bios-flags @ 1 and abort" Not supported" + h# 10000 bios-cx @ bounds ?do i @ 9 u.r 4 +loop cr + bios-bx @ ( continuation' ) ?dup 0= until ; -: bios-config-b@ ( adr -- b ) lwsplit h# 1a { h# b108 ax bx rm-di ! } rm-cx @ ; -: bios-config-w@ ( adr -- w ) lwsplit h# 1a { h# b109 ax bx rm-di ! } rm-cx @ ; -: bios-config-l@ ( adr -- l ) lwsplit h# 1a { h# b10a ax bx rm-di ! } rm-cx @ ; -: bios-config-b! ( b adr -- ) lwsplit h# 1a { h# b10b ax bx rm-di ! rm-cx ! } ; -: bios-config-w! ( w adr -- ) lwsplit h# 1a { h# b10c ax bx rm-di ! rm-cx ! } ; -: bios-config-l! ( l adr -- ) lwsplit h# 1a { h# b10d ax bx rm-di ! rm-cx ! } ; -: disk-status ( -- stat ) h# 13 { h# 0100 ax } rm-ax @ ; + +\ PCI BIOS - INT 1A +: (bios-config@) ( adr axval -- n ) + h# 1a bios{ ax lwsplit bx bios-di ! }bios bios-cx @ +; +: (bios-config!) ( n adr axval -- ) + h# 1a bios{ ax lwsplit bx bios-di ! bios-cx ! }bios +; + +: bios-config-b@ ( adr -- b ) h# b108 (bios-config@) ; +: bios-config-w@ ( adr -- w ) h# b109 (bios-config@) ; +: bios-config-l@ ( adr -- l ) h# b10a (bios-config@) ; +: bios-config-b! ( b adr -- ) h# b10b (bios-config!) ; +: bios-config-w! ( w adr -- ) h# b10c (bios-config!) ; +: bios-config-l! ( l adr -- ) h# b10d (bios-config!) ; + +\ Disk access - INT 13 +: disk-status ( -- stat ) h# 13 bios{ h# 0100 ax }bios bios-ax @ ; + 0 value #sects 0 value #cyls 0 value #heads : get-drive-params ( -- ) - h# 13 { 8 ah h# 80 dx } - rm-flags @ 1 and if true exit then - rm-cx @ wbsplit ( cl ch ) - over h# 3f and to #sects ( cl ch ) - swap 6 rshift bwjoin 1+ to #cyls ( ) - rm-dx @ 8 rshift 1+ to #heads ( ) + h# 13 bios{ 8 ah h# 80 dx }bios + bios-flags @ 1 and if true exit then + bios-cx @ wbsplit ( cl ch ) + over h# 3f and to #sects ( cl ch ) + swap 6 rshift bwjoin 1+ to #cyls ( ) + bios-dx @ 8 rshift 1+ to #heads ( ) ; : #drive-sectors ( -- n ) - h# 13 { h# 15 ah h# 80 dx } - rm-dx @ rm-cx @ wljoin + h# 13 bios{ h# 15 ah h# 80 dx }bios + bios-dx @ bios-cx @ wljoin ; -: reset-disks ( -- ) h# 13 { 0 ah h# 80 dx } ; -: reset-hard-disks ( -- ) h# 13 { h# 0d ah h# 80 dx } ; -: do-rw ( sector1 cyl0 head0 drive0 #sectors ah-val -- ) - h# 13 { ah al ( sector1 cyl0 head0 drive0 ) - swap bwjoin dx ( sector1 cyl0 ) - wbsplit ( sector1 cyl.lo cyl.hi ) - 6 lshift rot or ( cyl.lo cyl.hi|sector ) +: reset-disks ( -- ) h# 13 bios{ 0 ah h# 80 dx }bios ; +: reset-hard-disks ( -- ) h# 13 bios{ h# 0d ah h# 80 dx }bios ; +: bios-rw ( sector1 head0 cyl0 drive0 #sectors ah-val -- ) + h# 13 bios{ ah al ( sector1 head0 cyl0 drive0 ) + rot bwjoin dx ( sector1 cyl0 ) + wbsplit ( sector1 cyl.lo cyl.hi ) + 6 lshift rot or ( cyl.lo cyl.hi|sector ) swap bwjoin cx - h# 10000 >seg:off rm-es w! bx - } + h# 10000 >seg:off bios-es w! bx + }bios ; -: read-sectors ( sector1 cyl0 head0 drive0 #sectors -- ) 2 do-rw ; -: write-sectors ( sector1 cyl0 head0 drive0 #sectors -- ) 3 do-rw ; +: bios-read-sectors ( sector1 head0 cyl0 drive0 #sectors -- ) 2 bios-rw ; +: bios-write-sectors ( sector1 head0 cyl0 drive0 #sectors -- ) 3 bios-rw ; -: lbn>sch ( lbn -- sector cyl head ) - #sects /mod swap 1+ swap ( sector rem ) - #heads /mod ( sector head cyl ) - dup #cyls > abort" LBN out of range" - swap ( sector cyl head ) +: lbn>shc ( lbn -- sector head cyl ) + #sects /mod swap 1+ swap ( sector rem ) + #heads /mod ( sector head cyl ) + dup #cyls > abort" LBN out of range" ( sector head cyl ) ; -: lbn-read-sectors ( lbn drive #sectors -- ) 2>r lbn>sch 2r> read-sectors ; -: lbn-write-sectors ( lbn drive #sectors -- ) 2>r lbn>sch 2r> write-sectors ; +: lbn-read-sectors ( lbn drive #sectors -- ) 2>r lbn>shc 2r> bios-read-sectors ; +: lbn-write-sectors ( lbn drive #sectors -- ) 2>r lbn>shc 2r> bios-write-sectors ; Modified: cpu/x86/pc/biosload/fw.bth =================================================================== --- cpu/x86/pc/biosload/fw.bth 2008-01-28 04:18:50 UTC (rev 793) +++ cpu/x86/pc/biosload/fw.bth 2008-01-28 04:19:49 UTC (rev 794) @@ -206,7 +206,7 @@ ; fload ${BP}/cpu/x86/pc/biosload/usb.fth -\ fload ${BP}/cpu/x86/pc/biosload/callbios.fth +fload ${BP}/cpu/x86/pc/biosload/callbios.fth fload ${BP}/cpu/x86/pc/biosload/rmenter.fth \ false to stand-init-debug? @@ -275,7 +275,7 @@ warning on only forth also definitions - install-alarm +\ install-alarm #line off @@ -323,6 +323,7 @@ .( Saving fw.img ...) " fw.img" RAMbase save-abs-rom cr + \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks \ Modified: cpu/x86/pc/biosload/rmenter.fth =================================================================== --- cpu/x86/pc/biosload/rmenter.fth 2008-01-28 04:18:50 UTC (rev 793) +++ cpu/x86/pc/biosload/rmenter.fth 2008-01-28 04:19:49 UTC (rev 794) @@ -1,3 +1,4 @@ +[ifndef] >seg:off : >seg:off ( linear -- offset segment ) lwsplit d# 12 lshift ; : seg:off! ( linear adr -- ) >r >seg:off r@ wa1+ w! r> w! ; : seg:off> ( offset segment -- linear ) 4 lshift + ; @@ -2,2 +3,3 @@ : seg:off@ ( adr -- linear ) dup w@ swap wa1+ w@ seg:off> ; +[then] @@ -27,8 +29,11 @@ h# 0.0000 constant rm-base : +rm ( offset -- adr ) rm-base + ; +\ The real-mode stack pointer will start here +h# f00 +rm constant 'rm-stack +\ h# ef0 +rm constant 'rm-dispatch + \ Place for the initial registers upon entry to real mode. -\ The real-mode stack pointer will start here h# f00 +rm constant 'rm-regs \ (00) 4 * 2: GS,FS,ES,DS \ (08) 8 * 4: EDI,ESI,EBP,ESP,EBX,EDX,ECX,EAX @@ -97,8 +102,25 @@ : rm-flags! caller-regs >rm-flags w! ; : rm-set-cf rm-flags@ 1 or rm-flags! ; -: rm-clr-cf rm-flags@ 1 or rm-flags! ; +: rm-clr-cf rm-flags@ 1 invert and rm-flags! ; +true value show-rm-int? +: noshow false to show-rm-int? ; +variable save-eax +: snap-int + true to show-rm-int? caller-regs >rm-eax @ save-eax ! +; +: showint + ." INT " 'rm-int w@ . save-eax @ wbsplit ." AH " . ." AL " . cr +; +: ?showint show-rm-int? if showint then ; + +h# 80 constant /vectors + +/vectors buffer: saved-rm-vectors +/vectors buffer: saved-ofw-vectors + + \ 80ff0 is the target address of the interrupt vector \ We use different segment:offset representations of that address in \ the vector table, so the handler code can determine the vector @@ -108,13 +130,29 @@ \ ... \ ff: 80ff:0000 +: grab-rm-vector ( vector# -- ) + >r + h# ff0 r@ 4 lshift - r@ /l* w! \ Set offset + rm-base 4 rshift r@ + r> /l* wa1+ w! \ Set segment +; +: ungrab-rm-vector ( vector# -- ) + saved-rm-vectors over la+ l@ ( vector# value ) + swap /l* l! +; : make-vector-table ( -- ) - h# 100 0 do - h# ff0 i 4 lshift - i /l* w! \ Set offset - rm-base 4 rshift i + i /l* wa1+ w! \ Set segment - loop + h# 100 0 do i grab-rm-vector loop ; +label timer-off + real-mode + ax push + h# 21 # al in + 1 # al or + al h# 21 # out + ax pop + iret +end-code + label rm-to-pm real-mode @@ -205,40 +243,123 @@ end-code here rm-enter - constant /rm-enter -h# 400 buffer: saved-rm-vectors +: restore-vector ( int# -- ) + saved-rm-vectors over la+ l@ swap /l* l! +; 0 value rm-prepped? +: move-gdt ( -- ) + gdtr@ 1+ ( gdt-adr gdt-len ) + +\ dup h# 10 + alloc-mem h# f + h# f invert and ( gdt-adr gdt-len new-gdt ) + h# 900 + + swap 2dup 2>r move 2r> ( new-gdt gdt-len ) + 1- gdtr! +; +0 value kbd-ih + +: bios-vectors ( -- ) + 0 saved-ofw-vectors /vectors move + saved-rm-vectors 0 /vectors move +; +: ofw-vectors ( -- ) +\ 0 saved-ofw-vectors /vectors move + saved-ofw-vectors 0 /vectors move +; +: regs>bios ( -- ) + caller-regs bios-regs d# 40 move + rm-flags@ bios-flags l! + 'rm-int w@ /l* @ bios-target ! +; +: bios>regs ( -- ) + bios-regs caller-regs d# 40 move + bios-flags l@ rm-flags! +; +: use-bios ( -- ) + bios-vectors + ?prep-bios-call + regs>bios + }bios + bios>regs + ofw-vectors +; + : prep-rm ( -- ) rm-prepped? if exit then true to rm-prepped? fix-gdt - 0 saved-rm-vectors h# 400 move - make-vector-table + move-gdt + rm-enter 'rm-enter /rm-enter move rm-to-pm 'rm-to-pm /rm-to-pm move pm-to-rm 'pm-to-rm /pm-to-rm move + 0 saved-rm-vectors /vectors move + +[ifdef] syslinux-loaded + 7 h# 1.0004 config-w! + + h# 10 grab-rm-vector \ Video + h# 11 grab-rm-vector \ Sysinfo + h# 12 grab-rm-vector \ Low memory size + h# 13 grab-rm-vector \ Disk I/O +\ h# 15 grab-rm-vector \ Various system stuff + h# 16 grab-rm-vector \ Keyboard + h# 1a grab-rm-vector \ PCI BIOS +[else] + make-vector-table + + saved-rm-vectors 8 la+ l@ 0 8 la+ l! \ Use BIOS timer tick handler + saved-rm-vectors h# 1c la+ l@ 0 h# 1c la+ l! \ Timer handler chain +[then] + +\ \ Set up a rudimentary handler for the ISA timer +\ timer-off 'rm-timer-off /rm-timer-off move +\ 'rm-timer-off 0 8 la+ seg:off! + h# ffff 'rm-idt w! 0 'rm-idt wa1+ l! \ Limit and base + + " keyboard" open-dev to kbd-ih ; : rm-init-program ( pc -- ) prep-rm 'rm-regs h# 2e erase ( pc ) 'rm-regs h# 28 + seg:off! ( ) - 'rm-regs 'rm-sp seg:off! \ Initial stack pointer below regs + 'rm-stack 'rm-sp seg:off! \ Initial stack pointer below regs ; +: !font ( adr -- ) + >seg:off caller-regs >rm-es w! caller-regs >rm-ebp l! + h# 10 rm-cx! h# 18 rm-dx! +; : get-font ( -- ) rm-al@ h# 30 = if ." Int 10 get-font called - BH = " rm-bh@ . cr + rm-bh@ case +\ These numbers are cheats, pointing into the VIA BIOS + 2 of h# c69e0 !font endof + 3 of h# c6138 !font endof + 4 of h# c6538 !font endof + 5 of h# c69e0 !font endof + 6 of h# c77e0 !font endof + 7 of h# c77e0 !font +h# 10 ungrab-rm-vector +endof + ( default ) ." Unsupported get font - BH = " dup . cr rm-set-cf + endcase else ." Int 10 set-font called" cr then ; -: video-int ( -- ) +: set-cursor ( -- ) rm-dh@ rm-dl@ ( row column ) 2drop ; + +: video-int ( -- ) \ INT 10 rm-ah@ case h# 0 of ( rm-al@ set-video-mode ) endof \ Set mode - Should blank the screen + h# 2 of set-cursor endof h# a of rm-al@ emit endof \ Write character h# e of rm-al@ emit endof \ Write character h# 11 of get-font endof \ get or set font @@ -248,13 +369,29 @@ ( default ) ." Unimplemented video int - AH = " dup . cr rm-set-cf endcase ; -: sysinfo-int ( -- ) h# 26 rm-ax! ; +: bios-video-int debug-me use-bios ; +: sysinfo-int ( -- ) \ INT 11 + \ h# 4226 caller-regs >rm-eax ! \ to report 1 parallel and 1 serial port + h# 26 caller-regs >rm-eax ! \ 32 bits +; + 0 value disk-ih : disk-read-sectors ( adr sector# #sectors -- #read ) +noshow +\ ." Read " 2 pick . over . dup . ." -- " +\ over h# 8b74aaa = if debug-me then " read-blocks" disk-ih $call-method +\ dup . cr ; +: disk-write-sectors ( adr sector# #sectors -- #read ) +\ ." Write " 2 pick . over . dup . ." -- " +\ over h# 8b74aaa = if debug-me then + " write-blocks" disk-ih $call-method +\ dup . cr +; + 0 [if] h# 200 constant /sector : disk-seek ( sector# -- error? ) @@ -274,8 +411,9 @@ rm-dl@ h# 80 <> if rm-set-cf 7 rm-ah! true exit then disk-ih if false exit then \ " disk:0" open-dev to disk-ih - " /ide@0" open-dev to disk-ih + " /pci/ide@0" open-dev to disk-ih disk-ih dup 0= if rm-set-cf h# aa rm-ah! then + false ; : read-sectors ( -- ) check-drive if exit then @@ -292,13 +430,15 @@ \ rm-bx@ caller-regs >rm-es w@ seg:off> rm-al@ ( adr #sectors ) \ disk-read rm-al! ; +: drive-sectors ( -- n ) " #blocks" disk-ih $call-method ; : drive-params ( -- ) check-drive if exit then \ " size" disk-ih $call-method ( d.#bytes ) \ /sector um/mod nip ( #sectors ) - " #blocks" disk-ih $call-method ( #sectors ) + drive-sectors ( #sectors ) h# 3f / ( #tracks ) h# ff / 1- ( maxcyl ) \ Max 255 heads is traditional +\ dup ." MAXCYL " . cr wbsplit ( maxcyl.lo maxcyl.hi ) 3 min 6 lshift h# 3f or rm-cl! ( maxcyl.lo ) \ High cyl, max sector rm-ch! ( ) \ Low byte of max cylinder @@ -307,16 +447,33 @@ rm-clr-cf ; +: ds:si ( -- adr ) + caller-regs >rm-esi w@ caller-regs >rm-ds w@ seg:off> +; : lba-read ( -- ) check-drive if exit then - caller-regs >rm-esi w@ caller-regs >rm-ds w@ seg:off> ( packet-adr ) - >r r@ 4 + seg:off@ r@ 8 + l@ r@ 2+ w@ disk-read-sectors r> 2+ w! + ds:si ( packet-adr ) + >r r@ 4 + seg:off@ r@ 8 + l@ r@ 2+ w@ ( adr sector# #sectors ) +\ ." LBA " + disk-read-sectors r> 2+ w! \ dup 8 + l@ ( packet-adr sector# ) \ disk-seek if drop exit then ( packet-adr ) \ dup 4 + seg:off@ over 2+ w@ ( packet-adr adr #sectors ) \ disk-read \ swap 2+ w! ; +: lba-write ( -- ) + check-drive if exit then + ds:si ( packet-adr ) + >r r@ 4 + seg:off@ r@ 8 + l@ r@ 2+ w@ ( adr sector# #sectors ) +\ ." LBA " + disk-write-sectors r> 2+ w! +\ dup 8 + l@ ( packet-adr sector# ) +\ disk-seek if drop exit then ( packet-adr ) +\ dup 4 + seg:off@ over 2+ w@ ( packet-adr adr #sectors ) +\ disk-read +\ swap 2+ w! +; : check-disk-extensions ( -- ) check-drive if 0 rm-bx! exit then @@ -324,13 +481,42 @@ h# aa55 rm-bx! h# 20 rm-ah! 1 rm-cx! ; +: ext-get-drive-params ( -- ) + check-drive if exit then + 0 rm-ah! + ds:si >r ( adr ) + r@ 2 + h# 0e erase \ CHS info not valid + drive-sectors r@ h# 10 + l! 0 r@ h# 14 + l! \ Total #sectors + h# 200 r@ h# 18 + w! \ Sector len + h# 1a ( written-length ) + r@ w@ h# 1e >= if + -1 r@ h# 1a + l! \ No EDD + 4 + ( written-length' ) + then ( written-length ) + r@ w@ h# 20 >= if ( written-length ) + 0 r@ h# 1e + w! \ Ensure that device path info not interpreted + \ Don't claim these bytes + then ( written-length ) + r> w! \ Number of bytes written + rm-clr-cf +; +: get-disk-type ( -- ) + check-drive if exit then + 3 rm-ah! + drive-sectors lwsplit rm-cx! rm-dx! + rm-clr-cf +; + : disk-int ( -- ) \ INT 13 handler rm-ah@ case - h# 02 of read-sectors endof - h# 08 of drive-params endof + h# 02 of noshow read-sectors endof + h# 08 of drive-params endof + h# 15 of get-disk-type endof h# 41 of check-disk-extensions endof - h# 42 of lba-read endof + h# 42 of lba-read endof + h# 43 of lba-write endof + h# 48 of ext-get-drive-params endof ( default ) ." Unsupported disk INT 13 - AH = " dup . cr endcase ; @@ -354,11 +540,74 @@ dup h# 100.0000 min h# 10.0000 - 0 max /1k dup rm-ax! rm-cx! h# 100.0000 - 0 max d# 16 rshift dup rm-bx! rm-dx! ; +: allmem ( -- n ) + " /memory" find-package 0= abort" No /memory node" ( phandle ) + " reg" rot get-package-property abort" No available property" ( $ ) + decode-int drop get-encoded-int h# 10.0000 round-up +; + +0 [if] +Entry: + EBX Continuation value + ES:DI Address of Address Range Descriptor + ECX Length of Address Range Descriptor (=> 20 bytes) + EDX "SMAP" signature +Exit: + Carry 0 = E820 Supported + EAX "SMAP" signature + ES:DI Same value as entry + ECX Length of actual reported information in bytes + EBX Continuation value + Structure of Address Range Descriptor: + Bytes 0-3 Low 32 bits of Base Address + Bytes 4-7 High 32 bits of Base Address + Bytes 8-11 Low 32 bits of Length in bytes + Bytes 12-15 High 32 bits of Length in bytes + Bytes 16-20 Type of Address Range: + 1 = AddressRangeMemory, available to OS + 2 = AddressRangeReserved, not available + 3 = AddressRangeACPI, available to OS + 4 = AddressRangeNVS, not available to OS + Other = Not defined, not available + +d.base d.len l.type +[then] + +create memdescs + h# 0. d, h# a0000. d, 1 l, \ 0 +\ h# a0000. d, h# 60000. d, 2 l, \ 14 + h# f0000. d, h# 10000. d, 2 l, \ 14 + h# 100000. d, 0. d, 1 l, \ 28 +\ 0. d, 0. d, 2 l, \ 3c + h# ffff0000. d, h# 10000. d, 2 l, \ 40 +here memdescs - constant /memdescs + +: system-memory-map ( -- ) + caller-regs >rm-edx @ caller-regs >rm-eax ! + caller-regs >rm-ebx @ ?dup 0= if + memory-limit h# 100000 - memdescs h# 30 + l! +\ memory-limit memdescs h# 3c + l! +\ allmem memory-limit - memdescs h# 44 + l! + memdescs + then ( adr ) + + dup memdescs /memdescs + = if + drop + 0 caller-regs >rm-ecx ! + exit + then + + dup caller-regs >rm-edi w@ caller-regs >rm-es w@ seg:off> ( adr dst ) + caller-regs >rm-ecx @ move ( adr ) + caller-regs >rm-ecx @ + caller-regs >rm-ebx ! ( ) \ Continuation + rm-clr-cf +; + : bigmem-int ( -- ) rm-clr-cf rm-al@ case h# 01 of bigmem-16bit endof -\ h# 20 of system-memory-map endof + h# 20 of system-memory-map endof \ h# 81 of pm-system-memory-map endof ( default ) rm-set-cf ." Unsupported Bigmem int 15 AH=e8 AL=" dup . cr @@ -370,38 +619,94 @@ rm-set-cf h# 86 rm-ah! ; -create sysconf 8 w, h# fc c, 1 c, 0 c, h# 70 c, 0 c, 0 c, +\ System configure +create sysconf + 8 w, \ 8 bytes following + h# fc c, \ model + 1 c, \ Submodel + 0 c, \ BIOS rev + h# 74 c, \ Feature - second 8259, RTC, INT 9 calls INT 15/4F, extended BIOS area + 0 c, + 0 c, + 0 c, + 0 c, + : get-conf ( -- ) sysconf 'rm-regs 8 move 'rm-regs >seg:off 0 caller-regs >rm-es w! rm-bx! + 0 rm-ax! ; +: handle-mouse ( -- ) + rm-al@ case + 1 of rm-clr-cf endof \ Reset mouse + ( default ) ." Unsupported mouse INT 15 AH c2 AL " dup . cr rm-set-cf + endcase +; + : system-int ( -- ) \ INT 15 handler + rm-clr-cf rm-ah@ case + h# 91 of noshow 0 rm-ah! endof \ "pause" while waiting for I/O h# 53 of apm endof h# 86 of rm-dx@ rm-cx@ wljoin us endof \ Delay microseconds h# 8a of memory-limit h# 400.0000 - 0 max /1k lwsplit rm-dx! rm-ax! endof h# 88 of h# fffc rm-ax! endof \ Extended memory - at least 64 MB h# c0 of get-conf endof h# c1 of rm-set-cf h# 86 rm-ah! endof + h# c2 of handle-mouse endof h# e8 of bigmem-int endof ( default ) rm-set-cf ." Unsupported INT 15 AH=" dup . cr endcase ; -: poll-key ( -- ) - key? if - key rm-al! 0 rm-ah! \ ASCII in AL, scancode in AH +h# 4800 value the-key + +: poll-key ( -- false | scan,ascii true ) + the-key ?dup if true exit then + 0 " get-scancode" kbd-ih $call-method if ( scancode ) + dup h# 80 and if ( scancode ) + \ Discard release events and escapes (e0) + drop false ( false ) + else + dup " scancode->char" kbd-ih $call-method 0= if 0 then ( scancode ascii ) + dup h# 80 and if drop 0 then \ Don't return e.g. 9B for arrows + swap bwjoin to the-key + the-key true + then + else + false + then +; + +0 value polled? +: poll-keystroke ( -- ) + noshow + polled? 0= if ." ? " then + true to polled? + poll-key if ( scancode,ascii ) + rm-ax! rm-flags@ h# 40 invert and rm-flags! else rm-flags@ h# 40 or rm-flags! then ; +: get-keystroke ( -- ) + noshow -: keyboard-int ( -- ) \ INT 15 handler + begin poll-key until ( scancode,ascii ) + 0 to the-key + rm-ax! + + rm-al@ [char] q = if debug-me then + false to polled? +; + +: keyboard-int ( -- ) \ INT 16 handler rm-ah@ case - 1 of poll-key endof + 0 of get-keystroke endof + 1 of poll-keystroke endof 2 of 0 rm-al! endof \ Claim that no shift keys are active ( bit 7:sysrq 6:capslock 5:numlock 4:scrlock 3:ralt 2:rctrl 1:lalt 0:lctrl ) ( default ) ." Keyboard INT called with AH = " dup . cr @@ -417,9 +722,9 @@ h# 201 rm-bx! \ Version 2.1 1 rm-cl! \ Number of last PCI bus - XXX get this from PCI node ; -: pcibios ( -- ) +: pcibios ( -- ) \ INT 1a rm-clr-cf - rm-ah@ case + rm-al@ case h# 01 of pcibios-installed endof \ h# 02 of find-pci-device ( cx:devid dx:vendid si:index -> bh:bus# bl:devfn ) endof \ h# 03 of find-pci-class-code ( ecx:0,classcode si:index -> bh:bus# bl:devfn ) endof @@ -434,7 +739,7 @@ \ h# 0f of set-pci-int endof ( default ) h# 81 rm-ah! rm-set-cf - ." Unimplemented PCI BIOS INT - AH = " dup . cr + ." Unimplemented PCI BIOS INT 1a AH b1 - AL = " dup . cr endcase ; @@ -445,30 +750,28 @@ : int-1a ( -- ) rm-ah@ case - h# 0 of get-timer-ticks endof + h# 0 of get-timer-ticks noshow endof h# b1 of pcibios endof - ( default ) ." Unimplemented INT 1a - AH = " dup . rm-set-cf + ( default ) ." Unimplemented INT 1a - AH = " dup . cr rm-set-cf endcase ; -: showint - ." INT " 'rm-int w@ . ." AH " rm-ah@ . ." AL " rm-al@ . cr -; - : handle-bios-call ( -- ) + snap-int 'rm-int w@ case h# 10 of video-int endof h# 11 of sysinfo-int endof - h# 13 of disk-int endof -showint + h# 13 of noshow disk-int endof + h# 16 of keyboard-int endof + h# 15 of system-int endof h# 12 of h# a0000 /1k rm-ax! endof \ Low memory size - h# 15 of system-int endof - h# 16 of keyboard-int endof h# 1a of int-1a endof ( default ) ." Interrupt " dup . cr interact endcase + ?showint ; : rm-go ( -- ) + usb-quiet \ Load boot image at 7c00 h# 7c00 rm-init-program begin @@ -480,14 +783,14 @@ here xx - constant /xx : put-xx ( adr -- ) xx swap /xx move ; : get-mbr - " /ide@0" open-dev >r + " /pci/ide@0" open-dev >r h# 7c00 h# 3f 1 " read-blocks" r@ $call-method . r> close-dev ; : .lreg ( adr -- adr' ) 4 - dup l@ 9 u.r ; : .wreg ( adr -- adr' ) 2 - dup w@ 5 u.r ; : .caller-regs ( -- ) - ." AX CX BX DX SP BP SI DI" cr + ." AX CX DX BX SP BP SI DI" cr caller-regs >rm-eax 4 + 8 0 do .lreg loop cr cr ." DS ES FS GS PC FLAGS" cr

1 0

r793 - cpu/x86/pc/biosload
by svn＠openbios.org 28 Jan '08

28 Jan '08

Author: wmb Date: 2008-01-28 05:18:50 +0100 (Mon, 28 Jan 2008) New Revision: 793 Modified: cpu/x86/pc/biosload/devices.fth cpu/x86/pc/biosload/ofw.bth Log: BIOSload version - Added an optional driver for legacy VGA. Modified: cpu/x86/pc/biosload/devices.fth =================================================================== --- cpu/x86/pc/biosload/devices.fth 2008-01-28 04:17:34 UTC (rev 792) +++ cpu/x86/pc/biosload/devices.fth 2008-01-28 04:18:50 UTC (rev 793) @@ -207,6 +207,22 @@ ; [then] +[ifdef] use-vga +0 0 " i3c0" " /isa" begin-package + " vga" name + my-address my-space h# 20 reg + fload ${BP}/dev/video/common/defer.fth \ Defered words + fload ${BP}/dev/video/common/graphics.fth \ Graphics and color routines + fload ${BP}/dev/video/controlr/vga.fth \ Controller code + use-vga + fload ${BP}/dev/video/common/init.fth \ Init code + fload ${BP}/dev/video/common/display.fth \ High level interface code + fload ${BP}/dev/video/common/textmode.fth \ VGA text mode + : (map-io-regs) h# ffff0000 to io-base ; + ' (map-io-regs) to map-io-regs +end-package +[then] + [ifdef] use-ct65550 0 0 " i3b0" " /isa" begin-package fload ${BP}/dev/ct6555x/loadpkg.fth \ Video driver Modified: cpu/x86/pc/biosload/ofw.bth =================================================================== --- cpu/x86/pc/biosload/ofw.bth 2008-01-28 04:17:34 UTC (rev 792) +++ cpu/x86/pc/biosload/ofw.bth 2008-01-28 04:18:50 UTC (rev 793) @@ -133,6 +133,11 @@ " ${BP}/cpu/x86/pc/biosload/linux.fth" " linux.fth" $add-dropin " ${BP}/ofw/linux/penguin.txt" " penguin.txt" $add-dropin +[ifdef] use-vga + " ${BP}/ofw/termemu/cp881-16.obf" " font" $add-deflated-dropin +[then] + + [ifdef] grub-loaded ofd @ fsize pad ! \ file size; store in memory for convenience below h# 44 ofd @ fseek \ Seek to file size field; see elfhdr.bth

1 0

r792 - cpu/x86/pc/biosload
by svn＠openbios.org 28 Jan '08

28 Jan '08

Author: wmb Date: 2008-01-28 05:17:34 +0100 (Mon, 28 Jan 2008) New Revision: 792 Modified: cpu/x86/pc/biosload/usb.fth Log: BIOSload version - Removed hardcoded PCI device numbers from the USB probing code. Modified: cpu/x86/pc/biosload/usb.fth =================================================================== --- cpu/x86/pc/biosload/usb.fth 2008-01-24 23:27:35 UTC (rev 791) +++ cpu/x86/pc/biosload/usb.fth 2008-01-28 04:17:34 UTC (rev 792) @@ -12,20 +12,38 @@ r> to exit? ; +: (probe-usb2) ( -- ) + " device_type" get-property if exit then + get-encoded-string " ehci" $= if + pwd$ open-dev ?dup if close-dev then + then +; +: (show-usb2) ( -- ) + " device_type" get-property if exit then + get-encoded-string " ehci" $= if + pwd$ $nopage-show-devs + then +; +: (probe-usb1) ( -- ) + " device_type" get-property if exit then + get-encoded-string 2dup " uhci" $= >r " ohci" $= r> or if + pwd$ open-dev ?dup if close-dev then + then +; +: (show-usb1) ( -- ) + " device_type" get-property if exit then + get-encoded-string 2dup " uhci" $= >r " ohci" $= r> or if + pwd$ $nopage-show-devs + then +; : probe-usb ( -- ) ." USB2 devices:" cr - " /usb@1d,7" open-dev ?dup if close-dev then - " /usb" $nopage-show-devs + " /" ['] (probe-usb2) scan-subtree + " /" ['] (show-usb2) scan-subtree ." USB1 devices:" cr - " /usb@1d,3" open-dev ?dup if close-dev then - " /usb@1d,3" $nopage-show-devs - " /usb@1d,2" open-dev ?dup if close-dev then - " /usb@1d,2" $nopage-show-devs - " /usb@1d,1" open-dev ?dup if close-dev then - " /usb@1d,1" $nopage-show-devs - " /usb@1d,0" open-dev ?dup if close-dev then - " /usb@1d,0" $nopage-show-devs + " /" ['] (probe-usb1) scan-subtree + " /" ['] (show-usb1) scan-subtree ; alias p2 probe-usb

1 0

r791 - cpu/x86/pc/olpc
by svn＠openbios.org 25 Jan '08

25 Jan '08

Author: wmb Date: 2008-01-25 00:27:35 +0100 (Fri, 25 Jan 2008) New Revision: 791 Modified: cpu/x86/pc/olpc/verify.bth Log: OLPC build - verify md5sum for wireless firmware. Modified: cpu/x86/pc/olpc/verify.bth =================================================================== --- cpu/x86/pc/olpc/verify.bth 2008-01-24 23:25:58 UTC (rev 790) +++ cpu/x86/pc/olpc/verify.bth 2008-01-24 23:27:35 UTC (rev 791) @@ -10,8 +10,14 @@ " wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/fs.public -O fs.public" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/lease.public -O lease.public" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/crypto/${KEYS}/developer.public -O developer.public" expand$ $sh -" wget -q http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img -O verify.img" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img" expand$ $sh +" wget -q http://dev.laptop.org/pub/firmware/crypto/bios_verify-${CRYPTO_VERSION}.img…" expand$ $sh +" md5sum -b bios_verify-${CRYPTO_VERSION}.img | cmp - bios_verify-${CRYPTO_VERSION}.img.md5" expand$ $sh + +" mv bios_verify-${CRYPTO_VERSION}.img verify.img" expand$ $sh +" rm bios_verify-${CRYPTO_VERSION}.img.md5" expand$ $sh + \ This forces the creation of an verify.log file, so we don't re-fetch writing verify.version " ${CRYPTO_VERSION}"n" expand$ ofd @ fputs

1 0

r790 - cpu/x86
by svn＠openbios.org 25 Jan '08

25 Jan '08

Author: wmb Date: 2008-01-25 00:25:58 +0100 (Fri, 25 Jan 2008) New Revision: 790 Modified: cpu/x86/disassem.fth Log: x86 disassembler - fixed formatting bug with [reg+offset] for negative offsets. Modified: cpu/x86/disassem.fth =================================================================== --- cpu/x86/disassem.fth 2008-01-24 09:50:52 UTC (rev 789) +++ cpu/x86/disassem.fth 2008-01-24 23:25:58 UTC (rev 790) @@ -56,12 +56,16 @@ : ?+ ( -- ) ea-text c@ 1 > if " +" $add-text then ; +: ?- ( -- ) + ea-text c@ 1 > if " -" $add-text then +; : get-disp ( mod -- adr len ) case 0 of " " exit endof - 1 of op8@ bext dup 0>= if ?+ then endof - 2 of ?+ adv@ wext endof + 1 of op8@ bext endof + 2 of adv@ wext endof endcase + dup 0>= if ?+ else ?- negate then (u.) disp-buf pack count ; \ Used when "w" field contains 0

1 0

r789 - dev/olpc/keyboard
by svn＠openbios.org 24 Jan '08

24 Jan '08

Author: wmb Date: 2008-01-24 10:50:52 +0100 (Thu, 24 Jan 2008) New Revision: 789 Modified: dev/olpc/keyboard/selftest.fth Log: OLPC keyboard selftest - Added game key display and timeout after 20 seconds of inactivity. Modified: dev/olpc/keyboard/selftest.fth =================================================================== --- dev/olpc/keyboard/selftest.fth 2008-01-24 05:43:01 UTC (rev 788) +++ dev/olpc/keyboard/selftest.fth 2008-01-24 09:50:52 UTC (rev 789) @@ -32,9 +32,12 @@ d# 70 constant single-key-h d# 105 constant shift-key-w d# 540 constant space-key-w +d# 400 constant top-row-offset +d# 40 constant button-w +d# 40 constant button-h : key-adr ( i -- adr ) /key * keys + ; -: top-key-row ( -- ) row-gap to key-y key-gap to key-x ; +: top-key-row ( -- ) top-row-offset to key-y key-gap to key-x ; : next-key-row ( -- ) key-y single-key-h + row-gap + to key-y key-gap to key-x @@ -59,6 +62,7 @@ r> ++key-x add-key-gap ; +: make-button ( x y -- ) button-w button-h (make-key) ; : make-keys ( -- ) 0 to #keys @@ -85,6 +89,17 @@ 3 0 do make-single-key loop make-space-key 5 0 do make-single-key loop + + d# 80 d# 30 make-button \ Rocker up 65 + d# 30 d# 80 make-button \ Rocker left 67 + d# 130 d# 80 make-button \ Rocker right 68 + d# 80 d# 130 make-button \ Rocker down 66 + d# 80 d# 230 make-button \ Rotate 69 + + d# 1080 d# 30 make-button \ O e0 65 + d# 1030 d# 80 make-button \ square e0 67 + d# 1130 d# 80 make-button \ check e0 68 + d# 1080 d# 130 make-button \ X e0 66 ; 0 [if] @@ -146,8 +161,8 @@ ( 48 ) 96 c, 101 c, 105 c, 92 c, 97 c, 102 c, 106 c, 93 c, ( 50 ) 98 c, 103 c, 99 c, 104 c, 0 c, 0 c, 45 c, 122 c, ( 58 ) 123 c, 59 c, 0 c, 0 c, 133 c, 0 c, 0 c, 0 c, \ scan h# 59 is Fn - ibm# d# 59 -( 60 ) 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, -( 68 ) 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 135 c, 0 c, +( 60 ) 0 c, 0 c, 0 c, 0 c, 0 c, 150 c, 153 c, 151 c, \ 66-68 are left rocker +( 68 ) 152 c, 154 c, 0 c, 0 c, 0 c, 0 c, 135 c, 0 c, \ 69 is rotate ( 70 ) 0 c, 0 c, 0 c, 56 c, 0 c, 0 c, 0 c, 0 c, ( 78 ) 0 c, 130 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, @@ -215,6 +230,10 @@ h# 56 of d# 61 endof \ Fn space h# 5c of d# 128 endof \ F grab + h# 65 of d# 156 endof \ Button O + h# 66 of d# 159 endof \ Button X + h# 67 of d# 157 endof \ Button square + h# 68 of d# 158 endof \ Button check ( default ) 0 swap \ Not recognized endcase ; @@ -249,6 +268,11 @@ \ Function row - key#s 0x50 - 0x58 59 c, 127 c, 60 c, 61 c, 62 c, 128 c, 79 c, 84 c, 89 c, \ Fn, lgrab, alt, space, altgr, rgrab, left, down, right + + \ Game buttons - key#s 0x59 - 0x61 (these IBM#s are made up just for this program) + 150 c, 151 c, 152 c, 153 c, \ Rocker up, left, right, down + 154 c, \ Rotate + 156 c, 157 c, 158 c, 159 c, \ Game O, square, check, X here ibm#s - constant /ibm#s : ibm#>key# ( ibm# -- true | key# false ) @@ -350,7 +374,7 @@ : draw-keyboard ( -- ) kbd-bc fill-screen #keys 0 ?do i key-up loop - 0 d# 20 at-xy ." Press the top left key to exit" + 0 d# 13 at-xy ." X" ; false value verbose? @@ -375,10 +399,17 @@ false ; +0 value last-timestamp : selftest-keys ( -- ) false to esc? + get-msecs to last-timestamp begin - get-data? if process-raw else false then ( exit? ) + get-data? if + process-raw + get-msecs to last-timestamp + else + get-msecs last-timestamp - d# 20,000 >= + then ( exit? ) until ; @@ -388,11 +419,9 @@ open 0= if true exit then make-keys cursor-off draw-keyboard -\ toss-keys " translation-off" $call-parent - true to locked? + true to locked? \ Disable the keyboard alarm handler; it steals our scancodes selftest-keys false to locked? -\ " translation-on" $call-parent toss-keys cursor-on screen-ih iselect erase-screen iunselect page

1 0

r788 - dev/olpc/keyboard
by svn＠openbios.org 24 Jan '08

24 Jan '08

Author: wmb Date: 2008-01-24 06:43:01 +0100 (Thu, 24 Jan 2008) New Revision: 788 Modified: dev/olpc/keyboard/selftest.fth Log: OLPC keyboard selftest - Changed from scanset 2 to scanset 1, so that game key reports, which are always in scanset 1, don't confuse the up/down handler. Modified: dev/olpc/keyboard/selftest.fth =================================================================== --- dev/olpc/keyboard/selftest.fth 2008-01-22 08:59:25 UTC (rev 787) +++ dev/olpc/keyboard/selftest.fth 2008-01-24 05:43:01 UTC (rev 788) @@ -87,13 +87,202 @@ 5 0 do make-single-key loop ; -\ Keyboard top row: key entries 0-0x18 -\ next row: key entries 0x19-0x26 -\ next row: key entries 0x27-0x31 -\ next row: key entries 0x35-0x41 -\ next row: key entries 0x42-0x4f -\ next row: key entries 0x50-0x58 +0 [if] +hex +\ This is indexed by the IBM key number (the physical key number as +\ shown on language-independent drawings of the keyboard layout since +\ the original IBM documentation). The values are scanset1 codes. +create (ibm#>scan1) +\ 0 1 3 3 4 5 6 7 8 9 + 00 c, 29 c, 02 c, 03 c, 04 c, 05 c, 06 c, 07 c, 08 c, 09 c, \ + 0a c, 0b c, 0c c, 0d c, 00 c, 0e c, 0f c, 10 c, 11 c, 12 c, \ 1x + 13 c, 14 c, 15 c, 16 c, 17 c, 18 c, 19 c, 1a c, 1b c, 2b c, \ 2x + 3a c, 1e c, 1f c, 20 c, 21 c, 22 c, 23 c, 24 c, 25 c, 26 c, \ 3x + 27 c, 28 c, 00 c, 1c c, 2a c, 56 c, 2c c, 2d c, 2e c, 2f c, \ 4x + 30 c, 31 c, 32 c, 33 c, 34 c, 35 c, 73 c, 36 c, 1d c, 00 c, \ 5x + 38 c, 39 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, \ 6x + 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, \ 7x + 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, 00 c, \ 8x + 45 c, 47 c, 4B c, 4F c, 00 c, 00 c, 48 c, 4C c, 50 c, 52 c, \ 9x + 37 c, 49 c, 4D c, 51 c, 53 c, 4A c, 4E c, 00 c, 1c c, 00 c, \ 1 + 01 c, 00 c, 3b c, 3c c, 3d c, 3e c, 3f c, 40 c, 41 c, 42 c, \ 11x + 43 c, 44 c, 57 c, 58 c, 00 c, 46 c, 00 c, 00 c, 00 c, 00 c, \ 12x + 79 c, 00 c, 00 c, 5c c, 73 c, 6e c, 00 c, 00 c, 00 c, 00 c, \ 13x (analog intermediates) + 00 c, 00 c, 00 c, 00 c, 00 c, \ 14x +\ A program to invert the table above. We used the inverted form. +h# 80 buffer: sc1 +: invert-ibm ( -- ) + sc1 h# 80 erase + d# 145 0 do + (ibm#>scan1) i + c@ ?dup if i swap sc1 + c! then + loop + + h# 80 0 do + ." ( " i 2 u.r ." ) " + i 8 bounds do + sc1 i + c@ push-decimal 3 u.r pop-base ." c, " + loop + cr + 8 +loop +; +[then] + +\ This table is indexed by the (unescaped) scanset1 code, giving +\ an IBM physical key number. + +decimal +create (scan1>ibm#) +\ 0/8 1/9 2/a 3/b 4/c 5/d 6/e 7/f +( 0 ) 0 c, 110 c, 2 c, 3 c, 4 c, 5 c, 6 c, 7 c, \ 01 is esc +( 8 ) 8 c, 9 c, 10 c, 11 c, 12 c, 13 c, 15 c, 16 c, +( 10 ) 17 c, 18 c, 19 c, 20 c, 21 c, 22 c, 23 c, 24 c, +( 18 ) 25 c, 26 c, 27 c, 28 c, 43 c, 58 c, 31 c, 32 c, \ 1d is ctrl, 1c is Enter +( 20 ) 33 c, 34 c, 35 c, 36 c, 37 c, 38 c, 39 c, 40 c, +( 28 ) 41 c, 1 c, 44 c, 29 c, 46 c, 47 c, 48 c, 49 c, +( 30 ) 50 c, 51 c, 52 c, 53 c, 54 c, 55 c, 57 c, 100 c, +( 38 ) 60 c, 61 c, 30 c, 112 c, 113 c, 114 c, 115 c, 116 c, +( 40 ) 117 c, 118 c, 119 c, 120 c, 121 c, 90 c, 125 c, 91 c, +( 48 ) 96 c, 101 c, 105 c, 92 c, 97 c, 102 c, 106 c, 93 c, +( 50 ) 98 c, 103 c, 99 c, 104 c, 0 c, 0 c, 45 c, 122 c, +( 58 ) 123 c, 59 c, 0 c, 0 c, 133 c, 0 c, 0 c, 0 c, \ scan h# 59 is Fn - ibm# d# 59 +( 60 ) 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, +( 68 ) 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, 135 c, 0 c, +( 70 ) 0 c, 0 c, 0 c, 56 c, 0 c, 0 c, 0 c, 0 c, +( 78 ) 0 c, 130 c, 0 c, 0 c, 0 c, 0 c, 0 c, 0 c, + +\ This should be a lookup table. It would be smaller that way +: e0-scan1>ibm# ( scancode -- ibm# ) + case + h# 38 of d# 62 endof \ R ALT + +\ For a standard PC keyboard +\ h# 1c of d# 64 endof \ Numeric enter +\ h# 1d of d# 64 endof \ R CTRL +\ h# 52 of d# 75 endof \ Insert +\ h# 53 of d# 76 endof \ Delete +\ h# 47 of d# 80 endof \ Home +\ h# 4f of d# 81 endof \ End +\ h# 49 of d# 85 endof \ PageUp +\ h# 51 of d# 86 endof \ PageDown + + h# 3b of d# 112 endof \ Fn 1 + h# 3c of d# 113 endof \ Fn 2 + h# 3d of d# 114 endof \ Fn 3 + h# 3e of d# 115 endof \ Fn 4 + h# 3f of d# 116 endof \ Fn 5 + h# 40 of d# 117 endof \ Fn 6 + h# 41 of d# 118 endof \ Fn 7 + h# 42 of d# 119 endof \ Fn 8 + h# 43 of d# 120 endof \ Fn 9 + h# 44 of d# 121 endof \ Fn 10 + h# 57 of d# 122 endof \ Fn 11 + h# 58 of d# 123 endof \ Fn 12 + + h# 4b of d# 79 endof \ Left Arrow + h# 48 of d# 83 endof \ Up Arrow + h# 50 of d# 84 endof \ Down Arrow + h# 4d of d# 89 endof \ Right Arrow + +\ OLPC-specific + h# 47 of d# 79 endof \ Home + h# 4f of d# 89 endof \ End + h# 49 of d# 83 endof \ PageUp + h# 51 of d# 84 endof \ PageDown + h# 78 of d# 135 endof \ Fn View Source + h# 79 of d# 135 endof \ View Source + h# 77 of d# 136 endof \ Fn 1.5 + h# 76 of d# 137 endof \ Fn 2.5 + h# 75 of d# 138 endof \ Fn 3.5 + h# 74 of d# 139 endof \ Fn 5.5 + h# 73 of d# 140 endof \ Fn 6.5 + h# 72 of d# 141 endof \ Fn 7.5 + h# 71 of d# 142 endof \ Fn 9.5 + h# 70 of d# 143 endof \ Fn 10.5 + h# 6f of d# 144 endof \ Fn 11.5 + + h# 64 of d# 145 endof \ Fn Chat + h# 6e of d# 145 endof \ Chat + + h# 01 of d# 110 endof \ Fn Esc + h# 5a of d# 129 endof \ Fn Frame + h# 5d of d# 129 endof \ Frame + h# 53 of d# 15 endof \ Fn Erase + h# 52 of d# 57 endof \ Fn R-shift + h# 7e of d# 56 endof \ Language + + h# 5b of d# 127 endof \ L grab + h# 56 of d# 61 endof \ Fn space + h# 5c of d# 128 endof \ F grab + + ( default ) 0 swap \ Not recognized + endcase +; + +: scan1>ibm# ( scancode1 esc? -- ibm# ) + if e0-scan1>ibm# else (scan1>ibm#) + c@ then +; + +\ "key#" is a physical location on the screen +\ "ibm#" is the key number as shown on the original IBM PC documents +\ These keynum values are from the ALPS spec "CL1-matrix-20060920.pdf" +decimal +create ibm#s + \ Top row, key#s 0x00-0x18 + 110 c, 135 c, \ ESC, view source + 112 c, 136 c, 113 c, 137 c, 114 c, 138 c, 115 c, \ Left bar + 116 c, 139 c, 117 c, 140 c, 118 c, 141 c, 119 c, \ Middle bar + 120 c, 142 c, 121 c, 143 c, 122 c, 144 c, 123 c, \ Right bar + 145 c, 129 c, \ chat, frame + + \ Number row - key#s 0x19-0x26 + 1 c, 2 c, 3 c, 4 c, 5 c, 6 c, 7 c, 8 c, 9 c, 10 c, 11 c, 12 c, 13 c, 15 c, + + \ Top alpha row - key#s 0x27-0x34 + 16 c, 17 c, 18 c, 19 c, 20 c, 21 c, 22 c, 23 c, 24 c, 25 c, 26 c, 27 c, 28 c, 43 c, \ tab, chars, enter + + \ Middle alpha row - key#s 0x35-0x41 + 58 c, 31 c, 32 c, 33 c, 34 c, 35 c, 36 c, 37 c, 38 c, 39 c, 40 c, 41 c, 29 c, \ ctrl, chars + + \ Bottom alpha row - key#s 0x42-0x4f + 44 c, 46 c, 47 c, 48 c, 49 c, 50 c, 51 c, 52 c, 53 c, 54 c, 55 c, 57 c, 83 c, 56 c, \ shift, chars, shift, up, times + + \ Function row - key#s 0x50 - 0x58 + 59 c, 127 c, 60 c, 61 c, 62 c, 128 c, 79 c, 84 c, 89 c, \ Fn, lgrab, alt, space, altgr, rgrab, left, down, right +here ibm#s - constant /ibm#s + +: ibm#>key# ( ibm# -- true | key# false ) + /ibm#s 0 ?do ( ibm# ) + dup ibm#s i + c@ = if + drop i false unloop exit + then + loop ( ibm# ) + drop true +; + +0 [if] +\ This is a program to invert the ibm#s table +d# 145 buffer: sc2 +: invert-key ( -- ) + sc2 d# 145 erase + h# 59 0 do + i ibm#s i + c@ sc2 + c! + loop + + d# 145 0 do + ." ( " i push-decimal 3 u.r pop-base ." ) " + i d# 10 bounds do + sc2 i + c@ push-hex 2 u.r pop-base ." c, " + loop + cr + d# 10 +loop +; +[then] + +0 [if] +\ These are maps from scanset 2 to key position numbers. +\ They are no longer used +hex create raw-scancode ( -0 ) -1 c, 10 c, 0d c, 09 c, 06 c, 02 c, 04 c, 16 c, ( 08 ) -1 c, 12 c, 0f c, 0b c, 08 c, 27 c, 19 c, 50 c, @@ -131,13 +320,20 @@ ( 78 ) 14 c, -1 c, 57 c, -1 c, -1 c, 4e c, -1 c, -1 c, raw-scancode value cur-sc-table +[then] h# 07ff constant pressed-key-color h# 001f constant idle-key-color h# ffff constant kbd-bc -: scancode->key ( scancode -- key# ) cur-sc-table + c@ ; +0 value esc? +: scan1->key# ( scancode -- true | key# false ) + esc? scan1>ibm# + ?dup 0= if true exit then + ibm#>key# +; + : draw-key ( key# color -- ) swap key-adr >r @@ -158,33 +354,31 @@ ; false value verbose? -false value exit-selftest? -false value up-key? -: process-raw ( scan-code -- ) +: process-raw ( scan-code -- exit? ) verbose? if dup u. then - dup h# f0 = if - true to up-key? drop - else dup h# e0 = if - e0-scancode to cur-sc-table drop + true to esc? else - scancode->key dup h# ff = if - drop - else - up-key? if dup 0= to exit-selftest? key-up else key-down then + dup h# 7f and scan1->key# if ( scan ) + drop ( ) + else ( scan key# ) + swap h# 80 and if ( key# ) + dup key-up ( key# ) + 0= if true exit then ( ) + else ( key# ) + key-down ( ) + then ( ) then - false to up-key? - raw-scancode to cur-sc-table - then then + false to esc? + then + false ; : selftest-keys ( -- ) - raw-scancode to cur-sc-table - false to exit-selftest? false to up-key? + false to esc? begin - get-data? if process-raw then - exit-selftest? + get-data? if process-raw else false then ( exit? ) until ; @@ -194,9 +388,12 @@ open 0= if true exit then make-keys cursor-off draw-keyboard - toss-keys " translation-off" $call-parent +\ toss-keys " translation-off" $call-parent + true to locked? selftest-keys - " translation-on" $call-parent toss-keys cursor-on + false to locked? +\ " translation-on" $call-parent toss-keys + cursor-on screen-ih iselect erase-screen iunselect page close

1 0

r787 - clients/memtest86
by svn＠openbios.org 22 Jan '08

22 Jan '08

Author: wmb Date: 2008-01-22 09:59:25 +0100 (Tue, 22 Jan 2008) New Revision: 787 Modified: clients/memtest86/Makefile Log: memtest86 - Added an explicit rule for compiling random.o to fix problems when compiling on a 64-bit system. Modified: clients/memtest86/Makefile =================================================================== --- clients/memtest86/Makefile 2008-01-20 01:31:04 UTC (rev 786) +++ clients/memtest86/Makefile 2008-01-22 08:59:25 UTC (rev 787) @@ -75,6 +75,9 @@ spd.o: spd.c lib.c test.h screen_buffer.h ega.h $(CC) -c $(CCFLAGS) -fPIC spd.c +random.o: random.c + $(CC) -c $(CCFLAGS) -fPIC random.c + controller.s: controller.c defs.h config.h test.h pci.h controller.h $(CC) -S $(CCFLAGS) -fPIC controller.c

1 0

r786 - in cpu/x86/pc: biosload olpc
by svn＠openbios.org 20 Jan '08

20 Jan '08

Author: wmb Date: 2008-01-20 02:31:04 +0100 (Sun, 20 Jan 2008) New Revision: 786 Modified: cpu/x86/pc/biosload/fw.bth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/linux.fth Log: OLPC trac 6101 - fixed bug with the loading of ELF format programs. Modified: cpu/x86/pc/biosload/fw.bth =================================================================== --- cpu/x86/pc/biosload/fw.bth 2008-01-18 18:36:36 UTC (rev 785) +++ cpu/x86/pc/biosload/fw.bth 2008-01-20 01:31:04 UTC (rev 786) @@ -145,7 +145,8 @@ 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 [else] ' 2drop is elf-map-in Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-01-18 18:36:36 UTC (rev 785) +++ cpu/x86/pc/olpc/fw.bth 2008-01-20 01:31:04 UTC (rev 786) @@ -179,7 +179,8 @@ 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 [else] ' 2drop is elf-map-in Modified: cpu/x86/pc/olpc/linux.fth =================================================================== --- cpu/x86/pc/olpc/linux.fth 2008-01-18 18:36:36 UTC (rev 785) +++ cpu/x86/pc/olpc/linux.fth 2008-01-20 01:31:04 UTC (rev 786) @@ -251,11 +251,8 @@ \ It expects that virtual = physical; we depend on the fact \ that we have low memory mapped V=P over h# 10000 = if ( vaddr size ) - 0 mem-claim drop - \ Map the frame buffer (virtual=physical) h# 910 config-l@ dup 100.0000 -1 mmu-map - exit then \ If it's not memtest, chain to the linux recognizer

1 0

Olpc.fth testing in Qemu?
by Andreas.Trawoeger＠wgkk.at 19 Jan '08

19 Jan '08

Hi! I just recently got into writing my first olpc.fth booting script for my XO and my question is: Is there a way to do OFW testing in Qemu? There is a documentation about patching Qemu with OFW on the OpenBios.org site, but it still refers to using LinuxBios. I'm currently writing Forth using an advances method that combines cut & paste with wild guessing. So both me and my XO would be happy if I could do my tests in a virtual environtment. cu andreas

1 0

Command reference for Open Firmware?
by Harmon Seaver 18 Jan '08

18 Jan '08

Can someone point me to a reference for OF commands please? -- Harmon Seaver

2 1

r785 - dev/olpc/kb3700
by svn＠openbios.org 18 Jan '08

18 Jan '08

Author: wmb Date: 2008-01-18 19:36:36 +0100 (Fri, 18 Jan 2008) New Revision: 785 Modified: dev/olpc/kb3700/battery.fth Log: Q2D09 refresh - the battery test wasn't being invoked in test-all. Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2008-01-18 18:13:50 UTC (rev 784) +++ dev/olpc/kb3700/battery.fth 2008-01-18 18:36:36 UTC (rev 785) @@ -120,6 +120,7 @@ dev / new-device " battery" device-name +0 0 reg \ Needed so test-all will run the selftest : selftest ( -- error? ) .bat false

1 0

r784 - cpu/x86/pc/olpc
by svn＠openbios.org 18 Jan '08

18 Jan '08

Author: wmb Date: 2008-01-18 19:13:50 +0100 (Fri, 18 Jan 2008) New Revision: 784 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2D09 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2008-01-18 17:52:29 UTC (rev 783) +++ cpu/x86/pc/olpc/versions.fth 2008-01-18 18:13:50 UTC (rev 784) @@ -2,14 +2,14 @@ \ The overall firmware revision macro: FW_MAJOR D -macro: FW_MINOR 08 +macro: FW_MINOR 09 \ The EC microcode -macro: EC_VERSION test4e +macro: EC_VERSION d08b \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary -\ macro: GET_EC cp shiny4c.bin ec.img +\ macro: GET_EC cp PQ2D08a.bin ec.img macro: KEYS mpkeys \ macro: KEYS testkeys

1 0

r783 - cpu/x86/pc/olpc
by svn＠openbios.org 18 Jan '08

18 Jan '08

Author: wmb Date: 2008-01-18 18:52:29 +0100 (Fri, 18 Jan 2008) New Revision: 783 Modified: cpu/x86/pc/olpc/fw.bth Log: OLPC security - made the "just in case" firmware write protect that occurs before game-button functions contingent upon the presence of the "wp" tag. Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2008-01-18 17:50:23 UTC (rev 782) +++ cpu/x86/pc/olpc/fw.bth 2008-01-18 17:52:29 UTC (rev 783) @@ -260,6 +260,10 @@ false ; +: protect-fw ( -- ) + " wp" find-tag if 2drop ec-indexed-io-off then +; + \ stand-init-debug? [if] warning @ warning off : init @@ -271,7 +275,7 @@ [ifdef] rom-loaded d# 300 i-key-wait if - ec-indexed-io-off + protect-fw ." Interacting" cr hex interact then [ifdef] lx-devel @@ -511,7 +515,7 @@ : ?games ( -- ) rocker-right game-key? if - ec-indexed-io-off + protect-fw time&date 5drop 1 and if ['] pong guarded else @@ -522,7 +526,7 @@ ; : ?diags ( -- ) rocker-left game-key? if - ec-indexed-io-off + protect-fw text-on " test-all" ['] eval guarded ." Tests complete - powering off" cr d# 5000 ms power-off then @@ -530,12 +534,12 @@ : ?scan-nand ( -- ) rocker-up game-key? if - ec-indexed-io-off text-on ['] scan-nand guarded + protect-fw text-on ['] scan-nand guarded then ; : ?fs-update ( -- ) button-check button-x or button-o or button-square or ( mask ) - game-key-mask = if ec-indexed-io-off try-fs-update then + game-key-mask = if protect-fw try-fs-update then ; : open-keyboard ( -- ) " keyboard" open-dev ?dup if set-stdin then

1 0

r782 - in cpu/x86/pc: . biosload
by svn＠openbios.org 18 Jan '08

18 Jan '08

Author: wmb Date: 2008-01-18 18:50:23 +0100 (Fri, 18 Jan 2008) New Revision: 782 Added: cpu/x86/pc/biosload/i945.fth cpu/x86/pc/biosload/intelfb.fth cpu/x86/pc/port80.fth Log: Generic PC version - more of the omnibus checkin. Added: cpu/x86/pc/biosload/i945.fth =================================================================== --- cpu/x86/pc/biosload/i945.fth (rev 0) +++ cpu/x86/pc/biosload/i945.fth 2008-01-18 17:50:23 UTC (rev 782) @@ -0,0 +1,27 @@ +purpose: Startup hacks for Intel 945 chipset + +create use-pata +\ create use-sata +: ?configure-i945 ( -- ) +[ifdef] use-pata + h# f900 config-l@ h# 27df8086 = if \ i945 IDE + h# 8000 h# f940 config-w! \ Turn on IDE decode + h# fa00 config-l@ h# 27c08086 = if \ i945 SATA + h# 8f h# fa09 config-b! \ Prevent the legacy mode driver from binding + h# 0000 h# fa40 config-w! \ Turn off IDE decode + then + then +[then] +[ifdef] use-sata + h# fa00 config-l@ h# 27c08086 = if \ i945 SATA + h# 8000 h# fa40 config-w! \ Turn on IDE decode + h# 8a h# fa09 config-b! \ Allow the legacy mode driver to bind +\ h# 00 h# fa90 config-b! \ IDE mode using SATA for all devices + h# 01 h# fa90 config-b! \ IDE mode using PATA as primary, SATA as secondary +\ h# 02 h# fa90 config-b! \ IDE mode using SATA as primary, PATA as secondary + then +[then] +; +stand-init: I945 + ?configure-i945 +; Added: cpu/x86/pc/biosload/intelfb.fth =================================================================== --- cpu/x86/pc/biosload/intelfb.fth (rev 0) +++ cpu/x86/pc/biosload/intelfb.fth 2008-01-18 17:50:23 UTC (rev 782) @@ -0,0 +1,812 @@ +fc20.0000 value chip +: cl@ chip + rl@ ; +: cw@ chip + rw@ ; +: cb@ chip + rb@ ; +: cl! chip + rl! ; +: cw! chip + rw! ; +: cb! chip + rb! ; +: reg-set dup cl@ rot or swap cl! ; +: reg-clr dup cl@ rot invert and swap cl! ; + +: lvds@ ( -- l ) h# 61180 cl@ ; \ high bit is enable +h# 8000.0000 constant hibit + +0 value err-max +0 value err-target +0 value div-max +0 value p-inc +0 value clock + +\ This relies on the fact that p is always a multiple of 5 +\ If p is a multiple of 10, i.e. even, p1 is p/10 and p2 is 0 +\ Otherwise p1 is p/5 and p2 is 1 +: splitp ( p -- p1 p2 ) dup 1 and if 5 / 1 else d# 10 / 0 then ; + +\ We are looking for a solution to m = 5 * (m1 + 2) + (m2 + 2) +\ where 5 <= m2 <= 9. If we substitute m3 = 5 + m2 and do so +\ algebra, we get m - 17 = 5 * m1 + m3 where m3 is in the +\ right range to be a remainder mod 5. IMHO, this is rather +\ an improvement over the linuxfb driver code, which uses a doubly +\ nested loop to search for a solution. +: splitm ( m -- m1 m2 ) + d# 17 - 5 /mod ( m3 m1 ) + swap 5 + ( m1 m2 ) +; + +d# 96000 constant ref-clk + +\ PLL parameters +\ m - 75..120 m1 - 10..20 m2 - 5..9 n - 4..7 p - 5..80 p1 - 1..8 +\ vco - 1400000-2800000 p_transition_clk - 200000 +\ ref_clk - 96000 p_inc_lo - 10 p_inc_hi - 5 +0 value f-out +0 value f-vco +0 value err-best +0 value m-best +0 value n-best +0 value p-best + +0 value f-best +0 value f-err +0 value p + +: pll-calc ( clock -- m1 m2 n p1 p2 clock' ) + to clock + clock 5 * d# 1000 / to err-max + clock d# 1000 / to err-target + d# 10000000 to err-best + 0 to m-best + 0 to n-best + 0 to p-best + + clock d# 200000 <= if d# 10 else d# 5 then to p-inc + d# 2800000 clock / p-inc round-down d# 80 min ( p-max ) + + 1+ p-inc do \ Loop over P possibilities (i at this level is P) + i to p + i clock * to f-vco \ p * clock -> target VCO output frequency + 8 4 do \ Loop over N values (i at this level is N) + \ ceil of quotient + i f-vco * ref-clk /mod swap 0<> - ( approx-m ) + dup d# 120 min 1+ swap 1- d# 75 max ( high+1 low ) + ?do \ Loop over M values (i at this level is M) + \ Calculate resultant clock frequency from this M,N,P + ref-clk i * j / p / to f-out ( ) + \ Slightly bias the error to prefer generated clocks + \ slightly lower than the target frequency + clock f-out - dup 0<= if negate 1+ then ( f-err ) + dup err-best >= if ( f-err ) + drop ( ) + else ( f-err ) + to f-err f-out to f-best ( ) + i to m-best j to n-best p to p-best ( ) + then + loop + f-out clock < if leave then + loop + p-inc +loop + m-best 0= abort" Can't find parameters for clock" + m-best splitm ( m1 m2 ) + n-best 2- ( m1 m2 n ) + p-best splitp ( m1 m2 n p1 p2 ) + ref-clk m-best * n-best / p-best / +; + + +: flush-pipe ( -- ) + 0 0 + d# 2000 0 do + i d# 200 mod 0= if + hibit h# 71008 reg-clr \ Pipe B disable + then + h# 70000 cl@ ( n2 n1 n0 ) + 2dup = 2over = and if ( n2 n1 n0 ) + leave + then + rot drop + loop + 3drop +; + +: set-pll-a ( -- ) + h# abcd0000 h# 61204 cl! \ Unlock PLL + + hibit h# 06014 reg-clr \ Disable PLL A - value was 94.04.00.03 + h# 1004.0003 h# 06014 cl! +\ p2 << 24 | (1 << (p1 - 1)) << 16 (p2 is 0 or 1, p1 is 0..1f) +\ p2 = 0, p1 = 3 so p = 30 +\ n << 16 | m1 << 8 | m2 n=4 m1=0x15(21) m2=5 so m=5(21+2)+(5+2) = 122 +\ clk = 96000 * 122 / 4 / 30 = 97600 kHz = 97.6 MHz + h# 41505 h# 06040 cl! \ FPA0 + h# 31108 h# 06044 cl! \ FPA1 + hibit h# 06014 reg-set \ Enable PLL A + + \ saved-dvob h# 61140 cl! \ Restore DVO B 48.0000 + \ saved-dvoc h# 61160 cl! \ Restore DVO C 48.0000 + 0 h# 61204 cl! \ Relock PLL +; + +: set-pll-b ( -- ) + h# abcd0000 h# 61204 reg-set \ Unlock PLL + + hibit h# 06018 reg-clr \ Disable PLL B - value was 98.02.60.03 + h# 1802.6003 h# 06018 cl! +\ p2 << 24 | (1 << (p1 - 1)) << 16 (p2 is 0 or 1, p1 is 0..1f) +\ p2 = 0, p1 = 2 so p = 20 +\ n << 16 | m1 << 8 | m2 n=4 m1=0x16(22) m2=6 so m=5(22+2)+(6+2) = 128 +\ clk = 96000 * 128 / 4 / 20 = 153600 kHz = 153.6 MHz +\ h# 31108 h# 06040 cl! \ FPA0 +\ h# 31108 h# 06044 cl! \ FPA1 + h# 41606 h# 06048 cl! \ FPB0 + h# 31108 h# 0604c cl! \ FPB1 + hibit h# 06018 reg-set \ Enable PLL B + + \ saved-dvob h# 61140 cl! \ Restore DVO B 48.0000 + \ saved-dvoc h# 61160 cl! \ Restore DVO C 48.0000 + h# abcd0000 h# 61204 reg-clr \ Relock PLL +; + +: lcd-graphics-mode + hibit h# 71400 reg-set \ VGA OFF + flush-pipe + hibit h# 61100 reg-clr \ DAC OFF + hibit h# 70180 reg-clr \ Disable Plane A + hibit h# 71180 reg-clr \ Disable Plane B + d# 20 ms \ Wait at least 1 vblank interval + hibit h# 61140 reg-clr \ Disable DVO B + hibit h# 61160 reg-clr \ Disable DVO C + \ hibit h# 61100 reg-clr \ DAC OFF + h# c00 h# 61100 reg-set \ DPMS D3 (disable sync) + +\ noop + set-pll-b + + hibit h# 61100 reg-set \ Enable DAC + h# 4000.8c18 h# 61100 cl! \ 8000.0000 enable DAC, 4000.0000:pipe B, + \ 8000:syncpolarity, 10:VSYNC on 8:Hsync on + \ C00:D3 state + + h# 5d5.0595 h# 61008 cl! \ Hsync B + h# 66a.0555 h# 61004 cl! \ Hblank B + h# 66a.0555 h# 61000 cl! \ Htotal B + h# 301.0300 h# 61014 cl! \ Vsync B + h# 303.02ff h# 61010 cl! \ Vblank B + h# 303.02ff h# 6100c cl! \ Vtotal B + h# 555.02ff h# 6101c cl! \ Src_size B + + hibit h# 71008 reg-set \ Enable Pipe B + h# c00 h# 61100 reg-clr \ Enable sync + + h# 12 d# 26 << \ 8bpp w/gamma (16 is 5, 24 is 6, 32 is 7) + h# 100.0000 or \ Pipe B + h# 70180 cl! \ Display Plane A control + + d# 1024 h# 70188 cl! \ Plane A stride + 0 h# 70184 cl! \ Plane a base (should be offset to skip stolen stuff I think) + + hibit h# 70180 reg-set \ Display Plane A control + 0 h# 70184 cl! \ Plane A base (again) +; + +: vga-graphics-mode + h# 1010 config-l@ to chip \ For desktop board + + hibit h# 71400 reg-set \ VGA OFF + flush-pipe + hibit h# 61100 reg-clr \ DAC OFF (8000.0000) + hibit h# 70180 reg-clr \ Disable Plane A (9400.0000) + hibit h# 71180 reg-clr \ Disable Plane B (0100.0000) + d# 20 ms \ Wait at least 1 vblank interval + hibit h# 61140 reg-clr \ Disable DVO B (0048.0000) + hibit h# 61160 reg-clr \ Disable DVO C (0048.0000) + h# c00 h# 61100 reg-set \ DPMS D3 (disable sync) + + set-pll-a + + h# 8000.0c00 h# 61100 cl! \ 8000.0000 enable DAC, C00:D3 state + + h# 49f.0417 h# 60008 cl! \ Hsync A + h# 53f.03ff h# 60004 cl! \ Hblank A + h# 53f.03ff h# 60000 cl! \ Htotal A + h# 308.0302 h# 60014 cl! \ Vsync A + h# 325.02ff h# 60010 cl! \ Vblank A + h# 325.02ff h# 6000c cl! \ Vtotal A + h# 3ff.02ff h# 6001c cl! \ Src_size A + + hibit h# 70008 reg-set \ Enable Pipe B + hibit h# 71008 reg-set \ Enable Pipe B + h# c00 h# 61100 reg-clr \ Enable sync + + d# 5 d# 26 << \ 8bpp w/gamma (16 is 5, 24 is 6, 32 is 7) + h# 70180 cl! \ Display Plane A control + + h# 800 h# 70188 cl! \ Plane A stride + 0 h# 70184 cl! \ Plane a base (should be offset to skip stolen stuff I think) + + hibit h# 70180 reg-set \ Display Plane A control + 0 h# 70184 cl! \ Plane A base (again) +; + +0 [if] +In VGA mode, the beginning of the aperture contains an EGA style character map, +with char, attributes, and 6 bytes of something + +function 0 + +1000 27a28086 900007 3000003 800000 +1010 fc200000 1801 d0000008 fc300000 +1020 0 0 0 900e104d +1030 0 90 0 10a +1040 0 48 71090009 a10a2523 +1050 30000e 1b 0 3f800000 +1060 20000 0 0 0 +1070 0 0 0 0 +1080 0 0 0 0 +1090 d005 0 0 0 +10a0 0 0 0 0 +10b0 0 0 0 0 +10c0 400 0 0 0 +10d0 220001 0 0 0 +10e0 0 0 0 0 +10f0 34640000 ff 50f86 0 + +fc200000 BAR 0 size 80000 memory + 1800 BAR 1 size 8 I/O +d0000008 BAR 2 size 1000.0000 type 42 OFW has a bug in size handling when the 0x08 bit is set +fc300000 BAR 3 size 40000 memory + +ok d000.0000 100 dump + 0 1 2 3 4 5 6 7 8 9 a b c d e f 0123456789abcdef +d0000000 47 70 00 00 00 00 00 00 65 70 00 00 00 00 00 00 Gp......ep...... +d0000010 6e 70 00 00 00 00 00 00 65 70 00 00 00 00 00 00 np......ep...... +d0000020 72 70 00 00 00 00 00 00 69 70 00 00 00 00 00 00 rp......ip...... +d0000030 63 70 00 00 00 00 00 00 20 70 00 00 00 00 00 00 cp...... p...... +d0000040 50 70 00 00 00 00 00 00 43 70 00 00 00 00 00 00 Pp......Cp...... +d0000050 2c 70 00 00 00 00 00 00 20 70 00 00 00 00 00 00 ,p...... p...... +d0000060 53 70 00 00 00 00 00 00 65 70 00 00 00 00 00 00 Sp......ep...... +d0000070 72 70 00 00 00 00 00 00 69 70 00 00 00 00 00 00 rp......ip...... +d0000080 61 70 00 00 00 00 00 00 6c 70 7e 00 00 00 81 00 ap......lp~..... +d0000090 20 70 a5 00 00 00 81 00 23 70 81 00 00 00 bd 00 p%.....#p....=. +d00000a0 30 70 99 00 00 00 81 00 2c 70 81 00 00 00 7e 00 0p......,p....~. +d00000b0 20 70 00 00 00 00 00 00 31 70 00 00 00 00 00 00 p......1p...... +d00000c0 30 70 00 00 00 00 00 00 31 70 00 00 00 00 00 00 0p......1p...... +d00000d0 34 70 00 00 00 00 00 00 20 70 00 00 00 00 00 00 4p...... p...... +d00000e0 4d 70 00 00 00 00 00 00 69 70 00 00 00 00 00 00 Mp......ip...... +d00000f0 42 70 00 00 00 00 00 00 20 70 00 00 00 00 00 00 Bp...... p...... + +5555.5555 d000.0000 100 lfill <<-- hangs system + +function 1 +BAR 0 says 0x80000 assigned address is fc280000 +ok 0 bounds do i config-l@ 9 u.r 4 +loop cr 10 +loop +1100 27a68086 900007 3800003 800000 +1110 fc280000 0 0 0 +1120 0 0 0 900e104d +1130 0 d0 0 0 +1140 0 48 71090009 a10a2523 +1150 30000e 1b 0 3f800000 +1160 20000 0 0 0 +1170 0 0 0 0 +1180 0 0 0 0 +1190 0 0 0 0 +11a0 0 0 0 0 +11b0 0 0 0 0 +11c0 400 0 0 0 +11d0 220001 0 0 0 +11e0 0 0 0 0 +11f0 34640000 ff 50f86 0 + +#ifndef _INTELFBHW_H +#define _INTELFBHW_H + +/* $DHD: intelfb/intelfbhw.h,v 1.5 2003/06/27 15:06:25 dawes Exp $ */ + + +/*** HW-specific data ***/ + +/* Information about the 852GM/855GM variants */ +#define INTEL_85X_CAPID 0x44 +#define INTEL_85X_VARIANT_MASK 0x7 +#define INTEL_85X_VARIANT_SHIFT 5 +#define INTEL_VAR_855GME 0x0 +#define INTEL_VAR_855GM 0x4 +#define INTEL_VAR_852GME 0x2 +#define INTEL_VAR_852GM 0x5 + +/* Information about DVO/LVDS Ports */ +#define DVOA_PORT 0x1 +#define DVOB_PORT 0x2 +#define DVOC_PORT 0x4 +#define LVDS_PORT 0x8 + +/* + * The Bridge device's PCI config space has information about the + * fb aperture size and the amount of pre-reserved memory. + */ +#define INTEL_GMCH_CTRL 0x52 this is the config address in device 0 +#define INTEL_GMCH_ENABLED 0x4 +#define INTEL_GMCH_MEM_MASK 0x1 +#define INTEL_GMCH_MEM_64M 0x1 +#define INTEL_GMCH_MEM_128M 0 + +#define INTEL_830_GMCH_GMS_MASK (0x7 << 4) +#define INTEL_830_GMCH_GMS_DISABLED (0x0 << 4) +#define INTEL_830_GMCH_GMS_LOCAL (0x1 << 4) +#define INTEL_830_GMCH_GMS_STOLEN_512 (0x2 << 4) +#define INTEL_830_GMCH_GMS_STOLEN_1024 (0x3 << 4) +#define INTEL_830_GMCH_GMS_STOLEN_8192 (0x4 << 4) + +#define INTEL_855_GMCH_GMS_MASK (0x7 << 4) +#define INTEL_855_GMCH_GMS_DISABLED (0x0 << 4) +#define INTEL_855_GMCH_GMS_STOLEN_1M (0x1 << 4) +#define INTEL_855_GMCH_GMS_STOLEN_4M (0x2 << 4) +#define INTEL_855_GMCH_GMS_STOLEN_8M (0x3 << 4) +#define INTEL_855_GMCH_GMS_STOLEN_16M (0x4 << 4) +#define INTEL_855_GMCH_GMS_STOLEN_32M (0x5 << 4) + +#define INTEL_915G_GMCH_GMS_STOLEN_48M (0x6 << 4) +#define INTEL_915G_GMCH_GMS_STOLEN_64M (0x7 << 4) + +/* HW registers */ + +/* Fence registers */ +#define FENCE 0x2000 +#define FENCE_NUM 8 + +/* Primary ring buffer */ +#define PRI_RING_TAIL 0x2030 +#define RING_TAIL_MASK 0x001ffff8 +#define RING_INUSE 0x1 + +#define PRI_RING_HEAD 0x2034 +#define RING_HEAD_WRAP_MASK 0x7ff +#define RING_HEAD_WRAP_SHIFT 21 +#define RING_HEAD_MASK 0x001ffffc + +#define PRI_RING_START 0x2038 +#define RING_START_MASK 0xfffff000 + +#define PRI_RING_LENGTH 0x203c +#define RING_LENGTH_MASK 0x001ff000 +#define RING_REPORT_MASK (0x3 << 1) +#define RING_NO_REPORT (0x0 << 1) +#define RING_REPORT_64K (0x1 << 1) +#define RING_REPORT_4K (0x2 << 1) +#define RING_REPORT_128K (0x3 << 1) +#define RING_ENABLE 0x1 + +/* + * Tail can't wrap to any closer than RING_MIN_FREE bytes of the head, + * and the last RING_MIN_FREE bytes need to be padded with MI_NOOP + */ +#define RING_MIN_FREE 64 + +#define IPEHR 0x2088 + +#define INSTDONE 0x2090 +#define PRI_RING_EMPTY 1 + +#define HWSTAM 0x2098 +#define IER 0x20A0 +#define IIR 0x20A4 +#define IMR 0x20A8 +#define VSYNC_PIPE_A_INTERRUPT (1 << 7) +#define PIPE_A_EVENT_INTERRUPT (1 << 4) +#define VSYNC_PIPE_B_INTERRUPT (1 << 5) +#define PIPE_B_EVENT_INTERRUPT (1 << 4) +#define HOST_PORT_EVENT_INTERRUPT (1 << 3) +#define CAPTURE_EVENT_INTERRUPT (1 << 2) +#define USER_DEFINED_INTERRUPT (1 << 1) +#define BREAKPOINT_INTERRUPT 1 + +#define INSTPM 0x20c0 +#define SYNC_FLUSH_ENABLE (1 << 5) + +#define INSTPS 0x20c4 + +#define MEM_MODE 0x20cc + +#define MASK_SHIFT 16 + +#define FW_BLC_0 0x20d8 +#define FW_DISPA_WM_SHIFT 0 +#define FW_DISPA_WM_MASK 0x3f +#define FW_DISPA_BL_SHIFT 8 +#define FW_DISPA_BL_MASK 0xf +#define FW_DISPB_WM_SHIFT 16 +#define FW_DISPB_WM_MASK 0x1f +#define FW_DISPB_BL_SHIFT 24 +#define FW_DISPB_BL_MASK 0x7 + +#define FW_BLC_1 0x20dc +#define FW_DISPC_WM_SHIFT 0 +#define FW_DISPC_WM_MASK 0x1f +#define FW_DISPC_BL_SHIFT 8 +#define FW_DISPC_BL_MASK 0x7 + +#define GPIOA 0x5010 +#define GPIOB 0x5014 +#define GPIOC 0x5018 // this may be external DDC on i830 +#define GPIOD 0x501C // this is DVO DDC +#define GPIOE 0x5020 // this is DVO i2C +#define GPIOF 0x5024 + +/* PLL registers */ +#define VGA0_DIVISOR 0x06000 +#define VGA1_DIVISOR 0x06004 +#define VGAPD 0x06010 +#define VGAPD_0_P1_SHIFT 0 +#define VGAPD_0_P1_FORCE_DIV2 (1 << 5) +#define VGAPD_0_P2_SHIFT 7 +#define VGAPD_1_P1_SHIFT 8 +#define VGAPD_1_P1_FORCE_DIV2 (1 << 13) +#define VGAPD_1_P2_SHIFT 15 + +#define DPLL_A 0x06014 +#define DPLL_B 0x06018 +#define DPLL_VCO_ENABLE (1 << 31) +#define DPLL_2X_CLOCK_ENABLE (1 << 30) +#define DPLL_SYNCLOCK_ENABLE (1 << 29) +#define DPLL_VGA_MODE_DISABLE (1 << 28) +#define DPLL_P2_MASK 1 +#define DPLL_P2_SHIFT 23 +#define DPLL_I9XX_P2_SHIFT 24 +#define DPLL_P1_FORCE_DIV2 (1 << 21) +#define DPLL_P1_MASK 0x1f +#define DPLL_P1_SHIFT 16 +#define DPLL_REFERENCE_SELECT_MASK (0x3 << 13) +#define DPLL_REFERENCE_DEFAULT (0x0 << 13) +#define DPLL_REFERENCE_TVCLK (0x2 << 13) +#define DPLL_RATE_SELECT_MASK (1 << 8) +#define DPLL_RATE_SELECT_FP0 (0 << 8) +#define DPLL_RATE_SELECT_FP1 (1 << 8) + +#define FPA0 0x06040 +#define FPA1 0x06044 +#define FPB0 0x06048 +#define FPB1 0x0604c +#define FP_DIVISOR_MASK 0x3f +#define FP_N_DIVISOR_SHIFT 16 +#define FP_M1_DIVISOR_SHIFT 8 +#define FP_M2_DIVISOR_SHIFT 0 + +/* PLL parameters (these are for 852GM/855GM/865G, check earlier chips). */ +/* Clock values are in units of kHz */ +#define PLL_REFCLK 48000 +#define MIN_CLOCK 25000 +#define MAX_CLOCK 350000 + +/* Two pipes */ +#define PIPE_A 0 +#define PIPE_B 1 +#define PIPE_MASK 1 + +/* palette registers */ +#define PALETTE_A 0x0a000 +#define PALETTE_B 0x0a800 +#ifndef PALETTE_8_ENTRIES +#define PALETTE_8_ENTRIES 256 +#endif +#define PALETTE_8_SIZE (PALETTE_8_ENTRIES * 4) +#define PALETTE_10_ENTRIES 128 +#define PALETTE_10_SIZE (PALETTE_10_ENTRIES * 8) +#define PALETTE_8_MASK 0xff +#define PALETTE_8_RED_SHIFT 16 +#define PALETTE_8_GREEN_SHIFT 8 +#define PALETTE_8_BLUE_SHIFT 0 + +/* CRTC registers */ +#define HTOTAL_A 0x60000 +#define HBLANK_A 0x60004 +#define HSYNC_A 0x60008 +#define VTOTAL_A 0x6000c +#define VBLANK_A 0x60010 +#define VSYNC_A 0x60014 +#define SRC_SIZE_A 0x6001c +#define BCLRPAT_A 0x60020 + +#define HTOTAL_B 0x61000 +#define HBLANK_B 0x61004 +#define HSYNC_B 0x61008 +#define VTOTAL_B 0x6100c +#define VBLANK_B 0x61010 +#define VSYNC_B 0x61014 +#define SRC_SIZE_B 0x6101c +#define BCLRPAT_B 0x61020 + +#define HTOTAL_MASK 0xfff +#define HTOTAL_SHIFT 16 +#define HACTIVE_MASK 0x7ff +#define HACTIVE_SHIFT 0 +#define HBLANKEND_MASK 0xfff +#define HBLANKEND_SHIFT 16 +#define HBLANKSTART_MASK 0xfff +#define HBLANKSTART_SHIFT 0 +#define HSYNCEND_MASK 0xfff +#define HSYNCEND_SHIFT 16 +#define HSYNCSTART_MASK 0xfff +#define HSYNCSTART_SHIFT 0 +#define VTOTAL_MASK 0xfff +#define VTOTAL_SHIFT 16 +#define VACTIVE_MASK 0x7ff +#define VACTIVE_SHIFT 0 +#define VBLANKEND_MASK 0xfff +#define VBLANKEND_SHIFT 16 +#define VBLANKSTART_MASK 0xfff +#define VBLANKSTART_SHIFT 0 +#define VSYNCEND_MASK 0xfff +#define VSYNCEND_SHIFT 16 +#define VSYNCSTART_MASK 0xfff +#define VSYNCSTART_SHIFT 0 +#define SRC_SIZE_HORIZ_MASK 0x7ff +#define SRC_SIZE_HORIZ_SHIFT 16 +#define SRC_SIZE_VERT_MASK 0x7ff +#define SRC_SIZE_VERT_SHIFT 0 + +#define ADPA 0x61100 +#define ADPA_DAC_ENABLE (1 << 31) +#define ADPA_DAC_DISABLE 0 +#define ADPA_PIPE_SELECT_SHIFT 30 +#define ADPA_USE_VGA_HVPOLARITY (1 << 15) +#define ADPA_SETS_HVPOLARITY 0 +#define ADPA_DPMS_CONTROL_MASK (0x3 << 10) +#define ADPA_DPMS_D0 (0x0 << 10) +#define ADPA_DPMS_D2 (0x1 << 10) +#define ADPA_DPMS_D1 (0x2 << 10) +#define ADPA_DPMS_D3 (0x3 << 10) +#define ADPA_VSYNC_ACTIVE_SHIFT 4 +#define ADPA_HSYNC_ACTIVE_SHIFT 3 +#define ADPA_SYNC_ACTIVE_MASK 1 +#define ADPA_SYNC_ACTIVE_HIGH 1 +#define ADPA_SYNC_ACTIVE_LOW 0 + +#define DVOA 0x61120 +#define DVOB 0x61140 +#define DVOC 0x61160 +#define LVDS 0x61180 +#define PORT_ENABLE (1 << 31) +#define PORT_PIPE_SELECT_SHIFT 30 +#define PORT_TV_FLAGS_MASK 0xFF +#define PORT_TV_FLAGS 0xC4 // ripped from my BIOS + // to understand and correct + +#define DVOA_SRCDIM 0x61124 +#define DVOB_SRCDIM 0x61144 +#define DVOC_SRCDIM 0x61164 + +#define PIPEACONF 0x70008 +#define PIPEBCONF 0x71008 Normally 8000.0000 - set to 0 blanks panel +#define PIPECONF_ENABLE (1 << 31) +#define PIPECONF_DISABLE 0 +#define PIPECONF_DOUBLE_WIDE (1 << 30) +#define PIPECONF_SINGLE_WIDE 0 +#define PIPECONF_LOCKED (1 << 25) +#define PIPECONF_UNLOCKED 0 +#define PIPECONF_GAMMA (1 << 24) +#define PIPECONF_PALETTE 0 + +#define DISPARB 0x70030 +#define DISPARB_AEND_MASK 0x1ff +#define DISPARB_AEND_SHIFT 0 +#define DISPARB_BEND_MASK 0x3ff +#define DISPARB_BEND_SHIFT 9 + +/* Desktop HW cursor */ +#define CURSOR_CONTROL 0x70080 +#define CURSOR_ENABLE (1 << 31) +#define CURSOR_GAMMA_ENABLE (1 << 30) +#define CURSOR_STRIDE_MASK (0x3 << 28) +#define CURSOR_STRIDE_256 (0x0 << 28) +#define CURSOR_STRIDE_512 (0x1 << 28) +#define CURSOR_STRIDE_1K (0x2 << 28) +#define CURSOR_STRIDE_2K (0x3 << 28) +#define CURSOR_FORMAT_MASK (0x7 << 24) +#define CURSOR_FORMAT_2C (0x0 << 24) +#define CURSOR_FORMAT_3C (0x1 << 24) +#define CURSOR_FORMAT_4C (0x2 << 24) +#define CURSOR_FORMAT_ARGB (0x4 << 24) +#define CURSOR_FORMAT_XRGB (0x5 << 24) + +/* Mobile HW cursor (and i810) */ +#define CURSOR_A_CONTROL CURSOR_CONTROL +#define CURSOR_B_CONTROL 0x700c0 +#define CURSOR_MODE_MASK 0x27 +#define CURSOR_MODE_DISABLE 0 +#define CURSOR_MODE_64_3C 0x04 +#define CURSOR_MODE_64_4C_AX 0x05 +#define CURSOR_MODE_64_4C 0x06 +#define CURSOR_MODE_64_32B_AX 0x07 +#define CURSOR_MODE_64_ARGB_AX 0x27 +#define CURSOR_PIPE_SELECT_SHIFT 28 +#define CURSOR_MOBILE_GAMMA_ENABLE (1 << 26) +#define CURSOR_MEM_TYPE_LOCAL (1 << 25) + +/* All platforms (desktop has no pipe B) */ +#define CURSOR_A_BASEADDR 0x70084 +#define CURSOR_B_BASEADDR 0x700c4 +#define CURSOR_BASE_MASK 0xffffff00 + +#define CURSOR_A_POSITION 0x70088 +#define CURSOR_B_POSITION 0x700c8 +#define CURSOR_POS_SIGN (1 << 15) +#define CURSOR_POS_MASK 0x7ff +#define CURSOR_X_SHIFT 0 +#define CURSOR_Y_SHIFT 16 + +#define CURSOR_A_PALETTE0 0x70090 +#define CURSOR_A_PALETTE1 0x70094 +#define CURSOR_A_PALETTE2 0x70098 +#define CURSOR_A_PALETTE3 0x7009c +#define CURSOR_B_PALETTE0 0x700d0 +#define CURSOR_B_PALETTE1 0x700d4 +#define CURSOR_B_PALETTE2 0x700d8 +#define CURSOR_B_PALETTE3 0x700dc +#define CURSOR_COLOR_MASK 0xff +#define CURSOR_RED_SHIFT 16 +#define CURSOR_GREEN_SHIFT 8 +#define CURSOR_BLUE_SHIFT 0 +#define CURSOR_PALETTE_MASK 0xffffff + +/* Desktop only */ +#define CURSOR_SIZE 0x700a0 +#define CURSOR_SIZE_MASK 0x3ff +#define CURSOR_SIZE_H_SHIFT 0 +#define CURSOR_SIZE_V_SHIFT 12 + +#define DSPACNTR 0x70180 +#define DSPBCNTR 0x71180 +#define DISPPLANE_PLANE_ENABLE (1 << 31) +#define DISPPLANE_PLANE_DISABLE 0 +#define DISPPLANE_GAMMA_ENABLE (1<<30) +#define DISPPLANE_GAMMA_DISABLE 0 +#define DISPPLANE_PIXFORMAT_MASK (0xf<<26) +#define DISPPLANE_8BPP (0x2<<26) +#define DISPPLANE_15_16BPP (0x4<<26) +#define DISPPLANE_16BPP (0x5<<26) +#define DISPPLANE_32BPP_NO_ALPHA (0x6<<26) +#define DISPPLANE_32BPP (0x7<<26) +#define DISPPLANE_STEREO_ENABLE (1<<25) +#define DISPPLANE_STEREO_DISABLE 0 +#define DISPPLANE_SEL_PIPE_SHIFT 24 +#define DISPPLANE_SRC_KEY_ENABLE (1<<22) +#define DISPPLANE_SRC_KEY_DISABLE 0 +#define DISPPLANE_LINE_DOUBLE (1<<20) +#define DISPPLANE_NO_LINE_DOUBLE 0 +#define DISPPLANE_STEREO_POLARITY_FIRST 0 +#define DISPPLANE_STEREO_POLARITY_SECOND (1<<18) +/* plane B only */ +#define DISPPLANE_ALPHA_TRANS_ENABLE (1<<15) +#define DISPPLANE_ALPHA_TRANS_DISABLE 0 +#define DISPPLANE_SPRITE_ABOVE_DISPLAYA 0 +#define DISPPLANE_SPRITE_ABOVE_OVERLAY 1 + +#define DSPABASE 0x70184 +#define DSPASTRIDE 0x70188 + +#define DSPBBASE 0x71184 +#define DSPBSTRIDE 0x71188 + +#define VGACNTRL 0x71400 +#define VGA_DISABLE (1 << 31) This bit has to be 0 for VGA to be enabled +#define VGA_ENABLE 0 +#define VGA_PIPE_SELECT_SHIFT 29 This bit has to be 1 for VGA to be on +#define VGA_PALETTE_READ_SELECT 23 +#define VGA_PALETTE_A_WRITE_DISABLE (1 << 22) +#define VGA_PALETTE_B_WRITE_DISABLE (1 << 21) +#define VGA_LEGACY_PALETTE (1 << 20) +#define VGA_6BIT_DAC 0 +#define VGA_8BIT_DAC (1 << 20) + +#define ADD_ID 0x71408 +#define ADD_ID_MASK 0xff + +/* BIOS scratch area registers (830M and 845G). */ +#define SWF0 0x71410 +#define SWF1 0x71414 +#define SWF2 0x71418 +#define SWF3 0x7141c +#define SWF4 0x71420 +#define SWF5 0x71424 +#define SWF6 0x71428 + +/* BIOS scratch area registers (852GM, 855GM, 865G). */ +#define SWF00 0x70410 +#define SWF01 0x70414 +#define SWF02 0x70418 +#define SWF03 0x7041c +#define SWF04 0x70420 +#define SWF05 0x70424 +#define SWF06 0x70428 + +#define SWF10 SWF0 +#define SWF11 SWF1 +#define SWF12 SWF2 +#define SWF13 SWF3 +#define SWF14 SWF4 +#define SWF15 SWF5 +#define SWF16 SWF6 + +#define SWF30 0x72414 +#define SWF31 0x72418 +#define SWF32 0x7241c + +/* Memory Commands */ +#define MI_NOOP (0x00 << 23) +#define MI_NOOP_WRITE_ID (1 << 22) +#define MI_NOOP_ID_MASK ((1 << 22) - 1) + +#define MI_FLUSH (0x04 << 23) +#define MI_WRITE_DIRTY_STATE (1 << 4) +#define MI_END_SCENE (1 << 3) +#define MI_INHIBIT_RENDER_CACHE_FLUSH (1 << 2) +#define MI_INVALIDATE_MAP_CACHE (1 << 0) + +#define MI_STORE_DWORD_IMM ((0x20 << 23) | 1) + +/* 2D Commands */ +#define COLOR_BLT_CMD ((2 << 29) | (0x40 << 22) | 3) +#define XY_COLOR_BLT_CMD ((2 << 29) | (0x50 << 22) | 4) +#define XY_SETUP_CLIP_BLT_CMD ((2 << 29) | (0x03 << 22) | 1) +#define XY_SRC_COPY_BLT_CMD ((2 << 29) | (0x53 << 22) | 6) +#define SRC_COPY_BLT_CMD ((2 << 29) | (0x43 << 22) | 4) +#define XY_MONO_PAT_BLT_CMD ((2 << 29) | (0x52 << 22) | 7) +#define XY_MONO_SRC_BLT_CMD ((2 << 29) | (0x54 << 22) | 6) +#define XY_MONO_SRC_IMM_BLT_CMD ((2 << 29) | (0x71 << 22) | 5) +#define TXT_IMM_BLT_CMD ((2 << 29) | (0x30 << 22) | 2) +#define SETUP_BLT_CMD ((2 << 29) | (0x00 << 22) | 6) + +#define DW_LENGTH_MASK 0xff + +#define WRITE_ALPHA (1 << 21) +#define WRITE_RGB (1 << 20) +#define VERT_SEED (3 << 8) +#define HORIZ_SEED (3 << 12) + +#define COLOR_DEPTH_8 (0 << 24) +#define COLOR_DEPTH_16 (1 << 24) +#define COLOR_DEPTH_32 (3 << 24) + +#define SRC_ROP_GXCOPY 0xcc +#define SRC_ROP_GXXOR 0x66 + +#define PAT_ROP_GXCOPY 0xf0 +#define PAT_ROP_GXXOR 0x5a + +#define PITCH_SHIFT 0 +#define ROP_SHIFT 16 +#define WIDTH_SHIFT 0 +#define HEIGHT_SHIFT 16 + +/* in bytes */ +#define MAX_MONO_IMM_SIZE 128 + + +/*** Macros ***/ + +/* Ring buffer macros */ +#define OUT_RING(n) do { \ + writel((n), (u32 __iomem *)(dinfo->ring.virtual + dinfo->ring_tail));\ + dinfo->ring_tail += 4; \ + dinfo->ring_tail &= dinfo->ring_tail_mask; \ +} while (0) + +#define START_RING(n) do { \ + if (dinfo->ring_space < (n) * 4) \ + wait_ring(dinfo,(n) * 4); \ + dinfo->ring_space -= (n) * 4; \ +} while (0) + +#define ADVANCE_RING() do { \ + OUTREG(PRI_RING_TAIL, dinfo->ring_tail); \ +} while (0) + +#define DO_RING_IDLE() do { \ + u32 head, tail; \ + do { \ + head = INREG(PRI_RING_HEAD) & RING_HEAD_MASK; \ + tail = INREG(PRI_RING_TAIL) & RING_TAIL_MASK; \ + udelay(10); \ + } while (head != tail); \ +} while (0) +#endif /* _INTELFBHW_H */ +[then] Added: cpu/x86/pc/port80.fth =================================================================== --- cpu/x86/pc/port80.fth (rev 0) +++ cpu/x86/pc/port80.fth 2008-01-18 17:50:23 UTC (rev 782) @@ -0,0 +1,5 @@ + +also assembler definitions +: port80 ( n -- ) " # al mov al h# 80 # out" evaluate ; +previous definitions +

1 0