OpenBIOS August 2010

openbios@openbios.org

13 participants
46 discussions

[commit] r841 - in trunk/openbios-devel/arch: sparc32 sparc64 x86
by repository service 08 Aug '10

08 Aug '10

Author: blueswirl Date: Sun Aug 8 20:28:48 2010 New Revision: 841 URL: http://tracker.coreboot.org/trac/openbios/changeset/841 Log: linux_load: fix open_io return value checks open_io() returns -1 on error and 0 is a valid return value. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/linux_load.c trunk/openbios-devel/arch/sparc64/linux_load.c trunk/openbios-devel/arch/x86/linux_load.c Modified: trunk/openbios-devel/arch/sparc32/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/linux_load.c Sat Aug 7 14:49:53 2010 (r840) +++ trunk/openbios-devel/arch/sparc32/linux_load.c Sun Aug 8 20:28:48 2010 (r841) @@ -461,7 +461,7 @@ uint64_t forced; fd = open_io(initrd_file); - if (!fd) { + if (fd == -1) { printf("Can't open initrd: %s\n", initrd_file); return -1; } @@ -609,8 +609,9 @@ char *initrd_file = NULL; fd = open_io(file); - if (!fd) + if (fd == -1) { return -1; + } kern_addr = load_linux_header(&hdr); if (kern_addr == 0) { Modified: trunk/openbios-devel/arch/sparc64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/linux_load.c Sat Aug 7 14:49:53 2010 (r840) +++ trunk/openbios-devel/arch/sparc64/linux_load.c Sun Aug 8 20:28:48 2010 (r841) @@ -461,7 +461,7 @@ uint64_t forced; fd = open_io(initrd_file); - if (!fd) { + if (fd == -1) { printf("Can't open initrd: %s\n", initrd_file); return -1; } @@ -609,7 +609,7 @@ char *initrd_file = NULL; fd = open_io(file); - if (!fd) + if (fd == -1) return -1; kern_addr = load_linux_header(&hdr); Modified: trunk/openbios-devel/arch/x86/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c Sat Aug 7 14:49:53 2010 (r840) +++ trunk/openbios-devel/arch/x86/linux_load.c Sun Aug 8 20:28:48 2010 (r841) @@ -462,7 +462,7 @@ uint64_t forced; fd = open_io(initrd_file); - if (!fd) { + if (fd == -1) { printf("Can't open initrd: %s\n", initrd_file); return -1; } @@ -634,8 +634,9 @@ char *initrd_file = NULL; fd = open_io(file); - if (!fd) + if (fd == -1) { return -1; + } kern_addr = load_linux_header(&hdr); if (kern_addr == 0)

1 0

[commit] r840 - trunk/openbios-devel/packages
by repository service 07 Aug '10

07 Aug '10

Author: blueswirl Date: Sat Aug 7 14:49:53 2010 New Revision: 840 URL: http://tracker.coreboot.org/trac/openbios/changeset/840 Log: sun-parts: fix id and flag sizes Also use __bexx_to_cpu() to access the fields. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/packages/sun-parts.c Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Sat Aug 7 14:49:52 2010 (r839) +++ trunk/openbios-devel/packages/sun-parts.c Sat Aug 7 14:49:53 2010 (r840) @@ -46,10 +46,8 @@ uint8_t info[128]; /* Informative text string */ uint8_t spare0[14]; struct sun_info { - uint8_t spare1; - uint8_t id; - uint8_t spare2; - uint8_t flags; + uint16_t id; + uint16_t flags; } infos[8]; uint8_t spare[246]; /* Boot information etc. */ uint16_t rspeed; /* Disk rotational speed */ @@ -172,8 +170,11 @@ p = (struct sun_disklabel *)buf; for (i = 0; i < 8; i++) { - DPRINTF("%c: %d + %d, id %x, flags %x\n", 'a' + i, p->partitions[i].start_cylinder, - p->partitions[i].num_sectors, p->infos[i].id, p->infos[i].flags); + DPRINTF("%c: %d + %d, id %x, flags %x\n", 'a' + i, + __be32_to_cpu(p->partitions[i].start_cylinder), + __be32_to_cpu(p->partitions[i].num_sectors), + __be16_to_cpu(p->infos[i].id), + __be16_to_cpu(p->infos[i].flags)); if (parnum < 0) { if (p->partitions[i].num_sectors != 0 && p->infos[i].id != 0) parnum = i; @@ -193,7 +194,7 @@ size = (long long)__be32_to_cpu(p->partitions[parnum].num_sectors) * bs; di->size_hi = size >> BITS; di->size_lo = size & (ucell) -1; - di->type = __be32_to_cpu(p->infos[parnum].id); + di->type = __be16_to_cpu(p->infos[parnum].id); DPRINTF("Found Sun partition, offs %lld size %lld\n", (long long)offs, (long long)size);

1 0

[commit] r839 - trunk/openbios-devel/libopenbios
by repository service 07 Aug '10

07 Aug '10

Author: blueswirl Date: Sat Aug 7 14:49:52 2010 New Revision: 839 URL: http://tracker.coreboot.org/trac/openbios/changeset/839 Log: loaders: fix open_ih return value checks open_ih() returns -1 on error and 0 is a valid return value. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libopenbios/aout_load.c trunk/openbios-devel/libopenbios/elf_load.c trunk/openbios-devel/libopenbios/fcode_load.c trunk/openbios-devel/libopenbios/forth_load.c Modified: trunk/openbios-devel/libopenbios/aout_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/aout_load.c Sat Aug 7 14:49:50 2010 (r838) +++ trunk/openbios-devel/libopenbios/aout_load.c Sat Aug 7 14:49:52 2010 (r839) @@ -81,8 +81,9 @@ feval("0 state-valid !"); fd = open_ih(dev); - if (!fd) + if (fd == -1) { goto out; + } for (offset = 0; offset < 16 * 512; offset += 512) { seek_io(fd, offset); Modified: trunk/openbios-devel/libopenbios/elf_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_load.c Sat Aug 7 14:49:50 2010 (r838) +++ trunk/openbios-devel/libopenbios/elf_load.c Sat Aug 7 14:49:52 2010 (r839) @@ -383,8 +383,9 @@ feval("0 state-valid !"); fd = open_ih(dev); - if (!fd) + if (fd == -1) { goto out; + } offset = find_elf(&ehdr); if (!offset) { Modified: trunk/openbios-devel/libopenbios/fcode_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/fcode_load.c Sat Aug 7 14:49:50 2010 (r838) +++ trunk/openbios-devel/libopenbios/fcode_load.c Sat Aug 7 14:49:52 2010 (r839) @@ -35,8 +35,9 @@ feval("0 state-valid !"); fd = open_ih(dev); - if (!fd) + if (fd == -1) { goto out; + } for (offset = 0; offset < 16 * 512; offset += 512) { seek_io(fd, offset); Modified: trunk/openbios-devel/libopenbios/forth_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/forth_load.c Sat Aug 7 14:49:50 2010 (r838) +++ trunk/openbios-devel/libopenbios/forth_load.c Sat Aug 7 14:49:52 2010 (r839) @@ -33,8 +33,9 @@ feval("0 state-valid !"); fd = open_ih(dev); - if (!fd) + if (fd == -1) { goto out; + } if (read_io(fd, magic, 2) != 2) { debug("Can't read magic header\n");

1 0

[commit] r838 - trunk/openbios-devel/libc
by repository service 07 Aug '10

07 Aug '10

Author: blueswirl Date: Sat Aug 7 14:49:50 2010 New Revision: 838 URL: http://tracker.coreboot.org/trac/openbios/changeset/838 Log: diskio: add debugging Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libc/diskio.c Modified: trunk/openbios-devel/libc/diskio.c ============================================================================== --- trunk/openbios-devel/libc/diskio.c Sat Aug 7 14:05:02 2010 (r837) +++ trunk/openbios-devel/libc/diskio.c Sat Aug 7 14:49:50 2010 (r838) @@ -18,6 +18,14 @@ #include "libopenbios/bindings.h" #include "libc/diskio.h" +//#define CONFIG_DEBUG_DISKIO +#ifdef CONFIG_DEBUG_DISKIO +#define DPRINTF(fmt, args...) \ + do { printk(fmt , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) +#endif + typedef struct { ihandle_t ih; int do_close; @@ -73,6 +81,7 @@ fdp->do_close = 0; file_descriptors[fd]=fdp; + DPRINTF("%s(0x%lx) = %d\n", __func__, (unsigned long)ih, fd); return fd; } @@ -83,6 +92,7 @@ ihandle_t ih = open_dev( spec ); priv_fd_t *fdp; + DPRINTF("%s(%s)\n", __func__, spec); if( !ih ) return -1; @@ -110,6 +120,7 @@ call_package( fdp->reopen_xt, fdp->ih ); ret = (POP() == (ucell)-1)? 0 : -1; + DPRINTF("%s(%d, %s) = %d\n", __func__, fd, filename, ret); return ret; } @@ -118,6 +129,7 @@ { priv_fd_t *fdp = file_descriptors[fd]; + DPRINTF("%s(%d)\n", __func__, fd); if( lookup_xt(fdp->ih, "open-nwrom", &fdp->open_nwrom_xt) ) return -1; call_package( fdp->open_nwrom_xt, fdp->ih ); @@ -167,6 +179,7 @@ priv_fd_t *fdp; ucell ret; + DPRINTF("%s(%d, %p, %u)\n", __func__, fd, buf, cnt); if (fd != -1) { fdp = file_descriptors[fd]; @@ -189,6 +202,7 @@ { priv_fd_t *fdp; + DPRINTF("%s(%d, %lld)\n", __func__, fd, offs); if (fd != -1) { fdp = file_descriptors[fd]; @@ -210,6 +224,7 @@ return -1; call_package( fdp->tell_xt, fdp->ih ); offs = DPOP(); + DPRINTF("%s(%d) = %lld\n", __func__, fd, offs); return offs; } @@ -218,6 +233,7 @@ { priv_fd_t *fdp; + DPRINTF("%s(%d)\n", __func__, fd); if (fd != -1) { fdp = file_descriptors[fd];

1 0

[commit] r837 - trunk/openbios-devel/arch/x86
by repository service 07 Aug '10

07 Aug '10

Author: mcayland Date: Sat Aug 7 14:05:02 2010 New Revision: 837 URL: http://tracker.coreboot.org/trac/openbios/changeset/837 Log: Bind the (go) function into the C equivalent go function arch/x86/boot.c (this should re-enable load/boot with the new unified loader). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/x86/openbios.c Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sat Aug 7 14:02:42 2010 (r836) +++ trunk/openbios-devel/arch/x86/openbios.c Sat Aug 7 14:05:02 2010 (r837) @@ -18,8 +18,8 @@ #include "libopenbios/sys_info.h" #include "openbios.h" #include "relocate.h" +#include "boot.h" -void boot(void); void collect_sys_info(struct sys_info *info); #define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ @@ -71,6 +71,7 @@ #endif device_end(); bind_func("platform-boot", boot ); + bind_func("(go)", go ); } int openbios(void)

1 0

[commit] r836 - trunk/openbios-devel/arch/unix
by repository service 07 Aug '10

07 Aug '10

Author: mcayland Date: Sat Aug 7 14:02:42 2010 New Revision: 836 URL: http://tracker.coreboot.org/trac/openbios/changeset/836 Log: Stop openbios-unix from crashing when auto-boot? is enabled. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/unix/boot.c Modified: trunk/openbios-devel/arch/unix/boot.c ============================================================================== --- trunk/openbios-devel/arch/unix/boot.c Fri Aug 6 18:49:32 2010 (r835) +++ trunk/openbios-devel/arch/unix/boot.c Sat Aug 7 14:02:42 2010 (r836) @@ -64,9 +64,13 @@ void boot( void ) { - char *path=pop_fstr_copy(); + char *path; void *entry; + /* Copy the incoming path */ + fword("2dup"); + path = pop_fstr_copy(); + if(!path) { printk("[unix] Booting default not supported.\n"); return;

1 0

[commit] r835 - trunk/openbios-devel/drivers
by repository service 06 Aug '10

06 Aug '10

Author: blueswirl Date: Fri Aug 6 18:49:32 2010 New Revision: 835 URL: http://tracker.coreboot.org/trac/openbios/changeset/835 Log: vga_load_regs: check return value for errors Fixes a warning with GCC 4.0.2: CC target/drivers/vga_load_regs.o cc1: warnings being treated as errors ../drivers/vga_load_regs.c: In function 'vga_load_regs': ../drivers/vga_load_regs.c:491: warning: 'par.misc' may be used uninitialized in this function Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/vga_load_regs.c Modified: trunk/openbios-devel/drivers/vga_load_regs.c ============================================================================== --- trunk/openbios-devel/drivers/vga_load_regs.c Fri Aug 6 18:35:44 2010 (r834) +++ trunk/openbios-devel/drivers/vga_load_regs.c Fri Aug 6 18:49:32 2010 (r835) @@ -490,6 +490,7 @@ { struct vga_par par; - vga_decode_var(&vga_settings, &par); - vga_set_regs(&par); + if (vga_decode_var(&vga_settings, &par) == 0) { + vga_set_regs(&par); + } }

1 0

[commit] r834 - trunk/openbios-devel/arch/x86
by repository service 06 Aug '10

06 Aug '10

Author: blueswirl Date: Fri Aug 6 18:35:44 2010 New Revision: 834 URL: http://tracker.coreboot.org/trac/openbios/changeset/834 Log: Fix x86 build CC target/arch/x86/boot.o ../arch/x86/boot.c: In function 'go': ../arch/x86/boot.c:35: error: 'boot_notes' undeclared (first use in this function) Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/x86/boot.c Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Wed Aug 4 22:53:22 2010 (r833) +++ trunk/openbios-devel/arch/x86/boot.c Fri Aug 6 18:35:44 2010 (r834) @@ -32,7 +32,7 @@ switch (type) { case 0x0: /* Start ELF boot image */ - image_retval = start_elf(address, (uint32_t)&boot_notes); + image_retval = start_elf(address, (uint32_t)&elf_boot_notes); break; case 0x1:

1 0

[commit] r833 - trunk/openbios-devel/packages
by repository service 04 Aug '10

04 Aug '10

Author: mcayland Date: Wed Aug 4 22:53:22 2010 New Revision: 833 URL: http://tracker.coreboot.org/trac/openbios/changeset/833 Log: Improve packages/mac-parts partition detection for the cases where no partition is specified but a filename argument is, e.g hd:,%BOOT or cd:,\ofwboot.xcf. This latter form allows booting NetBSD PPC in a similar manner as described in the NetBSD documentation. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/packages/mac-parts.c Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Tue Aug 3 22:48:23 2010 (r832) +++ trunk/openbios-devel/packages/mac-parts.c Wed Aug 4 22:53:22 2010 (r833) @@ -102,10 +102,8 @@ parnum = atol(parstr); /* Detect if we are looking for the bootcode */ - if (strcmp(argstr, "%BOOT") == 0) { + if (strcmp(argstr, "%BOOT") == 0) want_bootcode = 1; - argstr = strdup(""); - } } } @@ -158,11 +156,12 @@ ret = -1; goto out; - } else if (parnum == -1) { + } else if (parnum == -1 && strlen(argstr)) { DPRINTF("mac-parts: counted %d partitions\n", __be32_to_cpu(par.pmMapBlkCnt)); - /* No partition was explicitly requested, so find one */ + /* No partition was explicitly requested, but an argstr was passed in. + So let's find a suitable partition... */ for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { SEEK( bs * parnum ); READ( &par, sizeof(par) ); @@ -172,15 +171,29 @@ DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); - /* Ignore any partition maps when searching */ - if (strcmp(par.pmPartType, "Apple_partition_map")) { - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { - offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; - size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; - + /* If we have a valid, allocated and readable partition... */ + if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; + size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; + + /* If the filename was set to %BOOT, we actually want the bootcode */ + if (want_bootcode && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid)) { + offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; + size = (long long)__be32_to_cpu(par.pmBootSize); + goto found; + } else { + /* Otherwise we were passed a filename and path. So let's + choose the first partition with a valid filesystem */ + DPUSH( offs ); + PUSH_ih( my_parent() ); + parword("find-filesystem"); + + ph = POP_ph(); + if (ph) + goto found; } } } @@ -207,12 +220,6 @@ found: - /* If the filename was set to %BOOT, we actually want the bootcode instead */ - if (want_bootcode) { - offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; - size = (long long)__be32_to_cpu(par.pmBootSize); - } - ret = -1; di->blocksize = (unsigned int)bs; @@ -234,6 +241,11 @@ DPRINTF("mac-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, argstr); di->filesystem_ph = ph; + /* If the filename was %BOOT then it's not a real filename, so clear argstr before + attempting interpose */ + if (want_bootcode) + argstr = strdup(""); + /* If we have been asked to open a particular file, interpose the filesystem package with the passed filename as an argument */ if (strlen(argstr)) {

1 0

[commit] r831 - trunk/openbios-devel/arch/sparc32
by repository service 04 Aug '10

04 Aug '10

Author: blueswirl Date: Tue Aug 3 20:39:27 2010 New Revision: 831 URL: http://tracker.coreboot.org/trac/openbios/changeset/831 Log: sparc32: fix NetBSD crash Fix NetBSD crash when printing bootpath. Also fix generation of compatibility paths when the bootpath includes partition letter (e.g. 'disk:d'). Consider also 'cd' alias of 'cdrom'. See also r244. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/boot.c Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Aug 1 23:25:08 2010 (r830) +++ trunk/openbios-devel/arch/sparc32/boot.c Tue Aug 3 20:39:27 2010 (r831) @@ -48,9 +48,12 @@ strncpy(bootargsbuf, prop, proplen); /* Set bootpath pointer used in romvec table to the bootpath */ - bootpath = bootpathbuf; + push_str(bootpathbuf); + fword("pathres-resolve-aliases"); + bootpath = pop_fstr_copy(); + printk("bootpath: %s\n", bootpath); - if (!strcmp(bootpathbuf, "cdrom") || !strcmp(bootpathbuf, "disk")) { + if (!strncmp(bootpathbuf, "cd", 2) || !strncmp(bootpathbuf, "disk", 4)) { /* Controller currently always 0 */ obp_arg.boot_dev_ctrl = 0; @@ -70,10 +73,11 @@ /* Generate the "oldpath" FIXME: hardcoding this looks almost definitely wrong. With sd(0,2,0):b we get to see the solaris kernel though */ - if (!strcmp(bootpathbuf, "disk")) + if (!strncmp(bootpathbuf, "disk", 4)) { bootid = 'd'; - else + } else { bootid = 'b'; + } snprintf(buf, sizeof(buf), "sd(0,%d,%d):%c", unit, part, bootid); @@ -82,7 +86,7 @@ obp_arg.argv[0] = buf; obp_arg.argv[1] = bootargsbuf; - } else if (!strcmp(bootpathbuf, "floppy")) { + } else if (!strncmp(bootpathbuf, "floppy", 6)) { obp_arg.boot_dev_ctrl = 0; obp_arg.boot_dev_unit = 0; @@ -95,7 +99,7 @@ obp_arg.argv[0] = buf; obp_arg.argv[1] = bootargsbuf; - } else if (!strcmp(bootpathbuf, "net")) { + } else if (!strncmp(bootpathbuf, "net", 3)) { obp_arg.boot_dev_ctrl = 0; obp_arg.boot_dev_unit = 0;

2 1