OpenBIOS August 2013

openbios@openbios.org

8 participants
34 discussions

[commit] r1200 - trunk/openbios-devel/libopenbios
by repository service 11 Aug '13

11 Aug '13

Author: mcayland Date: Sun Aug 11 09:24:27 2013 New Revision: 1200 URL: http://tracker.coreboot.org/trac/openbios/changeset/1200 Log: OFMEM: fix-up internal debugging functions Bring these up to date so that they now work with the current version of the code. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Wed Aug 7 23:22:47 2013 (r1199) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Aug 11 09:24:27 2013 (r1200) @@ -50,34 +50,37 @@ #if 0 static void -print_range( range_t *r, char *str ) +print_range( range_t *r, const char *str ) { printk("--- Range %s ---\n", str ); for( ; r; r=r->next ) - printk(FMT_plx " - " FMT_plx "\n", r->start, r->start + r->size - 1); + printk("%p : " FMT_plx " - " FMT_plx "\n", r, r->start, r->start + r->size - 1); printk("\n"); } static void -print_phys_range() +print_phys_range(void) { - print_range( ofmem.phys_range, "phys" ); + ofmem_t *ofmem = ofmem_arch_get_private(); + print_range( ofmem->phys_range, "phys" ); } static void -print_virt_range() +print_virt_range(void) { - print_range( ofmem.virt_range, "virt" ); + ofmem_t *ofmem = ofmem_arch_get_private(); + print_range( ofmem->virt_range, "virt" ); } static void print_trans( void ) { - translation_t *t = ofmem.trans; + ofmem_t *ofmem = ofmem_arch_get_private(); + translation_t *t = ofmem->trans; printk("--- Translations ---\n"); for( ; t; t=t->next ) - printk("%08lx -> " FMT_plx " [size %lx]\n", t->virt, t->phys, t->size); + printk("%p : " FMT_ucellx " -> " FMT_plx " [size " FMT_ucellx "]\n", t, t->virt, t->phys, t->size); printk("\n"); } #endif

1 0

[PATCH 00/14] Display driver rework and Forth conversion series
by Mark Cave-Ayland 08 Aug '13

08 Aug '13

This should be the final in the display rework patch series which completes the conversion of the VGA/TCX drivers from Forth to C. The series also includes several other improvements: - Fixes for SPARC32 romvec stdin/stdout initialisation - Fixes for ioc!/iow!/iol! words - Implementation of SBus and PCI map functions (see comments for PCI) - Isolation of all remaining MOL code into molvideo.h - Simple implementation of TCX "probe" function (will morph into probe-self with very little work) - Removal of remaining hacks required to support a mixed C/Forth display environment Once this patchset is applied, it only remains to implement cpeek and augment the SBus probe-self function to provide the ability to execute FCode ROMs supplied by QEMU. Mark Cave-Ayland (14): forth.c: fix ioc!, iow! and iol! words vga: move VGA initialisation from C to Forth video: move all non MOL-specific code from molvideo.c to vga.fs pci/vga: move PCI framebuffer map functions info Forth vga: move initialisation of screen-#columns/screen-#rows to setup_video() SPARC32: fix romvec stdin/stdout field initialisation display: move creation of "display" and "screen" properties to Forth sbus: implement map-in and map-out words sbus/tcx: implement probe_self() wrapper tcx.fs: tidy-up lookups using (find-xt) and use openbios-* vars where appropriate tcx.fs: move DAC programming from C to tcx.fs tcx.fs: move framebuffer mapping over from C to tcx.fs video: remove video_set_color() vga: remove vga_vbe_init() and vga_vbe.c openbios-devel/arch/ppc/qemu/init.c | 18 --- openbios-devel/arch/sparc32/console.c | 38 ----- openbios-devel/arch/sparc32/openbios.c | 19 +-- openbios-devel/arch/sparc32/romvec.c | 14 +- openbios-devel/arch/sparc32/tree.fs | 21 +-- openbios-devel/arch/sparc64/openbios.c | 18 --- openbios-devel/drivers/build.xml | 1 - openbios-devel/drivers/iommu.c | 32 ++++ openbios-devel/drivers/pci.c | 96 ++++++++--- openbios-devel/drivers/pci.fs | 77 +++++++++ openbios-devel/drivers/sbus.c | 238 ++++------------------------ openbios-devel/drivers/sbus.fs | 60 +++++++ openbios-devel/drivers/tcx.fs | 217 +++++++++++++++++++++++-- openbios-devel/drivers/vga.fs | 192 +++++++++++++++++++--- openbios-devel/drivers/vga_vbe.c | 191 ---------------------- openbios-devel/forth/admin/iocontrol.fs | 16 ++ openbios-devel/forth/device/display.fs | 13 +- openbios-devel/include/drivers/drivers.h | 2 - openbios-devel/include/libopenbios/video.h | 4 +- openbios-devel/kernel/forth.c | 6 +- openbios-devel/libopenbios/video_common.c | 46 ++---- openbios-devel/packages/build.xml | 2 +- openbios-devel/packages/molvideo.c | 78 ++------- 23 files changed, 718 insertions(+), 681 deletions(-) delete mode 100644 openbios-devel/drivers/vga_vbe.c -- 1.7.10.4

1 14

[commit] r1199 - trunk/openbios-devel/arch/sparc32
by repository service 07 Aug '13

07 Aug '13

Author: mcayland Date: Wed Aug 7 23:22:47 2013 New Revision: 1199 URL: http://tracker.coreboot.org/trac/openbios/changeset/1199 Log: SPARC32: fix up old-style romvec parameters Fixing up the generation of bootpath in r1167 exposed a bug since the romvec parameters were set depending upon hard-coded values of certain aliases in bootpath. As aliases are now expanded beforehand, the code to set the old-style parameters was no longer being called. Rework the code to set these parameters based upon device name instead, and while we're there change the code to use the my-* words to get their information rather than string parsing. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.c Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sat Jul 27 15:17:49 2013 (r1198) +++ trunk/openbios-devel/arch/sparc32/boot.c Wed Aug 7 23:22:47 2013 (r1199) @@ -23,9 +23,9 @@ void go(void) { ucell address, type, size; - int image_retval = 0, proplen, unit, part; + int image_retval = 0, proplen, target, device; phandle_t chosen; - char *prop, *id, bootid; + char *prop, *id, *name; static char bootpathbuf[128], bootargsbuf[128], buf[128]; /* Get the entry point and the type (see forth/debugging/client.fs) */ @@ -53,40 +53,51 @@ bootpath = pop_fstr_copy(); printk("bootpath: %s\n", bootpath); - if (!strncmp(bootpathbuf, "cd", 2) || !strncmp(bootpathbuf, "disk", 4)) { + /* Now do some work to get hold of the target, partition etc. */ + push_str(bootpathbuf); + feval("open-dev"); + feval("ihandle>boot-device-handle drop to my-self"); + push_str("name"); + fword("get-my-property"); + POP(); + name = pop_fstr_copy(); + + if (!strncmp(name, "sd", 2)) { + + /* + Old-style SunOS disk paths are given in the form: + + sd(c,t,d):s + + where: + c = controller (Nth controller in system, usually 0) + t = target (my-unit phys.hi) + d = device/LUN (my-unit phys.lo) + s = slice/partition (my-args) + */ /* Controller currently always 0 */ obp_arg.boot_dev_ctrl = 0; - /* Grab the device and unit number string (in form unit,partition) */ - push_str(bootpathbuf); - feval("pathres-resolve-aliases ascii @ right-split 2drop"); + /* Get the target, device and slice */ + fword("my-unit"); + target = POP(); + device = POP(); + + fword("my-args"); id = pop_fstr_copy(); - /* A bit hacky, but we have no atoi() function */ - unit = id[0] - '0'; - part = id[2] - '0'; - - obp_arg.boot_dev_unit = unit; - obp_arg.dev_partition = part; - - /* 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 (!strncmp(bootpathbuf, "disk", 4)) { - bootid = 'd'; - } else { - bootid = 'b'; - } + snprintf(buf, sizeof(buf), "sd(0,%d,%d):%c", target, device, id[0]); - snprintf(buf, sizeof(buf), "sd(0,%d,%d):%c", unit, part, bootid); + obp_arg.boot_dev_unit = target; + obp_arg.dev_partition = id[0] - 'a'; obp_arg.boot_dev[0] = buf[0]; obp_arg.boot_dev[1] = buf[1]; obp_arg.argv[0] = buf; obp_arg.argv[1] = bootargsbuf; - } else if (!strncmp(bootpathbuf, "floppy", 6)) { + } else if (!strncmp(name, "SUNW,fdtwo", 10)) { obp_arg.boot_dev_ctrl = 0; obp_arg.boot_dev_unit = 0; @@ -99,7 +110,7 @@ obp_arg.argv[0] = buf; obp_arg.argv[1] = bootargsbuf; - } else if (!strncmp(bootpathbuf, "net", 3)) { + } else if (!strncmp(name, "le", 2)) { obp_arg.boot_dev_ctrl = 0; obp_arg.boot_dev_unit = 0;

1 0

Decoding Solaris/SunOS disk identifiers?
by Mark Cave-Ayland 07 Aug '13

07 Aug '13

Hi all, I'm working on fixing up a regression on SPARC32 and I'm trying to understand the format of the SunOS disk identifiers in the form of sd(w,x,y):z in order to correct missing fields for romvec. The comments in OpenBIOS suggest the following: /* Generate the "oldpath" FIXME: hardcoding this looks almost definitely wrong. With sd(0,2,0):b we get to see the solaris kernel though */ and /* Controller currently always 0 */ Am I right to assume the following mappings given a disk identifier in the form of sd(w,x,y):z: w = controller = always 0 (or maybe my-unit phys.lo?) x = unit (equivalent of my-unit phys.hi) y = LUN (equivalent of my-address) z = partition identifier (equivalent of my-args) Any pointers gratefully received :) Many thanks, Mark.

3 3