OpenBIOS January 2013

openbios@openbios.org

14 participants
55 discussions

[PATCH] ESP : Debug SCSI command
by Olivier DANET 17 Jan '13

17 Jan '13

[PATCH] ESP : Debug SCSI command The SCSI command code is at position 1, the first byte is the message_out byte (=0x80, constant) diff a/openbios-devel/drivers/esp.c b/openbios-devel/drivers/esp.c --- a/openbios-devel/drivers/esp.c +++ b/openbios-devel/drivers/esp.c @@ -106,7 +106,7 @@ do_command(esp_private_t *esp, sd_privat // Clear interrupts to avoid guests seeing spurious interrupts (void)esp->ll->regs[ESP_INTRPT]; - DPRINTF("do_command: id %d, cmd[0] 0x%x, status 0x%x\n", sd->id, esp->buffer[0], status); + DPRINTF("do_command: id %d, cmd[0] 0x%x, status 0x%x\n", sd->id, esp->buffer[1], status); /* Target didn't want all command data? */ if ((status & ESP_STAT_TCNT) != ESP_STAT_TCNT) { Signed-off-by: Olivier DANET <odanet at caramail.com>

2 1

[PATCH] ESP : TEST_UNIT_READY SCSI command length
by Olivier DANET 17 Jan '13

17 Jan '13

[PATCH] ESP : TEST_UNIT_READY SCSI command length "TEST UNIT READY" is a 6 bytes SCSI command (00h/LUN/reserved/reserved/reserved/Control) and it is preceded by a IDENTIFY (0x80) message_out byte. the ESP transfer size is therefore 7 bytes. diff a/openbios-devel/drivers/esp.c b/openbios-devel/drivers/esp.c --- a/openbios-devel/drivers/esp.c +++ b/openbios-devel/drivers/esp.c @@ -197,11 +197,11 @@ static unsigned int test_unit_ready(esp_private_t *esp, sd_private_t *sd) { /* Setup command = Test Unit Ready */ - memset(esp->buffer, 0, 6); + memset(esp->buffer, 0, 7); esp->buffer[0] = 0x80; esp->buffer[1] = TEST_UNIT_READY; - if (do_command(esp, sd, 6, 0)) { + if (do_command(esp, sd, 7, 0)) { DPRINTF("test_unit_ready id %d failed\n", sd->id); return 0; } Signed-off-by: Olivier DANET <odanet at caramail.com>

2 1

[commit] r1092 - trunk/openbios-devel/config/examples
by repository service 17 Jan '13

17 Jan '13

Author: mcayland Date: Thu Jan 17 00:05:39 2013 New Revision: 1092 URL: http://tracker.coreboot.org/trac/openbios/changeset/1092 Log: Revert configuration change from previous commit. Accidentally manged to leave CONFIG_DEBUG_CONSOLE_VIDEO set to false from testing. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/config/examples/sparc32_config.xml Modified: trunk/openbios-devel/config/examples/sparc32_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/sparc32_config.xml Wed Jan 16 23:51:51 2013 (r1091) +++ trunk/openbios-devel/config/examples/sparc32_config.xml Thu Jan 17 00:05:39 2013 (r1092) @@ -11,7 +11,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_DEBUG_CONSOLE_VIDEO" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_CONSOLE_VIDEO" type="boolean" value="true"/> <option name="CONFIG_DEBUG_ESP" type="boolean" value="false"/> <option name="CONFIG_DEBUG_SUN_PARTS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_OBP" type="boolean" value="false"/>

1 0

[PATCH] SPARC32 : Palette registers
by Olivier DANET 16 Jan '13

16 Jan '13

[PATCH] SPARC32 : Palette addressing The dac[] global for the palette exists only when CONFIG_DEBUG_CONSOLE_VIDEO is defined diff a/openbios-devel/packages/video.c b/openbios-devel/packages/video.c --- a/openbios-devel/packages/video.c +++ b/openbios-devel/packages/video.c @@ -187,12 +186,14 @@ set_color( int ind, unsigned long color if( video.fb.depth == 8 ) OSI_SetColor( ind, color ); #elif defined(CONFIG_SPARC32) +#if defined(CONFIG_DEBUG_CONSOLE_VIDEO) if( video.fb.depth == 8 ) { dac[0] = ind << 24; dac[1] = ((color >> 16) & 0xff) << 24; // Red dac[1] = ((color >> 8) & 0xff) << 24; // Green dac[1] = (color & 0xff) << 24; // Blue } +#endif #else vga_set_color(ind, ((color >> 16) & 0xff), ((color >> 8) & 0xff), Signed-off-by: Olivier DANET <odanet(a)caramail.com>

2 1

[commit] r1091 - in trunk/openbios-devel: config/examples packages
by repository service 16 Jan '13

16 Jan '13

Author: mcayland Date: Wed Jan 16 23:51:51 2013 New Revision: 1091 URL: http://tracker.coreboot.org/trac/openbios/changeset/1091 Log: video.c: Fix compilation when CONFIG_DEBUG_CONSOLE_VIDEO is set to false. The dac[] global for the palette exists only when CONFIG_DEBUG_CONSOLE_VIDEO is defined. Signed-off-by: Olivier DANET <odanet(a)caramail.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/config/examples/sparc32_config.xml trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/config/examples/sparc32_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/sparc32_config.xml Wed Jan 16 23:51:38 2013 (r1090) +++ trunk/openbios-devel/config/examples/sparc32_config.xml Wed Jan 16 23:51:51 2013 (r1091) @@ -11,7 +11,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_DEBUG_CONSOLE_VIDEO" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_CONSOLE_VIDEO" type="boolean" value="false"/> <option name="CONFIG_DEBUG_ESP" type="boolean" value="false"/> <option name="CONFIG_DEBUG_SUN_PARTS" type="boolean" value="false"/> <option name="CONFIG_DEBUG_OBP" type="boolean" value="false"/> Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Wed Jan 16 23:51:38 2013 (r1090) +++ trunk/openbios-devel/packages/video.c Wed Jan 16 23:51:51 2013 (r1091) @@ -187,12 +187,14 @@ if( video.fb.depth == 8 ) OSI_SetColor( ind, color ); #elif defined(CONFIG_SPARC32) +#if defined(CONFIG_DEBUG_CONSOLE_VIDEO) if( video.fb.depth == 8 ) { dac[0] = ind << 24; dac[1] = ((color >> 16) & 0xff) << 24; // Red dac[1] = ((color >> 8) & 0xff) << 24; // Green dac[1] = (color & 0xff) << 24; // Blue } +#endif #else vga_set_color(ind, ((color >> 16) & 0xff), ((color >> 8) & 0xff),

1 0

[commit] r1090 - trunk/openbios-devel/packages
by repository service 16 Jan '13

16 Jan '13

Author: mcayland Date: Wed Jan 16 23:51:38 2013 New Revision: 1090 URL: http://tracker.coreboot.org/trac/openbios/changeset/1090 Log: video.c: Fix incorrect sized type in fill_rect(). 256 colour framebuffers are arrays of chars, not short integers. Signed-off-by: Olivier DANET <odanet(a)caramail.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sun Jan 13 16:27:00 2013 (r1089) +++ trunk/openbios-devel/packages/video.c Wed Jan 16 23:51:38 2013 (r1090) @@ -159,7 +159,7 @@ while( ww-- ) *p++ = col; } else { - char *p = (char *)((unsigned short*)pp + x); + char *p = (char *)(pp + x); while( ww-- ) *p++ = col;

1 0

[PATCH] 256 colours framebuffer fill
by Olivier DANET 14 Jan '13

14 Jan '13

[PATCH] 256 colours framebuffer fill 256 colours framebuffers are arrays of chars, not short integers. diff a/openbios-devel/packages/video.c b/openbios-devel/packages/video.c --- a/openbios-devel/packages/video.c +++ b/openbios-devel/packages/video.c @@ -159,8 +159,7 @@ fill_rect( int col_ind, int x, int y, in while( ww-- ) *p++ = col; } else { - char *p = (char *)((unsigned short*)pp + x); - + char *p = pp + x; while( ww-- ) *p++ = col; } Signed-off-by: Olivier DANET <odanet(a)caramail.com>

1 0

About the Apple_Bootstrap patch
by Programmingkid 13 Jan '13

13 Jan '13

I just wanted to note that I see this error message when loading my Debian cd image: WARNING: Bootstrap partition type is wrong: "Apple_HFS" type should be: "Apple_Bootstrap".

2 1

testing Max OS X boot on latest trunk (revision 1085) + divide by zero patch
by Amadeusz Sławiński 13 Jan '13

13 Jan '13

I used the latest proposed divide by zero patch So it seems like it is almost there. Seems like it still can't load kernel when run with boot cd:,\\:tbxi Mac OS X 10.0 http://asmblr.net/scrot/2013-01-12-155737_1366x768_scrot.png Mac OS X 10.2 http://asmblr.net/scrot/2013-01-12-155642_1366x768_scrot.png Mac OS X 10.4 http://asmblr.net/scrot/2013-01-12-155935_1366x768_scrot.png However when I specify partition to use it loads: Mac OS X 10.0 (boot cd:9,\\:tbxi) http://asmblr.net/scrot/2013-01-12-163133_1366x768_scrot.png Mac OS X 10.2 (boot cd:9,\\:tbxi) http://asmblr.net/scrot/2013-01-12-163300_1366x768_scrot.png Mac OS X 10.4 (boot cd:3,\\:tbxi) http://asmblr.net/scrot/2013-01-12-163419_1366x768_scrot.png There is also another patch which I think I forgot to mention but it makes kernel boot further on older versions: https://lists.nongnu.org/archive/html/qemu-devel/2011-08/msg01418.html it fakes frequencies of some hardware Mac OS X 10.0 http://asmblr.net/scrot/2013-01-12-164304_1366x768_scrot.png Mac OS X 10.2 http://asmblr.net/scrot/2013-01-12-164529_1366x768_scrot.png Mac OS X 10.4 (looks same as without) http://asmblr.net/scrot/2013-01-12-164738_1366x768_scrot.png Amadeusz

4 4

[commit] r1089 - trunk/openbios-devel/packages
by repository service 13 Jan '13

13 Jan '13

Author: mcayland Date: Sun Jan 13 16:27:00 2013 New Revision: 1089 URL: http://tracker.coreboot.org/trac/openbios/changeset/1089 Log: mac-parts.c: Update bootpath to reflect the chosen partition if unspecified. When not booting from a specified partition, bootpath doesn't contain the selected partition id. Since this is parsed by BootX in order to locate the Mach kernel, update it accordingly. Otherwise BootX falls back to its default behaviour of scanning the first 3 partitions in order to find the kernel and fails on early Darwin/OS X images. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.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 Sun Jan 13 16:26:57 2013 (r1088) +++ trunk/openbios-devel/packages/mac-parts.c Sun Jan 13 16:27:00 2013 (r1089) @@ -50,13 +50,14 @@ { char *str = my_args_copy(); char *parstr = NULL, *argstr = NULL; + char *tmpstr, *bootpath; int bs, parnum=-1, apple_parnum=-1; int parlist[2], parlist_size = 0; desc_map_t dmap; part_entry_t par; int ret = 0, i = 0, j = 0; int want_bootcode = 0; - phandle_t ph; + phandle_t ph, chosen_ph; ducell offs = 0, size = -1; DPRINTF("macparts_open '%s'\n", str ); @@ -256,6 +257,35 @@ DPRINTF("mac-parts: filesystem found on partition %d with ph " FMT_ucellx " and args %s\n", parnum, ph, argstr); di->filesystem_ph = ph; + /* Update bootpath to reflect where we booted from */ + chosen_ph = find_dev("/chosen"); + tmpstr = get_property(chosen_ph, "bootpath", &i); + if (tmpstr == NULL) { + tmpstr = strdup(""); + } + + /* Find just the device */ + if (strlen(tmpstr)) { + for (i = 0; i < strlen(tmpstr); i++) { + if (tmpstr[i] == ':' || tmpstr[i] == ',') { + tmpstr[i] = '\0'; + } + } + + /* Rebuild bootpath with the currently selected partition number */ + bootpath = malloc(strlen(tmpstr) + strlen(str) + 4); + sprintf(bootpath, "%s:%d", tmpstr, parnum); + if (strlen(argstr)) { + sprintf(bootpath, "%s:%d,%s", tmpstr, parnum, argstr); + } else { + sprintf(bootpath, "%s:%d", tmpstr, parnum); + } + + DPRINTF("mac-parts: setting bootpath to %s\n", bootpath); + + set_property(chosen_ph, "bootpath", bootpath, strlen(bootpath) + 1); + } + /* If the filename was %BOOT then it's not a real filename, so clear argstr before attempting interpose */ if (want_bootcode) {

2 1