OpenBIOS January 2014

openbios@openbios.org

7 participants
15 discussions

[commit] r1249 - trunk/openbios-devel/libopenbios
by repository service 13 Jan '14

13 Jan '14

Author: mcayland Date: Mon Jan 13 10:46:41 2014 New Revision: 1249 URL: http://tracker.coreboot.org/trac/openbios/changeset/1249 Log: client.c: update formatting to make it consistent Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/libopenbios/client.c Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Mon Jan 13 09:57:55 2014 (r1248) +++ trunk/openbios-devel/libopenbios/client.c Mon Jan 13 10:46:41 2014 (r1249) @@ -247,15 +247,15 @@ handle_calls( prom_args_t *pb ) { int i, dstacksave = dstackcnt; - prom_uarg_t val; + prom_uarg_t val; #ifdef DEBUG_CIF - printk("%s %s ([" FMT_prom_arg "] -- [" FMT_prom_arg "])\n", - get_service(pb), arg2pointer(pb->args[0]), pb->nargs, pb->nret); + printk("%s %s ([" FMT_prom_arg "] -- [" FMT_prom_arg "])\n", + get_service(pb), arg2pointer(pb->args[0]), pb->nargs, pb->nret); #endif - for( i=pb->nargs-1; i>=0; i-- ) - PUSH( pb->args[i] ); + for (i = pb->nargs - 1; i >= 0; i--) + PUSH(pb->args[i]); push_str(get_service(pb)); fword("client-call-iface"); @@ -264,28 +264,28 @@ catch result which is the first parameter below) */ POP(); - for( i=0; i<pb->nret; i++ ) { + for (i = 0; i < pb->nret; i++) { val = POP(); pb->args[pb->nargs + i] = val; /* don't pop args if an exception occured */ - if( !i && val ) + if (!i && val) break; } #ifdef DEBUG_CIF - /* useful for debug but not necessarily an error */ - if (i != pb->nret || dstackcnt != dstacksave) { - printk("%s '%s': possible argument error (" FMT_prom_arg "--" FMT_prom_arg ") got %d\n", - get_service(pb), arg2pointer(pb->args[0]), - pb->nargs - 2, pb->nret, i); - } - - printk("handle_calls return:"); - for (i = 0; i < pb->nret; i++) { - printk(" " FMT_prom_uargx, pb->args[pb->nargs + i]); - } - printk("\n"); + /* useful for debug but not necessarily an error */ + if (i != pb->nret || dstackcnt != dstacksave) { + printk("%s '%s': possible argument error (" FMT_prom_arg "--" FMT_prom_arg ") got %d\n", + get_service(pb), arg2pointer(pb->args[0]), + pb->nargs - 2, pb->nret, i); + } + + printk("handle_calls return:"); + for (i = 0; i < pb->nret; i++) { + printk(" " FMT_prom_uargx, pb->args[pb->nargs + i]); + } + printk("\n"); #endif dstackcnt = dstacksave; @@ -298,7 +298,7 @@ prom_args_t *pb = (prom_args_t*)params; int val, i, dstacksave; - if( pb->nargs < 0 || pb->nret < 0 || + if (pb->nargs < 0 || pb->nret < 0 || pb->nargs + pb->nret > PROM_MAX_ARGS) return -1; @@ -308,20 +308,20 @@ /* call-method exceptions are special */ if (!strcmp("call-method", get_service(pb)) || !strcmp("interpret", get_service(pb))) - return handle_calls( pb ); + return handle_calls(pb); dstacksave = dstackcnt; - for( i=pb->nargs-1; i>=0; i-- ) - PUSH( pb->args[i] ); + for (i = pb->nargs - 1; i >= 0; i--) + PUSH(pb->args[i]); push_str(get_service(pb)); fword("client-iface"); - if( (val=POP()) ) { + if (val=POP()) { dstackcnt = dstacksave; - if( val == -1 ) + if (val == -1) printk("Unimplemented service %s ([" FMT_prom_arg "] -- [" FMT_prom_arg "])\n", - get_service(pb), pb->nargs, pb->nret ); + get_service(pb), pb->nargs, pb->nret); #ifdef DEBUG_CIF else printk("ERROR!\n"); @@ -329,13 +329,13 @@ return -1; } - for( i=0; i<pb->nret ; i++ ) + for (i = 0; i < pb->nret ; i++) pb->args[pb->nargs + i] = POP(); - if( dstackcnt != dstacksave ) { + if (dstackcnt != dstacksave) { #ifdef DEBUG_CIF printk("service %s: possible argument error (%d %d)\n", - get_service(pb), i, dstackcnt - dstacksave ); + get_service(pb), i, dstackcnt - dstacksave); #endif /* Some clients request less parameters than the CIF method returns, e.g. getprop with OpenSolaris. Hence we drop any

1 0

[commit] r1248 - trunk/openbios-devel/drivers
by repository service 13 Jan '14

13 Jan '14

Author: mcayland Date: Mon Jan 13 09:57:55 2014 New Revision: 1248 URL: http://tracker.coreboot.org/trac/openbios/changeset/1248 Log: prep: add an IDE controller to the i82378 PCI-ISA bridge On PReP machines, IDE controller is really on the pc87312 Super I/O chip, but we currently don't detect it. Signed-off-by: Hervé Poussineau <hpoussin(a)reactos.org> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Mon Jan 13 09:57:51 2014 (r1247) +++ trunk/openbios-devel/drivers/pci.c Mon Jan 13 09:57:55 2014 (r1248) @@ -876,6 +876,9 @@ #ifdef CONFIG_DRIVER_PC_KBD ob_pc_kbd_init(config->path, "8042", arch->io_base, 0x60ULL, 0); #endif +#ifdef CONFIG_DRIVER_IDE + ob_ide_init(config->path, 0x1f0, 0x3f6, 0x170, 0x376); +#endif return 0; }

1 0

[commit] r1247 - in trunk/openbios-devel: arch/amd64 arch/x86 drivers
by repository service 13 Jan '14

13 Jan '14

Author: mcayland Date: Mon Jan 13 09:57:51 2014 New Revision: 1247 URL: http://tracker.coreboot.org/trac/openbios/changeset/1247 Log: ide: change ob_ide_init() to take usual control base addresses The +2 offset comes from the PCI IDE controllers, where control status must be accessed at BAR1+2 and BAR3+2. Signed-off-by: Hervé Poussineau <hpoussin(a)reactos.org> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Fri Dec 20 11:45:54 2013 (r1246) +++ trunk/openbios-devel/arch/amd64/openbios.c Mon Jan 13 09:57:51 2014 (r1247) @@ -44,7 +44,7 @@ modules_init(); #ifdef CONFIG_DRIVER_IDE setup_timers(); - ob_ide_init("/pci/pci-ata", 0x1f0, 0x3f4, 0x170, 0x374); + ob_ide_init("/pci/pci-ata", 0x1f0, 0x3f6, 0x170, 0x376); #endif device_end(); bind_func("platform-boot", boot ); Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Fri Dec 20 11:45:54 2013 (r1246) +++ trunk/openbios-devel/arch/x86/openbios.c Mon Jan 13 09:57:51 2014 (r1247) @@ -57,7 +57,7 @@ #endif #ifdef CONFIG_DRIVER_IDE setup_timers(); - ob_ide_init("/pci/isa", 0x1f0, 0x3f4, 0x170, 0x374); + ob_ide_init("/pci/isa", 0x1f0, 0x3f6, 0x170, 0x376); #endif #ifdef CONFIG_DRIVER_FLOPPY ob_floppy_init("/isa", "floppy0", 0x3f0, 0); Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Fri Dec 20 11:45:54 2013 (r1246) +++ trunk/openbios-devel/drivers/ide.c Mon Jan 13 09:57:51 2014 (r1247) @@ -1372,9 +1372,9 @@ u32 props[6]; io_ports[0] = io_port0; - ctl_ports[0] = ctl_port0 + 2; + ctl_ports[0] = ctl_port0; io_ports[1] = io_port1; - ctl_ports[1] = ctl_port1 + 2; + ctl_ports[1] = ctl_port1; for (i = 0; i < IDE_NUM_CHANNELS; i++, current_channel++) { Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Fri Dec 20 11:45:54 2013 (r1246) +++ trunk/openbios-devel/drivers/pci.c Mon Jan 13 09:57:51 2014 (r1247) @@ -584,9 +584,9 @@ { ob_ide_init(config->path, config->assigned[0] & ~0x0000000F, - config->assigned[1] & ~0x0000000F, + (config->assigned[1] & ~0x0000000F) + 2, config->assigned[2] & ~0x0000000F, - config->assigned[3] & ~0x0000000F); + (config->assigned[3] & ~0x0000000F) + 2); return 0; }

1 0

next-property
by Olivier Danet 03 Jan '14

03 Jan '14

I may have found a bug in OpenBIOS. An OS uses the "nextprop" iterator to scan device properties, and eventually asks about nonexistant properties. "const char *obp_nextprop(int node, const char *name)" (arch/sparc32/romvec.c) calls the "next-property" forth code, then pops the result. According to the standard, next-property should return 0 if the property selected is the last _OR_ if the property does not exist. The current code in forth/admin/devices.fs returns nothing when the property does not exit. For example (SPARC 32) : cd screen " name" ?active-package next-property drop cr type --> returns "device_type" " interrupts" ?active-package next-property --> returns 0, this is the last property. " bozo" ?active-package next-property --> returns nothing. Which, imho, is wrong. Here is a patch, I am not quite sure about it (debuting Forth) but it helps the target OS : Index: forth/device/property.fs =================================================================== --- forth/device/property.fs (révision 1246) +++ forth/device/property.fs (copie de travail) @@ -70,7 +70,7 @@ 2drop r> >dn.properties @ else r> find-property dup if @ then - ?dup if >prop.next @ then + dup if >prop.next @ then then ?dup if =================================================================== The standard asks for a pointer to a zero lenght string instead of zero, the C code obp_nextprop() expects a zero. I don't know if it makes a difference. Olivier (Btw, the OS is NetBSD :-)

3 3

Re: [OpenBIOS] next-property
by Mark Cave-Ayland 03 Jan '14

03 Jan '14

On 03/01/14 13:03, Artyom Tarasenko wrote: >> Oh that's interesting. As part of my test suite, I regularly boot SPARC32 >> NetBSD into graphics mode so I would expect this to already work. > > Have you tried the following image? > > ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-6.1.2/sparc/installation/miniroot/mi… > > Artyom Hi Artyom, Not that particular image, however I boot both sparccd-5.0.2.iso and sparccd-4.0.iso for my tests. Does NetBSD 6 do something different that the others don't? ATB, Mark.

2 1