OpenBIOS June 2006

openbios@openbios.org

9 participants
63 discussions

Re: [OpenBIOS] QEMU / OpenBIOS booting SunOS 4.1.3 / 4.1.4
by Parag Patel 07 Jun '06

07 Jun '06

>>Interesting. Loading the kernel at once. The ELF kernel loads fine, but >>the CD comes with an a.out kernel that has a wrong "text" size and no >>data size. Since it loads directly from the CD device as opposed to from >>a filesystem I have no idea how much data to load and how to parse it. >>:-( Oh yeah - SF also has an AOUT loader, and a COFF loader, along with some dumpaout and dumpcoff (and dumpelf) utils. They're handy to root around inside the various files to figure out where stuff needs to be loaded. (They're under the "exe" dir.) -- __ /__)_ _ _ _ While it may be true that a watched pot never boils, the / (// (/(/ one you don't keep an eye on can make an awful mess of _/ your stove. -- Edward Stevenson

1 0

Re: [OpenBIOS] QEMU / OpenBIOS booting SunOS 4.1.3 / 4.1.4
by Parag Patel 07 Jun '06

07 Jun '06

>This part seems very different on Sparc32. I did not know some weeks >ago, but OpenBoot until very late versions does not use the client >interface but a data structure called "romvec" (arch/sparc32/romvec.c) >that contains several data pointers and callbacks to different OF >functions I haven't looked at NetBSD/Sparc, unfortunately. Just NetBSD/PowerPC with Open Firmware support for Macs, old Moto stuf, etc, which makes proper call-backs, plus has specs in nauseating detail. Have you looked at the other BSDs (Free/Open) to see if their Sparc32 boot is any different, perhaps simpler? >Interesting. Loading the kernel at once. The ELF kernel loads fine, but >the CD comes with an a.out kernel that has a wrong "text" size and no >data size. Since it loads directly from the CD device as opposed to from >a filesystem I have no idea how much data to load and how to parse it. >:-( Yeah, the first trick is building that ELF netbsd kernel and not the bootstrap a.out thingie. A standard ELF kernel may lurk lower down on the CD somewhere. Otherwise it's cross-compile time. The SF trick short-circuits the loaders (at least initially) by directly loading the ELF image, then passing it the magic args that it expects. The args are hard-wired inside a C array, just to get things rolling. Works surprisingly well for system bring-up. >Does a version of Smart Firmware boot Solaris on Sparc? Any chance >there's some hint? Unfortunately the version of SF that boots Solaris contains a LOT of proprietary Sun code, some in C, some in Forth/Fcode. Even we never had a copy of it - it all stayed on Sun's machines. The Solaris versions Sun's SF was booting involved loading and running a variety of their Fcode loaders, which loaded other Fcode, which sometimes loaded even more Fcode, which eventually loaded a kernel, which would then run, making a bunch of callbacks all the while. A variety of subtle bugs and bug-compatibility modes in the SF code are #ifdef-ed SUN_COMPATIBILITY, but other than that, there's not much else. -- __ /__)_ _ _ _ "What do you give a man who has everything?" the / (// (/(/ pretty teenager asked her mother. "Encouragement, dear," _/ she replied.

1 0

r49 - in openbios-devel: arch/sparc32 drivers
by svn＠openbios.org 07 Jun '06

07 Jun '06

Author: stepan Date: 2006-06-07 00:23:04 +0200 (Wed, 07 Jun 2006) New Revision: 49 Modified: openbios-devel/arch/sparc32/console.c openbios-devel/arch/sparc32/entry.S openbios-devel/arch/sparc32/ldscript openbios-devel/arch/sparc32/romvec.c openbios-devel/arch/sparc32/tree.fs openbios-devel/drivers/obio.c openbios-devel/drivers/obio.h Log: openbios.patch-22.bz2 from blueswirl Modified: openbios-devel/arch/sparc32/console.c =================================================================== --- openbios-devel/arch/sparc32/console.c 2006-06-05 20:34:53 UTC (rev 48) +++ openbios-devel/arch/sparc32/console.c 2006-06-06 22:23:04 UTC (rev 49) @@ -153,17 +153,7 @@ void tcx_init(unsigned long base) { -#if 1 - unsigned int i; - - // Create 1:1 mapping for video memory - for (i = 0; i < VMEM_SIZE; i += 4096) { - map_page(base + VMEM_BASE + i, base + VMEM_BASE + i, 0); - } - vmem = (char *)base + VMEM_BASE; -#else vmem = map_io(base + VMEM_BASE, VMEM_SIZE); -#endif dac = map_io(base + DAC_BASE, DAC_SIZE); console_init(); Modified: openbios-devel/arch/sparc32/entry.S =================================================================== --- openbios-devel/arch/sparc32/entry.S 2006-06-05 20:34:53 UTC (rev 48) +++ openbios-devel/arch/sparc32/entry.S 2006-06-06 22:23:04 UTC (rev 49) @@ -11,7 +11,8 @@ #include "asi.h" #include "asm/crs.h" -#define PHYS_JJ_EEPROM 0x71200000 +#define PHYS_JJ_EEPROM 0x71200000 /* [2000] MK48T08 */ +#define PHYS_JJ_INTR0 0x71E00000 /* CPU0 interrupt control registers */ #define WRITE_PAUSE nop; nop; nop; /* Have to do this after %wim/%psr chg */ @@ -35,6 +36,35 @@ */ /* XXX no switching yet */ + ! Check if this not the first SMP CPU, if so, bypass PROM entirely + set PHYS_JJ_EEPROM + 0x2E, %g1 + lduba [%g1] ASI_M_BYPASS, %g2 + tst %g2 + bz first_cpu + nop + + set PHYS_JJ_INTR0 + 0x04, %g1 + sll %g2, 12, %g2 + add %g1, %g2, %g2 + set 0xffffffff, %g1 + sta %g1, [%g2] ASI_M_BYPASS ! clear softints + add %g2, 4, %g2 + sta %g0, [%g2] ASI_M_BYPASS ! clear softints + set PHYS_JJ_EEPROM + 0x3C, %g1 + lda [%g1] ASI_M_BYPASS, %g1 + set AC_M_CTPR, %g2 + sta %g1, [%g2] ASI_M_MMUREGS ! set ctx table ptr + set PHYS_JJ_EEPROM + 0x40, %g1 + lda [%g1] ASI_M_BYPASS, %g1 + set AC_M_CXR, %g2 + sta %g1, [%g2] ASI_M_MMUREGS ! set context + set PHYS_JJ_EEPROM + 0x38, %g1 + lda [%g1] ASI_M_BYPASS, %g2 + set 1, %g1 + jmp %g2 ! jump to kernel + sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu + +first_cpu: set PHYS_JJ_EEPROM + 0x30, %g1 lda [%g1] ASI_M_BYPASS, %g1 ! map PROLDATA to PROLBASE+PROLSIZE to end of ram Modified: openbios-devel/arch/sparc32/ldscript =================================================================== --- openbios-devel/arch/sparc32/ldscript 2006-06-05 20:34:53 UTC (rev 48) +++ openbios-devel/arch/sparc32/ldscript 2006-06-06 22:23:04 UTC (rev 49) @@ -14,7 +14,7 @@ HEAP_SIZE = 16384; STACK_SIZE = 16384; VMEM_SIZE = 128 * 1024; -IOMEM_SIZE = 256 * 1024; +IOMEM_SIZE = 256 * 1024 + 768 * 1024; SECTIONS { Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2006-06-05 20:34:53 UTC (rev 48) +++ openbios-devel/arch/sparc32/romvec.c 2006-06-06 22:23:04 UTC (rev 49) @@ -366,30 +366,27 @@ return ret; } +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, __attribute__((unused))char *prog_counter) { - //int cpu, found; -#ifdef CONFIG_DEBUG_OBP + int cpu, found; struct linux_prom_registers *smp_ctable = (void *)ctxtbl_ptr; -#endif DPRINTF("obp_cpustart: cpu %d, ctxptr 0x%x, ctx %d, pc 0x%x\n", whichcpu, smp_ctable->phys_addr, thiscontext, (unsigned int)prog_counter); -#if 0 + found = obp_getprop(whichcpu, "mid", (char *)&cpu); if (found == -1) return -1; - st_bypass(PHYS_JJ_EEPROM + 0x38, (unsigned int)prog_counter); - st_bypass(PHYS_JJ_EEPROM + 0x3C, ((unsigned int)smp_ctable->phys_addr) >> 4); - st_bypass(PHYS_JJ_EEPROM + 0x40, thiscontext); - DPRINTF("obp_cpustart: sending interrupt to CPU %d\n", cpu); - st_bypass(PHYS_JJ_INTR0 + 0x1000 * cpu + 8, 0x40000000); -#endif + DPRINTF("cpu found, id %d -> cpu %d\n", whichcpu, cpu); - return 0; + return start_cpu((unsigned int)prog_counter, ((unsigned int)smp_ctable->phys_addr) >> 4, + thiscontext, cpu); } static int obp_cpustop(__attribute__((unused)) unsigned int whichcpu) Modified: openbios-devel/arch/sparc32/tree.fs =================================================================== --- openbios-devel/arch/sparc32/tree.fs 2006-06-05 20:34:53 UTC (rev 48) +++ openbios-devel/arch/sparc32/tree.fs 2006-06-06 22:23:04 UTC (rev 49) @@ -29,35 +29,6 @@ finish-device new-device - " FMI,MB86904" device-name - " cpu" device-type - - \ 0 encode-int 0 encode-int encode+ 0 encode-int encode+ " context-table" property - 0 encode-int " implementation" property - d# 4 encode-int " version" property - - d# 32 encode-int " cache-line-size" property - d# 512 encode-int " cache-nlines" property - - d# 4096 encode-int " page-size" property - - d# 16 encode-int " dcache-line-size" property - d# 512 encode-int " dcache-nlines" property - d# 1 encode-int " dcache-associativity" property - - d# 16 encode-int " icache-line-size" property - d# 512 encode-int " icache-nlines" property - d# 1 encode-int " icache-associativity" property - - d# 2 encode-int " ncaches" property - d# 256 encode-int " mmu-nctx" property - d# 8 encode-int " sparc-version" property - d# 37 encode-int " mask_rev" property - - \ 1 encode-int " mid" property -finish-device - -new-device " iommu" device-name 2 encode-int " #address-cells" property 1 encode-int " #size-cells" property Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2006-06-05 20:34:53 UTC (rev 48) +++ openbios-devel/drivers/obio.c 2006-06-06 22:23:04 UTC (rev 49) @@ -148,6 +148,8 @@ extern uint32_t cmdline_size; extern char boot_device; + unsigned int i; + ob_new_obio_device("eeprom", NULL); nvram = (char *)ob_reg(base, offset, NVRAM_SIZE, 1); @@ -170,6 +172,7 @@ fword("finish-device"); + // Add /idprom push_str("/"); fword("find-device"); @@ -178,6 +181,103 @@ fword("encode-bytes"); push_str("idprom"); fword("property"); + + // Add cpus + printk("CPUs: %x\n", nv_info.smp_cpus); + for (i = 0; i < (unsigned int)nv_info.smp_cpus; i++) { + push_str("/"); + fword("find-device"); + + fword("new-device"); + + push_str("FMI,MB86904"); + fword("device-name"); + + push_str("cpu"); + fword("device-type"); + + PUSH(0); + fword("encode-int"); + push_str("implementation"); + fword("property"); + + PUSH(4); + fword("encode-int"); + push_str("version"); + fword("property"); + + PUSH(32); + fword("encode-int"); + push_str("cache-line-size"); + fword("property"); + + PUSH(512); + fword("encode-int"); + push_str("cache-nlines"); + fword("property"); + + PUSH(4096); + fword("encode-int"); + push_str("page-size"); + fword("property"); + + PUSH(16); + fword("encode-int"); + push_str("dcache-line-size"); + fword("property"); + + PUSH(512); + fword("encode-int"); + push_str("dcache-nlines"); + fword("property"); + + PUSH(1); + fword("encode-int"); + push_str("dcache-associativity"); + fword("property"); + + PUSH(16); + fword("encode-int"); + push_str("icache-line-size"); + fword("property"); + + PUSH(512); + fword("encode-int"); + push_str("icache-nlines"); + fword("property"); + + PUSH(1); + fword("encode-int"); + push_str("icache-associativity"); + fword("property"); + + PUSH(2); + fword("encode-int"); + push_str("ncaches"); + fword("property"); + + PUSH(256); + fword("encode-int"); + push_str("mmu-nctx"); + fword("property"); + + PUSH(8); + fword("encode-int"); + push_str("sparc-version"); + fword("property"); + + PUSH(37); + fword("encode-int"); + push_str("mask_rev"); + fword("property"); + + PUSH(i << 3); + fword("encode-int"); + push_str("mid"); + fword("property"); + + fword("finish-device"); + } } static void @@ -259,10 +359,11 @@ regs->cpu_timers[0].l14_timer_limit = 0; } +static volatile struct sun4m_intregs *intregs; + static void ob_interrupt_init(unsigned long base, unsigned long offset) { - volatile struct sun4m_intregs *regs; ob_new_obio_device("interrupt", NULL); @@ -286,21 +387,35 @@ push_str("reg"); fword("property"); - regs = map_io(base + offset, sizeof(*regs)); - regs->set = ~SUN4M_INT_MASKALL; - regs->cpu_intregs[0].clear = ~0x17fff; - - // is this really correct? - PUSH(regs); + intregs = map_io(base + offset, sizeof(*intregs)); + intregs->set = ~SUN4M_INT_MASKALL; + intregs->cpu_intregs[0].clear = ~0x17fff; + + PUSH(0); fword("encode-int"); - PUSH(regs); + PUSH((int)intregs); fword("encode-int"); fword("encode+"); push_str("address"); fword("property"); fword("finish-device"); +} +int +start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, int cpu) +{ + if (!cpu) + return -1; + + nvram[0x38] = pc; + nvram[0x3c] = context_ptr; + nvram[0x40] = context; + nvram[0x2e] = cpu & 0xff; + + intregs->cpu_intregs[cpu].set = SUN4M_SOFT_INT(14); + + return 0; } Modified: openbios-devel/drivers/obio.h =================================================================== --- openbios-devel/drivers/obio.h 2006-06-05 20:34:53 UTC (rev 48) +++ openbios-devel/drivers/obio.h 2006-06-06 22:23:04 UTC (rev 49) @@ -37,6 +37,7 @@ uint32_t nvram_size; // not used in Sun4m char unused1[8]; char arch[12]; + char curr_cpu; char smp_cpus; char unused2; char nographic;

1 0

Re: [OpenBIOS] QEMU / OpenBIOS booting SunOS 4.1.3 / 4.1.4
by Parag Patel 07 Jun '06

07 Jun '06

Stefan Reinauer wrote: >Welcome to OpenBIOS v1.0RC1 built on Jun 5 2006 15:07 > Type 'help' for detailed information > >[sparc] Kernel already loaded >OBP version 3, revision 2.25 (plugin rev 2) >Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 > The NetBSD Foundation, Inc. All rights reserved. >Copyright (c) 1982, 1986, 1989, 1991, 1993 > The Regents of the University of California. All rights reserved. > >NetBSD 3.0 (GENERIC) #0: Mon Dec 19 04:01:27 UTC 2005 > builds@b3.netbsd.org:/home/builds/ab/netbsd-3-0-RELEASE/sparc/200512182024Z-ob >j/home/builds/ab/netbsd-3-0-RELEASE/src/sys/arch/sparc/compile/GENERIC >total memory = 127 MB >avail memory = 120 MB >bootpath: >data fault: pc=0xf02a4f3c addr=0x7ff000 >sfsr=126<PERR=0,LVL=1,AT=1,FT=1,FAV,OW> >panic: kernel fault >halted It's been quite a while since I last played with NetBSD and OF. The last was with a PowerPC board. As I recall, NetBSD makes heavy use of the client-interface callbacks to get some important info. One of my tricks with SmartFirmware was to load the entire NetBSD kernel (builtin ELF loader), turn on tracing, then try to boot. Any callbacks etc would nicely print out as they were executed, so it was a lot easier to see at which point it was failing. I also added dprintfs in the NBSD routines that performed the various calls to OF. The usual debugging stuff. 'Course this requires having a cross-compile environment handy to build custom NBSD kernels to test. Booting Solaris was a whole new level of pain. A lot of Sun's intermediate boot-loaders made heinous use of Forth and required all sorts of Sun-specific hacks to get them to run. >Booting from the NetBSD 3.0 CD (sparccd-3.0.iso) I got an exception, >since the a.out header shows some weird values: > >Welcome to OpenBIOS v1.0RC1 built on Jun 5 2006 15:07 > Type 'help' for detailed information > >[sparc] Booting file 'cdrom' with parameters '<NULL>' >Loading a.out image... > N_TXTADDR: 0x00002000 (0x30800007 bytes) > N_TXTOFF : 0x00000020 (0x00000200) > N_DATADDR: 0x30802007 (0 bytes) >Loaded 8388615(0x30800007) bytes >entry point is 0x4000 >Jumping to entry point... >Unhandled Exception 0x00000002 >PC = 0x00000000 NPC = 0x00000004 >Stopping execution This sure looks like it's trying to jump through a NULL pointer. -- __ /__)_ _ _ _ There are three things I always forget. Names, faces -- / (// (/(/ the third I can't remember. -- Italo Svevo _/ -- __ /__)_ _ _ _ Iron Law of Distribution: Them that has, gets. / (// (/(/ _/

2 1

TCX fixed, SMP mode
by Blue Swirl 06 Jun '06

06 Jun '06

I fixed the TCX mapping problem and added SMP support from Proll. SMP is not working fully (neither was Proll), probably some problem with Qemu. I think earlier it worked. The idea is to send a soft interrupt to a halted CPU, which then awakes and begins execution. Now the CPU gets the interrupt (Qemu monitor commands info pic, info cpus confirm this) but it does not awaken. Now the only missing functionality that Proll had is TFTP booting support. It could be possible to reuse Proll's slirp stack, but I'm not sure if it is worth the trouble. In Qemu environment booting from network is not that useful, because you can preload the kernel. Otherwise OpenBIOS matches or exceeds Proll's capabilities. I'll propose switching to OpenBIOS to Qemu developers. _________________________________________________________________ Express yourself instantly with MSN Messenger! Download today it's FREE! http://messenger.msn.click-url.com/go/onm00200471ave/direct/01/

1 0

Re: [OpenBIOS] Starting QEMU with OpenBIOS for Sparc32
by Armistead, Jason 06 Jun '06

06 Jun '06

I should specifically add that I would like to get QEMU running under a Windows environment. I've managed to build QEMU using MinGW / MSYS etc as detailed in the QEMU HOWTOs. Now I just need to get that friendly Openboot-style prompt happening and I'll be on my way. Jason -----Original Message----- From: openbios-bounces(a)openbios.org [mailto:openbios-bounces@openbios.org]On Behalf Of Armistead, Jason Sent: Tuesday, 6 June 2006 12:42 PM To: 'openbios(a)lists.openbios.org' Subject: [OpenBIOS] Starting QEMU with OpenBIOS for Sparc32 Sorry for such a newbie question Can someone just give me a quick overview of the "right way" to start up QEMU so that it will load the OpenBIOS firmware instead of PROLL, and how to point QEMU to my Solaris installation CD image file. Do I need any hacks / patches to QEMU to use OpenBIOS instead of PROLL ? What debugging switches should I enable with QEMU to help me figure out why things aren't working when trying to boot the SunOS 4.1.4 (Solaris 1.1.2) installation CD ? Is there a "best way" to build OpenBIOS to ensure maximum useful debugging information is produced ? If I'm repeating a whole lot of old questions, is there a FAQ for the QEMU + OpenBIOS (Sparc32) combination that someone can point me to ? Thanks Jason -- OpenBIOS http://openbios.org/ Mailinglist: http://lists.openbios.org/mailman/listinfo Free your System - May the Forth be with you

2 1

Starting QEMU with OpenBIOS for Sparc32
by Armistead, Jason 06 Jun '06

06 Jun '06

Sorry for such a newbie question Can someone just give me a quick overview of the "right way" to start up QEMU so that it will load the OpenBIOS firmware instead of PROLL, and how to point QEMU to my Solaris installation CD image file. Do I need any hacks / patches to QEMU to use OpenBIOS instead of PROLL ? What debugging switches should I enable with QEMU to help me figure out why things aren't working when trying to boot the SunOS 4.1.4 (Solaris 1.1.2) installation CD ? Is there a "best way" to build OpenBIOS to ensure maximum useful debugging information is produced ? If I'm repeating a whole lot of old questions, is there a FAQ for the QEMU + OpenBIOS (Sparc32) combination that someone can point me to ? Thanks Jason

1 0

r48 - in openbios-devel: arch/sparc32 forth/admin
by svn＠openbios.org 05 Jun '06

05 Jun '06

Author: stepan Date: 2006-06-05 22:34:53 +0200 (Mon, 05 Jun 2006) New Revision: 48 Modified: openbios-devel/arch/sparc32/init.fs openbios-devel/arch/sparc32/romvec.c openbios-devel/forth/admin/reset.fs Log: add reset-all and reset for sparc32 Modified: openbios-devel/arch/sparc32/init.fs =================================================================== --- openbios-devel/arch/sparc32/init.fs 2006-06-05 20:02:44 UTC (rev 47) +++ openbios-devel/arch/sparc32/init.fs 2006-06-05 20:34:53 UTC (rev 48) @@ -51,6 +51,13 @@ ; CONSOLE-IN-initializer device-end + +: sparc32-reset-all + h# 71f00000 1 iow! + ; + +' sparc32-reset-all to reset-all + : rmap@ ( virt -- rmentry ) drop 0 ; Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2006-06-05 20:02:44 UTC (rev 47) +++ openbios-devel/arch/sparc32/romvec.c 2006-06-05 20:34:53 UTC (rev 48) @@ -413,7 +413,7 @@ return 0; } -void v2_eval(char *str) +static void obp_fortheval_v2(char *str) { // for now, move something to the stack so we // don't get a stack underrun. @@ -422,11 +422,10 @@ // fword("0"); fword("0"); - DPRINTF("\n---------------\n"); - DPRINTF(" %s", str); - DPRINTF("\n---------------\n"); - feval(str); - DPRINTF("\n---------------\n"); + + DPRINTF("obp_fortheval_v2(%s)\n", str); + push_str(str); + fword("eval"); } void * @@ -476,7 +475,7 @@ romvec0.pv_halt = obp_halt; romvec0.pv_synchook = &sync_hook; romvec0.pv_v0bootargs = &obp_argp; - romvec0.pv_fortheval.v2_eval = v2_eval; + romvec0.pv_fortheval.v2_eval = obp_fortheval_v2; romvec0.pv_v2devops.v2_inst2pkg = obp_inst2pkg; romvec0.pv_v2devops.v2_dumb_mmap = obp_dumb_mmap; romvec0.pv_v2devops.v2_dumb_munmap = obp_dumb_munmap; Modified: openbios-devel/forth/admin/reset.fs =================================================================== --- openbios-devel/forth/admin/reset.fs 2006-06-05 20:02:44 UTC (rev 47) +++ openbios-devel/forth/admin/reset.fs 2006-06-05 20:34:53 UTC (rev 48) @@ -1,5 +1,14 @@ \ 7.4.7 Reset -: reset-all ( -- ) +defer reset-all ( -- ) + +: no-reset-all + s" reset-all is not available on this platform." type cr ; +' no-reset-all to reset-all + +\ OpenBOOT knows reset as well. +: reset reset-all ; + +

1 0

r47 - openbios-devel/drivers
by svn＠openbios.org 05 Jun '06

05 Jun '06

Author: stepan Date: 2006-06-05 22:02:44 +0200 (Mon, 05 Jun 2006) New Revision: 47 Modified: openbios-devel/drivers/esp.c openbios-devel/drivers/obio.c Log: add quick and dirty hack to esp.c to get further with solaris. add interrupt information to obio.c to boot netbsd Modified: openbios-devel/drivers/esp.c =================================================================== --- openbios-devel/drivers/esp.c 2006-06-05 19:49:53 UTC (rev 46) +++ openbios-devel/drivers/esp.c 2006-06-05 20:02:44 UTC (rev 47) @@ -511,6 +511,8 @@ add_alias(nodebuff, aliasbuff); sprintf(aliasbuff, "sd(0,%d,0)", id); add_alias(nodebuff, aliasbuff); + sprintf(aliasbuff, "sd(0,%d,0)@0,0", id); + add_alias(nodebuff, aliasbuff); (*counter_ptr)++; } DPRINTF("done\n"); Modified: openbios-devel/drivers/obio.c =================================================================== --- openbios-devel/drivers/obio.c 2006-06-05 19:49:53 UTC (rev 46) +++ openbios-devel/drivers/obio.c 2006-06-05 20:02:44 UTC (rev 47) @@ -286,11 +286,21 @@ push_str("reg"); fword("property"); - fword("finish-device"); - regs = map_io(base + offset, sizeof(*regs)); regs->set = ~SUN4M_INT_MASKALL; regs->cpu_intregs[0].clear = ~0x17fff; + + // is this really correct? + PUSH(regs); + fword("encode-int"); + PUSH(regs); + fword("encode-int"); + fword("encode+"); + push_str("address"); + fword("property"); + + fword("finish-device"); + }

1 0

r46 - openbios-devel/arch/sparc32
by svn＠openbios.org 05 Jun '06

05 Jun '06

Author: stepan Date: 2006-06-05 21:49:53 +0200 (Mon, 05 Jun 2006) New Revision: 46 Modified: openbios-devel/arch/sparc32/romvec.c openbios-devel/arch/sparc32/tree.fs Log: we're on the way: solaris fails a lot later now: Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2006-06-05 19:41:28 UTC (rev 45) +++ openbios-devel/arch/sparc32/romvec.c 2006-06-05 19:49:53 UTC (rev 46) @@ -48,7 +48,7 @@ static struct linux_arguments_v0 obp_arg; static const struct linux_arguments_v0 * const obp_argp = &obp_arg; -static void (*synch_hook)(void); +static void (*sync_hook)(void); static struct linux_romvec romvec0; @@ -332,7 +332,7 @@ fword("$call-method"); ret = POP(); - DPRINTF("obp_devwrite(fd 0x%x, buf %s, nbytes %d) = %d\n", dev_desc, buf, nbytes, ret); + //DPRINTF("obp_devwrite(fd 0x%x, buf %s, nbytes %d) = %d\n", dev_desc, buf, nbytes, ret); return nbytes; } @@ -413,6 +413,22 @@ return 0; } +void v2_eval(char *str) +{ + // for now, move something to the stack so we + // don't get a stack underrun. + // + // FIXME: find out why solaris doesnt put its stuff on the stack + // + fword("0"); + fword("0"); + DPRINTF("\n---------------\n"); + DPRINTF(" %s", str); + DPRINTF("\n---------------\n"); + feval(str); + DPRINTF("\n---------------\n"); +} + void * init_openprom(unsigned long memsize, const char *cmdline, char boot_device) { @@ -438,8 +454,8 @@ // Linux wants a R/W romvec table romvec0.pv_magic_cookie = LINUX_OPPROM_MAGIC; romvec0.pv_romvers = 3; - romvec0.pv_plugin_revision = 77; - romvec0.pv_printrev = 0x10203; + romvec0.pv_plugin_revision = 2; + romvec0.pv_printrev = 0x20019; romvec0.pv_v0mem.v0_totphys = &ptphys; romvec0.pv_v0mem.v0_prommap = &ptmap; romvec0.pv_v0mem.v0_available = &ptavail; @@ -458,8 +474,9 @@ romvec0.pv_printf = (void (*)(const char *fmt, ...))printk; romvec0.pv_abort = obp_abort; romvec0.pv_halt = obp_halt; - romvec0.pv_synchook = &synch_hook; + romvec0.pv_synchook = &sync_hook; romvec0.pv_v0bootargs = &obp_argp; + romvec0.pv_fortheval.v2_eval = v2_eval; romvec0.pv_v2devops.v2_inst2pkg = obp_inst2pkg; romvec0.pv_v2devops.v2_dumb_mmap = obp_dumb_mmap; romvec0.pv_v2devops.v2_dumb_munmap = obp_dumb_munmap; @@ -482,7 +499,10 @@ break; case 'd': obp_arg.boot_dev_unit = 2; - obp_arg.argv[0] = "sd(0,2,0):d"; + // FIXME: hardcoding this looks almost definitely wrong. + // With sd(0,2,0):b we get to see the solaris kernel though + //obp_arg.argv[0] = "sd(0,2,0):d"; + obp_arg.argv[0] = "sd(0,2,0):b"; // Fall through case 'c': obp_arg.boot_dev[0] = 's'; Modified: openbios-devel/arch/sparc32/tree.fs =================================================================== --- openbios-devel/arch/sparc32/tree.fs 2006-06-05 19:41:28 UTC (rev 45) +++ openbios-devel/arch/sparc32/tree.fs 2006-06-05 19:49:53 UTC (rev 46) @@ -29,12 +29,32 @@ finish-device new-device - " STP1012PGA" device-name + " FMI,MB86904" device-name " cpu" device-type - d# 256 encode-int " mmu-nctx" property + + \ 0 encode-int 0 encode-int encode+ 0 encode-int encode+ " context-table" property + 0 encode-int " implementation" property + d# 4 encode-int " version" property + d# 32 encode-int " cache-line-size" property d# 512 encode-int " cache-nlines" property - 1 encode-int " mid" property + + d# 4096 encode-int " page-size" property + + d# 16 encode-int " dcache-line-size" property + d# 512 encode-int " dcache-nlines" property + d# 1 encode-int " dcache-associativity" property + + d# 16 encode-int " icache-line-size" property + d# 512 encode-int " icache-nlines" property + d# 1 encode-int " icache-associativity" property + + d# 2 encode-int " ncaches" property + d# 256 encode-int " mmu-nctx" property + d# 8 encode-int " sparc-version" property + d# 37 encode-int " mask_rev" property + + \ 1 encode-int " mid" property finish-device new-device

1 0