- OpenBIOS - mail.coreboot.org

[commit] r1286 - trunk/openbios-devel/libopenbios
by repository service 04 Apr '14

04 Apr '14

Author: mcayland Date: Fri Apr 4 11:46:24 2014 New Revision: 1286 URL: http://tracker.coreboot.org/trac/openbios/changeset/1286 Log: OFMEM: remove redundant minimum alignment check from find_area() This is now handled by the section of code preceding it. 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 Fri Apr 4 11:46:21 2014 (r1285) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Fri Apr 4 11:46:24 2014 (r1286) @@ -442,15 +442,11 @@ if( (align & (align-1)) ) { /* As per IEEE1275 specification, round up to the nearest power of 2 */ - if (old_align <= PAGE_SIZE) { - align = PAGE_SIZE; - } else { - align--; - for (i = 1; i < sizeof(ucell) * 8; i<<=1) { - align |= align >> i; - } - align++; + align--; + for (i = 1; i < sizeof(ucell) * 8; i<<=1) { + align |= align >> i; } + align++; OFMEM_TRACE("warning: bad alignment " FMT_ucellx " rounded up to " FMT_ucellx "\n", old_align, align); }

1 0

[commit] r1285 - trunk/openbios-devel/include/libopenbios
by repository service 04 Apr '14

04 Apr '14

Author: mcayland Date: Fri Apr 4 11:46:21 2014 New Revision: 1285 URL: http://tracker.coreboot.org/trac/openbios/changeset/1285 Log: OFMEM: redefine OFMEM_TRACE macro so that it always compiles Make sure that we always compile the OFMEM_TRACE macro regardless of whether CONFIG_DEBUG_OFMEM is set, similar to the way in which the DEBUG macros work in QEMU. This relies on the fact that the compiler optimiser will work out that the compile-time "if" test is always true/false and optimise the result out if is it not required. This ensures that we always get proper debug argument checking and means that certain sections of code don't keep giving unused variable warnings when they only appear in debug codepaths. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/include/libopenbios/ofmem.h Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Fri Apr 4 11:46:18 2014 (r1284) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Fri Apr 4 11:46:21 2014 (r1285) @@ -132,9 +132,15 @@ #define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK) #if defined(CONFIG_DEBUG_OFMEM) -# define OFMEM_TRACE(fmt, ...) do { printk("OFMEM: " fmt, ## __VA_ARGS__); } while (0) + #define DEBUG_OFMEM 1 #else -# define OFMEM_TRACE(fmt, ...) do {} while(0) + #define DEBUG_OFMEM 0 #endif +#define OFMEM_TRACE(fmt, ...) do { \ + if (DEBUG_OFMEM) { \ + printk("OFMEM: " fmt, ## __VA_ARGS__); \ + } \ +} while (0); + #endif /* _H_OFMEM */

1 0

[commit] r1284 - trunk/openbios-devel/libopenbios
by repository service 04 Apr '14

04 Apr '14

Author: mcayland Date: Fri Apr 4 11:46:18 2014 New Revision: 1284 URL: http://tracker.coreboot.org/trac/openbios/changeset/1284 Log: OFMEM: allow remove_range_() to split memory ranges. If a client tries to free a memory range that lies within one we have already allocated (and doesn't match exactly), split the range so that we able to just free the part of the range requested by the client. 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 Sun Mar 30 19:31:19 2014 (r1283) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Fri Apr 4 11:46:18 2014 (r1284) @@ -887,6 +887,25 @@ { range_t **t, *u; + /* If not an exact match then split the range */ + for (t = r; *t; t = &(**t).next) { + if (ea > (**t).start && ea < (**t).start + (**t).size - 1) { + u = (range_t*)malloc(sizeof(range_t)); + u->start = ea; + u->size = size; + u->next = (**t).next; + + OFMEM_TRACE("remove_range_ splitting range with addr=" FMT_plx + " size=" FMT_ucellx " -> addr=" FMT_plx " size=" FMT_ucellx ", " + "addr=" FMT_plx " size=" FMT_ucellx "\n", + (**t).start, (**t).size, (**t).start, (**t).size - size, + u->start, u->size); + + (**t).size = (**t).size - size; + (**t).next = u; + } + } + for (t = r; *t; t = &(**t).next) { if (ea >= (**t).start && ea + size <= (**t).start + (**t).size) { OFMEM_TRACE("remove_range_ freeing range with addr=" FMT_plx

1 0

[commit] r1283 - trunk/openbios-devel/libopenbios
by repository service 30 Mar '14

30 Mar '14

Author: mcayland Date: Sun Mar 30 19:31:19 2014 New Revision: 1283 URL: http://tracker.coreboot.org/trac/openbios/changeset/1283 Log: OFMEM: fix up debugging comment in ofmem_claim_phys(). It was mistakingly indicating ofmem_claim() as the source function rather than ofmem_claim_phys(). 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 Sun Mar 30 19:31:03 2014 (r1282) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Mar 30 19:31:19 2014 (r1283) @@ -521,7 +521,7 @@ /* if align != 0, phys is ignored. Returns -1 on error */ phys_addr_t ofmem_claim_phys( phys_addr_t phys, ucell size, ucell align ) { - OFMEM_TRACE("ofmem_claim phys=" FMT_plx " size=" FMT_ucellx + OFMEM_TRACE("ofmem_claim_phys phys=" FMT_plx " size=" FMT_ucellx " align=" FMT_ucellx "\n", phys, size, align);

1 0

[PATCH] OBP Memory deallocation
by Olivier Danet 30 Mar '14

30 Mar '14

During boot, NextSTEP do memory allocation & deallocation: - Implement dumb_memfree() - Unmap freed memory (during boot, all the virtual memory is probed, so freed memory must be properly unmapped) - The pointer given to dumb_memfree() does not always match the pointer returned by dumb_memalloc(). In that case, try to find a memory area which includes the pointer address. Ugly, indeed... Signed-off-by : Olivier Danet <odanet(a)caramail.com> Index: arch/sparc32/lib.c =================================================================== --- arch/sparc32/lib.c (révision 1257) +++ arch/sparc32/lib.c (copie de travail) @@ -239,10 +245,18 @@ return obp_memalloc(va, size, align); } -void obp_dumb_memfree(__attribute__((unused))char *va, - __attribute__((unused))unsigned sz) +void obp_dumb_memfree(char *va, unsigned size) { - DPRINTF("obp_dumb_memfree 0x%p (size %d)\n", va, sz); + phys_addr_t phys; + ucell cellmode; + + DPRINTF("obp_dumb_memfree: virta 0x%x, sz %d\n", (unsigned int)va, size); + + phys = ofmem_translate(pointer2cell(va), &cellmode); + + ofmem_unmap(pointer2cell(va), size); + ofmem_release_virt(pointer2cell(va), size); + ofmem_release_phys(phys, size); } /* Data fault handling routines */ Index: arch/sparc32/ofmem_sparc32.c =================================================================== --- arch/sparc32/ofmem_sparc32.c (révision 1257) +++ arch/sparc32/ofmem_sparc32.c (copie de travail) @@ -133,17 +133,24 @@ /* Generate memory available property entry for Sparc32 */ void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size) { - int i = 0; + int i; - i += ofmem_arch_encode_physaddr(availentry, start); + i = ofmem_arch_encode_physaddr(availentry, start); availentry[i] = size; } /* Unmap a set of pages */ void ofmem_arch_unmap_pages(ucell virt, ucell size) { - /* OFMEM re-maps the pages for us, so just ensure the TLB is in sync */ - srmmu_flush_whole_tlb(); + unsigned i; + unsigned long pa; + + for (i = 0; i < size; i += PAGE_SIZE) { + pa = find_pte(virt, 0); + *(uint32_t *)pa = 0; + virt += PAGE_SIZE; + } + srmmu_flush_whole_tlb(); } /* Map a set of pages */ Index: arch/sparc32/romvec.h =================================================================== --- arch/sparc32/romvec.h (révision 1257) +++ arch/sparc32/romvec.h (copie de travail) @@ -30,8 +30,8 @@ int obp_inst2pkg_handler(int dev_desc); char *obp_dumb_memalloc(char *va, unsigned int size); char *obp_dumb_memalloc_handler(char *va, unsigned int size); -void obp_dumb_memfree(__attribute__((unused))char *va, __attribute__((unused))unsigned sz); -void obp_dumb_memfree_handler(__attribute__((unused))char *va, __attribute__((unused))unsigned sz); +void obp_dumb_memfree(char *va, unsigned size); +void obp_dumb_memfree_handler(char *va, unsigned size); char *obp_dumb_mmap(char *va, int which_io, unsigned int pa, unsigned int size); char *obp_dumb_mmap_handler(char *va, int which_io, unsigned int pa, unsigned int size); void obp_dumb_munmap(__attribute__((unused)) char *va, __attribute__((unused)) unsigned int size); Index: libopenbios/ofmem_common.c =================================================================== --- libopenbios/ofmem_common.c (révision 1257) +++ libopenbios/ofmem_common.c (copie de travail) @@ -887,16 +887,25 @@ cr = *r; *r = (**r).next; free(cr); - return; } + cr = *r; + for ( ; *r && ((**r).next)->start < ea; r = &(**r).next) { + cr = *r; + } - for( ; *r && ((**r).next)->start < ea; r=&(**r).next ) { + if (((**r).next)->start == ea) { + /* Found matching entry */ + cr = (**r).next; + (**r).next = cr->next; + free(cr); + + } else { + /* Not exactly matching, delete the previous entry, with start < ea */ + free(cr->next); + cr->next = (*r)->next; + return; } - - cr = (**r).next; - (**r).next = cr->next; - free(cr); } static int remove_range( phys_addr_t ea, ucell size, range_t **r ) ===================================================================

2 6

[commit] r1282 - trunk/openbios-devel/libopenbios
by repository service 30 Mar '14

30 Mar '14

Author: mcayland Date: Sun Mar 30 19:31:03 2014 New Revision: 1282 URL: http://tracker.coreboot.org/trac/openbios/changeset/1282 Log: OFMEM: tidy up "bad parameters" debugging message. Display the values in lower-case hex to match the rest of the debugging 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 Sun Mar 30 19:31:01 2014 (r1281) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Mar 30 19:31:03 2014 (r1282) @@ -791,7 +791,7 @@ if( (phys & (PAGE_SIZE - 1)) || (virt & (PAGE_SIZE - 1)) || (size & (PAGE_SIZE - 1)) ) { OFMEM_TRACE("ofmem_map: Bad parameters (" - FMT_plx " " FMT_ucellX " " FMT_ucellX ")\n", + FMT_plx " " FMT_ucellx " " FMT_ucellx ")\n", phys, virt, size ); phys &= PAGE_MASK;

1 0

[commit] r1281 - trunk/openbios-devel/libopenbios
by repository service 30 Mar '14

30 Mar '14

Author: mcayland Date: Sun Mar 30 19:31:01 2014 New Revision: 1281 URL: http://tracker.coreboot.org/trac/openbios/changeset/1281 Log: OFMEM: improve remove_range_() function algorithm Rework the algorithm used in remove_range_() in order to make it similar to the algorithm used in unmap_pages(). This has several benefits: in particular the unmap_pages()/remove_range_() functions now have the same behaviour, the code is noticeably simpler, and it also correctly handles the case where the start address of the range to be removed doesn't match the range exactly (such as occurs when attempting to boot NextStep under SPARC32). 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 Sun Mar 9 21:51:13 2014 (r1280) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Mar 30 19:31:01 2014 (r1281) @@ -885,23 +885,18 @@ static void remove_range_( phys_addr_t ea, ucell size, range_t **r ) { - range_t *cr; + range_t **t, *u; - /* Handle special case if we're removing the first entry */ - if ((**r).start >= ea) { - cr = *r; - *r = (**r).next; - free(cr); - - return; - } - - for( ; *r && ((**r).next)->start < ea; r=&(**r).next ) { + for (t = r; *t; t = &(**t).next) { + if (ea >= (**t).start && ea + size <= (**t).start + (**t).size) { + OFMEM_TRACE("remove_range_ freeing range with addr=" FMT_plx + " size=" FMT_ucellx "\n", (**t).start, (**t).size); + u = *t; + *t = (**t).next; + free(u); + break; + } } - - cr = (**r).next; - (**r).next = cr->next; - free(cr); } static int remove_range( phys_addr_t ea, ucell size, range_t **r )

1 0

[commit] r1280 - in trunk/openbios-devel: forth/debugging libopenbios packages
by repository service 09 Mar '14

09 Mar '14

Author: mcayland Date: Sun Mar 9 21:51:13 2014 New Revision: 1280 URL: http://tracker.coreboot.org/trac/openbios/changeset/1280 Log: bootcode_load.c: use new get-bootcode-info plus minor bootcode fixes Bring the bootcode loader in line with all of the other existing loaders, making use of our new get-bootcode-info word to pass the parameters instead of creating global variables for them all. Here we remove all global variables and references to the fixed load address used by the quik bootcode loader as this is handled by get-bootcode-info. This exposes a minor bug where we need to return success as soon as a valid bootcode is detected; otherwise we inadvertently drop into the filesystem detection code which is invalid. Based upon a patch by Andrei E. Warkentin <andrey.warkentin(a)gmail.com>. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/libopenbios/bootcode_load.c trunk/openbios-devel/libopenbios/load.c trunk/openbios-devel/packages/mac-parts.c Modified: trunk/openbios-devel/forth/debugging/client.fs ============================================================================== --- trunk/openbios-devel/forth/debugging/client.fs Sun Mar 9 21:50:51 2014 (r1279) +++ trunk/openbios-devel/forth/debugging/client.fs Sun Mar 9 21:51:13 2014 (r1280) @@ -27,9 +27,6 @@ variable state-valid 0 state-valid ! -variable want-bootcode -0 want-bootcode ! - variable file-size : !load-size file-size ! ; Modified: trunk/openbios-devel/libopenbios/bootcode_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/bootcode_load.c Sun Mar 9 21:50:51 2014 (r1279) +++ trunk/openbios-devel/libopenbios/bootcode_load.c Sun Mar 9 21:51:13 2014 (r1280) @@ -12,13 +12,13 @@ #define printf printk #define debug printk -#define OLDWORLD_BOOTCODE_BASEADDR (0x3f4000) int bootcode_load(ihandle_t dev) { int retval = -1, count = 0, fd; - unsigned long bootcode, loadbase, offset; + unsigned long bootcode, loadbase, entry, size, offset; + ihandle_t bootcode_info; /* Mark the saved-program-state as invalid */ feval("0 state-valid !"); @@ -28,18 +28,37 @@ goto out; } + /* If we don't have the get-bootcode-info word then we don't support + loading bootcode via %BOOT */ + bootcode_info = find_ih_method("get-bootcode-info", dev); + if (!bootcode_info) { + goto out; + } + /* Default to loading at load-base */ fword("load-base"); loadbase = POP(); + entry = loadbase; + size = 0; #ifdef CONFIG_PPC - /* ...except that QUIK (the only known user of %BOOT to date) is built - with a hard-coded address of 0x3f4000. Let's just use this for the - moment on both New World and Old World Macs, allowing QUIK to also - work under a New World Mac. If we find another user of %BOOT we can - rethink this later. PReP machines should be left unaffected. */ + /* + * Apple OF does not honor load-base and instead uses pmBootLoad + * value from the boot partition descriptor. + * + * Tested with: + * a debian image with QUIK installed + * a debian image with iQUIK installed (https://github.com/andreiw/quik) + * an IQUIK boot floppy + * a NetBSD boot floppy (boots stage 2) + */ if (is_apple()) { - loadbase = OLDWORLD_BOOTCODE_BASEADDR; + PUSH(bootcode_info); + fword("execute"); + + loadbase = POP(); + entry = POP(); + size = POP(); } #endif @@ -58,11 +77,16 @@ if (!count) { goto out; } + + /* Use proper file size if we got it from bootcode info */ + if (size == 0) { + size = offset; + } /* Initialise saved-program-state */ - PUSH(loadbase); + PUSH(entry); feval("saved-program-state >sps.entry !"); - PUSH(offset); + PUSH(size); feval("saved-program-state >sps.file-size !"); feval("bootcode saved-program-state >sps.file-type !"); Modified: trunk/openbios-devel/libopenbios/load.c ============================================================================== --- trunk/openbios-devel/libopenbios/load.c Sun Mar 9 21:50:51 2014 (r1279) +++ trunk/openbios-devel/libopenbios/load.c Sun Mar 9 21:51:13 2014 (r1280) @@ -108,11 +108,13 @@ #ifdef CONFIG_LOADER_BOOTCODE /* Check for a "raw" %BOOT bootcode payload */ - feval("want-bootcode @"); - valid = POP(); - if (valid) { - bootcode_load(dev); - } + bootcode_load(dev); + feval("state-valid @"); + valid = POP(); + if (valid) { + feval("saved-program-state >sps.file-size @"); + return; + } #endif /* Didn't load anything, so return zero size */ Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Sun Mar 9 21:50:51 2014 (r1279) +++ trunk/openbios-devel/packages/mac-parts.c Sun Mar 9 21:51:13 2014 (r1280) @@ -92,9 +92,6 @@ /* Detect if we are looking for the bootcode */ if (strcmp(argstr, "%BOOT") == 0) { want_bootcode = 1; - feval("1 want-bootcode !"); - } else { - feval("0 want-bootcode !"); } } @@ -261,6 +258,11 @@ di->size_hi = size >> BITS; di->size_lo = size & (ucell) -1; + /* If we're trying to execute bootcode then we're all done */ + if (want_bootcode) { + goto out; + } + /* We have a valid partition - so probe for a filesystem at the current offset */ DPRINTF("mac-parts: about to probe for fs\n"); DPUSH( offs ); @@ -289,7 +291,7 @@ /* If we have been asked to open a particular file, interpose the filesystem package with the passed filename as an argument */ - if (!want_bootcode && strlen(argstr)) { + if (strlen(argstr)) { push_str( argstr ); PUSH_ph( ph ); fword("interpose");

1 0

[commit] r1279 - trunk/openbios-devel/packages
by repository service 09 Mar '14

09 Mar '14

Author: mcayland Date: Sun Mar 9 21:50:51 2014 New Revision: 1279 URL: http://tracker.coreboot.org/trac/openbios/changeset/1279 Log: mac-parts.c: introduce new get-bootcode-info word This is an intermediate step in preparation for allowing %BOOT to read its load/entry addresses from the partition header, based upon an original patch by Andrei E. Warkentin <andrey.warkentin(a)gmail.com>. 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 Mar 9 21:50:36 2014 (r1278) +++ trunk/openbios-devel/packages/mac-parts.c Sun Mar 9 21:50:51 2014 (r1279) @@ -35,6 +35,7 @@ xt_t seek_xt, read_xt; ucell offs_hi, offs_lo; ucell size_hi, size_lo; + ucell bootcode_addr, bootcode_entry; unsigned int blocksize; phandle_t filesystem_ph; } macparts_info_t; @@ -237,8 +238,19 @@ size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; if (want_bootcode) { - offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; + + /* If size == 0 then fail because we requested bootcode but it doesn't exist */ size = (long long)__be32_to_cpu(par.pmBootSize); + if (!size) { + ret = 0; + goto out; + } + + /* Adjust seek position so 0 = start of bootcode */ + offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; + + di->bootcode_addr = __be32_to_cpu(par.pmBootLoad); + di->bootcode_entry = __be32_to_cpu(par.pmBootEntry); } di->blocksize = (unsigned int)bs; @@ -326,6 +338,17 @@ PUSH( di->size_hi ); } +/* ( -- size entry addr ) */ +static void +macparts_get_bootcode_info( macparts_info_t *di ) +{ + DPRINTF("macparts_get_bootcode_info"); + + PUSH( di->size_lo ); + PUSH( di->bootcode_entry ); + PUSH( di->bootcode_addr ); +} + static void macparts_block_size( macparts_info_t *di ) { @@ -403,15 +426,16 @@ } NODE_METHODS( macparts ) = { - { "probe", macparts_probe }, - { "open", macparts_open }, - { "seek", macparts_seek }, - { "read", macparts_read }, - { "load", macparts_load }, - { "dir", macparts_dir }, - { "get-info", macparts_get_info }, - { "block-size", macparts_block_size }, - { NULL, macparts_initialize }, + { "probe", macparts_probe }, + { "open", macparts_open }, + { "seek", macparts_seek }, + { "read", macparts_read }, + { "load", macparts_load }, + { "dir", macparts_dir }, + { "get-info", macparts_get_info }, + { "get-bootcode-info", macparts_get_bootcode_info }, + { "block-size", macparts_block_size }, + { NULL, macparts_initialize }, }; void

1 0

[commit] r1278 - trunk/openbios-devel/packages
by repository service 09 Mar '14

09 Mar '14

Author: mcayland Date: Sun Mar 9 21:50:36 2014 New Revision: 1278 URL: http://tracker.coreboot.org/trac/openbios/changeset/1278 Log: mac-parts.c: prevent hang when opening partition without valid filesystem If a partition was opened with a file argument such as "hd:2,\\:tbxi" and no valid filesystem was detected, mac-parts would still attempt to access the file system in order to evaluate the file argument resulting in a hang. Make sure that we return a failure code to the caller to ensure that OpenBIOS doesn't continue to try and access the file when the underlying filesystem is invalid. As reported by Andrei E. Warkentin <andrey.warkentin(a)gmail.com>. 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 Sat Mar 8 14:03:01 2014 (r1277) +++ trunk/openbios-devel/packages/mac-parts.c Sun Mar 9 21:50:36 2014 (r1278) @@ -286,6 +286,12 @@ goto out; } else { DPRINTF("mac-parts: no filesystem found on partition %d; bypassing misc-files interpose\n", parnum); + + /* Here we have a valid partition; however if we tried to pass in a file argument for a + partition that doesn't contain a filesystem, then we must fail */ + if (strlen(argstr)) { + ret = 0; + } } }

1 0

Re: [OpenBIOS] [PATCH 0/4] Changes for MorphOS
by BALATON Zoltan 09 Mar '14

09 Mar '14

On Sat Mar 8 2014, Mark Cave-Ayland wrote: > I think the best solution is going to be to move the default device name > from forth/device/tree.fs into the individual per-architecture > arch/*/tree.fs files and then customise the PPC one as appropriate. Is it possible to set/override the value in forth/device/tree.fs in the ppc/qemu/init.c file somehow? If so then it would be easier and we already have an is_apple() function there so this can be done only for Apple emulation. Is the init code run when the tree is already set up? What should it do to replace the name property? A assume it would call some forth code to do this but I don't know how to do this properly. Any ideas? Regards, BALATON Zoltan

3 2

Re: [OpenBIOS] [PATCH 0/4] Changes for MorphOS
by BALATON Zoltan 08 Mar '14

08 Mar '14

> I missed the reason you wanted the name changed; I commented at the time > that for IEEE 1275, the name property at the root node is supposed to be > the platform name. Why do you want it called "device-tree", which would > certainly be incorrect? To match Apple's implementation which is expected my at least one client. Sould I enclose it in CONFIG_PPC or some other ifdefs? Would that make it better? Regards, BALATON Zoltan

3 2

[commit] r1277 - trunk/openbios-devel/libopenbios
by repository service 08 Mar '14

08 Mar '14

Author: mcayland Date: Sat Mar 8 14:03:01 2014 New Revision: 1277 URL: http://tracker.coreboot.org/trac/openbios/changeset/1277 Log: client.c: fixup display of nextprop return buffer when debugging is enabled Make sure that we display the entire 32-byte buffer result buffer when nextprop returns. Based upon a test patch sent to the mailing list by Olivier Danet. 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 Sat Mar 8 02:00:11 2014 (r1276) +++ trunk/openbios-devel/libopenbios/client.c Sat Mar 8 14:03:01 2014 (r1277) @@ -189,7 +189,7 @@ memdump(arg2pointer(pb->args[2]), MIN(pb->args[3], pb->args[pb->nargs])); } else if (strcmp(service, "nextprop") == 0) { printk(FMT_prom_arg "\n", pb->args[pb->nargs]); - memdump(arg2pointer(pb->args[2]), pb->args[pb->nargs]); + memdump(arg2pointer(pb->args[2]), 32); } else if (strcmp(service, "setprop") == 0) { printk(FMT_prom_arg "\n", pb->args[pb->nargs]); } else if (strcmp(service, "canon") == 0) {

1 0

Re: [OpenBIOS] [patch] fix "partition-zero"/%BOOT booting for PowerPC targets.
by Mark Cave-Ayland 08 Mar '14

08 Mar '14

On 05/03/14 08:50, Andrei E. Warkentin wrote: Hi Andrei, > Hi, > > This is a patch against r1272 which implements fully bootcode booting via > Apple boot partition descriptors. The current implementation in > libopenbios/bootcode_load.c hardcoded values for QUIK (the old > OldWorld bootloader), which is useless if you try to boot anything > else. > > In particular, I implemented this to simplify my development and test > cycle on iQUIK (https://github.com/andreiw/quik), but I also tested > this with the NetBSD floppy. The later now boots to stage 2 as well, > although it tries using some functionality unavailable in the OpenBIOS > implementation when compared to Apple's. > > I did this in the simplest way possible. Thanks for the patch! I've been aware for a while that the bootcode loader is slightly different from the others, although I've not been too keen to alter the existing behaviour in case it breaks anything. However it seems that you've got some test cases so... I've taken your patch as a starting point and reworked the bootcode loader to get rid of the global Forth variables and bring it in line with the others. Can you try the attached squashed patch and confirm that it still works in your tests? With these changes I can still boot my basic quik hard disk image which is all I have. One minor comment is that when you submit patches, please can you try and isolate different changes and be wary of whitespace? For example, I see that you've also added some code so that mac-parts.c will drop out early if want_bootcode is set which is a global behaviour change and so should be done as a separate patch. > Btw, I see that the optimization bugs are still present. I had to > compile with -O0, otherwise the resulting image doesn't boot (GCC 4.8 > here). That's interesting because I don't see that problem here? Then again I had problems with existing toolchains and so ended up rebuilding my cross-compiler by hand which eliminated all the problems I was seeing: build@kentang:~$ powerpc-elf-gcc -v Using built-in specs. COLLECT_GCC=powerpc-elf-gcc COLLECT_LTO_WRAPPER=/home/build/ppc-cross/libexec/gcc/powerpc-elf/4.8.2/lto-wrapper Target: powerpc-elf Configured with: ../gcc-4.8.2/configure --prefix=/home/build/ppc-cross --enable-languages=c --target=powerpc-elf --disable-libssp Thread model: single gcc version 4.8.2 (GCC) build@kentang:~$ ATB, Mark.

1 0

[commit] r1276 - trunk/openbios-devel/arch/ppc/qemu
by repository service 08 Mar '14

08 Mar '14

Author: mcayland Date: Sat Mar 8 02:00:11 2014 New Revision: 1276 URL: http://tracker.coreboot.org/trac/openbios/changeset/1276 Log: arch/ppc/qemu.c: Update Mac99 and PReP model to PowerMac3,1 Change model name to one which is similar but supported by MorphOS and better matches the emulated CPU. This should be safe to change as the two models are very close and unlikely to cause problems with other OSs but more testing is welcome. Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Mar 8 02:00:07 2014 (r1275) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Mar 8 02:00:11 2014 (r1276) @@ -745,12 +745,12 @@ /* model */ - push_str("PowerMac2,1"); + push_str("PowerMac3,1"); fword("model"); /* compatible */ - push_str("PowerMac2,1"); + push_str("PowerMac3,1"); fword("encode-string"); push_str("MacRISC"); fword("encode-string");

1 0

[commit] r1275 - trunk/openbios-devel/arch/ppc/qemu
by repository service 08 Mar '14

08 Mar '14

Author: mcayland Date: Sat Mar 8 02:00:07 2014 New Revision: 1275 URL: http://tracker.coreboot.org/trac/openbios/changeset/1275 Log: arch/ppc/qemu/ofmem.c: Update comment to point to new IEEE1275 documentation URL Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Mar 8 02:00:03 2014 (r1274) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Mar 8 02:00:07 2014 (r1275) @@ -179,7 +179,7 @@ /* Generate translation property entry for PPC. * According to the platform bindings for PPC - * (http://playground.sun.com/1275/bindings/ppc/release/ppc-2_1.html#REF34579) + * (http://www.openfirmware.org/1275/bindings/ppc/release/ppc-2_1.html#REF34579) * a translation property entry has the following layout: * * virtual address

1 0

[commit] r1274 - trunk/openbios-devel/arch/ppc/qemu
by repository service 08 Mar '14

08 Mar '14

Author: mcayland Date: Sat Mar 8 02:00:03 2014 New Revision: 1274 URL: http://tracker.coreboot.org/trac/openbios/changeset/1274 Log: arch/ppc/qemu.c: Fix cache parameter property names to match the standard Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Mar 8 01:59:59 2014 (r1273) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Mar 8 02:00:03 2014 (r1274) @@ -241,32 +241,32 @@ PUSH(cpu->dcache_size); fword("encode-int"); - push_str("dcache-size"); + push_str("d-cache-size"); fword("property"); PUSH(cpu->icache_size); fword("encode-int"); - push_str("icache-size"); + push_str("i-cache-size"); fword("property"); PUSH(cpu->dcache_sets); fword("encode-int"); - push_str("dcache-sets"); + push_str("d-cache-sets"); fword("property"); PUSH(cpu->icache_sets); fword("encode-int"); - push_str("icache-sets"); + push_str("i-cache-sets"); fword("property"); PUSH(cpu->dcache_block_size); fword("encode-int"); - push_str("dcache-block-size"); + push_str("d-cache-block-size"); fword("property"); PUSH(cpu->icache_block_size); fword("encode-int"); - push_str("icache-block-size"); + push_str("i-cache-block-size"); fword("property"); PUSH(fw_cfg_read_i32(FW_CFG_PPC_TBFREQ));

1 0

[commit] r1273 - trunk/openbios-devel/libopenbios
by repository service 08 Mar '14

08 Mar '14

Author: mcayland Date: Sat Mar 8 01:59:59 2014 New Revision: 1273 URL: http://tracker.coreboot.org/trac/openbios/changeset/1273 Log: client.c: fix up return value from CIF call-method/interpret The handle_calls() function was accidentally using the client-call-iface return value instead of the catch wrapping the underlying call. Return the correct catch result, and while we're at it add some extra logging to indicate when we've detected an error condition. 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 Wed Mar 5 01:04:32 2014 (r1272) +++ trunk/openbios-devel/libopenbios/client.c Sat Mar 8 01:59:59 2014 (r1273) @@ -261,15 +261,22 @@ push_str(get_service(pb)); fword("client-call-iface"); + /* Ignore client-call-iface return */ + POP(); + /* If the catch result is non-zero, restore stack and exit */ val = POP(); if (val) { + printk("%s %s failed with error " FMT_ucellx "\n", get_service(pb), arg2pointer(pb->args[0]), val); dstackcnt = dstacksave; return 0; } + /* Store catch result */ + pb->args[pb->nargs] = val; + j = dstackcnt; - for (i = 0; i < pb->nret; i++, j--) { + for (i = 1; i < pb->nret; i++, j--) { if (dstackcnt > dstacksave) { pb->args[pb->nargs + i] = POP(); }

1 0

Re: [OpenBIOS] [morphos] Re: [morphos] MorphOS on QEMU
by BALATON Zoltan 07 Mar '14

07 Mar '14

Hello, On Fri, 7 Mar 2014, Mark Olsen wrote: > Hi, > > On Fri, 7 Mar 2014 21:11:16 +0100 (CET) > BALATON Zoltan <balaton(a)eik.bme.hu> wrote: > >> [SPAM] > > Can you please stop cross posting to this mailing list? Thanks. I really don't understand why you call my messages spam. I was asking about MorphOS. Your website says: "Please use the MorphOS mailing list for bug reports and other inquiries regarding MorphOS." I've also started my first message with asking for alternative contact if this wasn't the right one. Can you please tell me what contact to use then for such questions? On the other hand, according to this forum thread: http://www.morphzone.info/modules/newbb_plus/viewtopic.php?topic_id=5774&fo… you are the one who at least once managed to do what I'm asking about so you're probably in a good position to help and share your experiences and knowledge. In the light of this your answer seems rather unfriendly. Can you explain why I should not use this list? Regards, BALATON Zoltan

1 0

Re: [OpenBIOS] [morphos] MorphOS on QEMU
by BALATON Zoltan 07 Mar '14

07 Mar '14

On Thu, 6 Mar 2014, laire(a)t-online.de wrote: > The new log is beyond the Openfirmware stage. Can't really say why it > fails now. Could be a side effect to unexpected data from OpenBIOS or > unusual powerpc usage. But without looking deeper into this I wouldn't > know what the root cause is. I've debugged it a bit further and here is the result: Breakpoint 3, 0x00441dec in ?? () (gdb) info reg r0 0x434f4d31 1129270577 r1 0x7de7d90 132021648 note the stack pointer and compare this with the log: > SYS_Init: New MemoryPtr 0x00988000 MemoryEnd 0x07e00000 > SYS_CreateMemList: MemoryPtr 0x988000 MemoryEnd 0x7e00000 > SYS_CreateMemList: Check Entry 0 VendorID 0x30000 DeviceID 0x1 Flags 0x1 > SYS_CreateMemList: MyBoardNode 0x688314 Type 0x0 Name 0x68838c <ABox Rom> > SYS_CreateMemList: FunctionID 0x1 VendorID 0x30000 DeviceID 0x1 <> > SYS_CreateMemList: Address 0x445000 Size 0x7b000 MapList 0x7de7e20 > SYS_MoveRomModuleToMemoryEnd: MyBoardNode 0x688314 MemoryStart 0x988000 MemoryEnd 0x7e00000 > SYS_MoveRomModuleToMemoryEnd: Module 0x445000 0x7b000 > SYS_MoveRomModuleToMemoryEnd: CompressType 0x1 [] 434f4d31 0038fd60 0007ae06 4a085fc8 > SYS_MoveRomModuleToMemoryEnd: Uncompress Module 0x445000(CSize 0x7b000) Size 0x390000 CType 0x1 > SYS_MoveRomModuleToMemoryEnd: Map it to 0x7a70000 if I'm reading this right it copies data to 0x7a70000-0x7e00000 which will overwrite the stack. I tried with larger memory (256M instead of the default 128M) to see if it helps and here's what I've got: Breakpoint 2, 0x00441dec in ?? () (gdb) info reg r0 0x434f4d31 1129270577 r1 0xfde7d90 266239376 and the log also looks much better now: macio_scan: macio_scan: found <mac-io> at 0x81080000 No more MacIO devices Done scanning MacIO openpic_init() Resetting PIC PIC reset 0xF80000E0 = 00000000 0xF80000E0 = 00000000 VendorID 0x0 I am CPU 0 IPVP0 Reg 0xa0000000 SYS_PreInit: Am I still alive? SYS_PreInit: Am I yet still alive? Quark 0.93 (29.11.2013) Copyright 1998-2013 by Ralph Schmidt, Mark Olsen SYS_Init: MemoryPtr 0x00988000 MemoryEnd 0x10000000 SYS_CopyCPUHalConfig: CPU Version 0xc Revision 0x209 SYS_CopyCPUHalConfig: CPUClock 0 BUSClock 0 BusTicks 0 SYS_CopyCPUHalConfig: Ticks50Hz 20000000 SYS_CopyCPUHalConfig: CacheL1Type 0x0 CacheL1Flags 0x1000f SYS_CopyCPUHalConfig: ICacheL1Size 32768 ICacheL1LineSize 32 ICacheL1Lines 1024 SYS_CopyCPUHalConfig: DCacheL1Size 32768 DCacheL1LineSize 32 DCacheL1Lines 1024 SYS_CopyCPUHalConfig: CacheL2Type 0x0 CacheL2Flags 0x0 SYS_CopyCPUHalConfig: ICacheL2Size 0 ICacheL2LineSize 0 ICacheL2Lines 0 SYS_CopyCPUHalConfig: DCacheL2Size 0 DCacheL2LineSize 0 DCacheL2Lines 0 SYS_CopyCPUHalConfig: CacheL3Type 0x0 CacheL3Flags 0x0 SYS_CopyCPUHalConfig: ICacheL3Size 0 ICacheL3LineSize 0 ICacheL3Lines 0 SYS_CopyCPUHalConfig: DCacheL3Size 0 DCacheL3LineSize 0 DCacheL3Lines 0 SYS_CopyCPUHalConfig: TLBEntries 0 TLBSets 0 MMU_SetupPageTable: MemoryPtr 0x00988000 MemoryEnd 0x10000000 MMU_SetupPageTable: PhysicalSpaceSize 0x11288000 MMU_Init_GetTableSize: AddressPhySpace 0x11288000 must be covered MMU_Init_GetTableSize: 0x20000000 Bytes covers all MMU_Init_GetTableSize: 2^524288 mapped Pages MMU_Init_GetTableSize: Number of PTEGs 0x00010000 MMU_SetupPageTable: PageTableSize 0x00400000 MMU_SetupPageTable: PageTable1 0xfc00000 PageTable2 0xc00000 MMU_SetupPageTable: PageTable 0xfc00000 MMU_SetupPageTable: SDR1 0x0fc0003f MMU_SetupPageTable: HTABORG 0x0fc00000 MMU_SetupPageTable: HTABMASK 0x0000003f MMU_SetupPageTable: Result 0x1 SYS_Init: New MemoryPtr 0x00988000 MemoryEnd 0x0fc00000 SYS_CreateMemList: MemoryPtr 0x988000 MemoryEnd 0xfc00000 SYS_CreateMemList: Check Entry 0 VendorID 0x30000 DeviceID 0x1 Flags 0x1 SYS_CreateMemList: MyBoardNode 0x688314 Type 0x0 Name 0x68838c <ABox Rom> SYS_CreateMemList: FunctionID 0x1 VendorID 0x30000 DeviceID 0x1 <> SYS_CreateMemList: Address 0x445000 Size 0x7b000 MapList 0xfde7e20 SYS_MoveRomModuleToMemoryEnd: MyBoardNode 0x688314 MemoryStart 0x988000 MemoryEnd 0xfc00000 SYS_MoveRomModuleToMemoryEnd: Module 0x445000 0x7b000 SYS_MoveRomModuleToMemoryEnd: CompressType 0x1 [] 434f4d31 0038fd60 0007ae06 4a085fc8 SYS_MoveRomModuleToMemoryEnd: Uncompress Module 0x445000(CSize 0x7b000) Size 0x390000 CType 0x1 SYS_MoveRomModuleToMemoryEnd: Map it to 0xf870000 SYS_MoveRomModuleToMemoryEnd: [] 9421fe80 7c0802a6 90010184 3ca01139 SYS_MoveRomModuleToMemoryEnd: New BoardNode Address 0xf870000 Size 0x390000 SYS_MoveRomModuleToMemoryEnd: MemoryEnd 0xf870000 SYS_CreateMemList: Check Entry 1 VendorID 0x30000 DeviceID 0x3 Flags 0x1 SYS_CreateMemList: MyBoardNode 0x6883a4 Type 0x0 Name 0x68841c <ABox Module Rom> SYS_CreateMemList: FunctionID 0x2 VendorID 0x30000 DeviceID 0x3 <> SYS_CreateMemList: Address 0x4c0000 Size 0x1bb000 MapList 0xfde7e20 SYS_MoveRomModuleToMemoryEnd: MyBoardNode 0x6883a4 MemoryStart 0x988000 MemoryEnd 0xf870000 SYS_MoveRomModuleToMemoryEnd: Module 0x4c0000 0x1bb000 SYS_MoveRomModuleToMemoryEnd: CompressType 0x1 [] 434f4d31 003d00e0 001ba40c 7f800000 SYS_MoveRomModuleToMemoryEnd: Uncompress Module 0x4c0000(CSize 0x1bb000) Size 0x3d1000 CType 0x1 SYS_MoveRomModuleToMemoryEnd: Map it to 0xf49f000 SYS_MoveRomModuleToMemoryEnd: [] ff000000 101003c0 9421ffe0 7c0802a6 SYS_MoveRomModuleToMemoryEnd: New BoardNode Address 0xf49f000 Size 0x3d1000 SYS_MoveRomModuleToMemoryEnd: MemoryEnd 0xf49f000 SYS_CreateMemList: Check Entry 2 VendorID 0x30000 DeviceID 0x7 Flags 0x1 SYS_CreateMemList: Board not found SYS_CreateMemList: Check Entry 3 VendorID 0x30000 DeviceID 0x4 Flags 0x1 SYS_CreateMemList: Board not found SYS_CreateMemList: Check Entry 4 VendorID 0x30000 DeviceID 0x2 Flags 0x0 SYS_CreateMemList: Board not found SYS_CreateMemList: Check Entry 5 VendorID 0x30000 DeviceID 0x6 Flags 0x0 SYS_CreateMemList: Board not found SYS_CreateMemList: Check Entry 6 VendorID 0x30000 DeviceID 0x8 Flags 0x0 SYS_CreateMemList: Board not found SYS_CreateMemList: VModuleTable 0xf870000 0xfc00000 Size 0x390000 SYS_CreateMemList: VModuleTable 0xf49f000 0xf870000 Size 0x3d1000 SYS_CreateMemList: VModuleTable 0x0 0x0 Size 0x0 SYS_CreateMemList: VModuleTable 0x0 0x0 Size 0x0 SYS_CreateMemList: VModuleTable 0x0 0x0 Size 0x0 SYS_CreateMemList: VModuleTable 0x0 0x0 Size 0x0 SYS_CreateMemList: VModuleTable 0x0 0x0 Size 0x0 SYS_CreateMemList: VModuleTable 0xfc00000 0x10000000 Size 0x400000 SYS_CreateMemList: Final MemoryPtr 0x988000 MemoryEnd 0xf49f000 SYS_CreateMemList: MemoryPtr 0x988000 SYS_FindFreeMemArea: MemoryPtr 0x988000 MemoryEnd 0xf49f000 SYS_FindFreeMemArea: PMemoryPtr 0x988000 PAreaEnd 0xf49f000 SYS_FindFreeMemArea: Current Module[0] 0xf870000 0xfc00000 SYS_FindFreeMemArea: Current Module[1] 0xf49f000 0xf870000 SYS_FindFreeMemArea: New CurrentEnd 0xf49f000 SYS_FindFreeMemArea: Current Module[2] 0x0 0x0 SYS_FindFreeMemArea: skip SYS_FindFreeMemArea: Current Module[3] 0x0 0x0 SYS_FindFreeMemArea: skip SYS_FindFreeMemArea: Current Module[4] 0x0 0x0 SYS_FindFreeMemArea: skip SYS_FindFreeMemArea: Current Module[5] 0x0 0x0 SYS_FindFreeMemArea: skip SYS_FindFreeMemArea: Current Module[6] 0x0 0x0 SYS_FindFreeMemArea: skip SYS_FindFreeMemArea: Current Module[7] 0xfc00000 0x10000000 SYS_FindFreeMemArea: FreeAreaSize 0xeb17000 SYS_CreateMemList: FreeAreaSize 0xeb17000 SYS_CreateMemList: EndArea MemoryPtr 0xf49f000 SYS_CreateMemList: SkipAreaSize 0x0 SYS_CreateMemList: MemoryPtr 0xf49f000 SYS_CreateMemList: MemoryPtr 0x0f49f000 MemoryEnd 0x0f49f000 SYS_Init: RamDebug Start 0x10000000 Size 0x400000 SYS_Init: Initializing RamDebug at 0xf09f000 Size 0x400000 SYS_Init: RamDebug log start SYS_Init: create MyBase->KernelMemPool SYS_Init: HalConfig 0x684348 SYS_Init: KernelMemPool 0x988000 SYS_Init: HalConfig 0x684348 SYS_Init: InitStack 0x9880a0 size 0x1000 SYS_Init: HalConfig 0x684348 SYS_Start: HalConfig 0x684348 SYS_Start: Alloc Interrupt Stacks for CPU 0 SYS_Start: CPU 0 IntStack 0x98a030 SYS_Start: Load CPU 0 stack 0x98b020 SYS_Start: MMU_CreateTable() ********************************* ********************************* ********************************* ********************************* ********************************* ********************************* Alert: 0x1005 Alert: SYS_MMUAddPage: Page 0x80000 EndPage 0x81000 already exists ********************************* ********************************* ********************************* ********************************* ********************************* ********************************* Alert: 0x1005 Alert: SYS_MMUAddPage: Page 0xf2000 EndPage 0xf2001 already exists SYS_Start: done SYS_Start: Create Initial Kernel Threads SYS_Start: Create System Chief Thread SYS_Start: done SYS_Start: Create Exception Server Thread SYS_Start: done SYS_Start: Create SystemInit Thread SYS_Start: done SYS_Start: done SYS_Start: MasterClanChiefTID 0x10000000 ExceptionTID 0x10000010 SystemInitTID 0x10000011 CPUTimerServerTID 0x0 KernelPID 0x10000000 SYS_Start: Enable Interrupts SYS_Start: Start first thread SYS_Start: MSR 0x3030 Can you tell if the above are good or something is obviously wrong here? Can you give any tips on how to continue from here? This is starting to look promising but without a working console I don't really know if it's working yet or not. For the graphics card I have these three ideas: 1. Find a supported card I can plug in my host and try to pci pass through it. QEMU people said this may be problematic as this was not tested very well. (And I don't have a suitable card yet either.) 2. Maybe MorphOS can use some generic graphics card (VESA frame buffer) or can have drivers to one of the virtual graphics cards supported by QEMU (QXL, VMWare). 3. There exists an open source Voodoo1-3 emulation that may be possible to be adapted to QEMU if this would work with MorphOS but I'm not sure how much work would this be. Any comments on this? Regards, BALATON Zoltan

2 4

Re: [OpenBIOS] [morphos] MorphOS on QEMU
by BALATON Zoltan 06 Mar '14

06 Mar '14

Hello, On Thu, 6 Mar 2014, laire(a)t-online.de wrote: > The standard behavior for the PPC OF boot process is disabled memory management when it starts > the boot image. The system take over is always a sensitive thing but there is no reason for an OF > to use the powerpc exception vectors in that early phase for what functions MorphOS is using. Thanks for your reply. I could prevent the crash due to writing to memory address 0x80 by moving the exception handling code of openbios to somewhere else but unfortunately openbios is using the DSI and ISI exceptions and it seems it cannot work without them. I have found this document: http://www.openfirmware.org/1275/bindings/ppc/release/ppc-2_1.html that discusses memory management issues between OF and clients on PPC but I don't see what would be the correct behaviour. I tried disabling these bits in openbios before staring the boot executable but that makes it freeze the first time it calls an openbios callback and I don't know how to change it to not rely on working memory management for client callbacks. However, if I leave these exceptions enabled and only disable them when the MorphOS boot tries to install its own handlers it seems to work all right and get past this point. So I think if MorphOS cleared the DSI and ISI bits before touching the vectors just in case, it would get further on QEMU while this should not matter on real hardware where these bits are supposedly not enabled anyway. Currently I think I've managed to get through the boot phase and got to where the Quark kernel is started and tries to initialise itself. Here is the debug log I got: macio_scan: macio_scan: found <mac-io> at 0x81080000 No more MacIO devices Done scanning MacIO openpic_init() Resetting PIC PIC reset 0xF80000E0 = 00000000 0xF80000E0 = 00000000 VendorID 0x0 I am CPU 0 IPVP0 Reg 0xa0000000 SYS_PreInit: Am I still alive? SYS_PreInit: Am I yet still alive? Quark 0.93 (29.11.2013) Copyright 1998-2013 by Ralph Schmidt, Mark Olsen SYS_Init: MemoryPtr 0x00988000 MemoryEnd 0x08000000 SYS_CopyCPUHalConfig: CPU Version 0xc Revision 0x209 SYS_CopyCPUHalConfig: CPUClock 0 BUSClock 0 BusTicks 0 SYS_CopyCPUHalConfig: Ticks50Hz 20000000 SYS_CopyCPUHalConfig: CacheL1Type 0x0 CacheL1Flags 0x1000f SYS_CopyCPUHalConfig: ICacheL1Size 32768 ICacheL1LineSize 32 ICacheL1Lines 1024 SYS_CopyCPUHalConfig: DCacheL1Size 32768 DCacheL1LineSize 32 DCacheL1Lines 1024 SYS_CopyCPUHalConfig: CacheL2Type 0x0 CacheL2Flags 0x0 SYS_CopyCPUHalConfig: ICacheL2Size 0 ICacheL2LineSize 0 ICacheL2Lines 0 SYS_CopyCPUHalConfig: DCacheL2Size 0 DCacheL2LineSize 0 DCacheL2Lines 0 SYS_CopyCPUHalConfig: CacheL3Type 0x0 CacheL3Flags 0x0 SYS_CopyCPUHalConfig: ICacheL3Size 0 ICacheL3LineSize 0 ICacheL3Lines 0 SYS_CopyCPUHalConfig: DCacheL3Size 0 DCacheL3LineSize 0 DCacheL3Lines 0 SYS_CopyCPUHalConfig: TLBEntries 0 TLBSets 0 MMU_SetupPageTable: MemoryPtr 0x00988000 MemoryEnd 0x08000000 MMU_SetupPageTable: PhysicalSpaceSize 0x09288000 MMU_Init_GetTableSize: AddressPhySpace 0x09288000 must be covered MMU_Init_GetTableSize: 0x10000000 Bytes covers all MMU_Init_GetTableSize: 2^262144 mapped Pages MMU_Init_GetTableSize: Number of PTEGs 0x00008000 MMU_SetupPageTable: PageTableSize 0x00200000 MMU_SetupPageTable: PageTable1 0x7e00000 PageTable2 0xa00000 MMU_SetupPageTable: PageTable 0x7e00000 MMU_SetupPageTable: SDR1 0x07e0001f MMU_SetupPageTable: HTABORG 0x07e00000 MMU_SetupPageTable: HTABMASK 0x0000001f MMU_SetupPageTable: Result 0x1 SYS_Init: New MemoryPtr 0x00988000 MemoryEnd 0x07e00000 SYS_CreateMemList: MemoryPtr 0x988000 MemoryEnd 0x7e00000 SYS_CreateMemList: Check Entry 0 VendorID 0x30000 DeviceID 0x1 Flags 0x1 SYS_CreateMemList: MyBoardNode 0x688314 Type 0x0 Name 0x68838c <ABox Rom> SYS_CreateMemList: FunctionID 0x1 VendorID 0x30000 DeviceID 0x1 <> SYS_CreateMemList: Address 0x445000 Size 0x7b000 MapList 0x7de7e20 SYS_MoveRomModuleToMemoryEnd: MyBoardNode 0x688314 MemoryStart 0x988000 MemoryEnd 0x7e00000 SYS_MoveRomModuleToMemoryEnd: Module 0x445000 0x7b000 SYS_MoveRomModuleToMemoryEnd: CompressType 0x1 [] 434f4d31 0038fd60 0007ae06 4a085fc8 SYS_MoveRomModuleToMemoryEnd: Uncompress Module 0x445000(CSize 0x7b000) Size 0x390000 CType 0x1 SYS_MoveRomModuleToMemoryEnd: Map it to 0x7a70000 Currently it fails when trying to return from a subroutine at the end here: IN: 0x00441d74: li r3,1 0x00441d78: b 0x441d94 IN: 0x00441d94: lwz r0,20(r1) 0x00441d98: mtlr r0 0x00441d9c: addi r1,r1,16 0x00441da0: blr Raise exception at 112ac440 => 00000003 (40000000) which looks like a stack corruption somewhere. Do you have any idea what may cause this? Regards, BALATON Zoltan > > Regards > > -----Original-Nachricht----- > Betreff: [morphos] MorphOS on QEMU > Datum: Wed, 05 Mar 2014 14:16:03 +0100 > Von: BALATON Zoltan <balaton(a)eik.bme.hu> > An: morphos(a)ml.morphos-team.net > > Hello, > > I'm trying to find out if it would be possible to run MorphOS on QEMU and > have done some experiments with it. (Even if it is far from being usable > and may never reach production quality it is still interesting to see how > far I can get and if I can make it work as much as it is possible.) Here > is what I have found so far. > > QEMU can emulate a Mac99 machine that is similar to whay is supported by > MorphOS so I try to use this for now. At first I've found that it crashes > due to boot.img trying to write zero to 0x80 memory address at the very > beginning, which overwrites the memory exception handlers of openbios and > leads to a crash. If I remove this zeroing and fix some openbios bugs (for > detailed discussion see the openbios mailing list at > http://www.openfirmware.info/pipermail/openbios/2014-March/thread.html) it > gets much further to the point where it is almost ready to start > initializing the system. More exactly it crashes now while installing its > own exception handlers. From this I think there is an implementation > difference between openbios and Apple's openfirmware in that the latter > seems to run the boot loader with memory management exceptions disabled > while openbios uses these exceptions and this causes problems during the > boot of MorphOS. Can someone who has knowledge about it please confirm > this? > > I've also found that MorphOS tries to get the name of the / node of the > device tree to decide if it is running on a Mac. Maybe it would be better > to use the "compatible" property instead as the root node name can differ > between implementations. > > I'd like to know if anyone from the developers can/is willing to help and > if I can get hints or can turn to here/elsewhere with my questions during > this effort? > > To those who hope this can be a viable alternative to running MorphOS > anytime in the near future I'd like to point out that a big obstacle I > know about is the lack of emulation of any supported graphics cards in > QEMU and possibly some other bugs to fix first so at this point it is more > an experiment than something that can be interesting to a wider audience. > > Regards, > BALATON Zoltan > > >

2 2

[PATCH 4/4] Changes for MorphOS
by BALATON Zoltan 06 Mar '14

06 Mar '14

arch/ppc/qemu: Move exception handling stubs to a place where it is less likely that they get overwritten. In particular this allows MorphOS to not crash at its first move which has previously overwritten the exception_return code at 0x80. According to the comments in ofmem.c it should still be safe to use space between 0x3000 and 0x3FFF Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> Index: openbios-devel/arch/ppc/qemu/start.S =================================================================== --- openbios-devel/arch/ppc/qemu/start.S (revision 1272) +++ openbios-devel/arch/ppc/qemu/start.S (working copy) @@ -280,21 +280,6 @@ 1: nop // b 1b -call_dsi_exception: - LOAD_REG_FUNC(r3, dsi_exception) - mtctr r3 - bctrl - b exception_return - -call_isi_exception: - LOAD_REG_FUNC(r3, isi_exception) - mtctr r3 - bctrl - b exception_return - -exception_return: - EXCEPTION_EPILOGUE - trap_error: lis r1, 0x8000 /* r1=0x80000000 */ add. r1,r1,r1 /* r1=r1+r1 (high 32bit !0) */ @@ -371,13 +356,19 @@ #endif +VECTOR( 0x3000, "DSI_ISI" ): real_dsi: EXCEPTION_PREAMBLE - b call_dsi_exception + LOAD_REG_FUNC(r3, dsi_exception) + b call_exception_handler real_isi: EXCEPTION_PREAMBLE - b call_isi_exception + LOAD_REG_FUNC(r3, isi_exception) +call_exception_handler: + mtctr r3 + bctrl + EXCEPTION_EPILOGUE GLOBL(__vectors_end):

1 0

[PATCH 3/4] Changes for MorphOS
by BALATON Zoltan 06 Mar '14

06 Mar '14

arch/ppc/qemu: Change model name to one which is similar but supported by MorphOS and better matches the emulated CPU. This should be safe to change as the two models are very close and unlikely to cause problems with other OSs but more testing is welcome. Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> Index: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c (revision 1272) +++ openbios-devel/arch/ppc/qemu/init.c (working copy) @@ -745,12 +745,12 @@ /* model */ - push_str("PowerMac2,1"); + push_str("PowerMac3,1"); fword("model"); /* compatible */ - push_str("PowerMac2,1"); + push_str("PowerMac3,1"); fword("encode-string"); push_str("MacRISC"); fword("encode-string");

1 0

[PATCH 2/4] Changes for MorphOS
by BALATON Zoltan 06 Mar '14

06 Mar '14

Update URL to documentation which is not where it used to be Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> Index: openbios-devel/arch/ppc/qemu/ofmem.c =================================================================== --- openbios-devel/arch/ppc/qemu/ofmem.c (revision 1272) +++ openbios-devel/arch/ppc/qemu/ofmem.c (working copy) @@ -179,7 +179,7 @@ /* Generate translation property entry for PPC. * According to the platform bindings for PPC - * (http://playground.sun.com/1275/bindings/ppc/release/ppc-2_1.html#REF34579) + * (http://www.openfirmware.org/1275/bindings/ppc/release/ppc-2_1.html#REF34579) * a translation property entry has the following layout: * * virtual address

1 0

[PATCH 1/4] Changes for MorphOS
by BALATON Zoltan 06 Mar '14

06 Mar '14

arch/ppc/qemu: Fix cache parameter property names to match the standard. Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> Index: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c (revision 1272) +++ openbios-devel/arch/ppc/qemu/init.c (working copy) @@ -241,32 +241,32 @@ PUSH(cpu->dcache_size); fword("encode-int"); - push_str("dcache-size"); + push_str("d-cache-size"); fword("property"); PUSH(cpu->icache_size); fword("encode-int"); - push_str("icache-size"); + push_str("i-cache-size"); fword("property"); PUSH(cpu->dcache_sets); fword("encode-int"); - push_str("dcache-sets"); + push_str("d-cache-sets"); fword("property"); PUSH(cpu->icache_sets); fword("encode-int"); - push_str("icache-sets"); + push_str("i-cache-sets"); fword("property"); PUSH(cpu->dcache_block_size); fword("encode-int"); - push_str("dcache-block-size"); + push_str("d-cache-block-size"); fword("property"); PUSH(cpu->icache_block_size); fword("encode-int"); - push_str("icache-block-size"); + push_str("i-cache-block-size"); fword("property"); PUSH(fw_cfg_read_i32(FW_CFG_PPC_TBFREQ));

1 0

"next-property" reloaded !
by Olivier Danet 05 Mar '14

05 Mar '14

Hello ! I have tried to recreate the 3 known variants of next-property: Standard : a) true "string" b) false c) false Sun Ultra10 : a) -1 "string" b) nothing c) nothing PowerPC iBook : a) -1 "string" b) -1 0 0 c) 0 Here is a tentative patch : Index: forth/admin/devices.fs =================================================================== --- forth/admin/devices.fs (révision 1269) +++ forth/admin/devices.fs (copie de travail) @@ -451,7 +451,7 @@ ?active-package dup >r if 0 0 begin - r@ next-property + r@ next-property-std while cr 2dup dup -rot type begin ." " 1+ dup d# 26 >= until drop Index: forth/device/property.fs =================================================================== --- forth/device/property.fs (révision 1269) +++ forth/device/property.fs (copie de travail) @@ -63,14 +63,14 @@ ; \ From package (5.3.4.1) -: next-property +: next-property-std ( previous-str previous-len phandle -- false | name-str name-len true ) >r 2dup 0= swap 0= or if 2drop r> >dn.properties @ else r> find-property dup if @ then - ?dup if >prop.next @ then + dup if >prop.next @ then then ?dup if @@ -81,7 +81,57 @@ then ; +: next-property-ppc +( previous-str previous-len phandle -- false | name-str name-len true | 0 0 true ) + >r + 2dup 0= swap 0= or if + 2drop r> >dn.properties @ true + else + r> find-property dup if @ then + dup if >prop.next @ true then + then + if + dup if + >prop.name @ dup cstrlen + ( phandle name-str name-len ) + else + 0 + ( 0 0 ) + then + true + else + false + then +; + +: next-property-std-bis + next-property-ppc + dup + if over 0= + if + 2drop + then + then +; + +: next-property-s64 + next-property-std + ?dup drop +; + +: next-property + [IFDEF] CONFIG_PPC + next-property-ppc + [ELSE] + [IFDEF] CONFIG_SPARC64 + next-property-s64 + [ELSE] + next-property-std + [THEN] + [THEN] +; + \ \ 5.3.5.4 Property value access \ Index: forth/system/ciface.fs =================================================================== --- forth/system/ciface.fs (révision 1269) +++ forth/system/ciface.fs (copie de travail) @@ -121,7 +121,7 @@ ( buf prev prev_len ) - r> next-property if + r> next-property-std if ( buf name name_len ) dup 1+ -rot ci-strcpy drop 1 else =================================================================== there are : next-property-std = standard, used by Sparc32 "romvec" C code and by forth code, like ".properties" next-property-s64 = Sparc64 version, built from next-property-std next-property-ppc = PowerPC version next-property-std-bis = Alternate standard version, built from the PPC one (e.g. when compiling for PPC target) Tests : showstack cd screen \ Sparc32 " " ?active-package next-property-std cr . type cr " name" ?active-package next-property-std cr . type cr " interrupts" ?active-package next-property-std cr . cr " ttttt" ?active-package next-property-std cr . cr \ PowerPC " " ?active-package next-property-ppc cr . type cr " name" ?active-package next-property-ppc cr . type cr " interrupts" ?active-package next-property-ppc cr . . . cr " ttttt" ?active-package next-property-ppc cr . cr \ Sparc64 " " ?active-package next-property-s64 cr . type cr " name" ?active-package next-property-s64 cr . type cr " interrupts" ?active-package next-property-s64 cr " ttttt" ?active-package next-property-s64 cr " " ?active-package next-property-std-bis cr . type cr " name" ?active-package next-property-std-bis cr . type cr " interrupts" ?active-package next-property-std-bis cr . cr " ttttt" ?active-package next-property-std-bis cr . cr Currently all variants are available simultaneously. Additional [IFDEF] can be used to hide some variants according to compilation options, generate the -std from the -ppc,.. One more oddity: NetBSD is not the only one to do strange things with properties. In OpenBSD, one can find : arch/sparc/dev/sbus.c:int sbus_testdma(sc, ca) ... getpropint(0, "slave-only", 0) ... arch/sparc/dev/sbus.c:int sbus_print(args, sbus) ... getpropint(0, sl, 0) ... Here, 0 should select the 'root' node. It really looks like a bug in OpenBSD. It does not prevent the OS from running though. Olivier

2 4

Re: [OpenBIOS] [Qemu-ppc] MorphOS 4.x on QEMU
by BALATON Zoltan 05 Mar '14

05 Mar '14

On Fri, 28 Feb 2014, BALATON Zoltan wrote: > On Thu, 27 Feb 2014, Mark Cave-Ayland wrote: >> FWIW there is a known issue with PPC's next-property iterator being >> implemented differently to the standard (see Olivier's tentative patch at >> http://www.openfirmware.info/pipermail/openbios/2014-February/008141.html). >> It's likely that a broken device tree iteration could be the cause of the >> MorphOS bootloader not being able to locate a suitable console mode which >> could be related to your issue. > > I think I did not hit this one yet at least the console problem is surely not > caused by this but by MorphOS only supporting some specific Radeon GPUs that > are found in the PPC Macs it is supporting. It is looking for them by their > vendor-id:device-id and fails if not found, but tries to continue anyway. While the next property iterator is not the cause of the console failed message it may very well be related to the hang in CPU detection later that I'm currently facing. I see the following openbios debug output with DEBUG_CIF enabled in libopenbios/client.c while MorphOS tries to detect the CPU: >> finddevice("/cpus") = 0xfff4bbec >> child(0xfff4bbec) = 0xfff5194c >> nextprop(0xfff5194c, "", 0x07de7e30) = 1 >> 0x07de7e30 6e __ __ __ __ __ __ __ __ __ __ __ __ __ __ __ n >> getprop(0xfff5194c, "name", 0x07de7df0, 64) = 11 >> 0x07de7df0 50 6f 77 65 72 50 43 2c 47 34 00 __ __ __ __ __ PowerPC,G4. >> nextprop(0xfff5194c, "name", 0x07de7e30) = -1 >> child(0xfff5194c) = 0x00000000 and here it gives up and freezes. This is with Olivier's patch applied, which does not change anything in the above, I'm seeing this with or without this patch. It seems to be a case of nextprop failing which the patch does not correct. Any hints how to debug it further? I don't know how to test or trace forth so I'd need some help with this. By the way, if it didn't fail to explore the properties of the CPU it seems to be looking for these on the CPU node: altivec bus-frequency clock-frequency cpu-version data-streams d-cache-block-size d-cache-line-size d-cache-sets d-cache-size i-cache-block-size i-cache-line-size i-cache-sets i-cache-size performance-monitor reservation-granule-size timebase-frequency tlb-size tlb-sets then it tries to go down the tree and explore l2-cache and l3-cache nodes (this is the last child call returning NULL in the above). I don't know which of these are optional and which are critical but looking at what QEMU provides now: name "PowerPC,G4" device_type "cpu" cpu-version c0209 dcache-size 8000 icache-size 8000 dcache-sets 80 icache-sets 80 dcache-block-size 20 icache-block-size 20 timebase-frequency 3b9aca00 clock-frequency 0 state "running" reg 00000000 available 00004000 07c54000 07e10000 f80f0000 00000000 ffffffff translations 00001000 00003000 00001000 00000000 07c58000 001b8000 07c58000 00000000 fff00000 00100000 07f00000 00000000 I expect some problems with these too once we manage to make nextprop work. For a start frequency entries are missing or seem to be wrong. Regards, BALATON Zoltan

5 22

[patch] fix "partition-zero"/%BOOT booting for PowerPC targets.
by Andrei E. Warkentin 05 Mar '14

05 Mar '14

Hi, This is a patch against r1272 which implements fully bootcode booting via Apple boot partition descriptors. The current implementation in libopenbios/bootcode_load.c hardcoded values for QUIK (the old OldWorld bootloader), which is useless if you try to boot anything else. In particular, I implemented this to simplify my development and test cycle on iQUIK (https://github.com/andreiw/quik), but I also tested this with the NetBSD floppy. The later now boots to stage 2 as well, although it tries using some functionality unavailable in the OpenBIOS implementation when compared to Apple's. I did this in the simplest way possible. Btw, I see that the optimization bugs are still present. I had to compile with -O0, otherwise the resulting image doesn't boot (GCC 4.8 here). -- A

1 0

[commit] r1272 - trunk/openbios-devel/forth/device
by repository service 05 Mar '14

05 Mar '14

Author: mcayland Date: Wed Mar 5 01:04:32 2014 New Revision: 1272 URL: http://tracker.coreboot.org/trac/openbios/changeset/1272 Log: property.fs: fix next-property return when requesting non-existent property obp_nextprop(node,name) calls the Forth word "next-property" then pops the result. "next-property" should therefore always return something: * A string when the property provided is not the last one of the node. * Zero when the property provided is the last one of the node. * Zero when the property provided does not exist in the current node. Previously, next-property returned nothing when the property didn't exist. "next-property" behavior with last and nonexistant properties differs between implementations of OF. This problem was found with NetBSD on Sparc32. It ennumerates peripherals when starting X11 and asks for the "name" and "device_type" property of many nodes, including some which have neither "name" nor "device_type" properties. 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/forth/device/property.fs Modified: trunk/openbios-devel/forth/device/property.fs ============================================================================== --- trunk/openbios-devel/forth/device/property.fs Mon Mar 3 18:00:20 2014 (r1271) +++ trunk/openbios-devel/forth/device/property.fs Wed Mar 5 01:04:32 2014 (r1272) @@ -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

1 0

[commit] r1271 - trunk/openbios-devel/forth/system
by repository service 03 Mar '14

03 Mar '14

Author: mcayland Date: Mon Mar 3 18:00:20 2014 New Revision: 1271 URL: http://tracker.coreboot.org/trac/openbios/changeset/1271 Log: ciface.fs: alter nextprop to preserve output buffer unless an error occurs Previously nextprop would always write a 0 length string to the output buffer before calling the underlying property words, with the assumption that this would be the default return value in the case of an error. MorphOS breaks this assumption by specifying buf == prev when calling nextprop which caused the prev value to be overwritten before it could be used, and so nextprop would always return an (error) exit code of -1. Fix nextprop so that the 0 length string is only written into the output buffer when an error exit code of -1 or 0 is returned, as per the IEEE1275 specification. As reported by BALATON Zoltan <balaton(a)eik.bme.hu>. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/system/ciface.fs Modified: trunk/openbios-devel/forth/system/ciface.fs ============================================================================== --- trunk/openbios-devel/forth/system/ciface.fs Mon Mar 3 00:18:34 2014 (r1270) +++ trunk/openbios-devel/forth/system/ciface.fs Mon Mar 3 18:00:20 2014 (r1271) @@ -108,12 +108,13 @@ dup 0= if 0 else dup cstrlen then ( buf prev prev_len ) - 0 3 pick c! \ verify that prev exists (overkill...) dup if 2dup r@ get-package-property if - r> 2drop 2drop -1 exit + r> 2drop drop + 0 swap c! + -1 exit else 2drop then @@ -126,7 +127,8 @@ dup 1+ -rot ci-strcpy drop 1 else ( buf ) - drop 0 + 0 swap c! + 0 then ;

1 0

[commit] r1270 - trunk/openbios-devel/drivers
by repository service 03 Mar '14

03 Mar '14

Author: mcayland Date: Mon Mar 3 00:18:34 2014 New Revision: 1270 URL: http://tracker.coreboot.org/trac/openbios/changeset/1270 Log: pci: Add the prog interface field to class-code property The class-code property of PCI devices should also include the prog interface field. This patch adds this. Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> 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 Sun Feb 16 17:26:46 2014 (r1269) +++ trunk/openbios-devel/drivers/pci.c Mon Mar 3 00:18:34 2014 (r1270) @@ -893,11 +893,13 @@ int status,id; uint16_t vendor_id, device_id; uint8_t rev; + uint8_t class_prog; uint32_t class_code; vendor_id = pci_config_read16(addr, PCI_VENDOR_ID); device_id = pci_config_read16(addr, PCI_DEVICE_ID); rev = pci_config_read8(addr, PCI_REVISION_ID); + class_prog = pci_config_read8(addr, PCI_CLASS_PROG); class_code = pci_config_read16(addr, PCI_CLASS_DEVICE); if (pci_dev) { @@ -925,7 +927,7 @@ set_int_property(dev, "vendor-id", vendor_id); set_int_property(dev, "device-id", device_id); set_int_property(dev, "revision-id", rev); - set_int_property(dev, "class-code", class_code << 8); + set_int_property(dev, "class-code", class_code << 8 | class_prog); if (config->irq_pin) { OLDWORLD(set_int_property(dev, "AAPL,interrupts",

1 0

[PATCH] Add the prog interface field to class-code property
by BALATON Zoltan 03 Mar '14

03 Mar '14

The class-code property of PCI devices should also include the prog interface field. This patch adds this. Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> =================================================================== --- drivers/pci.c (revision 1269) +++ drivers/pci.c (working copy) @@ -893,11 +893,13 @@ int status,id; uint16_t vendor_id, device_id; uint8_t rev; + uint8_t class_prog; uint32_t class_code; vendor_id = pci_config_read16(addr, PCI_VENDOR_ID); device_id = pci_config_read16(addr, PCI_DEVICE_ID); rev = pci_config_read8(addr, PCI_REVISION_ID); + class_prog = pci_config_read8(addr, PCI_CLASS_PROG); class_code = pci_config_read16(addr, PCI_CLASS_DEVICE); if (pci_dev) { @@ -925,7 +927,7 @@ set_int_property(dev, "vendor-id", vendor_id); set_int_property(dev, "device-id", device_id); set_int_property(dev, "revision-id", rev); - set_int_property(dev, "class-code", class_code << 8); + set_int_property(dev, "class-code", class_code << 8 | class_prog); if (config->irq_pin) { OLDWORLD(set_int_property(dev, "AAPL,interrupts", ===============================================================

2 3

[commit] r1269 - trunk/openbios-devel/arch/sparc32
by repository service 16 Feb '14

16 Feb '14

Author: mcayland Date: Sun Feb 16 17:26:46 2014 New Revision: 1269 URL: http://tracker.coreboot.org/trac/openbios/changeset/1269 Log: SPARC32: alter obp_dumb_memalloc() to handle allocation with va == 0 It seems that the obp_dumb_memalloc() function can be called with va == 0 which means that OpenBIOS should pick the next free virtual address itself. Otherwise we end up accidentally mapping into zero page causing all sorts of problems. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/lib.c Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Feb 16 17:26:43 2014 (r1268) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Feb 16 17:26:46 2014 (r1269) @@ -229,14 +229,28 @@ char *obp_dumb_memalloc(char *va, unsigned int size) { unsigned long align = size; + phys_addr_t phys; + ucell virt; DPRINTF("obp_dumb_memalloc: virta 0x%x, sz %d\n", (unsigned int)va, size); /* Solaris seems to assume that the returned value is physically aligned to size. - e.g. it is used for setting up page tables. Fortunately this is now handled by - ofmem_claim_phys() above. */ + e.g. it is used for setting up page tables. */ - return obp_memalloc(va, size, align); + /* Claim physical memory */ + phys = ofmem_claim_phys(-1, size, align); + + /* Claim virtual memory - if va == NULL then we choose va address */ + if (va == NULL) { + virt = ofmem_claim_virt((ucell)-1, size, align); + } else { + virt = ofmem_claim_virt(pointer2cell(va), size, 0); + } + + /* Map the memory */ + ofmem_map(phys, virt, size, ofmem_arch_default_translation_mode(phys)); + + return cell2pointer(virt); } void obp_dumb_memfree(char *va, unsigned size)

1 0

[commit] r1268 - trunk/openbios-devel/libopenbios
by repository service 16 Feb '14

16 Feb '14

Author: mcayland Date: Sun Feb 16 17:26:43 2014 New Revision: 1268 URL: http://tracker.coreboot.org/trac/openbios/changeset/1268 Log: OFMEM: ensure minimum alignment of PAGE_SIZE NextStep appears to request an alignment of 4 for some of its large memory ranges, and since this is an exact power of 2 then the code to ensure a minimum alignment of PAGE_SIZE is accidentally bypassed. Move this to a separate check so we can guarantee the minimum alignment requirement is always observed. 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 Sun Feb 16 17:26:40 2014 (r1267) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Feb 16 17:26:43 2014 (r1268) @@ -428,13 +428,20 @@ { phys_addr_t base = min; range_t *r2; - ucell old_align; + ucell old_align = align; int i; + if( (align < PAGE_SIZE) ) { + + /* Minimum alignment is page size */ + align = PAGE_SIZE; + + OFMEM_TRACE("warning: bad alignment " FMT_ucellx " rounded up to " FMT_ucellx "\n", old_align, align); + } + if( (align & (align-1)) ) { /* As per IEEE1275 specification, round up to the nearest power of 2 */ - old_align = align; if (old_align <= PAGE_SIZE) { align = PAGE_SIZE; } else { @@ -447,8 +454,6 @@ OFMEM_TRACE("warning: bad alignment " FMT_ucellx " rounded up to " FMT_ucellx "\n", old_align, align); } - if( !align ) - align = PAGE_SIZE; base = reverse ? max - size : min; r2 = reverse ? NULL : r;

1 0

[commit] r1267 - trunk/openbios-devel/arch/sparc32
by repository service 16 Feb '14

16 Feb '14

Author: mcayland Date: Sun Feb 16 17:26:40 2014 New Revision: 1267 URL: http://tracker.coreboot.org/trac/openbios/changeset/1267 Log: SPARC32: unmap freed memory in ofmem_arch_unmap_pages() During NextStep boot, all the virtual memory is probed so freed memory must be properly unmapped. 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/arch/sparc32/ofmem_sparc32.c Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Feb 16 17:26:37 2014 (r1266) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Feb 16 17:26:40 2014 (r1267) @@ -142,8 +142,16 @@ /* Unmap a set of pages */ void ofmem_arch_unmap_pages(ucell virt, ucell size) { - /* OFMEM re-maps the pages for us, so just ensure the TLB is in sync */ - srmmu_flush_whole_tlb(); + unsigned long pa; + ucell i; + + for (i = 0; i < size; i += PAGE_SIZE) { + pa = find_pte(virt, 0); + *(uint32_t *)pa = 0; + virt += PAGE_SIZE; + } + + srmmu_flush_whole_tlb(); } /* Map a set of pages */

1 0

[commit] r1266 - trunk/openbios-devel/arch/sparc32
by repository service 16 Feb '14

16 Feb '14

Author: mcayland Date: Sun Feb 16 17:26:37 2014 New Revision: 1266 URL: http://tracker.coreboot.org/trac/openbios/changeset/1266 Log: SPARC32: implement obp_dumb_memfree() 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/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc32/romvec.h Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Feb 16 17:26:34 2014 (r1265) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Feb 16 17:26:37 2014 (r1266) @@ -239,10 +239,18 @@ return obp_memalloc(va, size, align); } -void obp_dumb_memfree(__attribute__((unused))char *va, - __attribute__((unused))unsigned sz) +void obp_dumb_memfree(char *va, unsigned size) { - DPRINTF("obp_dumb_memfree 0x%p (size %d)\n", va, sz); + phys_addr_t phys; + ucell cellmode; + + DPRINTF("obp_dumb_memfree: virta 0x%x, sz %d\n", (unsigned int)va, size); + + phys = ofmem_translate(pointer2cell(va), &cellmode); + + ofmem_unmap(pointer2cell(va), size); + ofmem_release_virt(pointer2cell(va), size); + ofmem_release_phys(phys, size); } /* Data fault handling routines */ Modified: trunk/openbios-devel/arch/sparc32/romvec.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.h Sun Feb 16 17:26:34 2014 (r1265) +++ trunk/openbios-devel/arch/sparc32/romvec.h Sun Feb 16 17:26:37 2014 (r1266) @@ -31,8 +31,8 @@ int obp_inst2pkg_handler(int dev_desc); char *obp_dumb_memalloc(char *va, unsigned int size); char *obp_dumb_memalloc_handler(char *va, unsigned int size); -void obp_dumb_memfree(__attribute__((unused))char *va, __attribute__((unused))unsigned sz); -void obp_dumb_memfree_handler(__attribute__((unused))char *va, __attribute__((unused))unsigned sz); +void obp_dumb_memfree(char *va, unsigned size); +void obp_dumb_memfree_handler(char *va, unsigned size); char *obp_dumb_mmap(char *va, int which_io, unsigned int pa, unsigned int size); char *obp_dumb_mmap_handler(char *va, int which_io, unsigned int pa, unsigned int size); void obp_dumb_munmap(__attribute__((unused)) char *va, __attribute__((unused)) unsigned int size);

1 0

[commit] r1265 - trunk/openbios-devel/libopenbios
by repository service 16 Feb '14

16 Feb '14

Author: mcayland Date: Sun Feb 16 17:26:34 2014 New Revision: 1265 URL: http://tracker.coreboot.org/trac/openbios/changeset/1265 Log: SPARC32: copy the a.out header beneath load-base during load NextSTEP's bootloader for Sparc32 expects that the 32 bytes a.out header is copied just before the start address. Since this is a compatibility hack for an implementation detail of OBP then implement the functionality within a #define AOUT_HEADER_COPY section so it can easily be removed if people really need a strictly compliant firmware. 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/libopenbios/aout_load.c Modified: trunk/openbios-devel/libopenbios/aout_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/aout_load.c Sun Feb 16 17:26:31 2014 (r1264) +++ trunk/openbios-devel/libopenbios/aout_load.c Sun Feb 16 17:26:34 2014 (r1265) @@ -10,6 +10,12 @@ #define CONFIG_SPARC64_PAGE_SIZE_8KB #endif +/* NextStep bootloader on SPARC32 expects the a.out header directly + below load-base (0x4000) */ +#ifdef CONFIG_SPARC32 +#define AOUT_HEADER_COPY +#endif + #include "libopenbios/sys_info.h" #include "libopenbios/bindings.h" #include "libopenbios/aout_load.h" @@ -143,6 +149,11 @@ debug("Loaded %lu bytes\n", size); debug("entry point is %#lx\n", start); +#ifdef AOUT_HEADER_COPY + // Copy the a.out header just before start + memcpy((char *)(start - 0x20), &ehdr, 0x20); +#endif + // Initialise saved-program-state PUSH(addr_fixup(start)); feval("saved-program-state >sps.entry !");

1 0

[commit] r1264 - in trunk/openbios-devel: arch/sparc32 forth/device
by repository service 16 Feb '14

16 Feb '14

Author: mcayland Date: Sun Feb 16 17:26:31 2014 New Revision: 1264 URL: http://tracker.coreboot.org/trac/openbios/changeset/1264 Log: SPARC32: implement Forth get-msecs word Switch obp_ticks over to be a pointer to the counter rather than its value, then point this to the contents of a new Forth obp-ticks variable. This allows a simple get-msecs word to be implemented for SPARC32 which simply reads the value of the obp-ticks variable and places it on the stack. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/arch/sparc32/romvec.h trunk/openbios-devel/arch/sparc32/vectors.S trunk/openbios-devel/forth/device/other.fs Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Feb 16 17:26:28 2014 (r1263) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Feb 16 17:26:31 2014 (r1264) @@ -449,7 +449,7 @@ dstackcnt = dstacktmp; } -volatile uint32_t obp_ticks; +volatile uint32_t *obp_ticks; void * init_openprom(void) @@ -482,9 +482,11 @@ romvec0.pv_printf = obp_printf_handler; romvec0.pv_abort = obp_abort_handler; - /* Reset the tick counter */ - obp_ticks = 0; - romvec0.pv_ticks = &obp_ticks; + /* Point to the Forth obp-ticks variable and reset */ + fword("obp-ticks"); + obp_ticks = cell2pointer(POP()); + *obp_ticks = 0; + romvec0.pv_ticks = obp_ticks; romvec0.pv_halt = obp_halt_handler; romvec0.pv_synchook = &sync_hook; Modified: trunk/openbios-devel/arch/sparc32/romvec.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.h Sun Feb 16 17:26:28 2014 (r1263) +++ trunk/openbios-devel/arch/sparc32/romvec.h Sun Feb 16 17:26:31 2014 (r1264) @@ -2,7 +2,7 @@ * romvec main C function and handler declarations */ -extern volatile uint32_t obp_ticks; +extern volatile uint32_t *obp_ticks; void *init_openprom(void); int obp_devopen(char *str); Modified: trunk/openbios-devel/arch/sparc32/vectors.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/vectors.S Sun Feb 16 17:26:28 2014 (r1263) +++ trunk/openbios-devel/arch/sparc32/vectors.S Sun Feb 16 17:26:31 2014 (r1264) @@ -208,9 +208,10 @@ ld [%l7 + %lo(counter_regs)], %l7 ld [%l7], %g0 sethi %hi(obp_ticks), %l7 - ld [%l7 + %lo(obp_ticks)], %l6 + ld [%l7 + %lo(obp_ticks)], %l7 + ld [%l7], %l6 add %l6, 10, %l6 - st %l6, [%l7 + %lo(obp_ticks)] + st %l6, [%l7] jmp %l1 rett %l2 Modified: trunk/openbios-devel/forth/device/other.fs ============================================================================== --- trunk/openbios-devel/forth/device/other.fs Sun Feb 16 17:26:28 2014 (r1263) +++ trunk/openbios-devel/forth/device/other.fs Sun Feb 16 17:26:31 2014 (r1264) @@ -93,12 +93,25 @@ \ 5.3.7.3 Time +[IFDEF] CONFIG_SPARC32 + +\ OBP tick value updated by timer interrupt +variable obp-ticks + +: get-msecs ( -- n ) + obp-ticks @ + ; + +[ELSE] + 0 value dummy-msecs : get-msecs ( -- n ) dummy-msecs dup 1+ to dummy-msecs ; - + +[THEN] + : ms ( n -- ) get-msecs + begin dup get-msecs < until

1 0

[commit] r1263 - in trunk/openbios-devel: arch/sparc32 drivers
by repository service 16 Feb '14

16 Feb '14

Author: mcayland Date: Sun Feb 16 17:26:28 2014 New Revision: 1263 URL: http://tracker.coreboot.org/trac/openbios/changeset/1263 Log: SPARC32: implement romvec.pv_ticks counter romvec.pv_ticks is a pointer to an 'uptime' counter, calibrated in milliseconds. We use the [1st] CPU timer, running at 100Hz, to increment (+10) the counter. This counter is used by NextStep to measure the 10 seconds delay during boot, when asking about boot options. 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/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc32/openprom.h trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/arch/sparc32/romvec.h trunk/openbios-devel/arch/sparc32/vectors.S trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/drivers/obio.h Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Feb 16 17:26:25 2014 (r1262) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Feb 16 17:26:28 2014 (r1263) @@ -23,6 +23,7 @@ #include "boot.h" #include "romvec.h" #include "openprom.h" +#include "psr.h" #include "libopenbios/video.h" #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" @@ -916,6 +917,11 @@ fword("find-device"); setup_uuid(); + + /* Enable interrupts */ + temp = get_psr(); + temp = (temp & ~PSR_PIL) | (13 << 8); /* Enable CPU timer interrupt (level 14) */ + put_psr(temp); } extern struct _console_ops arch_console_ops; Modified: trunk/openbios-devel/arch/sparc32/openprom.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/openprom.h Sun Feb 16 17:26:25 2014 (r1262) +++ trunk/openbios-devel/arch/sparc32/openprom.h Sun Feb 16 17:26:28 2014 (r1263) @@ -117,7 +117,7 @@ void (*pv_reboot)(char *bootstr); void (*pv_printf)(__const__ char *fmt, ...); void (*pv_abort)(void); - __volatile__ int *pv_ticks; + __volatile__ unsigned int *pv_ticks; void (*pv_halt)(void); void (**pv_synchook)(void); Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Feb 16 17:26:25 2014 (r1262) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Feb 16 17:26:28 2014 (r1263) @@ -449,6 +449,8 @@ dstackcnt = dstacktmp; } +volatile uint32_t obp_ticks; + void * init_openprom(void) { @@ -479,6 +481,11 @@ romvec0.pv_reboot = obp_reboot_handler; romvec0.pv_printf = obp_printf_handler; romvec0.pv_abort = obp_abort_handler; + + /* Reset the tick counter */ + obp_ticks = 0; + romvec0.pv_ticks = &obp_ticks; + romvec0.pv_halt = obp_halt_handler; romvec0.pv_synchook = &sync_hook; romvec0.pv_v0bootargs = &obp_argp; Modified: trunk/openbios-devel/arch/sparc32/romvec.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.h Sun Feb 16 17:26:25 2014 (r1262) +++ trunk/openbios-devel/arch/sparc32/romvec.h Sun Feb 16 17:26:28 2014 (r1263) @@ -2,6 +2,7 @@ * romvec main C function and handler declarations */ +extern volatile uint32_t obp_ticks; void *init_openprom(void); int obp_devopen(char *str); Modified: trunk/openbios-devel/arch/sparc32/vectors.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/vectors.S Sun Feb 16 17:26:25 2014 (r1262) +++ trunk/openbios-devel/arch/sparc32/vectors.S Sun Feb 16 17:26:28 2014 (r1263) @@ -207,6 +207,10 @@ sethi %hi(counter_regs), %l7 ld [%l7 + %lo(counter_regs)], %l7 ld [%l7], %g0 + sethi %hi(obp_ticks), %l7 + ld [%l7 + %lo(obp_ticks)], %l6 + add %l6, 10, %l6 + st %l6, [%l7 + %lo(obp_ticks)] jmp %l1 rett %l2 Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Feb 16 17:26:25 2014 (r1262) +++ trunk/openbios-devel/drivers/obio.c Sun Feb 16 17:26:28 2014 (r1263) @@ -287,7 +287,7 @@ counter_regs = (struct sun4m_timer_regs *)ofmem_map_io(base + (uint64_t)offset, sizeof(*counter_regs)); - counter_regs->cfg = 0xffffffff; + counter_regs->cfg = 0xfffffffe; counter_regs->l10_timer_limit = 0; counter_regs->cpu_timers[0].l14_timer_limit = 0x9c4000; /* see comment in obio.h */ counter_regs->cpu_timers[0].cntrl = 1; Modified: trunk/openbios-devel/drivers/obio.h ============================================================================== --- trunk/openbios-devel/drivers/obio.h Sun Feb 16 17:26:25 2014 (r1262) +++ trunk/openbios-devel/drivers/obio.h Sun Feb 16 17:26:28 2014 (r1263) @@ -88,7 +88,7 @@ * Registers of hardware timer in sun4m. */ struct sun4m_timer_percpu { - volatile unsigned int l14_timer_limit; /* Initial value is 0x009c4000 */ + volatile unsigned int l14_timer_limit; /* Initial value is 0x009c4000 = 10ms period*/ volatile unsigned int l14_cur_count; };

1 0

[commit] r1262 - trunk/openbios-devel/arch/sparc32
by repository service 16 Feb '14

16 Feb '14

Author: mcayland Date: Sun Feb 16 17:26:25 2014 New Revision: 1262 URL: http://tracker.coreboot.org/trac/openbios/changeset/1262 Log: SPARC32: fixup psr.h header file for subsequent use Soon we will need to use the get_psr() and put_psr() functions, however the header file needs some tidying up first. Here the extern C functions are redeclared as static inline functions, and the __ASSEMBLY macro correctly set across the relevant .S files to allow compilation to succeed as normal. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/call-romvec.S trunk/openbios-devel/arch/sparc32/entry.S trunk/openbios-devel/arch/sparc32/psr.h trunk/openbios-devel/arch/sparc32/switch.S Modified: trunk/openbios-devel/arch/sparc32/call-romvec.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/call-romvec.S Sun Feb 16 17:26:19 2014 (r1261) +++ trunk/openbios-devel/arch/sparc32/call-romvec.S Sun Feb 16 17:26:25 2014 (r1262) @@ -1,3 +1,4 @@ +#define __ASSEMBLY #include "psr.h" #include "asm/asi.h" Modified: trunk/openbios-devel/arch/sparc32/entry.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/entry.S Sun Feb 16 17:26:19 2014 (r1261) +++ trunk/openbios-devel/arch/sparc32/entry.S Sun Feb 16 17:26:25 2014 (r1262) @@ -7,6 +7,7 @@ * $Id: head.S,v 1.12 2002/07/23 05:47:09 zaitcev Exp $ */ +#define __ASSEMBLY #include "psr.h" #include "asm/asi.h" #include "asm/crs.h" Modified: trunk/openbios-devel/arch/sparc32/psr.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/psr.h Sun Feb 16 17:26:19 2014 (r1261) +++ trunk/openbios-devel/arch/sparc32/psr.h Sun Feb 16 17:26:25 2014 (r1262) @@ -34,11 +34,9 @@ #define PSR_VERS 0x0f000000 /* cpu-version field */ #define PSR_IMPL 0xf0000000 /* cpu-implementation field */ -#ifdef __KERNEL__ - -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLY /* Get the %psr register. */ -extern __inline__ unsigned int get_psr(void) +static __inline__ unsigned int get_psr(void) { unsigned int psr; __asm__ __volatile__( @@ -53,7 +51,7 @@ return psr; } -extern __inline__ void put_psr(unsigned int new_psr) +static __inline__ void put_psr(unsigned int new_psr) { __asm__ __volatile__( "wr %0, 0x0, %%psr\n\t" @@ -70,9 +68,9 @@ * incur a trap. */ -extern unsigned int fsr_storage; +static unsigned int fsr_storage; -extern __inline__ unsigned int get_fsr(void) +static __inline__ unsigned int get_fsr(void) { unsigned int fsr = 0; @@ -87,6 +85,4 @@ #endif /* !(__ASSEMBLY__) */ -#endif /* (__KERNEL__) */ - #endif /* !(__LINUX_SPARC_PSR_H) */ Modified: trunk/openbios-devel/arch/sparc32/switch.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/switch.S Sun Feb 16 17:26:19 2014 (r1261) +++ trunk/openbios-devel/arch/sparc32/switch.S Sun Feb 16 17:26:25 2014 (r1262) @@ -1,3 +1,4 @@ +#define __ASSEMBLY #include "psr.h" #include "asm/asi.h" #define ASI_BP ASI_M_BYPASS

1 0

[commit] r1261 - in trunk/openbios-devel: arch/sparc32 drivers include/drivers
by repository service 16 Feb '14

16 Feb '14

Author: mcayland Date: Sun Feb 16 17:26:19 2014 New Revision: 1261 URL: http://tracker.coreboot.org/trac/openbios/changeset/1261 Log: SPARC32: properly handle SS-5, SS-10 and SS-20 timers/interrupts SparcStation 5 has 1 timer and 1 per-cpu interrupt controller. SparcStation 10/20 has 4 timers and 4 per-cpu interrupt controllers, independently from the number of CPUs installed. Timer and interrupt controller properties are set accordingly. This is what Sun's OpenBOOT does and having only 1 timer/interrupt declared on SS5 is necessary for NextSTEP. 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/arch/sparc32/openbios.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/include/drivers/drivers.h Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Fri Feb 7 19:12:41 2014 (r1260) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Feb 16 17:26:19 2014 (r1261) @@ -41,6 +41,7 @@ unsigned long aux1_offset, aux2_offset; uint64_t dma_base, esp_base, le_base; uint64_t tcx_base; + int intr_ncpu; int mid_offset; int machine_id_low, machine_id_high; }; @@ -57,6 +58,7 @@ .fd_offset = 0x00400000, .counter_offset = 0x00d00000, .intr_offset = 0x00e00000, + .intr_ncpu = 1, .aux1_offset = 0x00900000, .aux2_offset = 0x00910000, .dma_base = 0x78400000, @@ -66,7 +68,7 @@ .machine_id_low = 32, .machine_id_high = 63, }, - /* SS-10 */ + /* SS-10, SS-20 */ { .iommu_base = 0xfe0000000ULL, .tcx_base = 0xe20000000ULL, @@ -77,6 +79,7 @@ .fd_offset = 0x00700000, // 0xff1700000ULL, .counter_offset = 0x00300000, // 0xff1300000ULL, .intr_offset = 0x00400000, // 0xff1400000ULL, + .intr_ncpu = 4, .aux1_offset = 0x00800000, // 0xff1800000ULL, .aux2_offset = 0x00a01000, // 0xff1a01000ULL, .dma_base = 0xef0400000ULL, @@ -97,6 +100,7 @@ .fd_offset = -1, .counter_offset = 0x00300000, // 0xff1300000ULL, .intr_offset = 0x00400000, // 0xff1400000ULL, + .intr_ncpu = 4, .aux1_offset = 0x00800000, // 0xff1800000ULL, .aux2_offset = 0x00a01000, // 0xff1a01000ULL, XXX should not exist .dma_base = 0xef0081000ULL, @@ -837,7 +841,7 @@ #ifdef CONFIG_DRIVER_OBIO mem_size = fw_cfg_read_i32(FW_CFG_RAM_SIZE); ob_obio_init(hwdef->slavio_base, hwdef->fd_offset, - hwdef->counter_offset, hwdef->intr_offset, + hwdef->counter_offset, hwdef->intr_offset, hwdef->intr_ncpu, hwdef->aux1_offset, hwdef->aux2_offset, mem_size); Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Fri Feb 7 19:12:41 2014 (r1260) +++ trunk/openbios-devel/drivers/obio.c Sun Feb 16 17:26:19 2014 (r1261) @@ -26,14 +26,6 @@ #define PROMDEV_SCREEN 0 /* output to screen */ #define PROMDEV_TTYA 1 /* in/out to ttya */ -/* "NCPU" is an historical name that's now a bit of a misnomer. The sun4m - * architecture registers NCPU CPU-specific interrupts along with one - * system-wide interrupt, regardless of the number of actual CPUs installed. - * See the comment on "NCPU" at <http://stuff.mit.edu/afs/athena/astaff/ - * project/opssrc/sys.sunos/sun4m/devaddr.h>. - */ -#define SUN4M_NCPU 4 - /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_obio, INSTALL_OPEN, sizeof(int) ); @@ -262,13 +254,13 @@ volatile struct sun4m_timer_regs *counter_regs; static void -ob_counter_init(uint64_t base, unsigned long offset) +ob_counter_init(uint64_t base, unsigned long offset, int ncpu) { int i; ob_new_obio_device("counter", NULL); - for (i = 0; i < SUN4M_NCPU; i++) { + for (i = 0; i < ncpu; i++) { PUSH(0); fword("encode-int"); if (i != 0) fword("encode+"); @@ -300,7 +292,7 @@ counter_regs->cpu_timers[0].l14_timer_limit = 0x9c4000; /* see comment in obio.h */ counter_regs->cpu_timers[0].cntrl = 1; - for (i = 0; i < SUN4M_NCPU; i++) { + for (i = 0; i < ncpu; i++) { PUSH((unsigned long)&counter_regs->cpu_timers[i]); fword("encode-int"); if (i != 0) @@ -318,13 +310,13 @@ static volatile struct sun4m_intregs *intregs; static void -ob_interrupt_init(uint64_t base, unsigned long offset) +ob_interrupt_init(uint64_t base, unsigned long offset, int ncpu) { int i; ob_new_obio_device("interrupt", NULL); - for (i = 0; i < SUN4M_NCPU; i++) { + for (i = 0; i < ncpu; i++) { PUSH(0); fword("encode-int"); if (i != 0) fword("encode+"); @@ -353,7 +345,7 @@ intregs->clear = ~SUN4M_INT_MASKALL; intregs->cpu_intregs[0].clear = ~0x17fff; - for (i = 0; i < SUN4M_NCPU; i++) { + for (i = 0; i < ncpu; i++) { PUSH((unsigned long)&intregs->cpu_intregs[i]); fword("encode-int"); if (i != 0) @@ -491,7 +483,7 @@ int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, unsigned long counter_offset, unsigned long intr_offset, - unsigned long aux1_offset, unsigned long aux2_offset, + int intr_ncpu, unsigned long aux1_offset, unsigned long aux2_offset, unsigned long mem_size) { @@ -523,9 +515,9 @@ if (aux2_offset != (unsigned long) -1) ob_aux2_reset_init(slavio_base, aux2_offset, AUXIO2_INTR); - ob_counter_init(slavio_base, counter_offset); + ob_counter_init(slavio_base, counter_offset, intr_ncpu); - ob_interrupt_init(slavio_base, intr_offset); + ob_interrupt_init(slavio_base, intr_offset, intr_ncpu); ob_smp_init(mem_size); Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Fri Feb 7 19:12:41 2014 (r1260) +++ trunk/openbios-devel/include/drivers/drivers.h Sun Feb 16 17:26:19 2014 (r1261) @@ -63,7 +63,7 @@ /* drivers/obio.c */ int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, unsigned long counter_offset, unsigned long intr_offset, - unsigned long aux1_offset, unsigned long aux2_offset, + int intr_ncpu, unsigned long aux1_offset, unsigned long aux2_offset, unsigned long mem_size); int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, int cpu);

1 0

[PATCH] Tick counter
by Olivier Danet 11 Feb '14

11 Feb '14

romvec.pvtime is a pointer to an 'uptime' counter, calibrated in millisecond. We use the [1st] CPU timer, running at 100Hz, to increment (+10) the counter. This counter is used by NextStep to measure the 10 seconds delay during boot, when asking about boot options. Signed-off-by: Olivier Danet <odanet(a)caramail.com> --------------------------------------------------------------- diff a/arch/sparc32/romvec.c b/arch/sparc32/romvec.c --- a/arch/sparc32/romvec.c 2014-02-07 18:23:59.761220839 +0100 +++ b/arch/sparc32/romvec.c 2014-02-07 18:39:38.728186578 +0100 @@ -479,6 +479,7 @@ init_openprom(void) romvec0.pv_reboot = obp_reboot_handler; romvec0.pv_printf = obp_printf_handler; romvec0.pv_abort = obp_abort_handler; + romvec0.pv_ticks = &obp_ticks; romvec0.pv_halt = obp_halt_handler; romvec0.pv_synchook = &sync_hook; romvec0.pv_v0bootargs = &obp_argp; diff -rup a/arch/sparc32/vectors.S b/arch/sparc32/vectors.S --- a/arch/sparc32/vectors.S 2014-02-07 18:22:20.063224477 +0100 +++ b/arch/sparc32/vectors.S 2014-02-07 18:40:44.161184191 +0100 @@ -207,6 +207,10 @@ irq_entry14: sethi %hi(counter_regs), %l7 ld [%l7 + %lo(counter_regs)], %l7 ld [%l7], %g0 + sethi %hi(obp_ticks), %l7 + ld [%l7 + %lo(obp_ticks)], %l6 + add %l6, 10, %l6 + st %l6, [%l7 + %lo(obp_ticks)] jmp %l1 rett %l2 diff a/drivers/obio.c b/drivers/obio.c --- a/drivers/obio.c 2014-02-07 18:25:08.050218348 +0100 +++ b/drivers/obio.c 2014-02-07 18:56:54.126148798 +0100 @@ -253,6 +253,8 @@ ob_aux2_reset_init(uint64_t base, uint64 volatile struct sun4m_timer_regs *counter_regs; +volatile int32_t obp_ticks; + static void ob_counter_init(uint64_t base, unsigned long offset, int ncpu) { @@ -287,7 +289,7 @@ ob_counter_init(uint64_t base, unsigned counter_regs = (struct sun4m_timer_regs *)ofmem_map_io(base + (uint64_t)offset, sizeof(*counter_regs)); - counter_regs->cfg = 0xffffffff; + counter_regs->cfg = 0xfffffffe; counter_regs->l10_timer_limit = 0; counter_regs->cpu_timers[0].l14_timer_limit = 0x9c4000; /* see comment in obio.h */ counter_regs->cpu_timers[0].cntrl = 1; @@ -304,6 +306,8 @@ ob_counter_init(uint64_t base, unsigned push_str("address"); fword("property"); + obp_ticks = 0; + fword("finish-device"); } diff a/drivers/obio.h b/drivers/obio.h --- a/drivers/obio.h 2014-02-07 18:22:20.276224469 +0100 +++ b/drivers/obio.h 2014-02-07 18:45:46.417173162 +0100 @@ -88,7 +88,7 @@ struct sun4m_timer_regs { * Registers of hardware timer in sun4m. */ struct sun4m_timer_percpu { - volatile unsigned int l14_timer_limit; /* Initial value is 0x009c4000 */ + volatile unsigned int l14_timer_limit; /* Initial value is 0x009c4000 = 10ms period*/ volatile unsigned int l14_cur_count; }; diff a/include/drivers/drivers.h b/include/drivers/drivers.h --- a/include/drivers/drivers.h 2014-02-07 18:25:08.053218348 +0100 +++ b/include/drivers/drivers.h 2014-02-07 18:43:25.598178300 +0100 @@ -81,6 +81,7 @@ extern uint16_t graphic_depth; extern volatile unsigned char *power_reg; extern volatile unsigned int *reset_reg; extern volatile struct sun4m_timer_regs *counter_regs; +extern volatile int32_t obp_ticks; void ob_new_obio_device(const char *name, const char *type); unsigned long ob_reg(uint64_t base, uint64_t offset, unsigned long size, int map); ---------------------------------------------------------------

2 4

[PATCH] OBP Memory allocation
by Olivier Danet 10 Feb '14

10 Feb '14

When called with a null base address, char *obp_memalloc(va,size,align) shall provide the address itself. (and remove some trailing whitespaces) Signed-off-by : Olivier Danet <odanet(a)caramail.com> Index: arch/sparc32/lib.c =================================================================== --- arch/sparc32/lib.c (révision 1257) +++ arch/sparc32/lib.c (copie de travail) @@ -212,13 +212,19 @@ phys_addr_t phys; ucell virt; - DPRINTF("obp_memalloc: virta 0x%x, sz %d, align %d\n", (unsigned int)va, size, align); - + DPRINTF("obp_memalloc: virta 0x%x, sz %d, align %d\n", (unsigned int)va, size, align); + + /* Round to page size */ + size = (size + 0xfff) & 0xFFFFF000; + /* Claim physical memory */ phys = ofmem_claim_phys(-1, size, align); /* Claim virtual memory */ - virt = ofmem_claim_virt(pointer2cell(va), size, 0); + if (va) + virt = ofmem_claim_virt(pointer2cell(va), size, 0); + else + virt = ofmem_claim_virt(0, size, 0x1000); /* Map the memory */ ofmem_map(phys, virt, size, ofmem_arch_default_translation_mode(phys)); @@ -230,7 +236,7 @@ { unsigned long align = size; - DPRINTF("obp_dumb_memalloc: virta 0x%x, sz %d\n", (unsigned int)va, size); + DPRINTF("obp_dumb_memalloc: virta 0x%x, sz %d\n", (unsigned int)va, size); /* Solaris seems to assume that the returned value is physically aligned to size. e.g. it is used for setting up page tables. Fortunately this is now handled by ===================================================================

2 1

[PATCH] a.out header copy
by Olivier Danet 10 Feb '14

10 Feb '14

NextSTEP's bootloader for Sparc32 expects that the 32 bytes a.out header is copied just before the start address. Signed-off-by: Olivier Danet <odanet(a)caramail.com> =================================================================== --- libopenbios/aout_load.c (révision 1257) +++ libopenbios/aout_load.c (copie de travail) @@ -139,6 +139,8 @@ goto out; } } + seek_io(fd, offset); + read_io(fd, (char *)(start-0x20), 0x20); debug("Loaded %lu bytes\n", size); debug("entry point is %#lx\n", start); ===================================================================

2 5

[PATCH] Interrupt/Timer property
by Olivier Danet 07 Feb '14

07 Feb '14

SparcStation 5 has 1 timer and 1 per-cpu interrupt controller. SparcStation 10/20 has 4 timers and 4 per-cpu interrupt controllers, independently from the number of CPUs installed. Timer and interrupt controller properties are set accordingly. This is what Sun's OpenBOOT does and having only 1 timer/interrupt declared on SS5 is necessary for NextSTEP. Signed-off-by: Olivier Danet <odanet(a)caramail.com> =================================================================== --- arch/sparc32/openbios.c (révision 1257) +++ arch/sparc32/openbios.c (copie de travail) @@ -41,6 +41,7 @@ unsigned long aux1_offset, aux2_offset; uint64_t dma_base, esp_base, le_base; uint64_t tcx_base; + int intr_ncpu; int mid_offset; int machine_id_low, machine_id_high; }; @@ -57,6 +58,7 @@ .fd_offset = 0x00400000, .counter_offset = 0x00d00000, .intr_offset = 0x00e00000, + .intr_ncpu = 1, .aux1_offset = 0x00900000, .aux2_offset = 0x00910000, .dma_base = 0x78400000, @@ -66,7 +68,7 @@ .machine_id_low = 32, .machine_id_high = 63, }, - /* SS-10 */ + /* SS-10, SS-20 */ { .iommu_base = 0xfe0000000ULL, .tcx_base = 0xe20000000ULL, @@ -77,6 +79,7 @@ .fd_offset = 0x00700000, // 0xff1700000ULL, .counter_offset = 0x00300000, // 0xff1300000ULL, .intr_offset = 0x00400000, // 0xff1400000ULL, + .intr_ncpu = 4, .aux1_offset = 0x00800000, // 0xff1800000ULL, .aux2_offset = 0x00a01000, // 0xff1a01000ULL, .dma_base = 0xef0400000ULL, @@ -97,6 +100,7 @@ .fd_offset = -1, .counter_offset = 0x00300000, // 0xff1300000ULL, .intr_offset = 0x00400000, // 0xff1400000ULL, + .intr_ncpu = 4, .aux1_offset = 0x00800000, // 0xff1800000ULL, .aux2_offset = 0x00a01000, // 0xff1a01000ULL, XXX should not exist .dma_base = 0xef0081000ULL, @@ -837,7 +841,7 @@ #ifdef CONFIG_DRIVER_OBIO mem_size = fw_cfg_read_i32(FW_CFG_RAM_SIZE); ob_obio_init(hwdef->slavio_base, hwdef->fd_offset, - hwdef->counter_offset, hwdef->intr_offset, + hwdef->counter_offset, hwdef->intr_offset, hwdef->intr_ncpu, hwdef->aux1_offset, hwdef->aux2_offset, mem_size); =================================================================== --- include/drivers/drivers.h (révision 1257) +++ include/drivers/drivers.h (copie de travail) @@ -63,7 +63,7 @@ /* drivers/obio.c */ int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, unsigned long counter_offset, unsigned long intr_offset, - unsigned long aux1_offset, unsigned long aux2_offset, + int intr_ncpu, unsigned long aux1_offset, unsigned long aux2_offset, unsigned long mem_size); int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, int cpu); =================================================================== --- drivers/obio.c (révision 1257) +++ drivers/obio.c (copie de travail) @@ -26,14 +26,6 @@ #define PROMDEV_SCREEN 0 /* output to screen */ #define PROMDEV_TTYA 1 /* in/out to ttya */ -/* "NCPU" is an historical name that's now a bit of a misnomer. The sun4m - * architecture registers NCPU CPU-specific interrupts along with one - * system-wide interrupt, regardless of the number of actual CPUs installed. - * See the comment on "NCPU" at <http://stuff.mit.edu/afs/athena/astaff/ - * project/opssrc/sys.sunos/sun4m/devaddr.h>. - */ -#define SUN4M_NCPU 4 - /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_obio, INSTALL_OPEN, sizeof(int) ); @@ -262,13 +254,13 @@ volatile struct sun4m_timer_regs *counter_regs; static void -ob_counter_init(uint64_t base, unsigned long offset) +ob_counter_init(uint64_t base, unsigned long offset, int ncpu) { int i; ob_new_obio_device("counter", NULL); - for (i = 0; i < SUN4M_NCPU; i++) { + for (i = 0; i < ncpu; i++) { PUSH(0); fword("encode-int"); if (i != 0) fword("encode+"); @@ -300,7 +292,7 @@ counter_regs->cpu_timers[0].l14_timer_limit = 0x9c4000; /* see comment in obio.h */ counter_regs->cpu_timers[0].cntrl = 1; - for (i = 0; i < SUN4M_NCPU; i++) { + for (i = 0; i < ncpu; i++) { PUSH((unsigned long)&counter_regs->cpu_timers[i]); fword("encode-int"); if (i != 0) @@ -318,13 +310,13 @@ static volatile struct sun4m_intregs *intregs; static void -ob_interrupt_init(uint64_t base, unsigned long offset) +ob_interrupt_init(uint64_t base, unsigned long offset, int ncpu) { int i; ob_new_obio_device("interrupt", NULL); - for (i = 0; i < SUN4M_NCPU; i++) { + for (i = 0; i < ncpu; i++) { PUSH(0); fword("encode-int"); if (i != 0) fword("encode+"); @@ -353,7 +345,7 @@ intregs->clear = ~SUN4M_INT_MASKALL; intregs->cpu_intregs[0].clear = ~0x17fff; - for (i = 0; i < SUN4M_NCPU; i++) { + for (i = 0; i < ncpu; i++) { PUSH((unsigned long)&intregs->cpu_intregs[i]); fword("encode-int"); if (i != 0) @@ -491,7 +483,7 @@ int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, unsigned long counter_offset, unsigned long intr_offset, - unsigned long aux1_offset, unsigned long aux2_offset, + int intr_ncpu, unsigned long aux1_offset, unsigned long aux2_offset, unsigned long mem_size) { @@ -523,9 +515,9 @@ if (aux2_offset != (unsigned long) -1) ob_aux2_reset_init(slavio_base, aux2_offset, AUXIO2_INTR); - ob_counter_init(slavio_base, counter_offset); + ob_counter_init(slavio_base, counter_offset, intr_ncpu); - ob_interrupt_init(slavio_base, intr_offset); + ob_interrupt_init(slavio_base, intr_offset, intr_ncpu); ob_smp_init(mem_size); ===================================================================

2 4

[commit] r1260 - trunk/openbios-devel/kernel
by repository service 07 Feb '14

07 Feb '14

Author: mcayland Date: Fri Feb 7 19:12:41 2014 New Revision: 1260 URL: http://tracker.coreboot.org/trac/openbios/changeset/1260 Log: bootstrap.c: replace name -> fil Because name does not exist! 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/kernel/bootstrap.c Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Fri Feb 7 19:12:34 2014 (r1259) +++ trunk/openbios-devel/kernel/bootstrap.c Fri Feb 7 19:12:41 2014 (r1260) @@ -513,11 +513,11 @@ if (ret != NULL) { #ifdef CONFIG_DEBUG_INTERPRETER - printk("Including '%s'\n", name ); + printk("Including '%s'\n", fil); #endif - srcfilenames[cursrc] = strdup(fil); - srclines [ cursrc ] = 1; - srcfiles [ cursrc++ ] = ret; + srcfilenames[cursrc] = strdup(fil); + srclines[cursrc] = 1; + srcfiles[cursrc++] = ret; if (depfile) { fprintf(depfile, " %s", fullpath);

1 0

[commit] r1259 - trunk/openbios-devel/drivers
by repository service 07 Feb '14

07 Feb '14

Author: mcayland Date: Fri Feb 7 19:12:34 2014 New Revision: 1259 URL: http://tracker.coreboot.org/trac/openbios/changeset/1259 Log: SPARC32: SparcStation 10/20 mode fix * SS10/20 use 36bits addresses. When mapping peripherals, bits [35:32] are not always tied to 0. * The probe-set-sbus forth word expects hex numbers for slots. SS5 uses slots 0 to 5, whereas SS10/20 uses the slot 0xF, and triggers the bug. 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/drivers/iommu.c trunk/openbios-devel/drivers/sbus.c Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Fri Feb 7 19:12:30 2014 (r1258) +++ trunk/openbios-devel/drivers/iommu.c Fri Feb 7 19:12:34 2014 (r1259) @@ -158,8 +158,8 @@ ucell size, virt; size = POP(); - POP(); phys = POP(); + phys = (phys << 32) + POP(); virt = ofmem_map_io(phys, size); Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Fri Feb 7 19:12:30 2014 (r1258) +++ trunk/openbios-devel/drivers/sbus.c Fri Feb 7 19:12:34 2014 (r1259) @@ -153,7 +153,7 @@ fword("new-device"); PUSH(0); PUSH(0); - snprintf(buf, 6, "%d,0", slot); + snprintf(buf, 6, "%x,0", slot); push_str(buf); fword("set-args"); feval("['] tcx-driver-fcode 2 cells + 1 byte-load"); @@ -268,7 +268,7 @@ PUSH(0); PUSH(0); - snprintf(buf, 6, "%d,%ld", slot, offset); + snprintf(buf, 6, "%x,%lx", slot, offset); push_str(buf); fword("2dup"); fword("probe-self-sbus");

1 0

[commit] r1258 - trunk/openbios-devel/drivers
by repository service 07 Feb '14

07 Feb '14

Author: mcayland Date: Fri Feb 7 19:12:30 2014 New Revision: 1258 URL: http://tracker.coreboot.org/trac/openbios/changeset/1258 Log: escc: fix keyboard property for SPARC32 The keyboard property should be empty. NetBSD accesses the keyboard property in 'kernel/arch/sparc/dev/zs.c' and checks this : (prom_getproplen(zsc->zsc_node, "keyboard") == 0) ...which is true only when the property exists but has no value. It matches Sun's OpenBOOT behavior. 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/drivers/escc.c Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Mon Jan 13 10:47:06 2014 (r1257) +++ trunk/openbios-devel/drivers/escc.c Fri Feb 7 19:12:30 2014 (r1258) @@ -329,13 +329,13 @@ fword("property"); if (keyboard) { - PUSH(-1); - fword("encode-int"); + PUSH(0); + PUSH(0); push_str("keyboard"); fword("property"); - PUSH(-1); - fword("encode-int"); + PUSH(0); + PUSH(0); push_str("mouse"); fword("property"); }

1 0

Fwd: Re: [PATCH] next-property
by Olivier Danet 05 Feb '14

05 Feb '14

On 03/02/2014 23:12, Olivier Danet wrote: > On 03/02/2014 15:21, Artyom Tarasenko wrote: >> On Sat, Feb 1, 2014 at 9:54 PM, Olivier Danet <odanet(a)caramail.com> >> wrote: >>> obp_nextprop(node,name) calls the Forth word "next-property" then >>> pops the >>> result. "next-property" should therefore always return something : >>> * A string when the property provided is not the last one of the >>> node. >>> * Zero when the property provided is the last one of the node. >>> * Zero when the property provided does not exist in the current node. >>> >>> Previously, next-property returned nothing when the property didn't >>> exist. >>> >>> "next-property" behavior with last and nonexistant properties differs >>> between implementations of OF. >> Right. As discussed before, the current behavior matches the OBP >> behavior on >> sun4u machines. >> >> It would be nice to keep the comatibility with OBP. Can the C function >> obp_nextprop(node,name) be modified instead? >> >> Artyom >> >>> This problem was found with NetBSD on Sparc32. It ennumerates >>> peripherals >>> when starting X11 and asks for the "name" and "device_type" property >>> of many >>> nodes, including some which have neither "name" nor "device_type" >>> properties. >>> >>> Signed-off-by: Olivier Danet <odanet(a)caramail.com> >>> =================================================================== >>> --- forth/device/property.fs (révision 1257) >>> +++ 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 >>> =================================================================== >>> >>> -- >>> OpenBIOS http://openbios.org/ >>> Mailinglist: http://lists.openbios.org/mailman/listinfo >>> Free your System - May the Forth be with you >> >> > > OpenBIOS's current behavior does not match any other ! > > For "next-property" we have 3 cases : > a) The property is not the last > b) The property is the last > c) The property does not exist > > Current OpenBIOS : a) -1 "string" b) 0 c) nothing > Standard : a) true "string" b) false c) false > Sun Ultra10 : a) -1 "string" b) nothing c) nothing > PowerPC iBook : a) -1 "string" b) -1 0 0 c) 0 > Previous patch : a) -1 "string" b) 0 c) 0 > > Here is a patch adhering to the Ultra10's behavior, maybe other > Sun4u computers do differently : > > =================================================================== > --- arch/sparc32/romvec.c (révision 1257) > +++ arch/sparc32/romvec.c (copie de travail) > @@ -173,8 +173,9 @@ > > const char *obp_nextprop(int node, const char *name) > { > - int found; > + int stackcnt; > > + stackcnt = dstackcnt; > if (!name || *name == '\0') { > // NULL name means get first property > push_str(""); > @@ -184,14 +185,13 @@ > } > PUSH(node); > fword("next-property"); > - found = POP(); > - if (!found) { > + if (dstackcnt == stackcnt) { > DPRINTF("obp_nextprop(0x%x, %s) (not found)\n", node, name); > > return ""; > } else { > char *str; > - > + POP(); /* true */ > POP(); /* len */ > str = (char *) POP(); > > =================================================================== > --- forth/device/property.fs (révision 1257) > +++ forth/device/property.fs (copie de travail) > @@ -70,14 +70,12 @@ > 2drop r> >dn.properties @ > else > r> find-property dup if @ then > - ?dup if >prop.next @ then > + dup if >prop.next @ then > then > > ?dup if > >prop.name @ dup cstrlen true > ( phandle name-str name-len true ) > - else > - false > then > ; > > =================================================================== > > The 'standard' way makes next-property more useable as > a Forth word, but, really, I don't care. > > Olivier > > Oh, sorry, please forget this patch. It breaks things elsewhere (".properties" ...)

2 1

[PATCH] Dummy tick counter
by Olivier Danet 05 Feb '14

05 Feb '14

romvec.pvtime is a pointer to a millisecond rate uptime counter. NextSTEP uses this counter for timing the 10 seconds timeout during boot, when asking for boot options. For now, let's just set this to a constant, there is no timeout, but we avoid null pointer dereferencing. Signed-off-by: Olivier Danet <odanet(a)caramail.com> =================================================================== --- arch/sparc32/romvec.c (révision 1257) +++ arch/sparc32/romvec.c (copie de travail) @@ -26,7 +26,7 @@ char obp_stdin, obp_stdout; const char *obp_stdin_path, *obp_stdout_path; - +int32_t obp_ticks; struct linux_arguments_v0 obp_arg; const char *bootpath; static const struct linux_arguments_v0 * const obp_argp = &obp_arg; @@ -456,6 +456,8 @@ via their handler (see call-romvec.S) which acts as a proxy to save the globals and setup the stack correctly */ + obp_ticks = 10000; /* Dummy. Ticks should be the uptime, in milliseconds. */ + // Linux wants a R/W romvec table romvec0.pv_magic_cookie = LINUX_OPPROM_MAGIC; romvec0.pv_romvers = 3; @@ -479,6 +481,7 @@ romvec0.pv_reboot = obp_reboot_handler; romvec0.pv_printf = obp_printf_handler; romvec0.pv_abort = obp_abort_handler; + romvec0.pv_ticks = &obp_ticks; romvec0.pv_halt = obp_halt_handler; romvec0.pv_synchook = &sync_hook; romvec0.pv_v0bootargs = &obp_argp; ===================================================================

2 1

[PATCH] Replace name -> fil
by Olivier Danet 05 Feb '14

05 Feb '14

Because name does not exist ! Signed-off-by: Olivier Danet <odanet(a)caramail.com> =================================================================== --- kernel/bootstrap.c (révision 1257) +++ kernel/bootstrap.c (copie de travail) @@ -513,7 +513,7 @@ if (ret != NULL) { #ifdef CONFIG_DEBUG_INTERPRETER - printk("Including '%s'\n", name ); + printk("Including '%s'\n", fil); #endif srcfilenames[cursrc] = strdup(fil); srclines [ cursrc ] = 1; ===================================================================

2 1

[PATCH] SparcStation 10/20 mode fix
by Olivier Danet 05 Feb '14

05 Feb '14

* SS10/20 use 36bits addresses. When mapping peripherals, bits [35:32] are not always tied to 0. * The probe-set-sbus forth word expects hex numbers for slots. SS5 uses slots 0 to 5, whereas SS10/20 uses the slot 0xF, and triggers the bug. Signed-off-by: Olivier Danet <odanet(a)caramail.com> =================================================================== --- drivers/iommu.c (révision 1257) +++ drivers/iommu.c (copie de travail) @@ -158,8 +158,8 @@ ucell size, virt; size = POP(); - POP(); phys = POP(); + phys = (phys << 32) + POP(); virt = ofmem_map_io(phys, size); =================================================================== --- drivers/sbus.c (révision 1257) +++ drivers/sbus.c (copie de travail) @@ -153,7 +153,7 @@ fword("new-device"); PUSH(0); PUSH(0); - snprintf(buf, 6, "%d,0", slot); + snprintf(buf, 6, "%x,0", slot); push_str(buf); fword("set-args"); feval("['] tcx-driver-fcode 2 cells + 1 byte-load"); @@ -268,7 +268,7 @@ PUSH(0); PUSH(0); - snprintf(buf, 6, "%d,%ld", slot, offset); + snprintf(buf, 6, "%x,%lx", slot, offset); push_str(buf); fword("2dup"); fword("probe-self-sbus"); ===================================================================

2 1

[PATCH] Keyboard property
by Olivier Danet 05 Feb '14

05 Feb '14

The keyboard property should be empty. NetBSD accesses the keyboard property in 'kernel/arch/sparc/dev/zs.c' and checks this : (prom_getproplen(zsc->zsc_node, "keyboard") == 0) ...which is true only when the property exists but has no value. It matches Sun's OpenBOOT behavior. Signed-off-by: Olivier Danet <odanet(a)caramail.com> =================================================================== --- drivers/escc.c (révision 1257) +++ drivers/escc.c (copie de travail) @@ -329,13 +329,13 @@ fword("property"); if (keyboard) { - PUSH(-1); - fword("encode-int"); + PUSH(0); + PUSH(0); push_str("keyboard"); fword("property"); - PUSH(-1); - fword("encode-int"); + PUSH(0); + PUSH(0); push_str("mouse"); fword("property"); } ===================================================================

2 1

Re: [OpenBIOS] [PATCH] next-property
by Olivier Danet 03 Feb '14

03 Feb '14

On 03/02/2014 15:21, Artyom Tarasenko wrote: > On Sat, Feb 1, 2014 at 9:54 PM, Olivier Danet <odanet(a)caramail.com> wrote: >> obp_nextprop(node,name) calls the Forth word "next-property" then pops the >> result. "next-property" should therefore always return something : >> * A string when the property provided is not the last one of the node. >> * Zero when the property provided is the last one of the node. >> * Zero when the property provided does not exist in the current node. >> >> Previously, next-property returned nothing when the property didn't exist. >> >> "next-property" behavior with last and nonexistant properties differs >> between implementations of OF. > Right. As discussed before, the current behavior matches the OBP behavior on > sun4u machines. > > It would be nice to keep the comatibility with OBP. Can the C function > obp_nextprop(node,name) be modified instead? > > Artyom > >> This problem was found with NetBSD on Sparc32. It ennumerates peripherals >> when starting X11 and asks for the "name" and "device_type" property of many >> nodes, including some which have neither "name" nor "device_type" >> properties. >> >> Signed-off-by: Olivier Danet <odanet(a)caramail.com> >> =================================================================== >> --- forth/device/property.fs (révision 1257) >> +++ 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 >> =================================================================== >> >> -- >> OpenBIOS http://openbios.org/ >> Mailinglist: http://lists.openbios.org/mailman/listinfo >> Free your System - May the Forth be with you > > OpenBIOS's current behavior does not match any other ! For "next-property" we have 3 cases : a) The property is not the last b) The property is the last c) The property does not exist Current OpenBIOS : a) -1 "string" b) 0 c) nothing Standard : a) true "string" b) false c) false Sun Ultra10 : a) -1 "string" b) nothing c) nothing PowerPC iBook : a) -1 "string" b) -1 0 0 c) 0 Previous patch : a) -1 "string" b) 0 c) 0 Here is a patch adhering to the Ultra10's behavior, maybe other Sun4u computers do differently : =================================================================== --- arch/sparc32/romvec.c (révision 1257) +++ arch/sparc32/romvec.c (copie de travail) @@ -173,8 +173,9 @@ const char *obp_nextprop(int node, const char *name) { - int found; + int stackcnt; + stackcnt = dstackcnt; if (!name || *name == '\0') { // NULL name means get first property push_str(""); @@ -184,14 +185,13 @@ } PUSH(node); fword("next-property"); - found = POP(); - if (!found) { + if (dstackcnt == stackcnt) { DPRINTF("obp_nextprop(0x%x, %s) (not found)\n", node, name); return ""; } else { char *str; - + POP(); /* true */ POP(); /* len */ str = (char *) POP(); =================================================================== --- forth/device/property.fs (révision 1257) +++ forth/device/property.fs (copie de travail) @@ -70,14 +70,12 @@ 2drop r> >dn.properties @ else r> find-property dup if @ then - ?dup if >prop.next @ then + dup if >prop.next @ then then ?dup if >prop.name @ dup cstrlen true ( phandle name-str name-len true ) - else - false then ; =================================================================== The 'standard' way makes next-property more useable as a Forth word, but, really, I don't care. Olivier

1 0

[PATCH] next-property
by Olivier Danet 03 Feb '14

03 Feb '14

obp_nextprop(node,name) calls the Forth word "next-property" then pops the result. "next-property" should therefore always return something : * A string when the property provided is not the last one of the node. * Zero when the property provided is the last one of the node. * Zero when the property provided does not exist in the current node. Previously, next-property returned nothing when the property didn't exist. "next-property" behavior with last and nonexistant properties differs between implementations of OF. This problem was found with NetBSD on Sparc32. It ennumerates peripherals when starting X11 and asks for the "name" and "device_type" property of many nodes, including some which have neither "name" nor "device_type" properties. Signed-off-by: Olivier Danet <odanet(a)caramail.com> =================================================================== --- forth/device/property.fs (révision 1257) +++ 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 ===================================================================

2 1

Some SPARC32 Patches
by Olivier Danet 31 Jan '14

31 Jan '14

Hello ! Here are a few patches for QEMU and OpenBIOS, about SPARC32, grouped into two diffs: OpenBIOS : http://temlib.org/pub/openbios_nn.diff QEMU : http://temlib.org/pub/qemu_nn.diff Changes: OpenBIOS * SparcStation10/20 mode fix (drivers/iommu.c, drivers/sbus.c) - TCX properties (drivers/tcx.fs) - next-property (forth/device/property.fs) - Keyboard property (drivers/escc.c) + Memory allocation/deallocation (arch/sparc32/lib.c, arch/sparc32/ofmem_sparc32.c, libopenbios/ofmem_common.c, arch/sparc32/romvec.h) + a.out file loading (libopenbios/aout_load.c) + Dummy TICK counter (arch/sparc32/romvec.c) + Interrupt/Timer properties (include/drivers/drivers.h, forth/device/property.fs, drivers/obio.c) QEMU - TCX Hardware acceleration : Blitter, Stippler, HW cursor (hw/display/tcx.c, hw/sparc/sun4m.c) - "!TC on DATA XFER" warning under NetBSD (hw/scsi/esp.c) + Timer Run/Stop bit correction (hw/timer/slavio_timer.c) TCX emulation with acceleration seems good enough, although it is incomplete and it is probably impossible to implement the 24bits mode accurately and efficiently in QEMU. I will post each patch separately on the two mailing lists. TCX patches should be synchronised : OpenBIOS cannot advertise an hardware cursor until it is actually implemented. One more thing. After NetBSD and TCX acceleration, I tried NextSTEP, which needs the patches marked + above. Alas, this is not enough to make it run. Maybe it is because QEMU SCSI disk and ESP emulation are too fast. Olivier

5 4

Re: [OpenBIOS] next-property
by Olivier Danet 25 Jan '14

25 Jan '14

On 03/01/2014 17:09, Artyom Tarasenko wrote: > On Thu, Jan 2, 2014 at 2:43 AM, Olivier Danet <odanet(a)caramail.com> wrote: >> 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. > Actually this matches pretty much with what OBP does: > > ok showstack > ok " model" current-device next-property > fffe61e8 4 ffffffffffffffff ok drop type > name > ok " bozo" current-device next-property > ok > > Artyom > >> 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 :-) >> >> >> -- >> OpenBIOS http://openbios.org/ >> Mailinglist: http://lists.openbios.org/mailman/listinfo >> Free your System - May the Forth be with you > > You are right. I tried on an Ultra 10 with OpenBoot 3.12. next-property returns nothing when the property is unknown and also when the property is the last one. This contradicts Sun own documentation "Writing FCode 3.x Programs". Puzzled, I tried then on a Apple iBook G3 : dev screen " <something>" active-package next-property This laptop returns : - true and a forth string when the property is not the last one - true and "0 0" when the property is the last one - false when the property does not exist. Anyway, whatever method is chosen (return nothing, return zero...), OpenBIOS forth and/or C code ("opb_nextprop()") should be modifed to avoid page faults. Olivier

3 10

[commit] r1257 - trunk/openbios-devel/arch/sparc32
by repository service 13 Jan '14

13 Jan '14

Author: mcayland Date: Mon Jan 13 10:47:06 2014 New Revision: 1257 URL: http://tracker.coreboot.org/trac/openbios/changeset/1257 Log: SPARC32: create proper romvec memory lists from OFMEM memory properties Previously we would try and set safe values for the romvec properties list rather than calculating them. This should provide older clients with a more accurate representation of the memory areas they are allowed to use. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc32/romvec.c Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Mon Jan 13 10:47:04 2014 (r1256) +++ trunk/openbios-devel/arch/sparc32/boot.c Mon Jan 13 10:47:06 2014 (r1257) @@ -8,6 +8,7 @@ #include "drivers/drivers.h" #include "libc/diskio.h" #include "libc/vsprintf.h" +#include "libopenbios/ofmem.h" #include "libopenbios/sys_info.h" #include "openprom.h" #include "boot.h" @@ -20,17 +21,20 @@ char boot_device; const void *romvec; +static struct linux_mlist_v0 *totphyslist, *availlist, *prommaplist; static void setup_romvec(void) { /* SPARC32 is slightly unusual in that before invoking any loaders, a romvec array needs to be set up to pass certain parameters using a C struct. Hence this function extracts the relevant boot information and places it in obp_arg. */ - - int intprop, proplen, target, device; + + int intprop, proplen, target, device, i; + unsigned int *intprop_ptr; phandle_t chosen; char *prop, *id, *name; static char bootpathbuf[128], bootargsbuf[128], buf[128]; + struct linux_mlist_v0 **pp; /* Get the stdin and stdout paths */ chosen = find_dev("/chosen"); @@ -132,6 +136,60 @@ obp_arg.argv[1] = bootargsbuf; } + + /* Generate the totphys (total memory available) list */ + prop = get_property(s_phandle_memory, "reg", &proplen); + intprop_ptr = (unsigned int *)prop; + + for (pp = &totphyslist, i = 0; i < (proplen / sizeof(int)); pp = &(**pp).theres_more, i+=3) { + *pp = (struct linux_mlist_v0 *)malloc(sizeof(struct linux_mlist_v0)); + (**pp).theres_more = NULL; + (**pp).start_adr = (char *)intprop_ptr[1]; + (**pp).num_bytes = intprop_ptr[2]; + + printk("start_adr: %x\n", (int)(**pp).start_adr); + printk("num_bytes: %x\n", (**pp).num_bytes); + + intprop_ptr += 3; + } + + /* Generate the avail (physical memory available) list */ + prop = get_property(s_phandle_memory, "available", &proplen); + intprop_ptr = (unsigned int *)prop; + + for (pp = &availlist, i = 0; i < (proplen / sizeof(int)); pp = &(**pp).theres_more, i+=3) { + *pp = (struct linux_mlist_v0 *)malloc(sizeof(struct linux_mlist_v0)); + (**pp).theres_more = NULL; + (**pp).start_adr = (char *)intprop_ptr[1]; + (**pp).num_bytes = intprop_ptr[2]; + + intprop_ptr += 3; + } + + /* Generate the prommap (taken virtual memory) list from inverse of available */ + prop = get_property(s_phandle_mmu, "available", &proplen); + intprop_ptr = (unsigned int *)prop; + + for (pp = &prommaplist, i = 0; i < (proplen / sizeof(int)); pp = &(**pp).theres_more, i+=3) { + *pp = (struct linux_mlist_v0 *)malloc(sizeof(struct linux_mlist_v0)); + (**pp).theres_more = NULL; + (**pp).start_adr = (char *)(intprop_ptr[1] + intprop_ptr[2]); + + if (i + 3 < (proplen / sizeof(int))) { + /* Size from next entry */ + (**pp).num_bytes = (intprop_ptr[4] + intprop_ptr[5]) - (intprop_ptr[1] + intprop_ptr[2]); + } else { + /* Tail (size from top of virtual memory) */ + (**pp).num_bytes = 0xffffffffUL - (intprop_ptr[1] + intprop_ptr[2]); + } + + intprop_ptr += 3; + } + + /* Finally set the memory properties */ + ((struct linux_romvec *)romvec)->pv_v0mem.v0_totphys = &totphyslist; + ((struct linux_romvec *)romvec)->pv_v0mem.v0_available = &availlist; + ((struct linux_romvec *)romvec)->pv_v0mem.v0_prommap = &prommaplist; } Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Mon Jan 13 10:47:04 2014 (r1256) +++ trunk/openbios-devel/arch/sparc32/lib.c Mon Jan 13 10:47:06 2014 (r1257) @@ -59,14 +59,6 @@ unsigned long *l1; static unsigned long *context_table; -static ucell *mem_reg = 0; -static ucell *mem_avail = 0; -static ucell *virt_avail = 0; - -static struct linux_mlist_v0 totphys[1]; -static struct linux_mlist_v0 totmap[1]; -static struct linux_mlist_v0 totavail[1]; - struct linux_mlist_v0 *ptphys; struct linux_mlist_v0 *ptmap; struct linux_mlist_v0 *ptavail; @@ -200,55 +192,6 @@ ofmem_arch_map_pages(pa, va, size, ofmem_arch_default_translation_mode(pa)); } -static void -update_memory_properties(void) -{ - /* Update the device tree memory properties from the master - totphys, totmap and totavail romvec arrays */ - mem_reg[0] = 0; - mem_reg[1] = pointer2cell(totphys[0].start_adr); - mem_reg[2] = totphys[0].num_bytes; - - virt_avail[0] = 0; - virt_avail[1] = 0; - virt_avail[2] = pointer2cell(totmap[0].start_adr); - - mem_avail[0] = 0; - mem_avail[1] = pointer2cell(totavail[0].start_adr); - mem_avail[2] = totavail[0].num_bytes; -} - -static void -init_romvec_mem(void) -{ - ptphys = totphys; - ptmap = totmap; - ptavail = totavail; - - /* - * Form memory descriptors. - */ - totphys[0].theres_more = NULL; - totphys[0].start_adr = (char *) 0; - totphys[0].num_bytes = qemu_mem_size; - - totavail[0].theres_more = NULL; - totavail[0].start_adr = (char *) 0; - totavail[0].num_bytes = va2pa((int)&_start) - PAGE_SIZE; - - totmap[0].theres_more = NULL; - totmap[0].start_adr = &_start; - totmap[0].num_bytes = (unsigned long) &_iomem - - (unsigned long) &_start + PAGE_SIZE; - - /* Pointers to device tree memory properties */ - mem_reg = malloc(sizeof(ucell) * 3); - mem_avail = malloc(sizeof(ucell) * 3); - virt_avail = malloc(sizeof(ucell) * 3); - - update_memory_properties(); -} - char *obp_dumb_mmap(char *va, int which_io, unsigned int pa, unsigned int size) { @@ -326,8 +269,6 @@ phys_addr_t virtregsize; ofmem_t *ofmem = ofmem_arch_get_private(); - init_romvec_mem(); - /* Find the phandles for the /memory and /virtual-memory nodes */ push_str("/memory"); fword("find-package"); Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Mon Jan 13 10:47:04 2014 (r1256) +++ trunk/openbios-devel/arch/sparc32/romvec.c Mon Jan 13 10:47:06 2014 (r1257) @@ -461,9 +461,9 @@ romvec0.pv_romvers = 3; 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; + romvec0.pv_v0mem.v0_totphys = NULL; + romvec0.pv_v0mem.v0_prommap = NULL; + romvec0.pv_v0mem.v0_available = NULL; romvec0.pv_nodeops = &nodeops0; romvec0.pv_bootstr = (void *)doublewalk; romvec0.pv_v0devops.v0_devopen = &obp_devopen_handler;

1 0

[commit] r1256 - trunk/openbios-devel/arch/sparc32
by repository service 13 Jan '14

13 Jan '14

Author: mcayland Date: Mon Jan 13 10:47:04 2014 New Revision: 1256 URL: http://tracker.coreboot.org/trac/openbios/changeset/1256 Log: SPARC32: move romvec initialisation out of go() and into a separate function The go word should just execute the current program context, otherwise the romvec contents will get altered if called by a client. 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 Mon Jan 13 10:46:59 2014 (r1255) +++ trunk/openbios-devel/arch/sparc32/boot.c Mon Jan 13 10:47:04 2014 (r1256) @@ -20,26 +20,18 @@ char boot_device; const void *romvec; -void go(void) + +static void setup_romvec(void) { - ucell address, type, size; - int image_retval = 0, intprop, proplen, target, device; + /* SPARC32 is slightly unusual in that before invoking any loaders, a romvec array + needs to be set up to pass certain parameters using a C struct. Hence this function + extracts the relevant boot information and places it in obp_arg. */ + + int intprop, proplen, target, device; phandle_t chosen; char *prop, *id, *name; static char bootpathbuf[128], bootargsbuf[128], buf[128]; - /* Get the entry point and the type (see forth/debugging/client.fs) */ - feval("saved-program-state >sps.entry @"); - address = POP(); - feval("saved-program-state >sps.file-type @"); - type = POP(); - feval("saved-program-state >sps.file-size @"); - size = POP(); - - /* SPARC32 is slightly unusual in that before invoking any loaders, a romvec array - needs to be set up to pass certain parameters using a C struct. Hence this section - extracts the relevant boot information and places it in obp_arg. */ - /* Get the stdin and stdout paths */ chosen = find_dev("/chosen"); intprop = get_int_property(chosen, "stdin", &proplen); @@ -140,7 +132,24 @@ obp_arg.argv[1] = bootargsbuf; } - +} + + +void go(void) +{ + ucell address, type, size; + int image_retval = 0; + + /* Get the entry point and the type (see forth/debugging/client.fs) */ + feval("saved-program-state >sps.entry @"); + address = POP(); + feval("saved-program-state >sps.file-type @"); + type = POP(); + feval("saved-program-state >sps.file-size @"); + size = POP(); + + setup_romvec(); + printk("\nJumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); switch (type) {

1 0

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

13 Jan '14

Author: mcayland Date: Mon Jan 13 10:46:59 2014 New Revision: 1255 URL: http://tracker.coreboot.org/trac/openbios/changeset/1255 Log: OFMEM: allocate retained memory top downwards Not only does this match the behaviour of the other routines, but it also fixes a bug whereby the first free physical memory location was 0x0 and so page zero was being returned for use by SUNW,retain clients. Due to the way in which PCI/ISA devices are mapped in QEMU (e.g. IDE ioports) then clients could inadvertantly start writing to device registers. 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 Mon Jan 13 10:46:56 2014 (r1254) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Mon Jan 13 10:46:59 2014 (r1255) @@ -599,7 +599,7 @@ " align=" FMT_ucellx "\n", phys, size, align); - retain_phys = ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); + retain_phys = ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 1 /* reverse */ ); /* Add to the retain_phys_range list */ retained->retain_phys_range[retained->numentries].next = NULL;

1 0

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

13 Jan '14

Author: mcayland Date: Mon Jan 13 10:46:56 2014 New Revision: 1254 URL: http://tracker.coreboot.org/trac/openbios/changeset/1254 Log: fcode_load.c: don't skip the FCode header when invoked via init-program The FCode start address was set to bypass the FCode header rather than just executing the first word which does this automatically (and may even one day verify the payload contents/length). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/libopenbios/fcode_load.c Modified: trunk/openbios-devel/libopenbios/fcode_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/fcode_load.c Mon Jan 13 10:46:53 2014 (r1253) +++ trunk/openbios-devel/libopenbios/fcode_load.c Mon Jan 13 10:46:56 2014 (r1254) @@ -94,7 +94,6 @@ { /* If the payload is Fcode then we execute it immediately */ ucell address; - uint8_t fcode_header[8]; fword("load-base"); address = POP(); @@ -104,7 +103,7 @@ return; } - PUSH(address + sizeof(fcode_header)); + PUSH(address); PUSH(1); fword("byte-load"); }

1 0

[commit] r1253 - trunk/openbios-devel/forth/device
by repository service 13 Jan '14

13 Jan '14

Author: mcayland Date: Mon Jan 13 10:46:53 2014 New Revision: 1253 URL: http://tracker.coreboot.org/trac/openbios/changeset/1253 Log: other.fs: ensure the FCode function end0 is executed in immediate mode As per the IEEE1275 specification, end0 should set fcode-end to true in both FCode evaluation and execution modes. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/other.fs Modified: trunk/openbios-devel/forth/device/other.fs ============================================================================== --- trunk/openbios-devel/forth/device/other.fs Mon Jan 13 10:46:51 2014 (r1252) +++ trunk/openbios-devel/forth/device/other.fs Mon Jan 13 10:46:53 2014 (r1253) @@ -174,7 +174,7 @@ \ Cease evaluating this FCode program. : end0 ( -- ) true fcode-end ! - ; + ; immediate \ Cease evaluating this FCode program. : end1 ( -- )

1 0

[commit] r1252 - trunk/openbios-devel/forth/device
by repository service 13 Jan '14

13 Jan '14

Author: mcayland Date: Mon Jan 13 10:46:51 2014 New Revision: 1252 URL: http://tracker.coreboot.org/trac/openbios/changeset/1252 Log: feval.fs: enable OpenBIOS to recover correctly from invalid FCode If invalid FCode has been executed, the FCode interpreter may have exited whilst still in compile mode, causing OpenBIOS internals to become corrupted. Detect this condition and switch back to immediate mode to prevent subsequent random internal errors within OpenBIOS. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/feval.fs Modified: trunk/openbios-devel/forth/device/feval.fs ============================================================================== --- trunk/openbios-devel/forth/device/feval.fs Mon Jan 13 10:46:46 2014 (r1251) +++ trunk/openbios-devel/forth/device/feval.fs Mon Jan 13 10:46:51 2014 (r1252) @@ -49,6 +49,15 @@ , then fcode-end @ until + + \ If we've executed incorrect FCode we may have reached the end of the FCode + \ program but still be in compile mode. Make sure that if this has happened + \ then we switch back to immediate mode to prevent internal OpenBIOS errors. + tmp-comp-depth @ -1 <> if + -1 tmp-comp-depth ! + tmp-comp-buf @ @ here! + 0 state ! + then ; : byte-load ( addr xt -- )

1 0

[commit] r1251 - trunk/openbios-devel/forth/system
by repository service 13 Jan '14

13 Jan '14

Author: mcayland Date: Mon Jan 13 10:46:46 2014 New Revision: 1251 URL: http://tracker.coreboot.org/trac/openbios/changeset/1251 Log: ciface.fs: enable test-method for all architectures Currently it is only compiled for PPC, but at least *BSD on SPARC64 try to make use of it too. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/system/ciface.fs Modified: trunk/openbios-devel/forth/system/ciface.fs ============================================================================== --- trunk/openbios-devel/forth/system/ciface.fs Mon Jan 13 10:46:43 2014 (r1250) +++ trunk/openbios-devel/forth/system/ciface.fs Mon Jan 13 10:46:46 2014 (r1251) @@ -315,17 +315,12 @@ outer-interpreter ; -[IFDEF] CONFIG_PPC -\ PowerPC Microprocessor CHRP binding -\ 10.5.2. Client Interface - ( cstring-method phandle -- missing ) : test-method swap dup cstrlen rot find-method 0= if -1 else drop 0 then ; -[THEN] finish-device device-end

1 0

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

13 Jan '14

Author: mcayland Date: Mon Jan 13 10:46:43 2014 New Revision: 1250 URL: http://tracker.coreboot.org/trac/openbios/changeset/1250 Log: client.c: stop clients from being able to invoke stack underflow Clients that incorrectly requested too many return arguments for a client interface call could cause a Forth stack underflow (this was discovered due to a bug in NetBSD SPARC64). Ensure that we can never POP() beyond the original position of the stack from before the client interface call. 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 10:46:41 2014 (r1249) +++ trunk/openbios-devel/libopenbios/client.c Mon Jan 13 10:46:43 2014 (r1250) @@ -244,41 +244,43 @@ /* call-method, interpret */ static int -handle_calls( prom_args_t *pb ) +handle_calls(prom_args_t *pb) { - int i, dstacksave = dstackcnt; - prom_uarg_t val; + int i, j, dstacksave; + ucell 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); #endif + dstacksave = dstackcnt; for (i = pb->nargs - 1; i >= 0; i--) PUSH(pb->args[i]); push_str(get_service(pb)); fword("client-call-iface"); - /* Drop the return code from client-call-iface (status is handled by the - catch result which is the first parameter below) */ - POP(); - - for (i = 0; i < pb->nret; i++) { - val = POP(); - pb->args[pb->nargs + i] = val; + /* If the catch result is non-zero, restore stack and exit */ + val = POP(); + if (val) { + dstackcnt = dstacksave; + return 0; + } - /* don't pop args if an exception occured */ - if (!i && val) - break; + j = dstackcnt; + for (i = 0; i < pb->nret; i++, j--) { + if (dstackcnt > dstacksave) { + pb->args[pb->nargs + i] = POP(); + } } #ifdef DEBUG_CIF /* useful for debug but not necessarily an error */ - if (i != pb->nret || dstackcnt != dstacksave) { + if (j != 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); + pb->nargs - 2, pb->nret, j - dstacksave); } printk("handle_calls return:"); @@ -293,10 +295,11 @@ } int -of_client_interface( int *params ) +of_client_interface(int *params) { prom_args_t *pb = (prom_args_t*)params; - int val, i, dstacksave; + ucell val; + int i, j, dstacksave; if (pb->nargs < 0 || pb->nret < 0 || pb->nargs + pb->nret > PROM_MAX_ARGS) @@ -317,34 +320,41 @@ push_str(get_service(pb)); fword("client-iface"); - if (val=POP()) { - dstackcnt = dstacksave; - if (val == -1) + val = POP(); + if (val) { + 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); + } else { #ifdef DEBUG_CIF - else - printk("ERROR!\n"); + printk("Error calling client interface: " FMT_ucellx "\n", val); #endif + } + + dstackcnt = dstacksave; return -1; } - for (i = 0; i < pb->nret ; i++) - pb->args[pb->nargs + i] = POP(); + j = dstackcnt; + for (i = 0; i < pb->nret; i++, j--) { + if (dstackcnt > dstacksave) { + pb->args[pb->nargs + i] = POP(); + } + } - if (dstackcnt != dstacksave) { #ifdef DEBUG_CIF + if (j != dstacksave) { printk("service %s: possible argument error (%d %d)\n", - get_service(pb), i, dstackcnt - dstacksave); -#endif + get_service(pb), i, j - dstacksave); + /* Some clients request less parameters than the CIF method returns, e.g. getprop with OpenSolaris. Hence we drop any - stack parameters after issuing a warning above */ - dstackcnt = dstacksave; + stack parameters on exit after issuing a warning above */ } -#ifdef DEBUG_CIF dump_return(pb); #endif + + dstackcnt = dstacksave; return 0; }

1 0

[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

Re: [OpenBIOS] Qemu/OpenBIOS 64-bit
by Mark Cave-Ayland 31 Dec '13

31 Dec '13

On 29/12/13 14:12, Artyom Tarasenko wrote: >> Gah. Sorry Nick - this message was definitely a case of "fingers before >> brain. What I meant to say was that I see the "VAC too big!" error on my >> local copy of *64-bit* Solaris 9 too. I currently don't have access to a >> Solaris 9 32-bit image for testing, but it sounds as if it is working fine >> for you which is great. > > Actually "VAC too big" is a pretty nice error: it should happen in the > early sfmmu initialization phase, but for some reason I never get it. > I tried to make the boot process more verbose, but for this I'd need a > working kadb. Maybe it's easy to make it working? > With CIF_DEBUG booting kadb looks like this: > > Jumping to entry point 0000000000100000 for type 0000000000000001... > switching to new context: entry point 0x100000 stack 0x00000000ffe86a01 > finddevice("/chosen") = 0x00000000ffe1bed0 > getproplen(0x00000000ffe1bed0, "mmu") = 0x0000000000000004 > getproplen(0x00000000ffe1bed0, "mmu") = 0x0000000000000004 > getprop(0x00000000ffe1bed0, "mmu", 0x000000000013e02c, 4) = service > getprop: possible argument error (0 1) > > ^^^ The message about possible argument error keeps appearing on every > call after this point. > [...] > > getprop(0x00000000ffe30940, "clock-frequency", 0x0000000000138608, 4) > = service getprop: possible argument error (0 1) > 3990516880 > 0x00138608 05 f5 e1 00 __ __ __ __ __ __ __ __ __ __ __ __ .��. > getproplen(0x00000000ffe30940, "status") = 0xffffffffffffffff > > ^^^ are we missing "status" property? > > child(0x00000000ffe30940) = 0x0000000000000000 > peer(0x00000000ffe30940) = 0x0000000000000000 > peer(0x00000000ffe1b838) = 0x0000000000000000 > of_client_interface: interpret 00000000eddac894 0000000000000000 > 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > interpret : kadb_callback %pc dup f000.0000 ffff.ffff between if > drop exit then h# eddda630 x! %npc h# eddb0758 x! %g1 h# > eddda6d0 x! %g2 h# eddda6d8 x! %g3 h# eddda6e0 x! %g4 h# > eddda720 x! %g5 h# eddda728 x! %g6 h# eddda730 x! %g7 h# > eddda738 x! 1 %tstate h# eddaf070 x! 1 %tt h# eddd9e48 l! h# > edd008ec set-pc go ; ([6] -- [0]) > %pc:interpret: exception -13 caught > > ^^^ I guess things go wrong after this point. > > interpret ': kadb_callback %pc dup f000.0000 ffff.ffff between if > drop exit then h# eddda630 x! %npc h# eddb0758 x! %g1 h# > eddda6d0 x! %g2 h# eddda6d8 x! %g3 h# eddda6e0 x! %g4 h# > eddda720 x! %g5 h# eddda728 x! %g6 h# eddda730 x! %g7 h# > eddda738 x! 1 %tstate h# eddaf070 x! 1 %tt h# eddd9e48 l! h# > edd008ec set-pc go ; ': possible argument error (4--0) got 0 > handle_calls return: > of_client_interface: interpret 00000000edd28010 0000000000000000 > 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > interpret ['] kadb_callback init-debugger-hook ([6] -- [0]) > kadb_callback:interpret: exception -13 caught > interpret ' ['] kadb_callback init-debugger-hook ': possible argument > error (4--0) got 0 > > And then kadb prompt appears but it can't start executing the kernel: > > kadb[0]: :c > of_client_interface: call-method 00000000eddac6e0 00000000ffc847f0 > 0000000001006000 > call-method translate ([3] -- [5]) > handle_calls return: 0000000000000000 ffffffffffffffff > 0000000000000032 0000000000000000 000000001f806000 > of_client_interface: call-method 00000000eddac668 00000000ffc847f0 > 0000000000000033 0000000000002000 00000000ffc7e000 0000000000000000 > 000000001f806000 > call-method map ([7] -- [1]) > handle_calls return: 0000000000000000 > of_client_interface: call-method 00000000eddac6c8 00000000ffc847f0 > 0000000000002000 00000000ffc7e000 > call-method unmap ([4] -- [0]) > call-method 'unmap': possible argument error (2--0) got 0 > handle_calls return: > Unhandled Exception 0x000000000000017e > PC = 0x0000000001006f90 NPC = 0x0000000001006f94 > Stopping execution Ah this is because of a bug in Solaris whereby it requests too many parameters to be returned with respect to the CIF method that is being called. The fix is for OpenBIOS to not allow the client to POP() more items from the stack than were there before the CIF call, for which I have a local patch whilst I wait for the QEMU guys to update their git repository from our SVN. Please try the attached and let me know if you manage to get any further. ATB, Mark.

2 2

Can init-program cause code to run?
by Mark Cave-Ayland 31 Dec '13

31 Dec '13

Hi all, I've recently seen a couple of test cases in SPARC64 Forth bootloaders whereby during execution, the bootloaders call "init-program" on an address and expect it to start executing immediately. My understanding from reading the IEEE1275 specification is that "init-program" merely sets up the execution state ready for it to be invoked by "go" and doesn't start execution itself - or could it be that because "go" is currently running then "init-program" detects this and automatically re-invokes "go" on the new payload itself? ATB, Mark.

1 0

Qemu/OpenBIOS 64-bit
by Nick Couchman 29 Dec '13

29 Dec '13

So, I have Solaris 9 working inside a qemu-system-sparc (32-bit) environment with OpenBIOS, but no such luck getting 64-bit Solaris (8/9/10/11) to boot. I've attached boot output from Solaris verions 8, 9, 10, and 11. Getting a later version (10+) to work would be nice, since it seems that at least up to Solaris 9 doesn't support CPU power management, which means the qemu-system-sparc process runs at 100% CPU usage constantly. If I need to hook up a debugger and do more digging, I can...just let me know. Thanks, Nick -------- This e-mail may contain SEAKR Engineering (SEAKR) Confidential and Proprietary Information. If this message is not intended for you, you are strictly prohibited from using this message, its contents or attachments in any way. If you have received this message in error, please delete the message from your mailbox. This e-mail may contain export-controlled material and should be handled accordingly.

4 9

Qemu, OpenBIOS, and HostID
by Nick Couchman 29 Dec '13

29 Dec '13

First, thanks to everyone who has worked to get OpenBIOS up to its current functional level over the past couple of years. I'm using Solaris 9 on OpenBIOS with pretty good success these days, which is awesome. I do have a question about Qemu, OpenBIOS, and the Solaris hostid. It seems that, currently, when booting Solaris with Qemu, the host ID is set to "80000000." As far as I can tell, this isn't near correct - according to all of the documentation I've read, the host ID should be calculated based on the machine type, and some portion of the MAC address. This may be the wrong forum in which to ask this, but I'm wondering if someone could shed light on why it shows up that way, and if there's a way in OpenBIOS via the PROM/NVRAM data to set the host ID to something a little bit closer to normal? Thanks! -Nick -------- This e-mail may contain SEAKR Engineering (SEAKR) Confidential and Proprietary Information. If this message is not intended for you, you are strictly prohibited from using this message, its contents or attachments in any way. If you have received this message in error, please delete the message from your mailbox. This e-mail may contain export-controlled material and should be handled accordingly.

5 10

Re: [OpenBIOS] Qemu, OpenBIOS, and HostID
by Olivier Danet 28 Dec '13

28 Dec '13

On 28/12/2013 22:16, Artyom Tarasenko wrote: > Hi Oliver, > > On Fri, Dec 27, 2013 at 10:56 PM, Olivier Danet <odanet(a)caramail.com> wrote: >> On 27/12/2013 20:42, Tarl Neustaedter wrote: >>> On 2013-Dec-27, 14:10 , Nick Couchman wrote: >>>> First, thanks to everyone who has worked to get OpenBIOS up to its >>>> current functional level over the past couple of years. I'm using Solaris 9 >>>> on OpenBIOS with pretty good success these days, which is awesome. >>>> >>>> I do have a question about Qemu, OpenBIOS, and the Solaris hostid. It >>>> seems that, currently, when booting Solaris with Qemu, the host ID is set to >>>> "80000000." As far as I can tell, this isn't near correct - according to >>>> all of the documentation I've read, the host ID should be calculated based >>>> on the machine type, and some portion of the MAC address. This may be the >>>> wrong forum in which to ask this, but I'm wondering if someone could shed >>>> light on why it shows up that way, and if there's a way in OpenBIOS via the >>>> PROM/NVRAM data to set the host ID to something a little bit closer to >>>> normal? >>> >>> The HOSTID used to have embedded knowledge about the system type and other >>> details. As of (I recall) Sun4u, the hostid is 0x8000.0000 plus a serial >>> number. Openbios should pick a number other than "0" for the serial number >>> :-) >>> >>> >> [On 32bits SparcStations] >> The Host ID is made of the machine type and the serial number. >> the serial number is identical to three bytes of the Ethernet MAC address, >> shown as decimal during boot. >> All that stuff is written into the NVRAM >> >> For example, on a SparcStation 20 : >> MAC Address = 08:00:20:74:FB:DA >> Host ID = 7274FBDA (72 is the machine type of the SS20) >> Serial number = #7666650 = 0x74FBDA >> >> (And the barcode on the NVRAM chip is also "74FBDA" ) >> >> On a SparcStation5, the machine type is 0x80, everything else is identical. >> >> Maybe this small patch for QEMU could help : >> ------------------------------------------------------------------------ >> diff --git a/include/hw/nvram/openbios_firmware_abi.h >> b/include/hw/nvram/openbios_firmware_abi.h >> index 5e6e5d4..492c8d5 100644 >> --- a/include/hw/nvram/openbios_firmware_abi.h >> +++ b/include/hw/nvram/openbios_firmware_abi.h >> @@ -62,6 +62,8 @@ Sun_init_header(struct Sun_nvram *header, const uint8_t >> *macaddr, int machine_id >> header->type = 1; >> header->machine_id = machine_id & 0xff; >> memcpy(&header->macaddr, macaddr, 6); >> + memcpy(&header->hostid , &macaddr[3],3); >> + >> /* Calculate checksum */ >> tmp = 0; >> tmpptr = (uint8_t *)header; >> ------------------------------------------------------------------------ > Can you please submit this patch (+ SoB) to the qemu-devel mailing list? > It's short and beautiful. > > Artyom > The "idprom" property produced by OpenBIOS is modified with this patch, but I do not have any Solaris image. Can you test it ? Olivier

1 0

Probably a dumb question - Intel MB DG45ID
by Philip Rhoades 28 Dec '13

28 Dec '13

People, I have been on this list for some time lurking - just because I think it is interesting that a bit of firmware can allow hardware to be actually useful! I haven't done more than read the occasional post that was of interest but the thought occurred to me again about replacing the BIOS that is on my current machine with something that is open so I went back to the OpenBIOS home page but was a bit puzzled to see on the Download page: "Do not try to put OpenBIOS in a real boot ROM, it will not work and may damage your hardware!". After a little more looking around I am still confused - the ultimate aim of this software is to eventually allow people to replace their proprietary BIOSes right? I have an Intel MB DG45ID but I couldn't Google much overlap with OpenBIOS . . Thanks for any enlightenment! Regards, Phil. -- Philip Rhoades GPO Box 3411 Sydney NSW 2001 Australia E-mail: phil(a)pricom.com.au

3 3

Re: [OpenBIOS] Qemu, OpenBIOS, and HostID
by Mark Cave-Ayland 28 Dec '13

28 Dec '13

On 28/12/13 17:37, Artyom Tarasenko wrote: >> Okay that's something that's fairly easy to do. My main questions would be: >> >> i) if nothing looks at hostid, then would it matter that it is all zeros? >> >> ii) if we do set it to 8012.3456 then if something did happen to check >> hostid then would it detect this special magic number and start to behave >> differently? (e.g. kernels detecting prototype hardware) > > I'd suggest we fix it in QEMU, not in OpenBIOS. Some software may get > unhappy when a hostid in firmware diverges from the one in NVRAM. Yes, if things do try and access the NVRAM directly then that would definitely be a better solution (I had no idea that QEMU did this until I read your previous email!). It's not particularly on my radar at the moment as I'm back deep in SPARC64-land, but I'd be happy to support anyone that did come up with something suitable. ATB, Mark.

1 0

[commit] r1246 - trunk/openbios-devel/drivers
by repository service 20 Dec '13

20 Dec '13

Author: mcayland Date: Fri Dec 20 11:45:54 2013 New Revision: 1246 URL: http://tracker.coreboot.org/trac/openbios/changeset/1246 Log: tcx/cgthree: remove hard OpenBIOS dependency from driver Since QEMU 1.7, the OpenBIOS TCX framebuffer FCode ROM is made available to Open Firmware upon boot. However, this causes a boot failure for people who use a Sun OBP firmware with QEMU since the FCode throws an exception trying to access some OpenBIOS-specific variables. This causes an invalid device node to be created in the tree, causing a crash on boot as reported by Peter Bartoli and Artyom Tarasenko. Fix both drivers so that if OpenBIOS is not detected, we fall back to the QEMU framebuffer defaults of 1024x768x8 which should generate a valid device node and avoid the crash. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/cgthree.fs trunk/openbios-devel/drivers/tcx.fs Modified: trunk/openbios-devel/drivers/cgthree.fs ============================================================================== --- trunk/openbios-devel/drivers/cgthree.fs Mon Dec 16 19:06:28 2013 (r1245) +++ trunk/openbios-devel/drivers/cgthree.fs Fri Dec 20 11:45:54 2013 (r1246) @@ -18,20 +18,57 @@ $find if exit else + 2drop -1 then ; +: (is-openbios) \ ( -- true | false ) + " openbios-video-width" (find-xt) -1 <> if + -1 + else + 0 + then +; + " openbios-video-width" (find-xt) cell+ value openbios-video-width-xt " openbios-video-height" (find-xt) cell+ value openbios-video-height-xt " depth-bits" (find-xt) cell+ value depth-bits-xt " line-bytes" (find-xt) cell+ value line-bytes-xt " debug-type" (find-xt) value debug-type-xt -: openbios-video-width openbios-video-width-xt @ ; -: openbios-video-height openbios-video-height-xt @ ; -: depth-bits depth-bits-xt @ ; -: line-bytes line-bytes-xt @ ; +: openbios-video-width + (is-openbios) if + openbios-video-width-xt @ + else + h# 400 + then +; + +: openbios-video-height + (is-openbios) if + openbios-video-height-xt @ + else + h# 300 + then +; + +: depth-bits + (is-openbios) if + depth-bits-xt @ + else + h# 8 + then +; + +: line-bytes + (is-openbios) if + line-bytes-xt @ + else + h# 400 + then +; + : debug-type debug-type-xt execute ; \ @@ -113,6 +150,12 @@ : qemu-cg3-driver-install ( -- ) cg3-dac -1 = if map-regs + + \ Initial pallette taken from Sun's "Writing FCode Programs" + h# ff h# ff h# ff h# 0 color! \ Background white + h# 0 h# 0 h# 0 h# ff color! \ Foreground black + h# 64 h# 41 h# b4 h# 1 color! \ SUN-blue logo + fb-addr to frame-buffer-adr default-font set-font Modified: trunk/openbios-devel/drivers/tcx.fs ============================================================================== --- trunk/openbios-devel/drivers/tcx.fs Mon Dec 16 19:06:28 2013 (r1245) +++ trunk/openbios-devel/drivers/tcx.fs Fri Dec 20 11:45:54 2013 (r1246) @@ -18,19 +18,55 @@ $find if exit else + 2drop -1 then ; +: (is-openbios) \ ( -- true | false ) + " openbios-video-width" (find-xt) -1 <> if + -1 + else + 0 + then +; + " openbios-video-width" (find-xt) cell+ value openbios-video-width-xt " openbios-video-height" (find-xt) cell+ value openbios-video-height-xt " depth-bits" (find-xt) cell+ value depth-bits-xt " line-bytes" (find-xt) cell+ value line-bytes-xt -: openbios-video-width openbios-video-width-xt @ ; -: openbios-video-height openbios-video-height-xt @ ; -: depth-bits depth-bits-xt @ ; -: line-bytes line-bytes-xt @ ; +: openbios-video-width + (is-openbios) if + openbios-video-width-xt @ + else + h# 400 + then +; + +: openbios-video-height + (is-openbios) if + openbios-video-height-xt @ + else + h# 300 + then +; + +: depth-bits + (is-openbios) if + depth-bits-xt @ + else + h# 8 + then +; + +: line-bytes + (is-openbios) if + line-bytes-xt @ + else + h# 400 + then +; \ \ Registers @@ -183,6 +219,12 @@ : qemu-tcx-driver-install ( -- ) tcx-dac -1 = if map-regs + + \ Initial pallette taken from Sun's "Writing FCode Programs" + h# ff h# ff h# ff h# 0 color! \ Background white + h# 0 h# 0 h# 0 h# ff color! \ Foreground black + h# 64 h# 41 h# b4 h# 1 color! \ SUN-blue logo + fb-addr to frame-buffer-adr default-font set-font

1 0

[PATCH 1/2] ide: change ob_ide_init() to take usual control base addresses
by Hervé Poussineau 16 Dec '13

16 Dec '13

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> --- arch/amd64/openbios.c | 2 +- arch/x86/openbios.c | 2 +- drivers/ide.c | 4 ++-- drivers/pci.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/amd64/openbios.c b/arch/amd64/openbios.c index f632e93..15d3b62 100644 --- a/arch/amd64/openbios.c +++ b/arch/amd64/openbios.c @@ -44,7 +44,7 @@ arch_init( void ) 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 ); diff --git a/arch/x86/openbios.c b/arch/x86/openbios.c index 23721bc..6145436 100644 --- a/arch/x86/openbios.c +++ b/arch/x86/openbios.c @@ -57,7 +57,7 @@ arch_init( void ) #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); diff --git a/drivers/ide.c b/drivers/ide.c index 125b9ce..0e0f0cf 100644 --- a/drivers/ide.c +++ b/drivers/ide.c @@ -1372,9 +1372,9 @@ int ob_ide_init(const char *path, uint32_t io_port0, uint32_t ctl_port0, 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++) { diff --git a/drivers/pci.c b/drivers/pci.c index c13f031..ee35b61 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -584,9 +584,9 @@ int ide_config_cb2 (const pci_config_t *config) { 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.7.10.4

1 1

[commit] r1245 - trunk/openbios-devel/packages
by repository service 16 Dec '13

16 Dec '13

Author: mcayland Date: Mon Dec 16 19:06:28 2013 New Revision: 1245 URL: http://tracker.coreboot.org/trac/openbios/changeset/1245 Log: sun-parts.c: only interpose ufs-file-system if an argument (filename) is specified The code to interpose ufs-file-system similar to OBP would always interpose the package if it existed, causing Solaris ufsboot to fail when the package was subsequently opened on a raw disk device without a filename. Fix the code so that interposition only occurs when a filename is passed as an argument, which enables us to complete the load and start executing the Solaris 9 kernel on SPARC64. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/packages/sun-parts.c Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Mon Dec 16 19:06:24 2013 (r1244) +++ trunk/openbios-devel/packages/sun-parts.c Mon Dec 16 19:06:28 2013 (r1245) @@ -217,7 +217,7 @@ feval("find-package"); ph = POP_ph(); - if (argstr && ph) { + if (argstr && strlen(argstr) && ph) { ph = POP_ph(); push_str(argstr); PUSH_ph(ph);

1 0

[commit] r1244 - trunk/openbios-devel/arch/sparc64
by repository service 16 Dec '13

16 Dec '13

Author: mcayland Date: Mon Dec 16 19:06:24 2013 New Revision: 1244 URL: http://tracker.coreboot.org/trac/openbios/changeset/1244 Log: SPARC64: move retained area from top of physical RAM to static variable Currently the low-level SPARC entry routine reserves the top of physical RAM which is also where we happen to store our retained memory structure; because of the way this memory is mapped, a fault is generated when trying to access the retained memory area outside of OpenBIOS. Move the retained area into a static variable for the moment; the existing routine is unlikely to survive a reboot anyhow but at least we can store the requested information for analysis later. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon Dec 16 19:06:22 2013 (r1243) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon Dec 16 19:06:24 2013 (r1244) @@ -29,6 +29,7 @@ #define OFMEM (&s_ofmem_data.ofmem) #define TOP_OF_RAM (s_ofmem_data.memory + MEMSIZE) +static retain_t s_retained; translation_t **g_ofmem_translations = &s_ofmem_data.ofmem.trans; ucell *va2ttedata = 0; @@ -41,7 +42,7 @@ static ucell get_heap_top( void ) { - return (ucell)(TOP_OF_RAM - ALIGN_SIZE(sizeof(retain_t), 8)); + return (ucell)TOP_OF_RAM; } ofmem_t* ofmem_arch_get_private(void) @@ -85,8 +86,7 @@ retain_t *ofmem_arch_get_retained(void) { - /* Retained area is at the top of physical RAM */ - return (retain_t *)(qemu_mem_size - sizeof(retain_t)); + return (&s_retained); } int ofmem_arch_get_translation_entry_size(void)

1 0

[commit] r1243 - trunk/openbios-devel/include/arch/sparc64
by repository service 16 Dec '13

16 Dec '13

Author: mcayland Date: Mon Dec 16 19:06:22 2013 New Revision: 1243 URL: http://tracker.coreboot.org/trac/openbios/changeset/1243 Log: SPARC64: increase PAGE_SHIFT to 13 (8K page size) Some bootloaders use the IEEE1275 memory words to allocate blocks of memory which are less than PAGE_SIZE. With an incorect page size, OFMEM would allocate entries that were only aligned to 4K. This caused a problem whereby when memory was reallocated by OpenBIOS, the resulting TLB flush would be at the wrong address, silently fail, and hence cause a crash when the reallocated virtual address was first accessed. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/include/arch/sparc64/types.h Modified: trunk/openbios-devel/include/arch/sparc64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/types.h Mon Dec 16 19:06:19 2013 (r1242) +++ trunk/openbios-devel/include/arch/sparc64/types.h Mon Dec 16 19:06:22 2013 (r1243) @@ -85,7 +85,7 @@ #define BITS 64 -#define PAGE_SHIFT 12 +#define PAGE_SHIFT 13 /* size named types */

1 0

[commit] r1242 - trunk/openbios-devel/libopenbios
by repository service 16 Dec '13

16 Dec '13

Author: mcayland Date: Mon Dec 16 19:06:19 2013 New Revision: 1242 URL: http://tracker.coreboot.org/trac/openbios/changeset/1242 Log: OFMEM: remove remaining page size constants and replace with PAGE_SIZE Since OFMEM was originally based upon the PPC architecture (with 4K page size), there are still some places that use hardcoded values to calculate alignment. Replace these with equivalents that use the current architecture PAGE_SIZE. 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 Mon Dec 16 19:06:16 2013 (r1241) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Mon Dec 16 19:06:19 2013 (r1242) @@ -616,7 +616,7 @@ ofmem_t *ofmem = ofmem_arch_get_private(); ucell virt; phys_addr_t phys; - ucell offs = addr & 0xfff; + ucell offs = addr & (PAGE_SIZE - 1); OFMEM_TRACE("ofmem_claim " FMT_ucellx " " FMT_ucellx " " FMT_ucellx "\n", addr, size, align ); virt = phys = 0; @@ -631,8 +631,8 @@ return -1; } } else { - if( align < 0x1000 ) - align = 0x1000; + if( align < PAGE_SIZE ) + align = PAGE_SIZE; phys = ofmem_claim_phys_( addr, size, align, 0, ofmem_arch_get_phys_top(), 1 /* reverse */ ); virt = ofmem_claim_virt_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); if( phys == -1 || virt == -1 ) { @@ -643,13 +643,13 @@ } /* align */ - if( phys & 0xfff ) { - size += (phys & 0xfff); - virt -= (phys & 0xfff); - phys &= ~0xfff; + if( phys & (PAGE_SIZE - 1) ) { + size += (phys & (PAGE_SIZE - 1)); + virt -= (phys & (PAGE_SIZE - 1)); + phys &= PAGE_MASK; } - if( size & 0xfff ) - size = (size + 0xfff) & ~0xfff; + if( size & (PAGE_SIZE - 1) ) + size = (size + (PAGE_SIZE - 1)) & PAGE_MASK; /* printk("...free memory found... phys: %08lX, virt: %08lX, size %lX\n", phys, virt, size ); */ ofmem_map( phys, virt, size, -1 ); @@ -783,15 +783,15 @@ /* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n", virt, phys, size, mode ); */ - if( (phys & 0xfff) || (virt & 0xfff) || (size & 0xfff) ) { + if( (phys & (PAGE_SIZE - 1)) || (virt & (PAGE_SIZE - 1)) || (size & (PAGE_SIZE - 1)) ) { OFMEM_TRACE("ofmem_map: Bad parameters (" FMT_plx " " FMT_ucellX " " FMT_ucellX ")\n", phys, virt, size ); - phys &= ~0xfff; - virt &= ~0xfff; - size = (size + 0xfff) & ~0xfff; + phys &= PAGE_MASK; + virt &= PAGE_MASK; + size = (size + (PAGE_SIZE - 1)) & PAGE_MASK; } #if defined(OFMEM_FILL_RANGE) @@ -822,11 +822,11 @@ OFMEM_TRACE("ofmem_unmap " FMT_ucellx " " FMT_ucellx "\n", virt, size ); - if( (virt & 0xfff) || (size & 0xfff) ) { + if( (virt & (PAGE_SIZE - 1)) || (size & (PAGE_SIZE - 1)) ) { /* printk("ofmem_unmap: Bad parameters (%08lX %08lX)\n", virt, size ); */ - virt &= ~0xfff; - size = (size + 0xfff) & ~0xfff; + virt &= PAGE_MASK; + size = (size + (PAGE_SIZE - 1)) & PAGE_MASK; } /* remove translations and unmap pages */

1 0

[commit] r1241 - in trunk/openbios-devel/include: arch/amd64 arch/ppc arch/sparc32 arch/sparc64 arch/x86 libopenbios
by repository service 16 Dec '13

16 Dec '13

Author: mcayland Date: Mon Dec 16 19:06:16 2013 New Revision: 1241 URL: http://tracker.coreboot.org/trac/openbios/changeset/1241 Log: Move PAGE_SHIFT into architecture-specific header files This commit moves the declaration of PAGE_SHIFT (the number of bits in a page) into architecture-specific header files. This is required for a subsequent commit to ensure that OFMEM can correctly unmap pages on architectures where PAGE_SHIFT != 12 (4K page size). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/include/arch/amd64/types.h trunk/openbios-devel/include/arch/ppc/types.h trunk/openbios-devel/include/arch/sparc32/types.h trunk/openbios-devel/include/arch/sparc64/types.h trunk/openbios-devel/include/arch/x86/types.h trunk/openbios-devel/include/libopenbios/ofmem.h Modified: trunk/openbios-devel/include/arch/amd64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/amd64/types.h Mon Dec 16 19:06:13 2013 (r1240) +++ trunk/openbios-devel/include/arch/amd64/types.h Mon Dec 16 19:06:16 2013 (r1241) @@ -50,6 +50,8 @@ #define BITS 64 +#define PAGE_SHIFT 12 + /* size named types */ typedef unsigned char u8; Modified: trunk/openbios-devel/include/arch/ppc/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/types.h Mon Dec 16 19:06:13 2013 (r1240) +++ trunk/openbios-devel/include/arch/ppc/types.h Mon Dec 16 19:06:16 2013 (r1241) @@ -79,6 +79,8 @@ #define BITS 32 +#define PAGE_SHIFT 12 + /* size named types */ typedef unsigned char u8; Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Mon Dec 16 19:06:13 2013 (r1240) +++ trunk/openbios-devel/include/arch/sparc32/types.h Mon Dec 16 19:06:16 2013 (r1241) @@ -76,6 +76,8 @@ #define BITS 32 +#define PAGE_SHIFT 12 + /* size named types */ typedef unsigned char u8; Modified: trunk/openbios-devel/include/arch/sparc64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/types.h Mon Dec 16 19:06:13 2013 (r1240) +++ trunk/openbios-devel/include/arch/sparc64/types.h Mon Dec 16 19:06:16 2013 (r1241) @@ -85,6 +85,8 @@ #define BITS 64 +#define PAGE_SHIFT 12 + /* size named types */ typedef unsigned char u8; Modified: trunk/openbios-devel/include/arch/x86/types.h ============================================================================== --- trunk/openbios-devel/include/arch/x86/types.h Mon Dec 16 19:06:13 2013 (r1240) +++ trunk/openbios-devel/include/arch/x86/types.h Mon Dec 16 19:06:16 2013 (r1241) @@ -52,6 +52,8 @@ #define BITS 32 +#define PAGE_SHIFT 12 + /* size named types */ typedef unsigned char u8; Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Mon Dec 16 19:06:13 2013 (r1240) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Mon Dec 16 19:06:16 2013 (r1241) @@ -127,9 +127,6 @@ extern phandle_t s_phandle_memory; extern phandle_t s_phandle_mmu; -/* Currently the same for all architectures */ -#define PAGE_SHIFT 12 - #define PAGE_SIZE (1 << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE - 1)) #define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)

1 0

[commit] r1240 - trunk/openbios-devel/arch/sparc64
by repository service 16 Dec '13

16 Dec '13

Author: mcayland Date: Mon Dec 16 19:06:13 2013 New Revision: 1240 URL: http://tracker.coreboot.org/trac/openbios/changeset/1240 Log: SPARC64: fix stack underflow when no boot device argument is supplied Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/boot.c Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Tue Dec 10 22:01:48 2013 (r1239) +++ trunk/openbios-devel/arch/sparc64/boot.c Mon Dec 16 19:06:13 2013 (r1240) @@ -71,6 +71,7 @@ printk("Image returned with return value %#x\n", image_retval); } +/* ( path len -- path len ) */ void boot(void) { @@ -99,6 +100,8 @@ POP(); fword("get-package-property"); POP(); + /* Update our local copy of path as well as the one on the stack */ + fword("2dup"); path = pop_fstr_copy(); }

1 0

RFC: change default SPARC boot order to "disk:a disk"
by Mark Cave-Ayland 10 Dec '13

10 Dec '13

Hi all, I've had a bug report off-list indicating that r1199 broke booting Solaris from hard disk. Some investigation shows that the simple reason is because the boot list in arch/sparc32/openbios.c is missing a slice letter, and so the boot device in romvec is set incorrectly. As the disk device in OpenBIOS/QEMU is effectively modelled as sd(0,0,0), then I believe the correct solution should be this: diff --git a/openbios-devel/arch/sparc32/openbios.c b/openbios-devel/arch/sparc32/openbios.c index abdfe7c..6d1c3dc 100644 --- a/openbios-devel/arch/sparc32/openbios.c +++ b/openbios-devel/arch/sparc32/openbios.c @@ -887,7 +887,7 @@ arch_init( void ) push_str("floppy"); break; case 'c': - push_str("disk"); + push_str("disk:a disk"); break; default: case 'd': Unfortunately I only have a couple of SPARC disk images as my main test suite is ISO based, and so while it works for me (and the original reporter), I'm a bit nervous about just applying the change as-is. Can anyone confirm that my understanding of Solaris slices is correct, and that this is indeed the correct solution to the problem? Many thanks, Mark.

1 1

Zombie messages
by Tarl Neustaedter 10 Dec '13

10 Dec '13

Are we having a rash of Zombie messages from several months ago? I remember several discussions from earlier in the year, and I'm suddenly seeing a large number of messages that were sent from that timeframe. If I'm reading the headers correctly, it looks like ra.coresystems.de had held on to these messages, and forwarded them to mail.coresystems.de today.

2 1

Re: [OpenBIOS] [PATCH] Fix cross compiling sparc64 on arm32 host
by Mark Cave-Ayland 10 Dec '13

10 Dec '13

On 03/12/13 21:35, Cole Robinson wrote: > Add arm32 to the whitelist for handling lack of int128 type variants. > Otherwise we get errors like: > > /target/include/asm/types.h:79:1: error: unknown type name ‘__int128_t’ > typedef __int128_t dcell; > > This may introduce issues building on aarch64 but I have no way to test. > --- > > Recently, Fedora's build system had many arm hosts added. Since we always > cross build openbios, the RPM build is scheduled independent of the > build machine architecture. So whenever an openbios build was scheduled > to an arm host, things fell over. > > config/scripts/switch-arch | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch > index 44f2df4..86cab3c 100755 > --- a/config/scripts/switch-arch > +++ b/config/scripts/switch-arch > @@ -77,7 +77,7 @@ crosscflags() > if test "$target" = "sparc64" -o "$target" = "ia64" \ > -o "$target" = "amd64" -o "$target" = "x86_64" \ > -o "$target" = "alpha"; then > - if test "$host" = "x86"; then > + if test "$host" = "x86" -o "$host" = "arm"; then > cflags="$cflags -DNEED_FAKE_INT128_T" > elif test "$host" = "ppc" -a `uname -s` = "Darwin"; then > cflags="$cflags -DNEED_FAKE_INT128_T" Hi Cole, Thanks for the patch - I don't tend to do much with the build system but it looks fairly reasonable to me. One minor stylistic nit is that switch-arch seems to be grouped by arch, so would it be possible to rework so that the overall result looks like this: if test "$host" = "x86"; then if test "$host" = "arm"; then cflags="$cflags -DNEED_FAKE_INT128_T" elif test "$host" = "ppc" -a `uname -s` = "Darwin"; then cflags="$cflags -DNEED_FAKE_INT128_T" If you can resubmit like this (and also with a SOB) then I'm happy to apply it. ATB, Mark.

2 2

[commit] r1239 - trunk/openbios-devel/config/scripts
by repository service 10 Dec '13

10 Dec '13

Author: mcayland Date: Tue Dec 10 22:01:48 2013 New Revision: 1239 URL: http://tracker.coreboot.org/trac/openbios/changeset/1239 Log: Fix cross compiling sparc64 on arm32 host Add arm32 to the whitelist for handling lack of int128 type variants. Otherwise we get errors like: /target/include/asm/types.h:79:1: error: unknown type name ‘__int128_t’ typedef __int128_t dcell; This may introduce issues building on aarch64 but I have no way to test. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Tue Dec 10 22:01:46 2013 (r1238) +++ trunk/openbios-devel/config/scripts/switch-arch Tue Dec 10 22:01:48 2013 (r1239) @@ -79,6 +79,8 @@ -o "$target" = "alpha"; then if test "$host" = "x86"; then cflags="$cflags -DNEED_FAKE_INT128_T" + elif test "$host" = "arm"; then + cflags="$cflags -DNEED_FAKE_INT128_T" elif test "$host" = "ppc" -a `uname -s` = "Darwin"; then cflags="$cflags -DNEED_FAKE_INT128_T" fi

1 0

[commit] r1238 - trunk/openbios-devel/arch/sparc32
by repository service 10 Dec '13

10 Dec '13

Author: mcayland Date: Tue Dec 10 22:01:46 2013 New Revision: 1238 URL: http://tracker.coreboot.org/trac/openbios/changeset/1238 Log: SPARC32: fix NULL pointer reference when booting from device with no arguments When booting from a device with no arguments (such as "disk"), the resulting partition id string would be NULL causing an exception when setting up the romvec slice identifier. In the case where no slice is specified, we simply set the partition to 0 in order to preserve existing behaviour. This fixes booting from hard disk on QEMU as reported by Paul Wilhelm and Aurelien Jarno. 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 Tue Dec 10 22:01:42 2013 (r1237) +++ trunk/openbios-devel/arch/sparc32/boot.c Tue Dec 10 22:01:46 2013 (r1238) @@ -98,10 +98,15 @@ fword("my-args"); id = pop_fstr_copy(); - snprintf(buf, sizeof(buf), "sd(0,%d,%d):%c", target, device, id[0]); + if (id != NULL) { + snprintf(buf, sizeof(buf), "sd(0,%d,%d):%c", target, device, id[0]); + obp_arg.dev_partition = id[0] - 'a'; + } else { + snprintf(buf, sizeof(buf), "sd(0,%d,%d)", target, device); + obp_arg.dev_partition = 0; + } 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];

1 0

[commit] r1237 - in trunk/openbios-devel: libopenbios packages
by repository service 10 Dec '13

10 Dec '13

Author: mcayland Date: Tue Dec 10 22:01:42 2013 New Revision: 1237 URL: http://tracker.coreboot.org/trac/openbios/changeset/1237 Log: load.c: fix Forth stack underflow The load() API was incorrect in that it did not push the resulting loaded file size onto the Forth stack. This caused a stack underflow in the Forth $load word, except for devices which were interposed (such as those with partition arguments). Fix the load() function so that the resulting size is pushed onto the Forth stack as per the load package method description in IEEE1275. Since the loaders access load-base directly then currently the address argument is dropped. This exposed another bug whereby disk-label would explicitly drop the address parameter from the stack for non-interposed packages. Remove this as it is now consistently handled in load() for all cases. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/libopenbios/load.c trunk/openbios-devel/packages/disk-label.c Modified: trunk/openbios-devel/libopenbios/load.c ============================================================================== --- trunk/openbios-devel/libopenbios/load.c Sun Dec 8 13:48:24 2013 (r1236) +++ trunk/openbios-devel/libopenbios/load.c Tue Dec 10 22:01:42 2013 (r1237) @@ -44,11 +44,17 @@ struct sys_info sys_info; void *elf_boot_notes = NULL; +/* ( addr -- size ) */ + void load(ihandle_t dev) { /* Invoke the loaders on the specified device */ char *param; - ucell valid; + ucell valid; + + /* TODO: Currently the internal loader APIs use load-base directly, so + drop the address */ + POP(); #ifdef CONFIG_LOADER_ELF @@ -65,6 +71,7 @@ feval("state-valid @"); valid = POP(); if (valid) { + feval("saved-program-state >sps.file-size @"); return; } #endif @@ -74,6 +81,7 @@ feval("state-valid @"); valid = POP(); if (valid) { + feval("saved-program-state >sps.file-size @"); return; } #endif @@ -83,6 +91,7 @@ feval("state-valid @"); valid = POP(); if (valid) { + feval("saved-program-state >sps.file-size @"); return; } #endif @@ -92,6 +101,7 @@ feval("state-valid @"); valid = POP(); if (valid) { + feval("saved-program-state >sps.file-size @"); return; } #endif @@ -105,4 +115,6 @@ } #endif + /* Didn't load anything, so return zero size */ + PUSH(0); } Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Sun Dec 8 13:48:24 2013 (r1236) +++ trunk/openbios-devel/packages/disk-label.c Tue Dec 10 22:01:42 2013 (r1237) @@ -187,19 +187,8 @@ dlabel_load( __attribute__((unused)) dlabel_info_t *di ) { /* Try the load method of the part package */ -#ifdef DEBUG_DISK_LABEL - char *buf; -#endif xt_t xt; -#ifdef DEBUG_DISK_LABEL - buf = (char *)POP(); -#else - POP(); -#endif - - DPRINTF("load invoked with address %p\n", buf); - /* If we have a partition handle, invoke the load word on it */ if (di->part_ih) { xt = find_ih_method("load", di->part_ih);

1 0

[PATCH v2] Fix cross compiling sparc64 on arm32 host
by Cole Robinson 09 Dec '13

09 Dec '13

Add arm32 to the whitelist for handling lack of int128 type variants. Otherwise we get errors like: /target/include/asm/types.h:79:1: error: unknown type name ‘__int128_t’ typedef __int128_t dcell; This may introduce issues building on aarch64 but I have no way to test. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- v2: Break out arm check to its own 'if' line config/scripts/switch-arch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch index 44f2df4..868eae6 100755 --- a/config/scripts/switch-arch +++ b/config/scripts/switch-arch @@ -79,6 +79,8 @@ crosscflags() -o "$target" = "alpha"; then if test "$host" = "x86"; then cflags="$cflags -DNEED_FAKE_INT128_T" + elif test "$host" = "arm"; then + cflags="$cflags -DNEED_FAKE_INT128_T" elif test "$host" = "ppc" -a `uname -s` = "Darwin"; then cflags="$cflags -DNEED_FAKE_INT128_T" fi -- 1.8.4.2

1 0

[commit] r1209 - trunk/openbios-devel/arch/sparc32
by repository service 08 Dec '13

08 Dec '13

Author: mcayland Date: Mon Aug 19 09:40:12 2013 New Revision: 1209 URL: http://tracker.coreboot.org/trac/openbios/changeset/1209 Log: SPARC32: fix romvec stdin/stdout field initialisation Previously the romvec stdin/stdout ihandles were configured so that they were set to the current stdin and stdout paths at initialisation time. Unfortunately as stdin/stdout can be changed with the input and output words, they can end up pointing to invalid ihandles causing a crash when trying to output to the console. Fix this by pointing the romvec structure to the address of the stdin/stdout variables so that they are always in sync. Similarly we also resolve the text path stdin/stdout variables at boot time to ensure that they will never be stale. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/romvec.c Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Mon Aug 19 09:40:10 2013 (r1208) +++ trunk/openbios-devel/arch/sparc32/boot.c Mon Aug 19 09:40:12 2013 (r1209) @@ -23,7 +23,7 @@ void go(void) { ucell address, type, size; - int image_retval = 0, proplen, target, device; + int image_retval = 0, intprop, proplen, target, device; phandle_t chosen; char *prop, *id, *name; static char bootpathbuf[128], bootargsbuf[128], buf[128]; @@ -40,8 +40,19 @@ needs to be set up to pass certain parameters using a C struct. Hence this section extracts the relevant boot information and places it in obp_arg. */ - /* Get the name of the selected boot device, along with the device and unit number */ + /* Get the stdin and stdout paths */ chosen = find_dev("/chosen"); + intprop = get_int_property(chosen, "stdin", &proplen); + PUSH(intprop); + fword("get-instance-path"); + ((struct linux_romvec *)romvec)->pv_stdin = pop_fstr_copy(); + + intprop = get_int_property(chosen, "stdout", &proplen); + PUSH(intprop); + fword("get-instance-path"); + ((struct linux_romvec *)romvec)->pv_stdout = pop_fstr_copy(); + + /* Get the name of the selected boot device, along with the device and unit number */ prop = get_property(chosen, "bootpath", &proplen); strncpy(bootpathbuf, prop, proplen); prop = get_property(chosen, "bootargs", &proplen); Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Mon Aug 19 09:40:10 2013 (r1208) +++ trunk/openbios-devel/arch/sparc32/romvec.c Mon Aug 19 09:40:12 2013 (r1209) @@ -25,7 +25,6 @@ #endif char obp_stdin, obp_stdout; -static int obp_fd_stdin, obp_fd_stdout; const char *obp_stdin_path, *obp_stdout_path; struct linux_arguments_v0 obp_arg; @@ -498,15 +497,12 @@ romvec0.pv_v2bootargs.bootpath = &bootpath; romvec0.pv_v2bootargs.bootargs = &obp_arg.argv[1]; - romvec0.pv_v2bootargs.fd_stdin = &obp_fd_stdin; - romvec0.pv_v2bootargs.fd_stdout = &obp_fd_stdout; - push_str(obp_stdin_path); - fword("open-dev"); - obp_fd_stdin = POP(); - push_str(obp_stdout_path); - fword("open-dev"); - obp_fd_stdout = POP(); + /* Point fd_stdin/fd_stdout to the Forth stdin/stdout variables */ + fword("stdin"); + romvec0.pv_v2bootargs.fd_stdin = cell2pointer(POP()); + fword("stdout"); + romvec0.pv_v2bootargs.fd_stdout = cell2pointer(POP()); romvec0.v3_memalloc = obp_memalloc_handler;

3 6

[PATCH] forthstrap: avoid unaligned accesses
by Aurelien Jarno 08 Dec '13

08 Dec '13

Trying to compile OpenBIOS for SPARC32 on a SPARC machine, I get a SIGBUS within forthstrap, more precisely accessing reloc_table in load_dictionary. This table is not aligned because the dictionnary head as a size which is not a multiple of 4. This is due to the file QEMU,tcx.bin which is being encoded, and which has a size which is not a multiple of 4. Fix that by adding some padding after the encoded data. --- kernel/bootstrap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/bootstrap.c b/kernel/bootstrap.c index 546ffee..7f4458e 100644 --- a/kernel/bootstrap.c +++ b/kernel/bootstrap.c @@ -1008,6 +1008,7 @@ encode_file( const char *name ) PUSH( pointer2cell(dict + dicthead) ); PUSH( size ); dicthead += size; + paddict(sizeof(cell)); } -- 1.8.4.2

2 3

[commit] r1236 - trunk/openbios-devel/kernel
by repository service 08 Dec '13

08 Dec '13

Author: mcayland Date: Sun Dec 8 13:48:24 2013 New Revision: 1236 URL: http://tracker.coreboot.org/trac/openbios/changeset/1236 Log: forthstrap: avoid unaligned accesses Trying to compile OpenBIOS for SPARC32 on a SPARC machine, I get a SIGBUS within forthstrap, more precisely accessing reloc_table in load_dictionary. This table is not aligned because the dictionnary head as a size which is not a multiple of 4. This is due to the file QEMU,tcx.bin which is being encoded, and which has a size which is not a multiple of 4. Fix that by adding some padding after the encoded data. Signed-off-by: Aurelien Jarno <aurelien(a)aurel32.net> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/kernel/bootstrap.c Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Sun Nov 10 21:14:39 2013 (r1235) +++ trunk/openbios-devel/kernel/bootstrap.c Sun Dec 8 13:48:24 2013 (r1236) @@ -1008,6 +1008,7 @@ PUSH( pointer2cell(dict + dicthead) ); PUSH( size ); dicthead += size; + paddict(sizeof(cell)); }

1 0

[PATCH] forthstrap: avoid unaligned accesses
by Aurelien Jarno 08 Dec '13

08 Dec '13

Trying to compile OpenBIOS for SPARC32 on a SPARC machine, I get a SIGBUS within forthstrap, more precisely accessing reloc_table in load_dictionary. This table is not aligned because the dictionnary head as a size which is not a multiple of 4. This is due to the file QEMU,tcx.bin which is being encoded, and which has a size which is not a multiple of 4. Fix that by adding some padding after the encoded data. Signed-off-by: Aurelien Jarno <aurelien(a)aurel32.net> --- kernel/bootstrap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/bootstrap.c b/kernel/bootstrap.c index 546ffee..7f4458e 100644 --- a/kernel/bootstrap.c +++ b/kernel/bootstrap.c @@ -1008,6 +1008,7 @@ encode_file( const char *name ) PUSH( pointer2cell(dict + dicthead) ); PUSH( size ); dicthead += size; + paddict(sizeof(cell)); } -- 1.8.4.2

1 0

[PATCH] Fix cross compiling sparc64 on arm32 host
by Cole Robinson 03 Dec '13

03 Dec '13

Add arm32 to the whitelist for handling lack of int128 type variants. Otherwise we get errors like: /target/include/asm/types.h:79:1: error: unknown type name ‘__int128_t’ typedef __int128_t dcell; This may introduce issues building on aarch64 but I have no way to test. --- Recently, Fedora's build system had many arm hosts added. Since we always cross build openbios, the RPM build is scheduled independent of the build machine architecture. So whenever an openbios build was scheduled to an arm host, things fell over. config/scripts/switch-arch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch index 44f2df4..86cab3c 100755 --- a/config/scripts/switch-arch +++ b/config/scripts/switch-arch @@ -77,7 +77,7 @@ crosscflags() if test "$target" = "sparc64" -o "$target" = "ia64" \ -o "$target" = "amd64" -o "$target" = "x86_64" \ -o "$target" = "alpha"; then - if test "$host" = "x86"; then + if test "$host" = "x86" -o "$host" = "arm"; then cflags="$cflags -DNEED_FAKE_INT128_T" elif test "$host" = "ppc" -a `uname -s` = "Darwin"; then cflags="$cflags -DNEED_FAKE_INT128_T" -- 1.8.4.2

1 0

[commit] r1235 - in trunk/openbios-devel: arch/ppc/qemu config/examples drivers
by repository service 10 Nov '13

10 Nov '13

Author: mcayland Date: Sun Nov 10 21:14:39 2013 New Revision: 1235 URL: http://tracker.coreboot.org/trac/openbios/changeset/1235 Log: prep: Add PC keyboard to PPC build and enable it The default PPC configuration now includes a PC keyboard driver for PReP machines, and adds it as a device node in the ISA bridge. This provides a working keyboard in graphical mode for PReP machines. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Nov 10 21:14:33 2013 (r1234) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Nov 10 21:14:39 2013 (r1235) @@ -852,8 +852,13 @@ push_str("screen"); fword("property"); } else { - stdin_path = "adb-keyboard"; - stdout_path = "screen"; + if (is_apple()) { + stdin_path = "adb-keyboard"; + stdout_path = "screen"; + } else { + stdin_path = "keyboard"; + stdout_path = "screen"; + } } kvm_of_init(); Modified: trunk/openbios-devel/config/examples/ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml Sun Nov 10 21:14:33 2013 (r1234) +++ trunk/openbios-devel/config/examples/ppc_config.xml Sun Nov 10 21:14:39 2013 (r1235) @@ -9,6 +9,7 @@ <option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/> <option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/> <option name="CONFIG_DRIVER_PC_SERIAL" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_PC_KBD" type="boolean" value="true"/> <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Nov 10 21:14:33 2013 (r1234) +++ trunk/openbios-devel/drivers/pci.c Sun Nov 10 21:14:39 2013 (r1235) @@ -873,6 +873,9 @@ #ifdef CONFIG_DRIVER_PC_SERIAL ob_pc_serial_init(config->path, "serial", arch->io_base, 0x3f8ULL, 0); #endif +#ifdef CONFIG_DRIVER_PC_KBD + ob_pc_kbd_init(config->path, "8042", arch->io_base, 0x60ULL, 0); +#endif return 0; }

1 0

[commit] r1234 - in trunk/openbios-devel: arch/ppc/qemu drivers
by repository service 10 Nov '13

10 Nov '13

Author: mcayland Date: Sun Nov 10 21:14:33 2013 New Revision: 1234 URL: http://tracker.coreboot.org/trac/openbios/changeset/1234 Log: prep: Move serial port into the new ISA bridge node This is its real home according to device tree samples that I can find. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Nov 10 21:14:30 2013 (r1233) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Nov 10 21:14:33 2013 (r1234) @@ -662,11 +662,6 @@ ofmem_t *ofmem = ofmem_arch_get_private(); - if (!is_apple()) { - /* Initialise PReP serial port */ - ob_pc_serial_init("", "serial", arch->io_base, 0x3f8ULL, 0); - } - openbios_init(); modules_init(); setup_timers(); @@ -841,8 +836,8 @@ stdout_path = "sccb"; } } else { - stdin_path = "/serial"; - stdout_path = "/serial"; + stdin_path = "ttya"; + stdout_path = "ttya"; } /* Some bootloaders force the output to the screen device, so Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun Nov 10 21:14:30 2013 (r1233) +++ trunk/openbios-devel/drivers/pci.c Sun Nov 10 21:14:33 2013 (r1234) @@ -870,6 +870,10 @@ int i82378_config_cb(const pci_config_t *config) { +#ifdef CONFIG_DRIVER_PC_SERIAL + ob_pc_serial_init(config->path, "serial", arch->io_base, 0x3f8ULL, 0); +#endif + return 0; }

1 0

[commit] r1233 - in trunk/openbios-devel: drivers include/drivers
by repository service 10 Nov '13

10 Nov '13

Author: mcayland Date: Sun Nov 10 21:14:30 2013 New Revision: 1233 URL: http://tracker.coreboot.org/trac/openbios/changeset/1233 Log: prep: Add support for detection of i82378 ISA bridge Here we simply allow the ISA bridge to be detected during PCI bus enumeration and implement a stub callback so that devices can be added later. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/pci_database.c trunk/openbios-devel/drivers/pci_database.h trunk/openbios-devel/include/drivers/pci.h Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Fri Oct 25 12:38:24 2013 (r1232) +++ trunk/openbios-devel/drivers/pci.c Sun Nov 10 21:14:30 2013 (r1233) @@ -868,6 +868,11 @@ return 0; } +int i82378_config_cb(const pci_config_t *config) +{ + return 0; +} + static void ob_pci_add_properties(phandle_t phandle, pci_addr addr, const pci_dev_t *pci_dev, const pci_config_t *config, int num_bars) Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Fri Oct 25 12:38:24 2013 (r1232) +++ trunk/openbios-devel/drivers/pci_database.c Sun Nov 10 21:14:30 2013 (r1233) @@ -390,6 +390,21 @@ }, }; +static const pci_dev_t isabrg_devices[] = { + { + PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, NULL, + "isa", "isa", "pci8086,484\0", + 1, 1, 1, + i82378_config_cb, NULL, + }, + { + 0xFFFF, 0xFFFF, + NULL, NULL, NULL, NULL, + -1, -1, -1, + NULL, NULL, + }, +}; + static const pci_subclass_t bridg_subclass[] = { { PCI_SUBCLASS_BRIDGE_HOST, "PCI host bridge", @@ -398,7 +413,7 @@ }, { PCI_SUBCLASS_BRIDGE_ISA, "ISA bridge", - NULL, NULL, NULL, + "isa", isabrg_devices, NULL, NULL, NULL, }, { Modified: trunk/openbios-devel/drivers/pci_database.h ============================================================================== --- trunk/openbios-devel/drivers/pci_database.h Fri Oct 25 12:38:24 2013 (r1232) +++ trunk/openbios-devel/drivers/pci_database.h Sun Nov 10 21:14:30 2013 (r1233) @@ -37,6 +37,7 @@ extern int sabre_config_cb(const pci_config_t *config); extern int bridge_config_cb(const pci_config_t *config); extern int ebus_config_cb(const pci_config_t *config); +extern int i82378_config_cb(const pci_config_t *config); static inline int pci_compat_len(const pci_dev_t *dev) { Modified: trunk/openbios-devel/include/drivers/pci.h ============================================================================== --- trunk/openbios-devel/include/drivers/pci.h Fri Oct 25 12:38:24 2013 (r1232) +++ trunk/openbios-devel/include/drivers/pci.h Sun Nov 10 21:14:30 2013 (r1233) @@ -210,6 +210,7 @@ #define PCI_DEVICE_ID_VIRTIO_BLOCK 0x1001 #define PCI_VENDOR_ID_INTEL 0x8086 +#define PCI_DEVICE_ID_INTEL_82378 0x0484 #define PCI_DEVICE_ID_INTEL_82441 0x1237 #endif /* _H_PCI */

1 0

FYI: If trying to compile openboot source on Solaris ...
by Donald R Laster Jr 31 Oct '13

31 Oct '13

If one is trying to compile openboot on Solaris using the Solaris C compiler the source code Makefiles' DFLAG settings will need to have "-Xs" added. The code uses the word "restrict" in a prototype which is an ANSI C99 keyword. ------------------ More details ------------------ I was checking the options and trying to understand why an error was occuring on a valid prototype line and tried adding -Xt and eventually -Xs to the compiler options. It looks like it may be a C89/C90 versus C99 issue. The compiler default appears to be ANSI C99 mode based upon this from the -flags output -Xa Compile assuming ANSI C conformance, allow K & R extensions (default mode) -Xc Compile assuming strict ANSI C conformance -Xs Compile assuming (pre-ANSI) K & R C style code -Xt Compile assuming K & R conformance, allow ANSI C and in ./trunk/tools/fscope/fscope.h at line 120 this search_t *build_searchlist(extract_t *info, search_t *root, int restrict); appeared to be causing the error. When I added -Xs this warning was generated "./fscope.h", line 120: warning: restrict is a keyword in ISO C99 instead of this error "./fscope.h", line 120: Non-pointer types cannot be restrict qualified The word argument "restrict" in the prototype appears to be culprit. I appear to have gotten a clean build Sun C 5.3.

1 0

[commit] r1232 - in trunk/openbios-devel: arch/ppc/qemu config/examples
by repository service 25 Oct '13

25 Oct '13

Author: mcayland Date: Fri Oct 25 12:38:24 2013 New Revision: 1232 URL: http://tracker.coreboot.org/trac/openbios/changeset/1232 Log: ppc: enable basic PReP serial console This patch follows on from the previous patchsets and provides a basic PReP serial console when launched under QEMU with -nographic. This is done by including the PC serial driver as part of the PPC binary build and setting up a prep_console_ops structure for use when PReP architecture is detected. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> CC: Andreas Färber <afaerber(a)suse.de> CC: Hervé Poussineau <hpoussin(a)reactos.org> Modified: trunk/openbios-devel/arch/ppc/qemu/console.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/config/examples/ppc_config.xml Modified: trunk/openbios-devel/arch/ppc/qemu/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/console.c Fri Oct 25 12:38:14 2013 (r1231) +++ trunk/openbios-devel/arch/ppc/qemu/console.c Fri Oct 25 12:38:24 2013 (r1232) @@ -53,4 +53,36 @@ .getchar = mac_getchar }; +static int prep_putchar(int c) +{ +#ifdef CONFIG_DEBUG_CONSOLE_SERIAL + uart_putchar(c & 0xff); +#endif + return c; +} + +static int prep_availchar(void) +{ +#ifdef CONFIG_DEBUG_CONSOLE_SERIAL + if (uart_charav(CONFIG_SERIAL_PORT)) + return 1; +#endif + return 0; +} + +static int prep_getchar(void) +{ +#ifdef CONFIG_DEBUG_CONSOLE_SERIAL + if (uart_charav(CONFIG_SERIAL_PORT)) + return (uart_getchar(CONFIG_SERIAL_PORT)); +#endif + return 0; +} + +struct _console_ops prep_console_ops = { + .putchar = prep_putchar, + .availchar = prep_availchar, + .getchar = prep_getchar +}; + #endif // CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Fri Oct 25 12:38:14 2013 (r1231) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Fri Oct 25 12:38:24 2013 (r1232) @@ -163,7 +163,7 @@ }; unsigned long isa_io_base; -extern struct _console_ops mac_console_ops; +extern struct _console_ops mac_console_ops, prep_console_ops; void entry(void) @@ -188,7 +188,11 @@ isa_io_base = arch->io_base; #ifdef CONFIG_DEBUG_CONSOLE - init_console(mac_console_ops); + if (is_apple()) { + init_console(mac_console_ops); + } else { + init_console(prep_console_ops); + } #endif if (temp != 1) { @@ -658,6 +662,11 @@ ofmem_t *ofmem = ofmem_arch_get_private(); + if (!is_apple()) { + /* Initialise PReP serial port */ + ob_pc_serial_init("", "serial", arch->io_base, 0x3f8ULL, 0); + } + openbios_init(); modules_init(); setup_timers(); @@ -823,12 +832,17 @@ #endif if (fw_cfg_read_i16(FW_CFG_NOGRAPHIC)) { - if (CONFIG_SERIAL_PORT) { - stdin_path = "scca"; - stdout_path = "scca"; + if (is_apple()) { + if (CONFIG_SERIAL_PORT) { + stdin_path = "scca"; + stdout_path = "scca"; + } else { + stdin_path = "sccb"; + stdout_path = "sccb"; + } } else { - stdin_path = "sccb"; - stdout_path = "sccb"; + stdin_path = "/serial"; + stdout_path = "/serial"; } /* Some bootloaders force the output to the screen device, so Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Fri Oct 25 12:38:14 2013 (r1231) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Fri Oct 25 12:38:24 2013 (r1232) @@ -22,6 +22,7 @@ #include "libc/diskio.h" #include "libc/vsprintf.h" #include "kernel.h" +#include "drivers/drivers.h" #include "libopenbios/ofmem.h" #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" @@ -78,5 +79,7 @@ check_preloaded_kernel(); } - update_nvram(); + if (is_apple()) { + update_nvram(); + } } Modified: trunk/openbios-devel/config/examples/ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml Fri Oct 25 12:38:14 2013 (r1231) +++ trunk/openbios-devel/config/examples/ppc_config.xml Fri Oct 25 12:38:24 2013 (r1232) @@ -8,6 +8,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_DRIVER_PC_SERIAL" type="boolean" value="true"/> <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/>

1 0

[commit] r1231 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 drivers include/drivers
by repository service 25 Oct '13

25 Oct '13

Author: mcayland Date: Fri Oct 25 12:38:14 2013 New Revision: 1231 URL: http://tracker.coreboot.org/trac/openbios/changeset/1231 Log: escc/pc_serial: separate uart_* functions into separate namespaces In order to allow architectures to support both ESCC and PC serial, add an escc_ prefix to the ESCC serial functions so that they can both co-exist within the same binary. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> CC: Andreas Färber <afaerber(a)suse.de> CC: Hervé Poussineau <hpoussin(a)reactos.org> Modified: trunk/openbios-devel/arch/ppc/qemu/console.c trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/pc_serial.c trunk/openbios-devel/include/drivers/drivers.h Modified: trunk/openbios-devel/arch/ppc/qemu/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/console.c Fri Oct 25 12:38:08 2013 (r1230) +++ trunk/openbios-devel/arch/ppc/qemu/console.c Fri Oct 25 12:38:14 2013 (r1231) @@ -24,7 +24,7 @@ static int mac_putchar(int c) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL - serial_putchar(c); + escc_uart_putchar(c & 0xff); #endif return c; } @@ -32,7 +32,7 @@ static int mac_availchar(void) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL - if (uart_charav(CONFIG_SERIAL_PORT)) + if (escc_uart_charav(CONFIG_SERIAL_PORT)) return 1; #endif return 0; @@ -41,8 +41,8 @@ static int mac_getchar(void) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL - if (uart_charav(CONFIG_SERIAL_PORT)) - return (uart_getchar(CONFIG_SERIAL_PORT)); + if (escc_uart_charav(CONFIG_SERIAL_PORT)) + return (escc_uart_getchar(CONFIG_SERIAL_PORT)); #endif return 0; } Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Fri Oct 25 12:38:08 2013 (r1230) +++ trunk/openbios-devel/arch/sparc32/console.c Fri Oct 25 12:38:14 2013 (r1231) @@ -22,7 +22,7 @@ static int arch_putchar(int c) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL - serial_putchar(c); + escc_uart_putchar(c); #endif return c; } @@ -30,7 +30,7 @@ static int arch_availchar(void) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL - if (uart_charav(CONFIG_SERIAL_PORT)) + if (escc_uart_charav(CONFIG_SERIAL_PORT)) return 1; #endif #ifdef CONFIG_DEBUG_CONSOLE_VIDEO @@ -43,8 +43,8 @@ static int arch_getchar(void) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL - if (uart_charav(CONFIG_SERIAL_PORT)) - return (uart_getchar(CONFIG_SERIAL_PORT)); + if (escc_uart_charav(CONFIG_SERIAL_PORT)) + return (escc_uart_getchar(CONFIG_SERIAL_PORT)); #endif #ifdef CONFIG_DEBUG_CONSOLE_VIDEO if (keyboard_dataready()) Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Fri Oct 25 12:38:08 2013 (r1230) +++ trunk/openbios-devel/arch/sparc32/openbios.c Fri Oct 25 12:38:14 2013 (r1231) @@ -941,7 +941,7 @@ #endif #ifdef CONFIG_DEBUG_CONSOLE #ifdef CONFIG_DEBUG_CONSOLE_SERIAL - uart_init(hwdef->serial_base | (CONFIG_SERIAL_PORT? 0ULL: 4ULL), + escc_uart_init(hwdef->serial_base | (CONFIG_SERIAL_PORT? 0ULL: 4ULL), CONFIG_SERIAL_SPEED); #endif #ifdef CONFIG_DEBUG_CONSOLE_VIDEO Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Fri Oct 25 12:38:08 2013 (r1230) +++ trunk/openbios-devel/arch/sparc64/console.c Fri Oct 25 12:38:14 2013 (r1231) @@ -28,7 +28,7 @@ static int arch_putchar(int c) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL - serial_putchar(c); + uart_putchar(c); #endif return c; } Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Fri Oct 25 12:38:08 2013 (r1230) +++ trunk/openbios-devel/drivers/escc.c Fri Oct 25 12:38:14 2013 (r1231) @@ -11,7 +11,7 @@ * serial console functions * ****************************************************************** */ -static volatile unsigned char *serial_dev; +static volatile unsigned char *escc_serial_dev; #define CTRL(addr) (*(volatile unsigned char *)(uintptr_t)(addr)) #ifdef CONFIG_DRIVER_ESCC_SUN @@ -54,25 +54,25 @@ #define Rx_CH_AV 0x1 /* Rx Character Available */ #define Tx_BUF_EMP 0x4 /* Tx Buffer empty */ -int uart_charav(uintptr_t port) +int escc_uart_charav(uintptr_t port) { return (CTRL(port) & Rx_CH_AV) != 0; } -char uart_getchar(uintptr_t port) +char escc_uart_getchar(uintptr_t port) { - while (!uart_charav(port)) + while (!escc_uart_charav(port)) ; return DATA(port) & 0177; } -static void uart_putchar(uintptr_t port, unsigned char c) +static void escc_uart_port_putchar(uintptr_t port, unsigned char c) { - if (!serial_dev) + if (!escc_serial_dev) return; if (c == '\n') - uart_putchar(port, '\r'); + escc_uart_port_putchar(port, '\r'); while (!(CTRL(port) & Tx_BUF_EMP)) ; DATA(port) = c; @@ -102,31 +102,31 @@ } -int uart_init(phys_addr_t port, unsigned long speed) +int escc_uart_init(phys_addr_t port, unsigned long speed) { #ifdef CONFIG_DRIVER_ESCC_SUN - serial_dev = (unsigned char *)ofmem_map_io(port & ~7ULL, ZS_REGS); - serial_dev += port & 7ULL; + escc_serial_dev = (unsigned char *)ofmem_map_io(port & ~7ULL, ZS_REGS); + escc_serial_dev += port & 7ULL; #else - serial_dev = (unsigned char *)(uintptr_t)port; + escc_serial_dev = (unsigned char *)(uintptr_t)port; #endif - uart_init_line(serial_dev, speed); + uart_init_line(escc_serial_dev, speed); return -1; } -void serial_putchar(int c) +void escc_uart_putchar(int c) { - uart_putchar((uintptr_t)serial_dev, (unsigned char) (c & 0xff)); + escc_uart_port_putchar((uintptr_t)escc_serial_dev, (unsigned char) (c & 0xff)); } void serial_cls(void) { - serial_putchar(27); - serial_putchar('['); - serial_putchar('H'); - serial_putchar(27); - serial_putchar('['); - serial_putchar('J'); + escc_uart_putchar(27); + escc_uart_putchar('['); + escc_uart_putchar('H'); + escc_uart_putchar(27); + escc_uart_putchar('['); + escc_uart_putchar('J'); } /* ( addr len -- actual ) */ @@ -142,8 +142,8 @@ if (len < 1) printk("escc_read: bad len, addr %p len %x\n", addr, len); - if (uart_charav(*address)) { - *addr = (char)uart_getchar(*address); + if (escc_uart_charav(*address)) { + *addr = (char)escc_uart_getchar(*address); PUSH(1); } else { PUSH(0); @@ -161,7 +161,7 @@ addr = (unsigned char *)cell2pointer(POP()); for (i = 0; i < len; i++) { - uart_putchar(*address, addr[i]); + escc_uart_port_putchar(*address, addr[i]); } PUSH(len); } @@ -194,7 +194,7 @@ free(args); } #else - *address = (unsigned long)serial_dev; // XXX + *address = (unsigned long)escc_serial_dev; // XXX #endif RET ( -1 ); } @@ -470,7 +470,7 @@ escc_add_channel(buf, "a", addr, 1); escc_add_channel(buf, "b", addr, 0); - serial_dev = (unsigned char *)addr + IO_ESCC_OFFSET + + escc_serial_dev = (unsigned char *)addr + IO_ESCC_OFFSET + (CONFIG_SERIAL_PORT ? 0 : 0x20); } #endif Modified: trunk/openbios-devel/drivers/pc_serial.c ============================================================================== --- trunk/openbios-devel/drivers/pc_serial.c Fri Oct 25 12:38:08 2013 (r1230) +++ trunk/openbios-devel/drivers/pc_serial.c Fri Oct 25 12:38:14 2013 (r1231) @@ -40,10 +40,10 @@ return ((char) inb(RBR(port)) & 0177); } -static void uart_putchar(int port, unsigned char c) +static void uart_port_putchar(int port, unsigned char c) { if (c == '\n') - uart_putchar(port, '\r'); + uart_port_putchar(port, '\r'); while (!(inb(LSR(port)) & 0x20)); outb(c, THR(port)); } @@ -91,9 +91,9 @@ return -1; } -void serial_putchar(int c) +void uart_putchar(int c) { - uart_putchar(CONFIG_SERIAL_PORT, (unsigned char) (c & 0xff)); + uart_port_putchar(CONFIG_SERIAL_PORT, (unsigned char) (c & 0xff)); } #endif @@ -129,7 +129,7 @@ addr = (unsigned char *)POP(); for (i = 0; i < len; i++) { - uart_putchar(*address, addr[i]); + uart_port_putchar(*address, addr[i]); } PUSH(len); } Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Fri Oct 25 12:38:08 2013 (r1230) +++ trunk/openbios-devel/include/drivers/drivers.h Fri Oct 25 12:38:14 2013 (r1231) @@ -109,13 +109,13 @@ int uart_init(int port, unsigned long speed); int uart_charav(int port); char uart_getchar(int port); -void serial_putchar(int c); +void uart_putchar(int c); #endif #ifdef CONFIG_DRIVER_ESCC -int uart_init(phys_addr_t port, unsigned long speed); -int uart_charav(uintptr_t port); -char uart_getchar(uintptr_t port); -void serial_putchar(int c); +int escc_uart_init(phys_addr_t port, unsigned long speed); +int escc_uart_charav(uintptr_t port); +char escc_uart_getchar(uintptr_t port); +void escc_uart_putchar(int c); void serial_cls(void); #ifdef CONFIG_DRIVER_ESCC_SUN int keyboard_dataready(void);

1 0

[commit] r1230 - in trunk/openbios-devel: arch/amd64 arch/ppc/qemu arch/sparc32 arch/sparc64 arch/unix arch/x86 include/libopenbios libopenbios
by repository service 25 Oct '13

25 Oct '13

Author: mcayland Date: Fri Oct 25 12:38:08 2013 New Revision: 1230 URL: http://tracker.coreboot.org/trac/openbios/changeset/1230 Log: libopenbios: move console selection from compile-time to runtime Some architectures require different console configurations depending upon the machine type. This commit moves the console handlers into a struct _console_ops structure held within libopenbios and switches all our supported architectures over to use it. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> CC: Andreas Färber <afaerber(a)suse.de> CC: Hervé Poussineau <hpoussin(a)reactos.org> Added: trunk/openbios-devel/include/libopenbios/console.h trunk/openbios-devel/libopenbios/console.c - copied, changed from r1229, trunk/openbios-devel/arch/ppc/qemu/console.c Modified: trunk/openbios-devel/arch/amd64/console.c trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/ppc/qemu/console.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/unix/unix.c trunk/openbios-devel/arch/x86/console.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/libopenbios/build.xml Modified: trunk/openbios-devel/arch/amd64/console.c ============================================================================== --- trunk/openbios-devel/arch/amd64/console.c Fri Sep 13 16:16:01 2013 (r1229) +++ trunk/openbios-devel/arch/amd64/console.c Fri Oct 25 12:38:08 2013 (r1230) @@ -361,7 +361,7 @@ * common functions, implementing simple concurrent console * ****************************************************************** */ -int putchar(int c) +int arch_putchar(int c) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL serial_putchar(c); @@ -372,7 +372,7 @@ return c; } -int availchar(void) +int arch_availchar(void) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL if (uart_charav(CONFIG_SERIAL_PORT)) @@ -385,7 +385,7 @@ return 0; } -int getchar(void) +int arch_getchar(void) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL if (uart_charav(CONFIG_SERIAL_PORT)) @@ -408,5 +408,10 @@ #endif } +struct _console_ops arch_console_ops = { + .putchar = arch_putchar, + .availchar = arch_availchar, + .getchar = arch_getchar +}; #endif // CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Fri Sep 13 16:16:01 2013 (r1229) +++ trunk/openbios-devel/arch/amd64/openbios.c Fri Oct 25 12:38:08 2013 (r1230) @@ -50,9 +50,12 @@ bind_func("platform-boot", boot ); } +extern struct _console_ops arch_console_ops; + int openbios(void) { #ifdef CONFIG_DEBUG_CONSOLE + init_console(arch_console_ops); #ifdef CONFIG_DEBUG_CONSOLE_SERIAL uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED); #endif Modified: trunk/openbios-devel/arch/ppc/qemu/console.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/console.c Fri Sep 13 16:16:01 2013 (r1229) +++ trunk/openbios-devel/arch/ppc/qemu/console.c Fri Oct 25 12:38:08 2013 (r1230) @@ -13,6 +13,7 @@ #include "config.h" #include "libopenbios/bindings.h" +#include "libopenbios/console.h" #include "drivers/drivers.h" #ifdef CONFIG_DEBUG_CONSOLE @@ -20,7 +21,7 @@ * common functions, implementing simple concurrent console * ****************************************************************** */ -int putchar(int c) +static int mac_putchar(int c) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL serial_putchar(c); @@ -28,7 +29,7 @@ return c; } -int availchar(void) +static int mac_availchar(void) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL if (uart_charav(CONFIG_SERIAL_PORT)) @@ -37,7 +38,7 @@ return 0; } -int getchar(void) +static int mac_getchar(void) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL if (uart_charav(CONFIG_SERIAL_PORT)) @@ -45,4 +46,11 @@ #endif return 0; } + +struct _console_ops mac_console_ops = { + .putchar = mac_putchar, + .availchar = mac_availchar, + .getchar = mac_getchar +}; + #endif // CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Fri Sep 13 16:16:01 2013 (r1229) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Fri Oct 25 12:38:08 2013 (r1230) @@ -23,6 +23,7 @@ #include "config.h" #include "libopenbios/openbios.h" #include "libopenbios/bindings.h" +#include "libopenbios/console.h" #include "drivers/pci.h" #include "arch/common/nvram.h" #include "drivers/drivers.h" @@ -162,6 +163,8 @@ }; unsigned long isa_io_base; +extern struct _console_ops mac_console_ops; + void entry(void) { @@ -184,6 +187,10 @@ isa_io_base = arch->io_base; +#ifdef CONFIG_DEBUG_CONSOLE + init_console(mac_console_ops); +#endif + if (temp != 1) { printk("Incompatible configuration device version, freezing\n"); for (;;) { Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Fri Sep 13 16:16:01 2013 (r1229) +++ trunk/openbios-devel/arch/sparc32/console.c Fri Oct 25 12:38:08 2013 (r1230) @@ -9,6 +9,7 @@ #include "kernel/kernel.h" #include "drivers/drivers.h" #include "openbios.h" +#include "libopenbios/console.h" #include "libopenbios/ofmem.h" #include "libopenbios/video.h" @@ -18,7 +19,7 @@ * common functions, implementing simple concurrent console * ****************************************************************** */ -int putchar(int c) +static int arch_putchar(int c) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL serial_putchar(c); @@ -26,7 +27,7 @@ return c; } -int availchar(void) +static int arch_availchar(void) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL if (uart_charav(CONFIG_SERIAL_PORT)) @@ -39,7 +40,7 @@ return 0; } -int getchar(void) +static int arch_getchar(void) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL if (uart_charav(CONFIG_SERIAL_PORT)) @@ -52,4 +53,10 @@ return 0; } +struct _console_ops arch_console_ops = { + .putchar = arch_putchar, + .availchar = arch_availchar, + .getchar = arch_getchar +}; + #endif // CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Fri Sep 13 16:16:01 2013 (r1229) +++ trunk/openbios-devel/arch/sparc32/openbios.c Fri Oct 25 12:38:08 2013 (r1230) @@ -9,6 +9,7 @@ #include "config.h" #include "libopenbios/openbios.h" #include "libopenbios/bindings.h" +#include "libopenbios/console.h" #include "drivers/drivers.h" #include "asm/types.h" #include "dict.h" @@ -913,6 +914,8 @@ setup_uuid(); } +extern struct _console_ops arch_console_ops; + int openbios(void) { unsigned int i; @@ -927,6 +930,9 @@ if (!hwdef) for(;;); // Internal inconsistency, hang +#ifdef CONFIG_DEBUG_CONSOLE + init_console(arch_console_ops); +#endif /* Make sure we setup OFMEM before the MMU as we need malloc() to setup page tables */ ofmem_init(); Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Fri Sep 13 16:16:01 2013 (r1229) +++ trunk/openbios-devel/arch/sparc64/console.c Fri Oct 25 12:38:08 2013 (r1230) @@ -7,6 +7,7 @@ #include "config.h" #include "libopenbios/bindings.h" +#include "libopenbios/console.h" #include "kernel/kernel.h" #include "drivers/drivers.h" #include "libopenbios/fontdata.h" @@ -24,7 +25,7 @@ * common functions, implementing simple concurrent console * ****************************************************************** */ -int putchar(int c) +static int arch_putchar(int c) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL serial_putchar(c); @@ -32,7 +33,7 @@ return c; } -int availchar(void) +static int arch_availchar(void) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL if (uart_charav(CONFIG_SERIAL_PORT)) @@ -45,7 +46,7 @@ return 0; } -int getchar(void) +static int arch_getchar(void) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL if (uart_charav(CONFIG_SERIAL_PORT)) @@ -58,4 +59,10 @@ return 0; } +struct _console_ops arch_console_ops = { + .putchar = arch_putchar, + .availchar = arch_availchar, + .getchar = arch_getchar +}; + #endif // CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Fri Sep 13 16:16:01 2013 (r1229) +++ trunk/openbios-devel/arch/sparc64/openbios.c Fri Oct 25 12:38:08 2013 (r1230) @@ -9,6 +9,7 @@ #include "config.h" #include "libopenbios/openbios.h" #include "libopenbios/bindings.h" +#include "libopenbios/console.h" #include "drivers/drivers.h" #include "dict.h" #include "arch/common/nvram.h" @@ -577,6 +578,8 @@ unsigned long isa_io_base; +extern struct _console_ops arch_console_ops; + int openbios(void) { unsigned int i; @@ -598,6 +601,7 @@ for(;;); // Internal inconsistency, hang #ifdef CONFIG_DEBUG_CONSOLE + init_console(arch_console_ops); #ifdef CONFIG_DEBUG_CONSOLE_SERIAL uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED); #endif Modified: trunk/openbios-devel/arch/unix/unix.c ============================================================================== --- trunk/openbios-devel/arch/unix/unix.c Fri Sep 13 16:16:01 2013 (r1229) +++ trunk/openbios-devel/arch/unix/unix.c Fri Oct 25 12:38:08 2013 (r1230) @@ -32,6 +32,7 @@ #include "kernel/stack.h" #include "arch/unix/plugins.h" #include "libopenbios/bindings.h" +#include "libopenbios/console.h" #include "libopenbios/openbios.h" #include "openbios-version.h" @@ -179,7 +180,7 @@ * functions used by primitives */ -int availchar(void) +static int unix_availchar(void) { int tmp = getc(stdin); if (tmp != EOF) { @@ -189,6 +190,23 @@ return 0; } +static int unix_putchar(int c) +{ + putc(c, stdout); + return c; +} + +static int unix_getchar(void) +{ + return getc(stdin); +} + +static struct _console_ops unix_console_ops = { + .putchar = unix_putchar, + .availchar = unix_availchar, + .getchar = unix_getchar +}; + u8 inb(u32 reg) { #ifdef CONFIG_PLUGINS @@ -498,6 +516,9 @@ return 1; } + /* Initialise console */ + init_console(unix_console_ops); + if ((dict = (unsigned char *) malloc(DICTIONARY_SIZE)) == NULL) { printk("panic: not enough memory.\n"); return 1; Modified: trunk/openbios-devel/arch/x86/console.c ============================================================================== --- trunk/openbios-devel/arch/x86/console.c Fri Sep 13 16:16:01 2013 (r1229) +++ trunk/openbios-devel/arch/x86/console.c Fri Oct 25 12:38:08 2013 (r1230) @@ -8,6 +8,7 @@ #include "config.h" #include "kernel/kernel.h" #include "openbios.h" +#include "libopenbios/console.h" #ifdef CONFIG_DEBUG_CONSOLE @@ -361,7 +362,7 @@ * common functions, implementing simple concurrent console * ****************************************************************** */ -int putchar(int c) +static int arch_putchar(int c) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL serial_putchar(c); @@ -372,7 +373,7 @@ return c; } -int availchar(void) +static int arch_availchar(void) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL if (uart_charav(CONFIG_SERIAL_PORT)) @@ -385,7 +386,7 @@ return 0; } -int getchar(void) +static int arch_getchar(void) { #ifdef CONFIG_DEBUG_CONSOLE_SERIAL if (uart_charav(CONFIG_SERIAL_PORT)) @@ -408,5 +409,10 @@ #endif } +struct _console_ops arch_console_ops = { + .putchar = arch_putchar, + .availchar = arch_availchar, + .getchar = arch_getchar +}; #endif // CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Fri Sep 13 16:16:01 2013 (r1229) +++ trunk/openbios-devel/arch/x86/openbios.c Fri Oct 25 12:38:08 2013 (r1230) @@ -9,6 +9,7 @@ #include "config.h" #include "libopenbios/openbios.h" #include "libopenbios/bindings.h" +#include "libopenbios/console.h" #include "asm/types.h" #include "dict.h" #include "kernel/kernel.h" @@ -75,9 +76,12 @@ bind_func("(go)", go ); } +extern struct _console_ops arch_console_ops; + int openbios(void) { #ifdef CONFIG_DEBUG_CONSOLE + init_console(arch_console_ops); #ifdef CONFIG_DEBUG_CONSOLE_SERIAL uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED); #endif Added: trunk/openbios-devel/include/libopenbios/console.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/include/libopenbios/console.h Fri Oct 25 12:38:08 2013 (r1230) @@ -0,0 +1,25 @@ +/* + * <console.h> + * + * Shared console routines + * + * Copyright (C) 2013 Mark Cave-Ayland (mark.cave-ayland(a)ilande.co.uk) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#ifndef _H_CONSOLE +#define _H_CONSOLE + +struct _console_ops { + int (*putchar)(int c); + int (*availchar)(void); + int (*getchar)(void); +}; + +void init_console(struct _console_ops ops); + +#endif /* _H_CONSOLE */ Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Fri Sep 13 16:16:01 2013 (r1229) +++ trunk/openbios-devel/libopenbios/build.xml Fri Oct 25 12:38:08 2013 (r1230) @@ -6,6 +6,7 @@ <object source="bootcode_load.c" condition="LOADER_BOOTCODE"/> <object source="bootinfo_load.c" condition="LOADER_BOOTINFO"/> <object source="client.c"/> + <object source="console.c"/> <object source="elf_info.c" /> <object source="elf_load.c" condition="LOADER_ELF"/> <object source="font_8x8.c" condition="FONT_8X8"/> Copied and modified: trunk/openbios-devel/libopenbios/console.c (from r1229, trunk/openbios-devel/arch/ppc/qemu/console.c) ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/console.c Fri Sep 13 16:16:01 2013 (r1229, copy source) +++ trunk/openbios-devel/libopenbios/console.c Fri Oct 25 12:38:08 2013 (r1230) @@ -4,6 +4,7 @@ * Simple text console * * Copyright (C) 2005 Stefan Reinauer <stepan(a)openbios.org> + * Copyright (C) 2013 Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -13,36 +14,55 @@ #include "config.h" #include "libopenbios/bindings.h" +#include "libopenbios/console.h" #include "drivers/drivers.h" -#ifdef CONFIG_DEBUG_CONSOLE /* ****************************************************************** * common functions, implementing simple concurrent console * ****************************************************************** */ +/* Dummy routines for when console is unassigned */ + +static int dummy_putchar(int c) +{ + return c; +} + +static int dummy_availchar(void) +{ + return 0; +} + +static int dummy_getchar(void) +{ + return 0; +} + +struct _console_ops console_ops = { + .putchar = dummy_putchar, + .availchar = dummy_availchar, + .getchar = dummy_getchar +}; + +#ifdef CONFIG_DEBUG_CONSOLE + +void init_console(struct _console_ops ops) +{ + console_ops = ops; +} + int putchar(int c) { -#ifdef CONFIG_DEBUG_CONSOLE_SERIAL - serial_putchar(c); -#endif - return c; + return (*console_ops.putchar)(c); } int availchar(void) { -#ifdef CONFIG_DEBUG_CONSOLE_SERIAL - if (uart_charav(CONFIG_SERIAL_PORT)) - return 1; -#endif - return 0; + return (*console_ops.availchar)(); } int getchar(void) { -#ifdef CONFIG_DEBUG_CONSOLE_SERIAL - if (uart_charav(CONFIG_SERIAL_PORT)) - return (uart_getchar(CONFIG_SERIAL_PORT)); -#endif - return 0; + return (*console_ops.getchar)(); } -#endif // CONFIG_DEBUG_CONSOLE +#endif // CONFIG_DEBUG_CONSOLE

1 0

[PATCH 0/3] Enable serial console for PReP machines
by Mark Cave-Ayland 13 Oct '13

13 Oct '13

This patchset, when applied against Hervé's QEMU raven branch, provides a basic serial console for PReP machines when launched from QEMU with -nographic. There is still some further work to be done with setting up a proper ISA bridge device but it seemed worthwhile handling the required console changes first as a self-contained patchset. Mark Cave-Ayland (3): libopenbios: move console selection from compile-time to runtime escc/pc_serial: separate uart_* functions into separate namespaces ppc: enable basic PReP serial console openbios-devel/arch/amd64/console.c | 11 ++-- openbios-devel/arch/amd64/openbios.c | 3 ++ openbios-devel/arch/ppc/qemu/console.c | 50 ++++++++++++++++-- openbios-devel/arch/ppc/qemu/init.c | 31 +++++++++-- openbios-devel/arch/ppc/qemu/main.c | 5 +- openbios-devel/arch/sparc32/console.c | 21 +++++--- openbios-devel/arch/sparc32/openbios.c | 8 ++- openbios-devel/arch/sparc64/console.c | 15 ++++-- openbios-devel/arch/sparc64/openbios.c | 4 ++ openbios-devel/arch/unix/unix.c | 23 ++++++++- openbios-devel/arch/x86/console.c | 12 +++-- openbios-devel/arch/x86/openbios.c | 4 ++ openbios-devel/config/examples/ppc_config.xml | 1 + openbios-devel/drivers/escc.c | 50 +++++++++--------- openbios-devel/drivers/pc_serial.c | 10 ++-- openbios-devel/include/drivers/drivers.h | 10 ++-- openbios-devel/include/libopenbios/console.h | 25 +++++++++ openbios-devel/libopenbios/build.xml | 1 + openbios-devel/libopenbios/console.c | 68 +++++++++++++++++++++++++ 19 files changed, 287 insertions(+), 65 deletions(-) create mode 100644 openbios-devel/include/libopenbios/console.h create mode 100644 openbios-devel/libopenbios/console.c -- 1.7.10.4

1 3

[commit] r1229 - trunk/openbios-devel/arch/ppc/qemu
by repository service 13 Sep '13

13 Sep '13

Author: afaerber Date: Fri Sep 13 16:16:01 2013 New Revision: 1229 URL: http://tracker.coreboot.org/trac/openbios/changeset/1229 Log: prep: fix start address of PCI memory region PCI devices having memory BARs are now accessed at the right address. This at least fixes the QEMU video card, which is now able to display the OpenBIOS prompt. Signed-off-by: Hervé Poussineau <hpoussin(a)reactos.org> Acked-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Tue Sep 3 01:36:45 2013 (r1228) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Fri Sep 13 16:16:01 2013 (r1229) @@ -99,8 +99,8 @@ .cfg_data = 0x80000cfc, .cfg_base = 0x80000000, .cfg_len = 0x00100000, - .host_pci_base = 0x0, - .pci_mem_base = 0xf0000000, + .host_pci_base = 0xc0000000, + .pci_mem_base = 0x100000, /* avoid VGA at 0xa0000 */ .mem_len = 0x10000000, .io_base = 0x80000000, .io_len = 0x00010000,

1 0

[PATCH v2] prep: fix start address of PCI memory region
by Hervé Poussineau 13 Sep '13

13 Sep '13

PCI devices having memory BARs are now accessed at the right address. This at least fixes the QEMU video card, which is now able to display the OpenBIOS prompt. Signed-off-by: Hervé Poussineau <hpoussin(a)reactos.org> --- Changes v1->v2: - rebased on r1228 arch/ppc/qemu/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index f370514..1124c6f 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -99,8 +99,8 @@ static const pci_arch_t known_arch[] = { .cfg_data = 0x80000cfc, .cfg_base = 0x80000000, .cfg_len = 0x00100000, - .host_pci_base = 0x0, - .pci_mem_base = 0xf0000000, + .host_pci_base = 0xc0000000, + .pci_mem_base = 0x100000, /* avoid VGA at 0xa0000 */ .mem_len = 0x10000000, .io_base = 0x80000000, .io_len = 0x00010000, -- 1.7.10.4

3 2

[PATCH] prep: fix start address of PCI memory region
by Hervé Poussineau 13 Sep '13

13 Sep '13

PCI devices having memory BARs are now accessed at the right address. This at least fixes the QEMU video card, which is now able to display the OpenBIOS prompt. Signed-off-by: Hervé Poussineau <hpoussin(a)reactos.org> --- arch/ppc/qemu/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index f370514..cbed740 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -99,8 +99,8 @@ static const pci_arch_t known_arch[] = { .cfg_data = 0x80000cfc, .cfg_base = 0x80000000, .cfg_len = 0x00100000, - .host_pci_base = 0x0, - .pci_mem_base = 0xf0000000, + .host_mem_base = 0xc0000000, + .pci_mem_base = 0x100000, /* avoid VGA at 0xa0000 */ .mem_len = 0x10000000, .io_base = 0x80000000, .io_len = 0x00010000, -- 1.7.10.4

2 1

[commit] r1228 - in trunk/openbios-devel: arch/ppc/qemu drivers
by repository service 03 Sep '13

03 Sep '13

Author: afaerber Date: Tue Sep 3 01:36:45 2013 New Revision: 1228 URL: http://tracker.coreboot.org/trac/openbios/changeset/1228 Log: PPC: fix PReP PCI bus enumeration This patch corrects the PCI configuration and data IO port addresses, along with detection of the Raven PCI bridge. With this in place, we can now enumerate a PReP PCI bus. Reported-by: Hervé Poussineau <hpoussin(a)reactos.org> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Tested-by: Hervé Poussineau <hpoussin(a)reactos.org> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/drivers/pci_database.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Tue Sep 3 01:24:56 2013 (r1227) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Tue Sep 3 01:36:45 2013 (r1228) @@ -95,8 +95,8 @@ .name = "PREP", .vendor_id = PCI_VENDOR_ID_MOTOROLA, .device_id = PCI_DEVICE_ID_MOTOROLA_RAVEN, - .cfg_addr = 0x80800000, - .cfg_data = 0x800c0000, + .cfg_addr = 0x80000cf8, + .cfg_data = 0x80000cfc, .cfg_base = 0x80000000, .cfg_len = 0x00100000, .host_pci_base = 0x0, Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Tue Sep 3 01:24:56 2013 (r1227) +++ trunk/openbios-devel/drivers/pci_database.c Tue Sep 3 01:36:45 2013 (r1228) @@ -336,7 +336,7 @@ }, { PCI_VENDOR_ID_MOTOROLA, PCI_DEVICE_ID_MOTOROLA_RAVEN, NULL, - "pci-bridge", "PREP Host PCI Bridge - Motorola Raven", NULL, + "pci", "PREP Host PCI Bridge - Motorola Raven", NULL, 3, 2, 1, host_config_cb, NULL, },

1 0

[commit] r1227 - trunk/openbios-devel/drivers
by repository service 03 Sep '13

03 Sep '13

Author: afaerber Date: Tue Sep 3 01:24:56 2013 New Revision: 1227 URL: http://tracker.coreboot.org/trac/openbios/changeset/1227 Log: pci: Set config hook for Raven PCI host bridge Acked-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Tested-by: Hervé Poussineau <hpoussin(a)reactos.org> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/drivers/pci_database.c Modified: trunk/openbios-devel/drivers/pci_database.c ============================================================================== --- trunk/openbios-devel/drivers/pci_database.c Mon Sep 2 15:46:01 2013 (r1226) +++ trunk/openbios-devel/drivers/pci_database.c Tue Sep 3 01:24:56 2013 (r1227) @@ -338,7 +338,7 @@ PCI_VENDOR_ID_MOTOROLA, PCI_DEVICE_ID_MOTOROLA_RAVEN, NULL, "pci-bridge", "PREP Host PCI Bridge - Motorola Raven", NULL, 3, 2, 1, - NULL, NULL, + host_config_cb, NULL, }, { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_SABRE, NULL,

1 0

[PATCH 1/2] PPC: Fix PCI configuration space address access
by Mark Cave-Ayland 02 Sep '13

02 Sep '13

This patch corrects two long-standing bugs with PPC PCI configuration space access. Firstly fix the calculation of PCI configuration space addresses by the PCI_ADDR macro; this was incorrectly using arch->cfg_base which is the mapped address and has nothing to do with the PCI configuration space address. Instead just set bit 31 to initiate a configuration cycle as per the PCI specification. Secondly, fix pci_config_read32() and pci_config_write16() which were incorrectly adding the register offset to the PCI IO dataport address causing them to write into unknown address space for registers > 0. It appears that this only worked purely by coincidence with QEMU due to the way in which the configuration address was calculated for an oversized PCI configuration IO dataport MemoryRegion. Reported-by: Hervé Poussineau <hpoussin(a)reactos.org> CC: Hervé Poussineau <hpoussin(a)reactos.org> CC: Andreas Färber <afaerber(a)suse.de> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/include/arch/ppc/pci.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openbios-devel/include/arch/ppc/pci.h b/openbios-devel/include/arch/ppc/pci.h index cccefb1..d96bd7e 100644 --- a/openbios-devel/include/arch/ppc/pci.h +++ b/openbios-devel/include/arch/ppc/pci.h @@ -12,7 +12,7 @@ /* PCI Configuration Mechanism #1 */ #define PCI_ADDR(bus, dev, fn) \ - ((pci_addr) (arch->cfg_base \ + ((pci_addr) (0x80000000u \ | (uint32_t) (bus) << 16 \ | (uint32_t) (dev) << 11 \ | (uint32_t) (fn) << 8)) @@ -41,7 +41,7 @@ static inline uint32_t pci_config_read32(pci_addr dev, uint8_t reg) { uint32_t res; out_le32((unsigned *)arch->cfg_addr, dev | reg); - res = in_le32((unsigned *)(arch->cfg_data + reg)); + res = in_le32((unsigned *)(arch->cfg_data)); return res; } @@ -60,7 +60,7 @@ static inline void pci_config_write16(pci_addr dev, uint8_t reg, uint16_t val) static inline void pci_config_write32(pci_addr dev, uint8_t reg, uint32_t val) { out_le32((unsigned *)arch->cfg_addr, dev | reg); - out_le32((unsigned *)(arch->cfg_data + reg), val); + out_le32((unsigned *)(arch->cfg_data), val); } #else /* !PCI_CONFIG_1 */ #error PCI Configuration Mechanism is not specified or implemented -- 1.7.10.4

2 4

[commit] r1226 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc64 drivers include/drivers
by repository service 02 Sep '13

02 Sep '13

Author: mcayland Date: Mon Sep 2 15:46:01 2013 New Revision: 1226 URL: http://tracker.coreboot.org/trac/openbios/changeset/1226 Log: PCI: switch calculation of host PCI memory base to use an offset Instead of using two different variables to track the absolute values of the PCI memory base and the host memory base, change the host memory base to be an offset which is added to the PCI memory base during conversion. As a consequence of this, the code in pci_bus_addr_to_host_addr() can be unified to be consistent across all architectures. Note that this commit also renames arch->host_mem_base to arch->host_pci_base in order to better describe its function. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/include/drivers/pci.h Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Mon Sep 2 15:45:56 2013 (r1225) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Mon Sep 2 15:46:01 2013 (r1226) @@ -99,7 +99,7 @@ .cfg_data = 0x800c0000, .cfg_base = 0x80000000, .cfg_len = 0x00100000, - .host_mem_base = 0xf0000000, + .host_pci_base = 0x0, .pci_mem_base = 0xf0000000, .mem_len = 0x10000000, .io_base = 0x80000000, @@ -116,7 +116,7 @@ .cfg_data = 0xf2c00000, .cfg_base = 0xf2000000, .cfg_len = 0x02000000, - .host_mem_base = 0x80000000, + .host_pci_base = 0x0, .pci_mem_base = 0x80000000, .mem_len = 0x10000000, .io_base = 0xf2000000, @@ -133,7 +133,7 @@ .cfg_data = 0xf0c00000, .cfg_base = 0xf0000000, .cfg_len = 0x02000000, - .host_mem_base = 0x80000000, + .host_pci_base = 0x0, .pci_mem_base = 0x80000000, .mem_len = 0x10000000, .io_base = 0xf2000000, @@ -150,7 +150,7 @@ .cfg_data = 0xfee00000, .cfg_base = 0x80000000, .cfg_len = 0x7f000000, - .host_mem_base = 0x80000000, + .host_pci_base = 0x0, .pci_mem_base = 0x80000000, .mem_len = 0x10000000, .io_base = 0xfe000000, Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Mon Sep 2 15:45:56 2013 (r1225) +++ trunk/openbios-devel/arch/sparc64/openbios.c Mon Sep 2 15:46:01 2013 (r1226) @@ -59,7 +59,7 @@ .cfg_data = APB_MEM_BASE, // PCI bus memory space .cfg_base = APB_SPECIAL_BASE, .cfg_len = 0x2000000, - .host_mem_base = APB_MEM_BASE, + .host_pci_base = APB_MEM_BASE, .pci_mem_base = 0x100000, /* avoid VGA at 0xa0000 */ .mem_len = 0x10000000, .io_base = APB_SPECIAL_BASE + 0x2000000ULL, // PCI Bus I/O space Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Mon Sep 2 15:45:56 2013 (r1225) +++ trunk/openbios-devel/drivers/pci.c Mon Sep 2 15:46:01 2013 (r1226) @@ -143,11 +143,7 @@ static unsigned long pci_bus_addr_to_host_addr(uint32_t ba) { -#ifdef CONFIG_SPARC64 - return arch->cfg_data + (unsigned long)ba; -#else - return (unsigned long)ba; -#endif + return arch->host_pci_base + (unsigned long)ba; } static void @@ -525,11 +521,12 @@ ncells += host_encode_phys_addr(props + ncells, arch->rbase); ncells += pci_encode_size(props + ncells, arch->rlen); } - if (arch->host_mem_base) { + if (arch->pci_mem_base) { ncells += pci_encode_phys_addr(props + ncells, 0, MEMORY_SPACE_32, config->dev, 0, arch->pci_mem_base); - ncells += host_encode_phys_addr(props + ncells, arch->host_mem_base); - ncells += pci_encode_size(props + ncells, arch->mem_len); + ncells += host_encode_phys_addr(props + ncells, arch->host_pci_base + + arch->pci_mem_base); + ncells += pci_encode_size(props + ncells, arch->mem_len); } set_property(dev, "ranges", (char *)props, ncells * sizeof(props[0])); } Modified: trunk/openbios-devel/include/drivers/pci.h ============================================================================== --- trunk/openbios-devel/include/drivers/pci.h Mon Sep 2 15:45:56 2013 (r1225) +++ trunk/openbios-devel/include/drivers/pci.h Mon Sep 2 15:46:01 2013 (r1226) @@ -13,7 +13,7 @@ unsigned long cfg_data; unsigned long cfg_base; unsigned long cfg_len; - unsigned long host_mem_base; /* in host memory space */ + unsigned long host_pci_base; /* offset of PCI memory space within host memory space */ unsigned long pci_mem_base; /* in PCI memory space */ unsigned long mem_len; unsigned long io_base;

1 0

[commit] r1225 - trunk/openbios-devel/include/arch/ppc
by repository service 02 Sep '13

02 Sep '13

Author: mcayland Date: Mon Sep 2 15:45:56 2013 New Revision: 1225 URL: http://tracker.coreboot.org/trac/openbios/changeset/1225 Log: PPC: Fix PCI configuration space address access This patch corrects two long-standing bugs with PPC PCI configuration space access. Firstly fix the calculation of PCI configuration space addresses by the PCI_ADDR macro; this was incorrectly using arch->cfg_base which is the mapped address and has nothing to do with the PCI configuration space address. Instead just set bit 31 to initiate a configuration cycle as per the PCI specification. Secondly, fix pci_config_read32() and pci_config_write32() which were incorrectly adding the register offset to the PCI IO dataport address causing them to write into unknown address space for registers > 0. It appears that this only worked purely by coincidence with QEMU due to the way in which the configuration address was calculated for an oversized PCI configuration IO dataport MemoryRegion. Reported-by: Hervé Poussineau <hpoussin(a)reactos.org> CC: Hervé Poussineau <hpoussin(a)reactos.org> CC: Andreas Färber <afaerber(a)suse.de> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/include/arch/ppc/pci.h Modified: trunk/openbios-devel/include/arch/ppc/pci.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/pci.h Sat Aug 24 22:00:36 2013 (r1224) +++ trunk/openbios-devel/include/arch/ppc/pci.h Mon Sep 2 15:45:56 2013 (r1225) @@ -12,7 +12,7 @@ /* PCI Configuration Mechanism #1 */ #define PCI_ADDR(bus, dev, fn) \ - ((pci_addr) (arch->cfg_base \ + ((pci_addr) (0x80000000u \ | (uint32_t) (bus) << 16 \ | (uint32_t) (dev) << 11 \ | (uint32_t) (fn) << 8)) @@ -41,7 +41,7 @@ { uint32_t res; out_le32((unsigned *)arch->cfg_addr, dev | reg); - res = in_le32((unsigned *)(arch->cfg_data + reg)); + res = in_le32((unsigned *)(arch->cfg_data)); return res; } @@ -60,7 +60,7 @@ static inline void pci_config_write32(pci_addr dev, uint8_t reg, uint32_t val) { out_le32((unsigned *)arch->cfg_addr, dev | reg); - out_le32((unsigned *)(arch->cfg_data + reg), val); + out_le32((unsigned *)(arch->cfg_data), val); } #else /* !PCI_CONFIG_1 */ #error PCI Configuration Mechanism is not specified or implemented

1 0

Re: [OpenBIOS] [PATCH] ppc: Implement NVRAM support for PReP
by Mark Cave-Ayland 30 Aug '13

30 Aug '13

On 27/08/13 11:10, Artyom Tarasenko wrote: > Hi Mark, > > On Mon, Aug 26, 2013 at 11:05 PM, Mark Cave-Ayland > <mark.cave-ayland(a)ilande.co.uk> wrote: >> On 24/08/13 23:06, Andreas Färber wrote: >> >>> Signed-off-by: Andreas Färber<andreas.faerber(a)web.de> >>> --- >>> arch/ppc/qemu/qemu.c | 18 ++++++++++-- >>> config/examples/ppc64_config.xml | 1 + >>> config/examples/ppc_config.xml | 1 + >>> drivers/build.xml | 1 + >>> drivers/m48t59.c | 60 >>> ++++++++++++++++++++++++++++++++++++++++ >>> include/drivers/drivers.h | 3 ++ >>> 6 files changed, 81 insertions(+), 3 deletions(-) >>> create mode 100644 drivers/m48t59.c >>> >>> diff --git a/arch/ppc/qemu/qemu.c b/arch/ppc/qemu/qemu.c >>> index 381affb..1e3994c 100644 >>> --- a/arch/ppc/qemu/qemu.c >>> +++ b/arch/ppc/qemu/qemu.c >>> @@ -80,9 +80,13 @@ printk( const char *fmt, ... ) >>> int arch_nvram_size(void) >>> { >>> if (is_apple()) { >>> +#ifdef CONFIG_DRIVER_MACIO >>> return macio_get_nvram_size(); >>> +#endif >>> } else { >>> - // not implemented >>> +#ifdef CONFIG_DRIVER_M48T59 >>> + return m48t59_nvram_size(); >>> +#endif >>> } >>> return 0; >>> } >>> @@ -90,17 +94,25 @@ int arch_nvram_size(void) >>> void arch_nvram_put(char *buf) >>> { >>> if (is_apple()) { >>> +#ifdef CONFIG_DRIVER_MACIO >>> macio_nvram_put(buf); >>> +#endif >>> } else { >>> - // not implemented >>> +#ifdef CONFIG_DRIVER_M48T59 >>> + m48t59_nvram_put(buf); >>> +#endif >>> } >>> } >>> >>> void arch_nvram_get(char *buf) >>> { >>> if (is_apple()) { >>> +#ifdef CONFIG_DRIVER_MACIO >>> macio_nvram_get(buf); >>> +#endif >>> } else { >>> - // not implemented >>> +#ifdef CONFIG_DRIVER_M48T59 >>> + m48t59_nvram_get(buf); >>> +#endif >>> } >>> } >>> diff --git a/config/examples/ppc64_config.xml >>> b/config/examples/ppc64_config.xml >>> index 5f79c21..04343b4 100644 >>> --- a/config/examples/ppc64_config.xml >>> +++ b/config/examples/ppc64_config.xml >>> @@ -75,3 +75,4 @@ >>> <option name="CONFIG_DRIVER_ESCC" type="boolean" value="true"/> >>> <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> >>> <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0xf0000510"/> >>> +<option name="CONFIG_DRIVER_M48T59" type="boolean" value="false"/> >>> diff --git a/config/examples/ppc_config.xml >>> b/config/examples/ppc_config.xml >>> index 5bb789f..2229f00 100644 >>> --- a/config/examples/ppc_config.xml >>> +++ b/config/examples/ppc_config.xml >>> @@ -78,3 +78,4 @@ >>> <option name="CONFIG_DRIVER_ESCC" type="boolean" value="true"/> >>> <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> >>> <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0xf0000510"/> >>> +<option name="CONFIG_DRIVER_M48T59" type="boolean" value="true"/> >>> diff --git a/drivers/build.xml b/drivers/build.xml >>> index edec6b5..bcb21ae 100644 >>> --- a/drivers/build.xml >>> +++ b/drivers/build.xml >>> @@ -22,6 +22,7 @@ >>> <object source="pc_serial.c" condition="DRIVER_PC_SERIAL"/> >>> <object source="escc.c" condition="DRIVER_ESCC"/> >>> <object source="fw_cfg.c" condition="DRIVER_FW_CFG"/> >>> +<object source="m48t59.c" condition="DRIVER_M48T59"/> >>> </library> >>> >>> <dictionary name="openbios" target="forth"> >>> diff --git a/drivers/m48t59.c b/drivers/m48t59.c >>> new file mode 100644 >>> index 0000000..cd9e9f6 >>> --- /dev/null >>> +++ b/drivers/m48t59.c >>> @@ -0,0 +1,60 @@ >>> +/* >>> + * OpenBIOS PReP m48t59 driver >>> + * >>> + * Copyright (c) 2013 Andreas Färber >>> + */ >>> + >>> +#include "config.h" >>> + >>> +#include "drivers/drivers.h" >>> +#include "asm/io.h" >>> + >>> +#define PREP_NVRAM_SIZE 0x2000 >>> +#define PREP_NVRAM_ADDR_LO 0x74 >>> +#define PREP_NVRAM_ADDR_HI 0x75 >>> +#define PREP_NVRAM_DATA 0x77 >>> + >>> +static uint8_t m48t59_nvram_read_byte(uint16_t offset) >>> +{ >>> + outb(offset& 0xff, PREP_NVRAM_ADDR_LO); >>> >>> + outb(offset>> 8, PREP_NVRAM_ADDR_HI); >>> + return inb(PREP_NVRAM_DATA); >>> +} >>> + >>> +static void m48t59_nvram_read(uint16_t offset, char *buf, unsigned int >>> len) >>> +{ >>> + unsigned int i; >>> + for (i = 0; i< len; i++) { >>> + buf[i] = m48t59_nvram_read_byte(offset); >>> + } >>> +} >>> + >>> +static void m48t59_nvram_write_byte(uint16_t offset, uint8_t value) >>> +{ >>> + outb(offset& 0xff, PREP_NVRAM_ADDR_LO); >>> >>> + outb(offset>> 8, PREP_NVRAM_ADDR_HI); >>> + outb(value, PREP_NVRAM_DATA); >>> +} >>> + >>> +static void m48t59_nvram_write(uint16_t offset, const char *buf, unsigned >>> int len) >>> +{ >>> + unsigned int i; >>> + for (i = 0; i< len; i++) { >>> + m48t59_nvram_write_byte(offset, buf[i]); >>> + } >>> +} >>> + >>> +int m48t59_nvram_size(void) >>> +{ >>> + return PREP_NVRAM_SIZE; >>> +} >>> + >>> +void m48t59_nvram_put(char *buf) >>> +{ >>> + m48t59_nvram_write(0, buf, PREP_NVRAM_SIZE); >>> +} >>> + >>> +void m48t59_nvram_get(char *buf) >>> +{ >>> + m48t59_nvram_read(0, buf, PREP_NVRAM_SIZE); >>> +} >>> diff --git a/include/drivers/drivers.h b/include/drivers/drivers.h >>> index 47d730f..73da6a2 100644 >>> --- a/include/drivers/drivers.h >>> +++ b/include/drivers/drivers.h >>> @@ -125,6 +125,9 @@ unsigned char keyboard_readdata(void); >>> int macio_get_nvram_size(void); >>> void macio_nvram_put(char *buf); >>> void macio_nvram_get(char *buf); >>> +int m48t59_nvram_size(void); >>> +void m48t59_nvram_put(char *buf); >>> +void m48t59_nvram_get(char *buf); >>> >>> /* drivers/timer.c */ >>> void setup_timers(void); >> >> >> The basic patch looks good, although I have a feeling that the m48t59 is the >> same NVRAM chip used by SPARC64 so there could be some changes required to >> support both. Artyom, any thoughts? > > The m48t59 wired differently on sun4u machines. PReP seems to use PIO, > whereas sun4u uses MMIO for accessing the chip. (It is possible that > both modes are supported on sun4u, but only MMIO is exposed to user > via OBP, but I couldn't find any documentation which would prove or > deny that). > > No objections to this patch from my side. Thanks Artyom. Given that m48t59 could potentially be used across different architectures, on further inspection I'd prefer something a bit more generic and a bit less PReP-specific. As a compromise, how about renaming the PREP_NVRAM_* constants to M48T59_NVRAM_* and moving them to a .h file somewhere under include/arch/ppc? Then at least if someone tries to re-use the driver in a different architecture, it will fail to compile which will serve as a reminder that some alterations to the interface will be required. ATB, Mark.

2 1

[PATCH] ppc: Implement NVRAM support for PReP
by Andreas Färber 27 Aug '13

27 Aug '13

Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- arch/ppc/qemu/qemu.c | 18 ++++++++++-- config/examples/ppc64_config.xml | 1 + config/examples/ppc_config.xml | 1 + drivers/build.xml | 1 + drivers/m48t59.c | 60 ++++++++++++++++++++++++++++++++++++++++ include/drivers/drivers.h | 3 ++ 6 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 drivers/m48t59.c diff --git a/arch/ppc/qemu/qemu.c b/arch/ppc/qemu/qemu.c index 381affb..1e3994c 100644 --- a/arch/ppc/qemu/qemu.c +++ b/arch/ppc/qemu/qemu.c @@ -80,9 +80,13 @@ printk( const char *fmt, ... ) int arch_nvram_size(void) { if (is_apple()) { +#ifdef CONFIG_DRIVER_MACIO return macio_get_nvram_size(); +#endif } else { - // not implemented +#ifdef CONFIG_DRIVER_M48T59 + return m48t59_nvram_size(); +#endif } return 0; } @@ -90,17 +94,25 @@ int arch_nvram_size(void) void arch_nvram_put(char *buf) { if (is_apple()) { +#ifdef CONFIG_DRIVER_MACIO macio_nvram_put(buf); +#endif } else { - // not implemented +#ifdef CONFIG_DRIVER_M48T59 + m48t59_nvram_put(buf); +#endif } } void arch_nvram_get(char *buf) { if (is_apple()) { +#ifdef CONFIG_DRIVER_MACIO macio_nvram_get(buf); +#endif } else { - // not implemented +#ifdef CONFIG_DRIVER_M48T59 + m48t59_nvram_get(buf); +#endif } } diff --git a/config/examples/ppc64_config.xml b/config/examples/ppc64_config.xml index 5f79c21..04343b4 100644 --- a/config/examples/ppc64_config.xml +++ b/config/examples/ppc64_config.xml @@ -75,3 +75,4 @@ <option name="CONFIG_DRIVER_ESCC" type="boolean" value="true"/> <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0xf0000510"/> + <option name="CONFIG_DRIVER_M48T59" type="boolean" value="false"/> diff --git a/config/examples/ppc_config.xml b/config/examples/ppc_config.xml index 5bb789f..2229f00 100644 --- a/config/examples/ppc_config.xml +++ b/config/examples/ppc_config.xml @@ -78,3 +78,4 @@ <option name="CONFIG_DRIVER_ESCC" type="boolean" value="true"/> <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0xf0000510"/> + <option name="CONFIG_DRIVER_M48T59" type="boolean" value="true"/> diff --git a/drivers/build.xml b/drivers/build.xml index edec6b5..bcb21ae 100644 --- a/drivers/build.xml +++ b/drivers/build.xml @@ -22,6 +22,7 @@ <object source="pc_serial.c" condition="DRIVER_PC_SERIAL"/> <object source="escc.c" condition="DRIVER_ESCC"/> <object source="fw_cfg.c" condition="DRIVER_FW_CFG"/> + <object source="m48t59.c" condition="DRIVER_M48T59"/> </library> <dictionary name="openbios" target="forth"> diff --git a/drivers/m48t59.c b/drivers/m48t59.c new file mode 100644 index 0000000..cd9e9f6 --- /dev/null +++ b/drivers/m48t59.c @@ -0,0 +1,60 @@ +/* + * OpenBIOS PReP m48t59 driver + * + * Copyright (c) 2013 Andreas Färber + */ + +#include "config.h" + +#include "drivers/drivers.h" +#include "asm/io.h" + +#define PREP_NVRAM_SIZE 0x2000 +#define PREP_NVRAM_ADDR_LO 0x74 +#define PREP_NVRAM_ADDR_HI 0x75 +#define PREP_NVRAM_DATA 0x77 + +static uint8_t m48t59_nvram_read_byte(uint16_t offset) +{ + outb(offset & 0xff, PREP_NVRAM_ADDR_LO); + outb(offset >> 8, PREP_NVRAM_ADDR_HI); + return inb(PREP_NVRAM_DATA); +} + +static void m48t59_nvram_read(uint16_t offset, char *buf, unsigned int len) +{ + unsigned int i; + for (i = 0; i < len; i++) { + buf[i] = m48t59_nvram_read_byte(offset); + } +} + +static void m48t59_nvram_write_byte(uint16_t offset, uint8_t value) +{ + outb(offset & 0xff, PREP_NVRAM_ADDR_LO); + outb(offset >> 8, PREP_NVRAM_ADDR_HI); + outb(value, PREP_NVRAM_DATA); +} + +static void m48t59_nvram_write(uint16_t offset, const char *buf, unsigned int len) +{ + unsigned int i; + for (i = 0; i < len; i++) { + m48t59_nvram_write_byte(offset, buf[i]); + } +} + +int m48t59_nvram_size(void) +{ + return PREP_NVRAM_SIZE; +} + +void m48t59_nvram_put(char *buf) +{ + m48t59_nvram_write(0, buf, PREP_NVRAM_SIZE); +} + +void m48t59_nvram_get(char *buf) +{ + m48t59_nvram_read(0, buf, PREP_NVRAM_SIZE); +} diff --git a/include/drivers/drivers.h b/include/drivers/drivers.h index 47d730f..73da6a2 100644 --- a/include/drivers/drivers.h +++ b/include/drivers/drivers.h @@ -125,6 +125,9 @@ unsigned char keyboard_readdata(void); int macio_get_nvram_size(void); void macio_nvram_put(char *buf); void macio_nvram_get(char *buf); +int m48t59_nvram_size(void); +void m48t59_nvram_put(char *buf); +void m48t59_nvram_get(char *buf); /* drivers/timer.c */ void setup_timers(void); -- 1.8.1.4

3 2

[commit] r1224 - in trunk/openbios-devel: arch/ppc/qemu drivers include/drivers
by repository service 24 Aug '13

24 Aug '13

Author: afaerber Date: Sat Aug 24 22:00:36 2013 New Revision: 1224 URL: http://tracker.coreboot.org/trac/openbios/changeset/1224 Log: macio: Rename arch_nvram_{put,get,size}() PReP does not have MacIO, so don't call its functions arch_*. Instead, dispatch from arch_* functions to macio_* functions via is_apple(). Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c trunk/openbios-devel/drivers/macio.c trunk/openbios-devel/include/drivers/drivers.h Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.c Mon Aug 19 14:58:12 2013 (r1223) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.c Sat Aug 24 22:00:36 2013 (r1224) @@ -76,3 +76,31 @@ } return i; } + +int arch_nvram_size(void) +{ + if (is_apple()) { + return macio_get_nvram_size(); + } else { + // not implemented + } + return 0; +} + +void arch_nvram_put(char *buf) +{ + if (is_apple()) { + macio_nvram_put(buf); + } else { + // not implemented + } +} + +void arch_nvram_get(char *buf) +{ + if (is_apple()) { + macio_nvram_get(buf); + } else { + // not implemented + } +} Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Mon Aug 19 14:58:12 2013 (r1223) +++ trunk/openbios-devel/drivers/macio.c Sat Aug 24 22:00:36 2013 (r1224) @@ -35,7 +35,7 @@ static char *nvram; int -arch_nvram_size( void ) +macio_get_nvram_size(void) { if (is_oldworld()) return OW_IO_NVRAM_SIZE >> OW_IO_NVRAM_SHIFT; @@ -120,7 +120,7 @@ void -arch_nvram_put( char *buf ) +macio_nvram_put(char *buf) { int i; unsigned int it_shift; @@ -139,7 +139,7 @@ } void -arch_nvram_get( char *buf ) +macio_nvram_get(char *buf) { int i; unsigned int it_shift; Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Mon Aug 19 14:58:12 2013 (r1223) +++ trunk/openbios-devel/include/drivers/drivers.h Sat Aug 24 22:00:36 2013 (r1224) @@ -122,6 +122,9 @@ unsigned char keyboard_readdata(void); #endif #endif +int macio_get_nvram_size(void); +void macio_nvram_put(char *buf); +void macio_nvram_get(char *buf); /* drivers/timer.c */ void setup_timers(void);

1 0

[PATCH 0/2] CG3 Framebuffer preview
by Mark Cave-Ayland 19 Aug '13

19 Aug '13

Finally we have a working CG3 framebuffer with QEMU on SPARC32! This patchset, minus integration of Bob's cpeek patches, should be fairly close to the final implementation. It includes FCode source for a CG3 ROM which can be probed using a patched version of QEMU, and should be applied on top of my previous v2 display patchset. As a teaser, I've created the following images from my testing: http://www.ilande.co.uk/tmp/sol8-1.png http://www.ilande.co.uk/tmp/sol8-2.png http://www.ilande.co.uk/tmp/sol8-3.png http://www.ilande.co.uk/tmp/debian-woody.png Some discussion points: what should be the fallback behaviour if we fail an FCode ROM probe for the display? At the moment I attempt to execute an internal copy of the FCode payload directly, so if people are running OpenBIOS on systems which don't emulate SBus then there should be no difference in behaviour. The only minor issue at the moment is that OpenBIOS will crash if you try to drive the display at 1152x900 rather than 1024x768. This is simply because there isn't enough room in the 2M address space for the extra 200K or so required for the extra screen area. We could probably fix this by trimming out some of the extras such as grubfs (and possibly pre-aligning parts of the memory image) but any ideas gratefully received. If you have access to proprietary ROM images then those should work with the patched QEMU too - please test and let me know. Finally I've pushed my modifed QEMU source with updated OpenBIOS images to github for testing. Simply pass -vga cg3 on the command line and you will be switched onto the new CG3 framebuffer. https://github.com/mcayland/qemu/tree/cg3-preview As always thanks to everyone else for helping to make this possible - enjoy! Mark Cave-Ayland (2): cg3: add new FCode ROM for QEMU's Sun CG3 framebuffer sbus: add probe for display device openbios-devel/arch/sparc32/build.xml | 1 + openbios-devel/drivers/build.xml | 1 + openbios-devel/drivers/cgthree.fs | 154 +++++++++++++++++++++++++++++++++ openbios-devel/drivers/sbus.c | 30 ++++++- openbios-devel/drivers/sbus.fs | 27 ++++-- 5 files changed, 202 insertions(+), 11 deletions(-) create mode 100644 openbios-devel/drivers/cgthree.fs -- 1.7.10.4

1 3

[PATCH 0/3] peek/poke fault handling
by Bob Breuer 19 Aug '13

19 Aug '13

Implement data fault handling for cpeek and friends on SPARC32. Keeps the existing behavior for other architectures. This series incorporates contributions and naming suggestions from Mark Cave-Ayland. Bob Breuer (3): Add peek/poke hooks SPARC32: implement data fault handler SPARC32: handle data faults for peek/poke openbios-devel/arch/sparc32/init.fs | 30 ++++++++++++++++++++++++++++++ openbios-devel/arch/sparc32/lib.c | 21 +++++++++++++++++++++ openbios-devel/arch/sparc32/vectors.S | 32 ++++++++++++++++++++++++++++++-- openbios-devel/forth/device/other.fs | 22 ++++++++++++++++------ 4 files changed, 97 insertions(+), 8 deletions(-) -- 1.7.10.4

2 4

[commit] r1223 - in trunk/openbios-devel: drivers forth/admin
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 14:58:12 2013 New Revision: 1223 URL: http://tracker.coreboot.org/trac/openbios/changeset/1223 Log: sbus: add SBus slot probe functionality Change the SBus logic so that we first probe each slot and attempt to execute any FCode if present. Only if no FCode is found do we fall back to the internal (hardwired) device node generation. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/sbus.fs trunk/openbios-devel/forth/admin/devices.fs Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Mon Aug 19 14:58:09 2013 (r1222) +++ trunk/openbios-devel/drivers/sbus.c Mon Aug 19 14:58:12 2013 (r1223) @@ -141,8 +141,26 @@ static void ob_tcx_init(unsigned int slot, const char *path) { - push_str(path); - fword("find-device"); + char buf[6]; + + printk("No display device located during SBus probe - falling back to internal TCX driver\n"); + + /* Make the sbus node the current instance and active package for probing */ + feval("active-package my-self"); + push_str("/iommu/sbus"); + feval("2dup find-device open-dev to my-self"); + + fword("new-device"); + PUSH(0); + PUSH(0); + snprintf(buf, 6, "%d,0", slot); + push_str(buf); + fword("set-args"); + feval("['] tcx-driver-fcode 2 cells + 1 byte-load"); + fword("finish-device"); + + /* Restore */ + feval("to my-self active-package!"); } static void @@ -241,6 +259,8 @@ as the current instance during probe. */ char buf[6]; + printk("Probing SBus slot %d offset %ld\n", slot, offset); + /* Make the sbus node the current instance and active package for probing */ feval("active-package my-self"); push_str("/iommu/sbus"); @@ -257,13 +277,28 @@ feval("to my-self active-package!"); } +static int +sbus_probe_sucess(void) +{ + /* Return true if the last sbus_probe_self() resulted in + the successful detection and execution of FCode */ + fword("probe-fcode?"); + return POP(); +} + static void sbus_probe_slot_ss5(unsigned int slot, uint64_t base) { - // OpenBIOS and QEMU don't know how to do Sbus probing + /* Probe the slot */ + sbus_probe_self(slot, 0); + + /* If the device was successfully created by FCode then do nothing */ + if (sbus_probe_sucess()) { + return; + } + switch(slot) { case 3: // SUNW,tcx - sbus_probe_self(slot, 0); ob_tcx_init(slot, "/iommu/sbus/SUNW,tcx"); break; case 4: @@ -283,10 +318,16 @@ static void sbus_probe_slot_ss10(unsigned int slot, uint64_t base) { - // OpenBIOS and QEMU don't know how to do Sbus probing + /* Probe the slot */ + sbus_probe_self(slot, 0); + + /* If the device was successfully created by FCode then do nothing */ + if (sbus_probe_sucess()) { + return; + } + switch(slot) { case 2: // SUNW,tcx - sbus_probe_self(slot, 0); ob_tcx_init(slot, "/iommu/sbus/SUNW,tcx"); break; case 0xf: // le, esp, bpp, power-management @@ -302,10 +343,16 @@ static void sbus_probe_slot_ss600mp(unsigned int slot, uint64_t base) { - // OpenBIOS and QEMU don't know how to do Sbus probing + /* Probe the slot */ + sbus_probe_self(slot, 0); + + /* If the device was successfully created by FCode then do nothing */ + if (sbus_probe_sucess()) { + return; + } + switch(slot) { case 2: // SUNW,tcx - sbus_probe_self(slot, 0); ob_tcx_init(slot, "/iommu/sbus/SUNW,tcx"); break; case 0xf: // le, esp, bpp, power-management Modified: trunk/openbios-devel/drivers/sbus.fs ============================================================================== --- trunk/openbios-devel/drivers/sbus.fs Mon Aug 19 14:58:09 2013 (r1222) +++ trunk/openbios-devel/drivers/sbus.fs Mon Aug 19 14:58:12 2013 (r1223) @@ -55,7 +55,7 @@ r> drop ; -: map-out-sbus ( virt ) +: map-out-sbus ( virt size ) " map-out" $call-parent ; @@ -64,15 +64,31 @@ \ ------------------------------------------------------------------------- : probe-self-sbus ( arg-adr arg-len reg-adr reg-len fcode-adr fcode-len -- ) - 2drop - new-device - set-args - - \ Note: this is currently hardcoded to TCX for testing as we don't have - \ cpeek (yet). Once cpeek is in place, adapting this to probe any slot - \ will be faily easy. - " tcx-driver-fcode" $find drop 2 cells + - 1 byte-load - finish-device + 0 to probe-fcode? + + ['] decode-unit-sbus catch if + 2drop 2drop 2drop 2drop + exit + then + + h# 10000 map-in-sbus + + dup cpeek if + dup h# f1 = swap h# fd = or if + new-device + >r set-args r> + dup 1 byte-load + finish-device + + -1 to probe-fcode? + else + nip nip nip nip + ." Invalid FCode start byte" cr + then + else + nip nip nip nip + then + + h# 10000 map-out-sbus ; Modified: trunk/openbios-devel/forth/admin/devices.fs ============================================================================== --- trunk/openbios-devel/forth/admin/devices.fs Mon Aug 19 14:58:09 2013 (r1222) +++ trunk/openbios-devel/forth/admin/devices.fs Mon Aug 19 14:58:12 2013 (r1223) @@ -508,5 +508,8 @@ \ 7.4.11.3 Device probing +\ Set to true if the last probe-self was successful +0 value probe-fcode? + : probe-all ( -- ) ;

1 0

[commit] r1222 - in trunk/openbios-devel: arch/sparc32 drivers
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 14:58:09 2013 New Revision: 1222 URL: http://tracker.coreboot.org/trac/openbios/changeset/1222 Log: cg3: add new FCode ROM for Sun CG3 framebuffer Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Added: trunk/openbios-devel/drivers/cgthree.fs Modified: trunk/openbios-devel/arch/sparc32/build.xml trunk/openbios-devel/drivers/build.xml Modified: trunk/openbios-devel/arch/sparc32/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc32/build.xml Mon Aug 19 14:58:06 2013 (r1221) +++ trunk/openbios-devel/arch/sparc32/build.xml Mon Aug 19 14:58:09 2013 (r1222) @@ -4,6 +4,7 @@ <object source="tree.fs" target="forth"/> <object source="init.fs" target="forth"/> <object source="QEMU,tcx.bin" target="fcode" condition="DRIVER_SBUS"/> + <object source="QEMU,cgthree.bin" target="fcode" condition="DRIVER_SBUS"/> </dictionary> <library name="sparc32" type="static" target="target"> Modified: trunk/openbios-devel/drivers/build.xml ============================================================================== --- trunk/openbios-devel/drivers/build.xml Mon Aug 19 14:58:06 2013 (r1221) +++ trunk/openbios-devel/drivers/build.xml Mon Aug 19 14:58:09 2013 (r1222) @@ -31,6 +31,7 @@ </dictionary> <fcode source="tcx.fs" name="QEMU,tcx.bin" condition="DRIVER_SBUS" /> + <fcode source="cgthree.fs" name="QEMU,cgthree.bin" condition="DRIVER_SBUS" /> <fcode source="vga.fs" name="QEMU,VGA.bin" condition="DRIVER_VGA" /> </build> Added: trunk/openbios-devel/drivers/cgthree.fs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/drivers/cgthree.fs Mon Aug 19 14:58:09 2013 (r1222) @@ -0,0 +1,154 @@ +\ +\ Fcode payload for QEMU CG3 graphics card +\ +\ This is the Forth source for an Fcode payload to initialise +\ the QEMU CG3 graphics card. +\ +\ (C) Copyright 2013 Mark Cave-Ayland +\ + +fcode-version3 + +\ +\ Instead of using fixed values for the framebuffer address and the width +\ and height, grab the ones passed in by QEMU/generated by OpenBIOS +\ + +: (find-xt) \ ( str len -- xt | -1 ) + $find if + exit + else + -1 + then +; + +" openbios-video-width" (find-xt) cell+ value openbios-video-width-xt +" openbios-video-height" (find-xt) cell+ value openbios-video-height-xt +" depth-bits" (find-xt) cell+ value depth-bits-xt +" line-bytes" (find-xt) cell+ value line-bytes-xt +" debug-type" (find-xt) value debug-type-xt + +: openbios-video-width openbios-video-width-xt @ ; +: openbios-video-height openbios-video-height-xt @ ; +: depth-bits depth-bits-xt @ ; +: line-bytes line-bytes-xt @ ; +: debug-type debug-type-xt execute ; + +\ +\ Registers +\ + +h# 400000 constant cg3-off-dac +h# 20 constant /cg3-off-dac + +h# 800000 constant cg3-off-fb +h# c0000 constant /cg3-off-fb + +: >cg3-reg-spec ( offset size -- encoded-reg ) + >r 0 my-address d+ my-space encode-phys r> encode-int encode+ +; + +: cg3-reg + \ A real cg3 rom appears to just map the entire region with a + \ single entry + h# 0 h# 1000000 >cg3-reg-spec + " reg" property +; + +: do-map-in ( offset size -- virt ) + >r my-space r> " map-in" $call-parent +; + +: do-map-out ( virt size ) + " map-out" $call-parent +; + +\ +\ DAC +\ + +-1 value cg3-dac +-1 value fb-addr + +: dac! ( data reg# -- ) + cg3-dac + c! +; + +external + +: color! ( r g b c# -- ) + 0 dac! ( r g b ) + swap rot ( b g r ) + 4 dac! ( b g ) + 4 dac! ( b ) + 4 dac! ( ) +; + +headerless + +\ +\ Mapping +\ + +: dac-map + cg3-off-dac /cg3-off-dac do-map-in to cg3-dac +; + +: fb-map + cg3-off-fb h# c0000 do-map-in to fb-addr +; + +: map-regs + dac-map fb-map +; + +\ +\ Installation +\ + +" cgthree" device-name +" display" device-type +" SUNW,501-1415" model + +: qemu-cg3-driver-install ( -- ) + cg3-dac -1 = if + map-regs + fb-addr to frame-buffer-adr + default-font set-font + + frame-buffer-adr encode-int " address" property + + openbios-video-width openbios-video-height over char-width / over char-height / + fb8-install + then +; + +: qemu-cg3-driver-init + + cg3-reg + + openbios-video-height encode-int " height" property + openbios-video-width encode-int " width" property + line-bytes encode-int " linebytes" property + + h# 39 encode-int 0 encode-int encode+ " intr" property + + \ Monitor sense. Some searching suggests that this is + \ 5 for 1024x768 and 7 for 1152x900 + openbios-video-width h# 480 = if + h# 7 + else + h# 5 + then + encode-int " monitor-sense" property + + " SUNW" encode-string " manufacturer" property + " ISO8859-1" encode-string " character-set" property + h# c encode-int " cursorshift" property + + ['] qemu-cg3-driver-install is-install +; + +qemu-cg3-driver-init + +end0

1 0

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

19 Aug '13

Author: mcayland Date: Mon Aug 19 14:58:06 2013 New Revision: 1221 URL: http://tracker.coreboot.org/trac/openbios/changeset/1221 Log: SPARC32: handle data faults for peek/poke Signed-off-by: Bob Breuer <breuerr(a)mc.net> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/init.fs trunk/openbios-devel/arch/sparc32/lib.c Modified: trunk/openbios-devel/arch/sparc32/init.fs ============================================================================== --- trunk/openbios-devel/arch/sparc32/init.fs Mon Aug 19 14:58:03 2013 (r1220) +++ trunk/openbios-devel/arch/sparc32/init.fs Mon Aug 19 14:58:06 2013 (r1221) @@ -46,6 +46,36 @@ 0 ; +\ (peek) and (poke) implementation +defer sfsr@ +defer ignore-dfault + +:noname + \ ( addr xt -- false | value true ) + sfsr@ drop \ Clear any existing MMU fault status + + -1 ignore-dfault ! \ Disable data fault trap + execute + 0 ignore-dfault ! \ Enable data fault trap + + sfsr@ 0= if + true + else + drop false \ Failed, drop the read value + then +; to (peek) + +:noname + \ ( value addr xt -- okay? ) + sfsr@ drop \ Clear any existing MMU fault status + + -1 ignore-dfault ! \ Disable data fault trap + execute + 0 ignore-dfault ! \ Enable data fault trap + + sfsr@ 0= \ true if no fault +; to (poke) + \ Load TCX FCode driver blob [IFDEF] CONFIG_DRIVER_SBUS -1 value tcx-driver-fcode Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Mon Aug 19 14:58:03 2013 (r1220) +++ trunk/openbios-devel/arch/sparc32/lib.c Mon Aug 19 14:58:06 2013 (r1221) @@ -302,6 +302,22 @@ DPRINTF("obp_dumb_memfree 0x%p (size %d)\n", va, sz); } +/* Data fault handling routines */ + +extern unsigned int ignore_dfault; + +/* ( -- reg ) */ +static void srmmu_get_sfsr(void) +{ + PUSH(srmmu_get_fstatus()); +} + +/* ( -- addr ) */ +static void ignore_dfault_addr(void) +{ + PUSH(pointer2cell(&ignore_dfault)); +} + void ob_init_mmu(void) { @@ -360,6 +376,12 @@ bind_func("pgmap@", pgmap_fetch); bind_func("pgmap!", pgmap_store); bind_func("map-pages", ob_map_pages); + + /* Install data fault handler words for cpeek etc. */ + PUSH_xt(bind_noname_func(srmmu_get_sfsr)); + feval("to sfsr@"); + PUSH_xt(bind_noname_func(ignore_dfault_addr)); + feval("to ignore-dfault"); } /*

1 0

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

19 Aug '13

Author: mcayland Date: Mon Aug 19 14:58:03 2013 New Revision: 1220 URL: http://tracker.coreboot.org/trac/openbios/changeset/1220 Log: SPARC32: implement data fault handler Implement a trivial data fault handler for SPARC32 to skip over a faulting instruction when the ignore_dfault variable is non-zero. Signed-off-by: Bob Breuer <breuerr(a)mc.net> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/vectors.S Modified: trunk/openbios-devel/arch/sparc32/vectors.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/vectors.S Mon Aug 19 14:58:00 2013 (r1219) +++ trunk/openbios-devel/arch/sparc32/vectors.S Mon Aug 19 14:58:03 2013 (r1220) @@ -41,6 +41,9 @@ #define WINDOW_FILL \ rd %psr, %l0; rd %wim, %l3; b fill_window_entry; nop; +#define TRAP_DFAULT(lvl) \ + rd %psr, %l0; rd %wim, %l3; b handle_dfault; mov lvl, %l7; + #define BTRAP(lvl) ba bug; mov lvl, %g1; nop; nop; #define BTRAPS(x) BTRAP(x) BTRAP(x+1) BTRAP(x+2) BTRAP(x+3) BTRAP(x+4) BTRAP(x+5) BTRAP(x+6) BTRAP(x+7) #define TRAP_ENTRY_INTERRUPT(int_level) \ @@ -54,7 +57,9 @@ t_wovf: WINDOW_SPILL /* Window Overflow */ t_wunf: WINDOW_FILL /* Window Underflow */ BTRAP(0x7) - BTRAPS(0x8) + BTRAP(0x8) + TRAP_DFAULT(0x9) + BTRAP(0xa) BTRAP(0xb) BTRAP(0xc) BTRAP(0xd) BTRAP(0xe) BTRAP(0xf) #if 0 BAD_TRAP(0x10) t_irq1: TRAP_ENTRY_INTERRUPT(1) /* IRQ Software/SBUS Level 1 */ @@ -80,7 +85,10 @@ t_irq14: TRAP_ENTRY_INTERRUPT(14) /* IRQ Timer #2 */ BTRAP(0x1f) #endif - BTRAPS(0x20) BTRAPS(0x28) + BTRAPS(0x20) + BTRAP(0x28) + TRAP_DFAULT(0x29) + BTRAP(0x2a) BTRAP(0x2b) BTRAP(0x2c) BTRAP(0x2d) BTRAP(0x2e) BTRAP(0x2f) BTRAPS(0x30) BTRAPS(0x38) BTRAPS(0x40) BTRAPS(0x48) BTRAPS(0x50) BTRAPS(0x58) @@ -206,6 +214,30 @@ #include "wof.S" #include "wuf.S" +/* Data fault handler */ + .data + .align 4 + .global ignore_dfault + +ignore_dfault: + .word 0 + + .text + .align 4 + +handle_dfault: + /* If ignore_dfault is 0, fall through to normal exception handler */ + sethi %hi(ignore_dfault), %l4 + ld [%l4 + %lo(ignore_dfault)], %l4 + tst %l4 + bz,a bug + mov %l7, %g1 + + /* Otherwise skip the faulting instruction and return */ + jmp %l2 + rett %l2 + 4 + + .section .rodata _BUG_message_0: .string "Unhandled Exception 0x"

1 0

[commit] r1219 - trunk/openbios-devel/forth/device
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 14:58:00 2013 New Revision: 1219 URL: http://tracker.coreboot.org/trac/openbios/changeset/1219 Log: Add peek/poke hooks Add hooks for hardware specific fault handlers for the peek and poke commands. Signed-off-by: Bob Breuer <breuerr(a)mc.net> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/other.fs Modified: trunk/openbios-devel/forth/device/other.fs ============================================================================== --- trunk/openbios-devel/forth/device/other.fs Mon Aug 19 14:57:56 2013 (r1218) +++ trunk/openbios-devel/forth/device/other.fs Mon Aug 19 14:58:00 2013 (r1219) @@ -20,28 +20,38 @@ \ 5.3.7.1 Peek/poke +defer (peek) +:noname + execute true +; to (peek) + : cpeek ( addr -- false | byte true ) - c@ true + ['] c@ (peek) ; : wpeek ( waddr -- false | w true ) - w@ true + ['] w@ (peek) ; : lpeek ( qaddr -- false | quad true ) - l@ true + ['] l@ (peek) ; +defer (poke) +:noname + execute true +; to (poke) + : cpoke ( byte addr -- okay? ) - c! true + ['] c! (poke) ; : wpoke ( w waddr -- okay? ) - w! true + ['] w! (poke) ; : lpoke ( quad qaddr -- okay? ) - l! true + ['] l! (poke) ;

1 0

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

19 Aug '13

Author: mcayland Date: Mon Aug 19 14:57:56 2013 New Revision: 1218 URL: http://tracker.coreboot.org/trac/openbios/changeset/1218 Log: SPARC32: add implementation of ofmem_arch_unmap_pages() Add a simple TLB flush to handle the case where a virtual address is reallocated by OFMEM and now points to a different physical address. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Mon Aug 19 09:40:38 2013 (r1217) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Mon Aug 19 14:57:56 2013 (r1218) @@ -142,7 +142,8 @@ /* Unmap a set of pages */ void ofmem_arch_unmap_pages(ucell virt, ucell size) { - /* Currently do nothing */ + /* OFMEM re-maps the pages for us, so just ensure the TLB is in sync */ + srmmu_flush_whole_tlb(); } /* Map a set of pages */

1 0

[commit] r1217 - trunk/openbios-devel/drivers
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:38 2013 New Revision: 1217 URL: http://tracker.coreboot.org/trac/openbios/changeset/1217 Log: vga: remove vga_vbe_init() and vga_vbe.c Since the VBE initialisation is now done as part of the Forth driver, this can now be completely removed. The tiny bit of code remaining for ROM detection is moved into pci.c. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Deleted: trunk/openbios-devel/drivers/vga_vbe.c Modified: trunk/openbios-devel/drivers/build.xml trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/build.xml ============================================================================== --- trunk/openbios-devel/drivers/build.xml Mon Aug 19 09:40:35 2013 (r1216) +++ trunk/openbios-devel/drivers/build.xml Mon Aug 19 09:40:38 2013 (r1217) @@ -17,7 +17,6 @@ <object source="obio.c" condition="DRIVER_OBIO"/> <object source="vga_load_regs.c" condition="DRIVER_VGA"/> <object source="vga_set_mode.c" condition="DRIVER_VGA"/> - <object source="vga_vbe.c" condition="DRIVER_VGA"/> <object source="macio.c" condition="DRIVER_MACIO"/> <object source="pc_kbd.c" condition="DRIVER_PC_KBD"/> <object source="pc_serial.c" condition="DRIVER_PC_SERIAL"/> Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Mon Aug 19 09:40:35 2013 (r1216) +++ trunk/openbios-devel/drivers/pci.c Mon Aug 19 09:40:38 2013 (r1217) @@ -805,15 +805,30 @@ int vga_config_cb (const pci_config_t *config) { - if (config->assigned[0] != 0x00000000) { - vga_vbe_init(config->path, - pci_bus_addr_to_host_addr(config->assigned[0] & ~0x0000000F), - config->sizes[0], - pci_bus_addr_to_host_addr(config->assigned[1] & ~0x0000000F), - config->sizes[1]); + unsigned long rom; + uint32_t rom_size, size; + phandle_t ph; - /* Currently we don't read FCode from the hardware but execute it directly */ - feval("['] vga-driver-fcode 2 cells + 1 byte-load"); + if (config->assigned[0] != 0x00000000) { + setup_video(); + + rom = pci_bus_addr_to_host_addr(config->assigned[1] & ~0x0000000F); + rom_size = config->sizes[1]; + + ph = get_cur_dev(); + + if (rom_size >= 8) { + const char *p; + + p = (const char *)rom; + if (p[0] == 'N' && p[1] == 'D' && p[2] == 'R' && p[3] == 'V') { + size = *(uint32_t*)(p + 4); + set_property(ph, "driver,AAPL,MacOS,PowerPC", p + 8, size); + } + } + + /* Currently we don't read FCode from the hardware but execute it directly */ + feval("['] vga-driver-fcode 2 cells + 1 byte-load"); #ifdef CONFIG_MOL /* Install special words for Mac On Linux */

1 0

[commit] r1216 - in trunk/openbios-devel: drivers forth/device include/libopenbios libopenbios
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:35 2013 New Revision: 1216 URL: http://tracker.coreboot.org/trac/openbios/changeset/1216 Log: video: remove video_set_color() Since all of the colour state is now held in Forth, remove the hack that was video_set_color(). Anything that needs to change the pallette (including MOL) can just call "color!" on the driver package. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/tcx.fs trunk/openbios-devel/drivers/vga.fs trunk/openbios-devel/forth/device/display.fs trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c Modified: trunk/openbios-devel/drivers/tcx.fs ============================================================================== --- trunk/openbios-devel/drivers/tcx.fs Mon Aug 19 09:40:33 2013 (r1215) +++ trunk/openbios-devel/drivers/tcx.fs Mon Aug 19 09:40:35 2013 (r1216) @@ -145,6 +145,8 @@ >r dup 2dup bljoin r> tcx-dac + l! ; +external + : color! ( r g b c# -- ) 0 dac! ( r g b ) swap rot ( b g r ) @@ -153,6 +155,8 @@ 4 dac! ( ) ; +headerless + \ \ Mapping \ @@ -169,14 +173,6 @@ dac-map fb-map ; -external - -: hw-set-color - color! -; - -headerless - \ \ Installation \ Modified: trunk/openbios-devel/drivers/vga.fs ============================================================================== --- trunk/openbios-devel/drivers/vga.fs Mon Aug 19 09:40:33 2013 (r1215) +++ trunk/openbios-devel/drivers/vga.fs Mon Aug 19 09:40:35 2013 (r1216) @@ -135,7 +135,7 @@ \ Perhaps for neatness this there should be a separate molvga.fs \ but let's leave it here for now. -: hw-set-color ( r g b index -- ) +: color! ( r g b index -- ) mol-color! ; @@ -143,16 +143,12 @@ \ Standard VGA -: hw-set-color ( r g b index -- ) +: color! ( r g b index -- ) vga-color! ; [THEN] -: color! ( r g b index -- ) - hw-set-color -; - : fill-rectangle ( color_ind x y width height -- ) fb8-fillrect ; @@ -168,7 +164,7 @@ c@ swap 1+ \ ( table start r table-g ) dup c@ swap 1+ \ ( table start r g table-b ) c@ 3 pick \ ( table start r g b index ) - hw-set-color \ ( table start ) + color! \ ( table start ) 1+ swap 3 + swap \ ( table+3 start+1 ) loop Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Mon Aug 19 09:40:33 2013 (r1215) +++ trunk/openbios-devel/forth/device/display.fs Mon Aug 19 09:40:35 2013 (r1216) @@ -399,7 +399,7 @@ 1 pick @ ff00 and d# 8 rshift 2 pick @ ff and i - s" hw-set-color" $find if + s" color!" $find if execute else 2drop Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Mon Aug 19 09:40:33 2013 (r1215) +++ trunk/openbios-devel/include/libopenbios/video.h Mon Aug 19 09:40:35 2013 (r1216) @@ -21,7 +21,6 @@ void setup_video(void); unsigned long video_get_color(int col_ind); -void video_set_color(int ind, unsigned long color); void video_mask_blit(void); void video_invert_rect(void); void video_fill_rect(void); Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Mon Aug 19 09:40:33 2013 (r1215) +++ trunk/openbios-devel/libopenbios/video_common.c Mon Aug 19 09:40:35 2013 (r1216) @@ -43,35 +43,6 @@ return 0; } -void -video_set_color( int ind, unsigned long color ) -{ - xt_t hw_xt = 0; - - if( !VIDEO_DICT_VALUE(video.ih) || ind < 0 || ind > 255 ) - return; - video.pal[ind] = color; - - /* Call the low-level hardware setter in the - display package */ - hw_xt = find_ih_method("hw-set-color", VIDEO_DICT_VALUE(video.ih)); - if (hw_xt) { - PUSH((color >> 16) & 0xff); // Red - PUSH((color >> 8) & 0xff); // Green - PUSH(color & 0xff); // Blue - PUSH(ind); - PUSH(hw_xt); - fword("execute"); - } - - /* Call the low-level palette update if required */ - hw_xt = find_ih_method("hw-refresh-palette", VIDEO_DICT_VALUE(video.ih)); - if (hw_xt) { - PUSH(hw_xt); - fword("execute"); - } -} - /* ( fbaddr maskaddr width height fgcolor bgcolor -- ) */ void

1 0

[commit] r1215 - in trunk/openbios-devel: arch/sparc32 arch/x86 drivers forth/device include/drivers include/libopenbios libopenbios
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:33 2013 New Revision: 1215 URL: http://tracker.coreboot.org/trac/openbios/changeset/1215 Log: tcx.fs: move framebuffer mapping over from C to tcx.fs Finally we can now fix up setup_video() so that it has no knowledge of fixed addresse but simply refers to the underlying Forth variables as per the specification. Touch up various places as a result of this, but we can now remove the bogus openbios-video-addr and just use frame-buffer-adr instead. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/tcx.fs trunk/openbios-devel/drivers/vga.fs trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/forth/device/display.fs trunk/openbios-devel/include/drivers/drivers.h trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Mon Aug 19 09:40:29 2013 (r1214) +++ trunk/openbios-devel/arch/sparc32/console.c Mon Aug 19 09:40:33 2013 (r1215) @@ -15,24 +15,6 @@ #ifdef CONFIG_DEBUG_CONSOLE /* ****************************************************************** - * simple polling video/keyboard console functions - * ****************************************************************** */ - -#ifdef CONFIG_DEBUG_CONSOLE_VIDEO - -#define VMEM_BASE 0x00800000ULL -#define VMEM_SIZE (1024*768*1) - -unsigned char *vmem; - -void tcx_init(uint64_t base) -{ - vmem = (unsigned char *)ofmem_map_io(base + VMEM_BASE, VMEM_SIZE); -} - -#endif - -/* ****************************************************************** * common functions, implementing simple concurrent console * ****************************************************************** */ Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Mon Aug 19 09:40:29 2013 (r1214) +++ trunk/openbios-devel/arch/sparc32/openbios.c Mon Aug 19 09:40:33 2013 (r1215) @@ -846,7 +846,7 @@ #endif #ifdef CONFIG_DRIVER_SBUS #ifdef CONFIG_DEBUG_CONSOLE_VIDEO - setup_video(hwdef->tcx_base + 0x00800000ULL, (unsigned long)vmem); + setup_video(); #endif ob_sbus_init(hwdef->iommu_base + 0x1000ULL, qemu_machine_type); #endif @@ -939,7 +939,6 @@ CONFIG_SERIAL_SPEED); #endif #ifdef CONFIG_DEBUG_CONSOLE_VIDEO - tcx_init(hwdef->tcx_base); kbd_init(hwdef->ms_kb_base); #endif #endif Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Mon Aug 19 09:40:29 2013 (r1214) +++ trunk/openbios-devel/arch/x86/openbios.c Mon Aug 19 09:40:33 2013 (r1215) @@ -62,7 +62,7 @@ ob_floppy_init("/isa", "floppy0", 0x3f0, 0); #endif #ifdef CONFIG_XBOX - setup_video(0x3C00000, phys_to_virt(0x3C00000)); + setup_video(); /* Force video to 32-bit depth */ VIDEO_DICT_VALUE(video.depth) = 32; Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Mon Aug 19 09:40:29 2013 (r1214) +++ trunk/openbios-devel/drivers/pci.c Mon Aug 19 09:40:33 2013 (r1215) @@ -361,11 +361,11 @@ #if defined(CONFIG_OFMEM) ofmem_claim_phys(phys, size, 0); -#if defined(CONFIG_SPARC64) - /* Fix virtual address on SPARC64 somewhere else */ - virt = ofmem_claim_virt(0xfe000000ULL, size, 0); -#else +#if defined(CONFIG_PPC) + /* For some reason PPC gets upset when virt != phys for map-in... */ virt = ofmem_claim_virt(phys, size, 0); +#else + virt = ofmem_claim_virt(-1, size, size); #endif ofmem_map(phys, virt, size, ofmem_arch_io_translation_mode(phys)); Modified: trunk/openbios-devel/drivers/tcx.fs ============================================================================== --- trunk/openbios-devel/drivers/tcx.fs Mon Aug 19 09:40:29 2013 (r1214) +++ trunk/openbios-devel/drivers/tcx.fs Mon Aug 19 09:40:33 2013 (r1215) @@ -22,13 +22,11 @@ then ; -" openbios-video-addr" (find-xt) cell+ value openbios-video-addr-xt " openbios-video-width" (find-xt) cell+ value openbios-video-width-xt " openbios-video-height" (find-xt) cell+ value openbios-video-height-xt " depth-bits" (find-xt) cell+ value depth-bits-xt " line-bytes" (find-xt) cell+ value line-bytes-xt -: openbios-video-addr openbios-video-addr-xt @ ; : openbios-video-width openbios-video-width-xt @ ; : openbios-video-height openbios-video-height-xt @ ; : depth-bits depth-bits-xt @ ; @@ -141,6 +139,7 @@ -1 value tcx-dac -1 value /tcx-dac +-1 value fb-addr : dac! ( data reg# -- ) >r dup 2dup bljoin r> tcx-dac + l! @@ -162,8 +161,12 @@ tcx-off-dac /tcx-dac do-map-in to tcx-dac ; +: fb-map + tcx-off-fb h# c0000 do-map-in to fb-addr +; + : map-regs - dac-map + dac-map fb-map ; external @@ -184,7 +187,7 @@ : qemu-tcx-driver-install ( -- ) tcx-dac -1 = if map-regs - openbios-video-addr to frame-buffer-adr + fb-addr to frame-buffer-adr default-font set-font frame-buffer-adr encode-int " address" property Modified: trunk/openbios-devel/drivers/vga.fs ============================================================================== --- trunk/openbios-devel/drivers/vga.fs Mon Aug 19 09:40:29 2013 (r1214) +++ trunk/openbios-devel/drivers/vga.fs Mon Aug 19 09:40:33 2013 (r1215) @@ -21,13 +21,11 @@ then ; -" openbios-video-addr" (find-xt) cell+ value openbios-video-addr-xt " openbios-video-width" (find-xt) cell+ value openbios-video-width-xt " openbios-video-height" (find-xt) cell+ value openbios-video-height-xt " depth-bits" (find-xt) cell+ value depth-bits-xt " line-bytes" (find-xt) cell+ value line-bytes-xt -: openbios-video-addr openbios-video-addr-xt @ ; : openbios-video-width openbios-video-width-xt @ ; : openbios-video-height openbios-video-height-xt @ ; : depth-bits depth-bits-xt @ ; Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:29 2013 (r1214) +++ trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:33 2013 (r1215) @@ -54,18 +54,10 @@ void vga_vbe_init(const char *path, unsigned long fb, uint32_t fb_size, unsigned long rom, uint32_t rom_size) { - phys_addr_t phys; phandle_t ph; int size; - phys = fb; - -#if defined(CONFIG_SPARC64) - /* Fix virtual address on SPARC64 somewhere else */ - fb = 0xfe000000ULL; -#endif - - setup_video(phys, fb); + setup_video(); #if 0 ph = find_dev(path); Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Mon Aug 19 09:40:29 2013 (r1214) +++ trunk/openbios-devel/forth/device/display.fs Mon Aug 19 09:40:33 2013 (r1215) @@ -51,7 +51,6 @@ 0 value display-ih \ internal values -0 value openbios-video-addr 0 value openbios-video-height 0 value openbios-video-width Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Mon Aug 19 09:40:29 2013 (r1214) +++ trunk/openbios-devel/include/drivers/drivers.h Mon Aug 19 09:40:33 2013 (r1215) @@ -46,7 +46,6 @@ int ob_sbus_init(uint64_t base, int machine_id); /* arch/sparc32/console.c */ -void tcx_init(uint64_t base); void kbd_init(uint64_t base); #endif #ifdef CONFIG_DRIVER_IDE Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Mon Aug 19 09:40:29 2013 (r1214) +++ trunk/openbios-devel/include/libopenbios/video.h Mon Aug 19 09:40:33 2013 (r1215) @@ -19,7 +19,7 @@ #define VGA_DEFAULT_LINEBYTES (VGA_DEFAULT_WIDTH*((VGA_DEFAULT_DEPTH+7)/8)) -void setup_video(phys_addr_t phys, ucell virt); +void setup_video(void); unsigned long video_get_color(int col_ind); void video_set_color(int ind, unsigned long color); void video_mask_blit(void); @@ -28,7 +28,6 @@ extern struct video_info { volatile ihandle_t *ih; - volatile phys_addr_t mphys; volatile ucell *mvirt; volatile ucell *rb, *w, *h, *depth; Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Mon Aug 19 09:40:29 2013 (r1214) +++ trunk/openbios-devel/libopenbios/video_common.c Mon Aug 19 09:40:33 2013 (r1215) @@ -214,7 +214,7 @@ } } -void setup_video(phys_addr_t phys, ucell virt) +void setup_video() { /* Make everything inside the video_info structure point to the values in the Forth dictionary. Hence everything is always in @@ -222,12 +222,10 @@ phandle_t options; char buf[6]; - video.mphys = phys; - feval("['] display-ih cell+"); video.ih = cell2pointer(POP()); - feval("['] openbios-video-addr cell+"); + feval("['] frame-buffer-adr cell+"); video.mvirt = cell2pointer(POP()); feval("['] openbios-video-width cell+"); video.w = cell2pointer(POP()); @@ -260,7 +258,6 @@ feval("to (romfont-width)"); /* Initialise the structure */ - VIDEO_DICT_VALUE(video.mvirt) = virt; VIDEO_DICT_VALUE(video.w) = VGA_DEFAULT_WIDTH; VIDEO_DICT_VALUE(video.h) = VGA_DEFAULT_HEIGHT; VIDEO_DICT_VALUE(video.depth) = VGA_DEFAULT_DEPTH;

1 0

[commit] r1214 - in trunk/openbios-devel: arch/sparc32 drivers include/drivers
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:29 2013 New Revision: 1214 URL: http://tracker.coreboot.org/trac/openbios/changeset/1214 Log: tcx.fs: move DAC programming from C to tcx.fs Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/tcx.fs trunk/openbios-devel/include/drivers/drivers.h Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Mon Aug 19 09:40:26 2013 (r1213) +++ trunk/openbios-devel/arch/sparc32/console.c Mon Aug 19 09:40:29 2013 (r1214) @@ -22,32 +22,12 @@ #define VMEM_BASE 0x00800000ULL #define VMEM_SIZE (1024*768*1) -#define DAC_BASE 0x00200000ULL -#define DAC_SIZE 16 unsigned char *vmem; -volatile uint32_t *dac; void tcx_init(uint64_t base) { vmem = (unsigned char *)ofmem_map_io(base + VMEM_BASE, VMEM_SIZE); - dac = (uint32_t *)ofmem_map_io(base + DAC_BASE, DAC_SIZE); -} - -/* ( r g b index -- ) */ -void tcx_hw_set_color(void) -{ - int index = POP(); - int b = POP(); - int g = POP(); - int r = POP(); - - if( VIDEO_DICT_VALUE(video.depth) == 8 ) { - dac[0] = index << 24; - dac[1] = r << 24; // Red - dac[1] = g << 24; // Green - dac[1] = b << 24; // Blue - } } #endif Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Mon Aug 19 09:40:26 2013 (r1213) +++ trunk/openbios-devel/drivers/sbus.c Mon Aug 19 09:40:29 2013 (r1214) @@ -141,207 +141,8 @@ static void ob_tcx_init(unsigned int slot, const char *path) { - phandle_t chosen; - push_str(path); fword("find-device"); - - PUSH(slot); - fword("encode-int"); - PUSH(0x00800000); - fword("encode-int"); - fword("encode+"); - PUSH(0x00100000); - fword("encode-int"); - fword("encode+"); - - PUSH(slot); - fword("encode-int"); - fword("encode+"); - PUSH(0x02000000); - fword("encode-int"); - fword("encode+"); - if (graphic_depth == 24) { - PUSH(0x00400000); - } else { - PUSH(0x00000001); - } - fword("encode-int"); - fword("encode+"); - - PUSH(slot); - fword("encode-int"); - fword("encode+"); - PUSH(0x04000000); - fword("encode-int"); - fword("encode+"); - if (graphic_depth == 24) { - PUSH(0x00400000); - } else { - PUSH(0x00000001); - } - fword("encode-int"); - fword("encode+"); - - PUSH(slot); - fword("encode-int"); - fword("encode+"); - PUSH(0x06000000); - fword("encode-int"); - fword("encode+"); - PUSH(0x00800000); - fword("encode-int"); - fword("encode+"); - - PUSH(slot); - fword("encode-int"); - fword("encode+"); - PUSH(0x0a000000); - fword("encode-int"); - fword("encode+"); - if (graphic_depth == 24) { - PUSH(0x00400000); - } else { - PUSH(0x00000001); - } - fword("encode-int"); - fword("encode+"); - - PUSH(slot); - fword("encode-int"); - fword("encode+"); - PUSH(0x0c000000); - fword("encode-int"); - fword("encode+"); - if (graphic_depth == 24) { - PUSH(0x00800000); - } else { - PUSH(0x00000001); - } - fword("encode-int"); - fword("encode+"); - - PUSH(slot); - fword("encode-int"); - fword("encode+"); - PUSH(0x0e000000); - fword("encode-int"); - fword("encode+"); - if (graphic_depth == 24) { - PUSH(0x00800000); - } else { - PUSH(0x00000001); - } - fword("encode-int"); - fword("encode+"); - - PUSH(slot); - fword("encode-int"); - fword("encode+"); - PUSH(0x00700000); - fword("encode-int"); - fword("encode+"); - PUSH(0x00001000); - fword("encode-int"); - fword("encode+"); - - PUSH(slot); - fword("encode-int"); - fword("encode+"); - PUSH(0x00200000); - fword("encode-int"); - fword("encode+"); - if (graphic_depth == 24) { - PUSH(0x00004000); - } else { - PUSH(0x00000004); - } - fword("encode-int"); - fword("encode+"); - - PUSH(slot); - fword("encode-int"); - fword("encode+"); - if (graphic_depth == 24) { - PUSH(0x00301000); - } else { - PUSH(0x00300000); - } - fword("encode-int"); - fword("encode+"); - if (graphic_depth == 24) { - PUSH(0x00001000); - } else { - PUSH(0x0000081c); - } - fword("encode-int"); - fword("encode+"); - - PUSH(slot); - fword("encode-int"); - fword("encode+"); - PUSH(0x00000000); - fword("encode-int"); - fword("encode+"); - PUSH(0x00010000); - fword("encode-int"); - fword("encode+"); - - PUSH(slot); - fword("encode-int"); - fword("encode+"); - PUSH(0x00240000); - fword("encode-int"); - fword("encode+"); - if (graphic_depth == 24) { - PUSH(0x00004000); - } else { - PUSH(0x00000004); - } - fword("encode-int"); - fword("encode+"); - - PUSH(slot); - fword("encode-int"); - fword("encode+"); - PUSH(0x00280000); - fword("encode-int"); - fword("encode+"); - if (graphic_depth == 24) { - PUSH(0x00008000); - } else { - PUSH(0x00000001); - } - fword("encode-int"); - fword("encode+"); - - push_str("reg"); - fword("property"); - - PUSH((int)graphic_depth); - fword("encode-int"); - push_str("depth"); - fword("property"); - - if (graphic_depth == 8) { - push_str("true"); - fword("encode-string"); - push_str("tcx-8-bit"); - fword("property"); - } - - /* Even with a 24-bit enabled TCX card, the control plane is - used in 8-bit mode. So force the video subsystem into 8-bit - mode before initialisation. */ - if (graphic_depth == 24) { - VIDEO_DICT_VALUE(video.depth) = 8; - VIDEO_DICT_VALUE(video.rb) = VIDEO_DICT_VALUE(video.w); - - chosen = get_cur_dev(); - set_int_property(chosen, "linebytes", VIDEO_DICT_VALUE(video.rb)); - } - - bind_func("hw-set-color", tcx_hw_set_color); } static void Modified: trunk/openbios-devel/drivers/tcx.fs ============================================================================== --- trunk/openbios-devel/drivers/tcx.fs Mon Aug 19 09:40:26 2013 (r1213) +++ trunk/openbios-devel/drivers/tcx.fs Mon Aug 19 09:40:29 2013 (r1214) @@ -35,6 +35,146 @@ : line-bytes line-bytes-xt @ ; \ +\ Registers +\ + +h# 0 constant tcx-off1 +h# 10000 constant /tcx-off1 + +h# 200000 constant tcx-off-dac +h# 4000 constant /tcx-off-dac-24 +h# 4 constant /tcx-off-dac-8 + +h# 240000 constant tcx-off3 +h# 4000 constant /tcx-off3-24 +h# 4 constant /tcx-off3-8 + +h# 280000 constant tcx-off4 +h# 8000 constant /tcx-off4-24 +h# 1 constant /tcx-off4-8 + +h# 301000 constant tcx-off5-24 +h# 300000 constant tcx-off5-8 +h# 1000 constant /tcx-off5-24 +h# 81c constant /tcx-off5-8 + +h# 700000 constant tcx-off6 +h# 1000 constant /tcx-off6 + +h# 800000 constant tcx-off-fb +h# 100000 constant /tcx-off-fb + +h# 2000000 constant tcx-off8 +h# 400000 constant /tcx-off8-24 +h# 1 constant /tcx-off8-8 + +h# 4000000 constant tcx-off9 +h# 400000 constant /tcx-off9-24 +h# 1 constant /tcx-off9-8 + +h# 6000000 constant tcx-off10 +h# 800000 constant /tcx-off10 + +h# a000000 constant tcx-off11 +h# 400000 constant /tcx-off11-24 +h# 1 constant /tcx-off11-8 + +h# c000000 constant tcx-off12 +h# 800000 constant /tcx-off12-24 +h# 1 constant /tcx-off12-8 + +h# e000000 constant tcx-off13 +h# 800000 constant /tcx-off13-24 +h# 1 constant /tcx-off13-8 + +: >tcx-reg-spec ( offset size -- encoded-reg ) + >r 0 my-address d+ my-space encode-phys r> encode-int encode+ +; + +: tcx-8bit-reg + \ WARNING: order is important (at least to Solaris) + tcx-off-fb /tcx-off-fb >tcx-reg-spec + tcx-off8 /tcx-off8-8 >tcx-reg-spec encode+ + tcx-off9 /tcx-off9-8 >tcx-reg-spec encode+ + tcx-off10 /tcx-off10 >tcx-reg-spec encode+ + tcx-off11 /tcx-off11-8 >tcx-reg-spec encode+ + tcx-off12 /tcx-off12-8 >tcx-reg-spec encode+ + tcx-off13 /tcx-off13-8 >tcx-reg-spec encode+ + tcx-off6 /tcx-off6 >tcx-reg-spec encode+ + tcx-off-dac /tcx-off-dac-8 >tcx-reg-spec encode+ + tcx-off5-8 /tcx-off5-8 >tcx-reg-spec encode+ + tcx-off1 /tcx-off1 >tcx-reg-spec encode+ + tcx-off3 /tcx-off3-8 >tcx-reg-spec encode+ + tcx-off4 /tcx-off4-8 >tcx-reg-spec encode+ + " reg" property +; + +: tcx-24bit-reg + \ WARNING: order is important (at least to Solaris) + tcx-off-fb /tcx-off-fb >tcx-reg-spec + tcx-off8 /tcx-off8-24 >tcx-reg-spec encode+ + tcx-off9 /tcx-off9-24 >tcx-reg-spec encode+ + tcx-off10 /tcx-off10 >tcx-reg-spec encode+ + tcx-off11 /tcx-off11-24 >tcx-reg-spec encode+ + tcx-off12 /tcx-off12-24 >tcx-reg-spec encode+ + tcx-off13 /tcx-off13-24 >tcx-reg-spec encode+ + tcx-off6 /tcx-off6 >tcx-reg-spec encode+ + tcx-off-dac /tcx-off-dac-24 >tcx-reg-spec encode+ + tcx-off5-24 /tcx-off5-24 >tcx-reg-spec encode+ + tcx-off1 /tcx-off1 >tcx-reg-spec encode+ + tcx-off3 /tcx-off3-24 >tcx-reg-spec encode+ + tcx-off4 /tcx-off4-24 >tcx-reg-spec encode+ + " reg" property +; + +: do-map-in ( offset size -- virt ) + >r my-space r> " map-in" $call-parent +; + +: do-map-out ( virt size ) + " map-out" $call-parent +; + +\ +\ DAC +\ + +-1 value tcx-dac +-1 value /tcx-dac + +: dac! ( data reg# -- ) + >r dup 2dup bljoin r> tcx-dac + l! +; + +: color! ( r g b c# -- ) + 0 dac! ( r g b ) + swap rot ( b g r ) + 4 dac! ( b g ) + 4 dac! ( b ) + 4 dac! ( ) +; + +\ +\ Mapping +\ + +: dac-map + tcx-off-dac /tcx-dac do-map-in to tcx-dac +; + +: map-regs + dac-map +; + +external + +: hw-set-color + color! +; + +headerless + +\ \ Installation \ @@ -42,14 +182,36 @@ " display" device-type : qemu-tcx-driver-install ( -- ) - openbios-video-addr to frame-buffer-adr - default-font set-font - openbios-video-width openbios-video-height over char-width / over char-height / - fb8-install + tcx-dac -1 = if + map-regs + openbios-video-addr to frame-buffer-adr + default-font set-font + + frame-buffer-adr encode-int " address" property + + openbios-video-width openbios-video-height over char-width / over char-height / + fb8-install + then ; : qemu-tcx-driver-init + \ Handle differences between 8-bit/24-bit mode + depth-bits 8 = if + tcx-8bit-reg + /tcx-off-dac-8 to /tcx-dac + " true" encode-string " tcx-8-bit" property + else + tcx-24bit-reg + /tcx-off-dac-24 to /tcx-dac + + \ Even with a 24-bit enabled TCX card, the control plane is + \ used in 8-bit mode. So force the video subsystem into 8-bit + \ mode before initialisation. + 8 depth-bits-xt ! + openbios-video-width line-bytes-xt ! + then + h# 1d encode-int " vbporch" property h# a0 encode-int " hbporch" property h# 06 encode-int " vsync" property Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Mon Aug 19 09:40:26 2013 (r1213) +++ trunk/openbios-devel/include/drivers/drivers.h Mon Aug 19 09:40:29 2013 (r1214) @@ -47,7 +47,6 @@ /* arch/sparc32/console.c */ void tcx_init(uint64_t base); -void tcx_hw_set_color(void); void kbd_init(uint64_t base); #endif #ifdef CONFIG_DRIVER_IDE

1 0

[commit] r1213 - trunk/openbios-devel/drivers
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:26 2013 New Revision: 1213 URL: http://tracker.coreboot.org/trac/openbios/changeset/1213 Log: tcx.fs: tidy-up lookups using (find-xt) and use openbios-* vars where appropriate Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/tcx.fs Modified: trunk/openbios-devel/drivers/tcx.fs ============================================================================== --- trunk/openbios-devel/drivers/tcx.fs Mon Aug 19 09:40:22 2013 (r1212) +++ trunk/openbios-devel/drivers/tcx.fs Mon Aug 19 09:40:26 2013 (r1213) @@ -14,23 +14,25 @@ \ and height, grab the ones passed in by QEMU/generated by OpenBIOS \ -: openbios-video-addr - " openbios-video-addr" $find if - cell+ @ +: (find-xt) \ ( str len -- xt | -1 ) + $find if + exit + else + -1 then ; -: openbios-video-width - " openbios-video-width" $find if - cell+ @ - then -; - -: openbios-video-height - " openbios-video-height" $find if - cell+ @ - then -; +" openbios-video-addr" (find-xt) cell+ value openbios-video-addr-xt +" openbios-video-width" (find-xt) cell+ value openbios-video-width-xt +" openbios-video-height" (find-xt) cell+ value openbios-video-height-xt +" depth-bits" (find-xt) cell+ value depth-bits-xt +" line-bytes" (find-xt) cell+ value line-bytes-xt + +: openbios-video-addr openbios-video-addr-xt @ ; +: openbios-video-width openbios-video-width-xt @ ; +: openbios-video-height openbios-video-height-xt @ ; +: depth-bits depth-bits-xt @ ; +: line-bytes line-bytes-xt @ ; \ \ Installation @@ -56,9 +58,10 @@ h# 18 encode-int " hfporch" property h# 03dfd240 encode-int " pixfreq" property h# 3c encode-int " vfreq" property - h# 300 encode-int " height" property - h# 400 encode-int " width" property - h# 400 encode-int " linebytes" property + + openbios-video-height encode-int " height" property + openbios-video-width encode-int " width" property + line-bytes encode-int " linebytes" property 5 encode-int 0 encode-int encode+ " intr" property 5 encode-int " interrupts" property

1 0

[commit] r1212 - in trunk/openbios-devel: arch/sparc32 drivers
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:22 2013 New Revision: 1212 URL: http://tracker.coreboot.org/trac/openbios/changeset/1212 Log: sbus/tcx: implement probe_self() wrapper Implement a C wrapper around the Forth probe-self word and test it by moving TCX package properties to tcx.fs. Note that the probe-self-sbus word is currently hard-coded to invoke the TCX driver FCode - this is only temporary and will be replaced when we have a working cpeek implementation. Also remove the creation of the SUNW,tcx package from tree.fs since this is now done as part of probe-self-sbus. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/tree.fs trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/sbus.fs trunk/openbios-devel/drivers/tcx.fs Modified: trunk/openbios-devel/arch/sparc32/tree.fs ============================================================================== --- trunk/openbios-devel/arch/sparc32/tree.fs Mon Aug 19 09:40:18 2013 (r1211) +++ trunk/openbios-devel/arch/sparc32/tree.fs Mon Aug 19 09:40:22 2013 (r1212) @@ -70,25 +70,6 @@ " /iommu/sbus" find-device new-device - " SUNW,tcx" device-name - " display" device-type - h# 1d encode-int " vbporch" property - h# a0 encode-int " hbporch" property - h# 06 encode-int " vsync" property - h# 88 encode-int " hsync" property - h# 03 encode-int " vfporch" property - h# 18 encode-int " hfporch" property - h# 03dfd240 encode-int " pixfreq" property - h# 3c encode-int " vfreq" property - h# 300 encode-int " height" property - h# 400 encode-int " width" property - h# 400 encode-int " linebytes" property - 5 encode-int 0 encode-int encode+ " intr" property - 5 encode-int " interrupts" property -finish-device - -" /iommu/sbus" find-device -new-device " espdma" device-name external : encode-unit encode-unit-sbus ; Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Mon Aug 19 09:40:18 2013 (r1211) +++ trunk/openbios-devel/drivers/sbus.c Mon Aug 19 09:40:22 2013 (r1212) @@ -141,7 +141,7 @@ static void ob_tcx_init(unsigned int slot, const char *path) { - phandle_t chosen, aliases; + phandle_t chosen; push_str(path); fword("find-device"); @@ -342,18 +342,6 @@ } bind_func("hw-set-color", tcx_hw_set_color); - - /* Currently we don't have an SBus probe routine, so execute FCode - directly */ - feval("['] tcx-driver-fcode 2 cells + 1 byte-load"); - - chosen = find_dev("/chosen"); - push_str(path); - fword("open-dev"); - set_int_property(chosen, "screen", POP()); - - aliases = find_dev("/aliases"); - set_property(aliases, "screen", path, strlen(path) + 1); } static void @@ -445,11 +433,36 @@ } static void +sbus_probe_self(unsigned int slot, unsigned long offset) +{ + /* Wrapper for calling probe-self in Forth. This is mainly because some + drivers don't handle properties correctly when the sbus node is set + as the current instance during probe. */ + char buf[6]; + + /* Make the sbus node the current instance and active package for probing */ + feval("active-package my-self"); + push_str("/iommu/sbus"); + feval("open-dev to my-self"); + + PUSH(0); + PUSH(0); + snprintf(buf, 6, "%d,%ld", slot, offset); + push_str(buf); + fword("2dup"); + fword("probe-self-sbus"); + + /* Restore */ + feval("to my-self active-package!"); +} + +static void sbus_probe_slot_ss5(unsigned int slot, uint64_t base) { // OpenBIOS and QEMU don't know how to do Sbus probing switch(slot) { case 3: // SUNW,tcx + sbus_probe_self(slot, 0); ob_tcx_init(slot, "/iommu/sbus/SUNW,tcx"); break; case 4: @@ -472,6 +485,7 @@ // OpenBIOS and QEMU don't know how to do Sbus probing switch(slot) { case 2: // SUNW,tcx + sbus_probe_self(slot, 0); ob_tcx_init(slot, "/iommu/sbus/SUNW,tcx"); break; case 0xf: // le, esp, bpp, power-management @@ -490,6 +504,7 @@ // OpenBIOS and QEMU don't know how to do Sbus probing switch(slot) { case 2: // SUNW,tcx + sbus_probe_self(slot, 0); ob_tcx_init(slot, "/iommu/sbus/SUNW,tcx"); break; case 0xf: // le, esp, bpp, power-management Modified: trunk/openbios-devel/drivers/sbus.fs ============================================================================== --- trunk/openbios-devel/drivers/sbus.fs Mon Aug 19 09:40:18 2013 (r1211) +++ trunk/openbios-devel/drivers/sbus.fs Mon Aug 19 09:40:22 2013 (r1212) @@ -58,3 +58,21 @@ : map-out-sbus ( virt ) " map-out" $call-parent ; + +\ ------------------------------------------------------------------------- +\ SBus probe +\ ------------------------------------------------------------------------- + +: probe-self-sbus ( arg-adr arg-len reg-adr reg-len fcode-adr fcode-len -- ) + 2drop + new-device + set-args + + \ Note: this is currently hardcoded to TCX for testing as we don't have + \ cpeek (yet). Once cpeek is in place, adapting this to probe any slot + \ will be faily easy. + " tcx-driver-fcode" $find drop 2 cells + + 1 byte-load + + finish-device +; Modified: trunk/openbios-devel/drivers/tcx.fs ============================================================================== --- trunk/openbios-devel/drivers/tcx.fs Mon Aug 19 09:40:18 2013 (r1211) +++ trunk/openbios-devel/drivers/tcx.fs Mon Aug 19 09:40:22 2013 (r1212) @@ -4,6 +4,8 @@ \ This is the Forth source for an Fcode payload to initialise \ the QEMU TCX graphics card. \ +\ (C) Copyright 2013 Mark Cave-Ayland +\ fcode-version3 @@ -30,6 +32,13 @@ then ; +\ +\ Installation +\ + +" SUNW,tcx" device-name +" display" device-type + : qemu-tcx-driver-install ( -- ) openbios-video-addr to frame-buffer-adr default-font set-font @@ -38,6 +47,22 @@ ; : qemu-tcx-driver-init + + h# 1d encode-int " vbporch" property + h# a0 encode-int " hbporch" property + h# 06 encode-int " vsync" property + h# 88 encode-int " hsync" property + h# 03 encode-int " vfporch" property + h# 18 encode-int " hfporch" property + h# 03dfd240 encode-int " pixfreq" property + h# 3c encode-int " vfreq" property + h# 300 encode-int " height" property + h# 400 encode-int " width" property + h# 400 encode-int " linebytes" property + + 5 encode-int 0 encode-int encode+ " intr" property + 5 encode-int " interrupts" property + ['] qemu-tcx-driver-install is-install ;

1 0

[commit] r1211 - in trunk/openbios-devel: arch/sparc32 drivers
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:18 2013 New Revision: 1211 URL: http://tracker.coreboot.org/trac/openbios/changeset/1211 Log: sbus: implement map-in and map-out words As these pass requests up the instance chain, make sure we do the real work in the IOMMU map-in and map-in words too. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/tree.fs trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/drivers/sbus.fs Modified: trunk/openbios-devel/arch/sparc32/tree.fs ============================================================================== --- trunk/openbios-devel/arch/sparc32/tree.fs Mon Aug 19 09:40:16 2013 (r1210) +++ trunk/openbios-devel/arch/sparc32/tree.fs Mon Aug 19 09:40:18 2013 (r1211) @@ -55,6 +55,8 @@ : close ; : encode-unit encode-unit-sbus ; : decode-unit decode-unit-sbus ; + : map-in map-in-sbus ; + : map-out map-out-sbus ; finish-device [IFDEF] CONFIG_BPP Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Mon Aug 19 09:40:16 2013 (r1210) +++ trunk/openbios-devel/drivers/iommu.c Mon Aug 19 09:40:18 2013 (r1211) @@ -6,6 +6,7 @@ **/ #include "config.h" #include "libopenbios/bindings.h" +#include "libopenbios/ofmem.h" #include "drivers/drivers.h" #include "iommu.h" #include "arch/sparc32/ofmem_sparc32.h" @@ -148,6 +149,34 @@ return regs; } +/* ( addr.lo addr.hi size -- virt ) */ + +static void +ob_iommu_map_in(void) +{ + phys_addr_t phys; + ucell size, virt; + + size = POP(); + POP(); + phys = POP(); + + virt = ofmem_map_io(phys, size); + + PUSH(virt); +} + +/* ( virt size ) */ + +static void +ob_iommu_map_out(void) +{ + ucell size = POP(); + ucell virt = POP(); + + ofmem_release_io(virt, size); +} + void ob_init_iommu(uint64_t base) { @@ -172,4 +201,7 @@ fword("encode+"); push_str("reg"); fword("property"); + + bind_func("map-in", ob_iommu_map_in); + bind_func("map-out", ob_iommu_map_out); } Modified: trunk/openbios-devel/drivers/sbus.fs ============================================================================== --- trunk/openbios-devel/drivers/sbus.fs Mon Aug 19 09:40:16 2013 (r1210) +++ trunk/openbios-devel/drivers/sbus.fs Mon Aug 19 09:40:18 2013 (r1211) @@ -16,3 +16,45 @@ " ," pocket tmpstrcat >r rot pocket tohexstr r> tmpstrcat drop ; + +\ Convert sbus unit (from decode-unit) to physical address using +\ sbus node ranges property + +: sbus-unit>addr ( phys.lo phys.hi -- phys.lo phys.hi -1 | 0 ) + " ranges" my-self ihandle>phandle + get-package-property 0= if ( phys.lo phys.hi prop prop-len ) + begin + 2over swap drop 0 swap \ force phys.lo to zero for matching + 2swap ( unit.phys.lo unit.phys.hi 0 phys.hi res prop prop-len ) + 0 -rot ( unit.phys.lo unit.phys.hi res prop prop-len ) + 2 0 do + decode-int -rot >r >r ( unit.phys.lo unit.phys.hi res phys.x -- R: prop-len prop ) + rot ( unit.phys.lo res phys.x phys.hi ) + = if + 1+ + then ( unit.phys.lo res ) + r> r> ( unit.phys.lo res prop prop-len ) + loop + rot ( prop prop-len res ) + 2 = if \ did we match the unit address? if so, return the physical address + decode-phys 2swap 2drop 2swap ( unit.phys.lo unit.phys.hi phys.lo phys.hi ) + drop 0 d+ \ force unit.phys.hi to zero and add address for final offset + -1 exit + else + decode-phys 2drop decode-int drop \ drop the size and carry on + then + dup 0= until + 2drop 2drop 0 + then +; + +: map-in-sbus ( phys.lo phys.hi size ) + >r sbus-unit>addr if + r@ " map-in" $call-parent + then + r> drop +; + +: map-out-sbus ( virt ) + " map-out" $call-parent +;

1 0

[commit] r1210 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 drivers forth/admin forth/device
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:16 2013 New Revision: 1210 URL: http://tracker.coreboot.org/trac/openbios/changeset/1210 Log: display: move creation of "display" and "screen" properties to Forth This means we can remove this code from vga_vbe_init() and move it in to the generic display system. As part of this, we alter the "input" and "output" words so that they update the stdin/stdout handles under /chosen. While we are here, fix up the various architectures so that they don't call "input" and "output" themselves - this is now handled by the Forth console. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/forth/admin/iocontrol.fs trunk/openbios-devel/forth/device/display.fs Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Mon Aug 19 09:40:12 2013 (r1209) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Mon Aug 19 09:40:16 2013 (r1210) @@ -870,18 +870,6 @@ fword("find-device"); push_str(stdin_path); - fword("open-dev"); - fword("encode-int"); - push_str("stdin"); - fword("property"); - - push_str(stdout_path); - fword("open-dev"); - fword("encode-int"); - push_str("stdout"); - fword("property"); - - push_str(stdin_path); fword("pathres-resolve-aliases"); push_str("input-device"); fword("$setenv"); @@ -891,12 +879,6 @@ push_str("output-device"); fword("$setenv"); - push_str(stdin_path); - fword("input"); - - push_str(stdout_path); - fword("output"); - #if 0 if(getbool("tty-interface?") == 1) #endif Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Mon Aug 19 09:40:12 2013 (r1209) +++ trunk/openbios-devel/arch/sparc32/openbios.c Mon Aug 19 09:40:16 2013 (r1210) @@ -748,7 +748,6 @@ { char nographic; const char *stdin, *stdout; - phandle_t chosen; fw_cfg_read(FW_CFG_NOGRAPHIC, &nographic, 1); if (nographic) { @@ -763,31 +762,6 @@ stdout = "screen"; } - push_str("/"); - fword("find-device"); - - push_str(stdin); - fword("pathres-resolve-aliases"); - fword("encode-string"); - push_str("stdin-path"); - fword("property"); - - push_str(stdout); - fword("pathres-resolve-aliases"); - fword("encode-string"); - push_str("stdout-path"); - fword("property"); - - chosen = find_dev("/chosen"); - push_str(stdin); - fword("open-dev"); - set_int_property(chosen, "stdin", POP()); - - chosen = find_dev("/chosen"); - push_str(stdout); - fword("open-dev"); - set_int_property(chosen, "stdout", POP()); - push_str(stdin); push_str("input-device"); fword("$setenv"); @@ -796,9 +770,6 @@ push_str("output-device"); fword("$setenv"); - push_str(stdin); - fword("input"); - obp_stdin_path = stdin; obp_stdout_path = stdout; } Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Mon Aug 19 09:40:12 2013 (r1209) +++ trunk/openbios-devel/arch/sparc64/openbios.c Mon Aug 19 09:40:16 2013 (r1210) @@ -505,30 +505,12 @@ } push_str(stdin_path); - fword("open-dev"); - fword("encode-int"); - push_str("stdin"); - fword("property"); - - push_str(stdout_path); - fword("open-dev"); - fword("encode-int"); - push_str("stdout"); - fword("property"); - - push_str(stdin_path); push_str("input-device"); fword("$setenv"); push_str(stdout_path); push_str("output-device"); fword("$setenv"); - - push_str(stdin_path); - fword("input"); - - push_str(stdout_path); - fword("output"); } void arch_nvram_put(char *data) Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:12 2013 (r1209) +++ trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:16 2013 (r1210) @@ -55,7 +55,7 @@ unsigned long rom, uint32_t rom_size) { phys_addr_t phys; - phandle_t ph, chosen, aliases; + phandle_t ph; int size; phys = fb; @@ -73,14 +73,6 @@ ph = get_cur_dev(); #endif - chosen = find_dev("/chosen"); - push_str(path); - fword("open-dev"); - set_int_property(chosen, "display", POP()); - - aliases = find_dev("/aliases"); - set_property(aliases, "screen", path, strlen(path) + 1); - if (rom_size >= 8) { const char *p; Modified: trunk/openbios-devel/forth/admin/iocontrol.fs ============================================================================== --- trunk/openbios-devel/forth/admin/iocontrol.fs Mon Aug 19 09:40:12 2013 (r1209) +++ trunk/openbios-devel/forth/admin/iocontrol.fs Mon Aug 19 09:40:16 2013 (r1210) @@ -36,6 +36,19 @@ close-dev then stdin ! + + \ update /chosen + " /chosen" find-package if + >r stdin @ encode-int " stdin" r> (property) + then + +[IFDEF] CONFIG_SPARC32 + \ update stdin-path properties + \ (this isn't part of the IEEE1275 spec but needed by older Solaris) + " /" find-package if + >r stdin @ get-instance-path encode-string " stdin-path" r> (property) + then +[THEN] ; : output ( dev-str dev-len -- ) @@ -57,6 +70,19 @@ \ close old stdout stdout @ ?dup if close-dev then stdout ! + + \ update /chosen + " /chosen" find-package if + >r stdout @ encode-int " stdout" r> (property) + then + +[IFDEF] CONFIG_SPARC32 + \ update stdout-path properties + \ (this isn't part of the IEEE1275 spec but needed by older Solaris) + " /" find-package if + >r stdout @ get-instance-path encode-string " stdout-path" r> (property) + then +[THEN] ; : io ( dev-str dev-len -- ) Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Mon Aug 19 09:40:12 2013 (r1209) +++ trunk/openbios-devel/forth/device/display.fs Mon Aug 19 09:40:16 2013 (r1210) @@ -356,6 +356,14 @@ my-self to display-ih + \ set /chosen display property + my-self active-package 0 to my-self + " /chosen" (find-dev) 0<> if + active-package! + display-ih encode-int " display" property + then + active-package! to my-self + \ set defer functions to 8bit versions ['] fb8-draw-character to draw-character

1 0

[commit] r1208 - in trunk/openbios-devel: drivers libopenbios
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:10 2013 New Revision: 1208 URL: http://tracker.coreboot.org/trac/openbios/changeset/1208 Log: vga: move initialisation of screen-#columns/screen-#rows to setup_video() Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/libopenbios/video_common.c Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:07 2013 (r1207) +++ trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:10 2013 (r1208) @@ -55,8 +55,7 @@ unsigned long rom, uint32_t rom_size) { phys_addr_t phys; - phandle_t ph, chosen, aliases, options; - char buf[6]; + phandle_t ph, chosen, aliases; int size; phys = fb; @@ -82,12 +81,6 @@ aliases = find_dev("/aliases"); set_property(aliases, "screen", path, strlen(path) + 1); - options = find_dev("/options"); - snprintf(buf, sizeof(buf), FMT_ucell, VIDEO_DICT_VALUE(video.w) / FONT_WIDTH); - set_property(options, "screen-#columns", buf, strlen(buf) + 1); - snprintf(buf, sizeof(buf), FMT_ucell, VIDEO_DICT_VALUE(video.h) / FONT_HEIGHT); - set_property(options, "screen-#rows", buf, strlen(buf) + 1); - if (rom_size >= 8) { const char *p; Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Mon Aug 19 09:40:07 2013 (r1207) +++ trunk/openbios-devel/libopenbios/video_common.c Mon Aug 19 09:40:10 2013 (r1208) @@ -15,6 +15,7 @@ */ #include "config.h" +#include "libc/vsprintf.h" #include "libopenbios/bindings.h" #include "libopenbios/fontdata.h" #include "libopenbios/ofmem.h" @@ -218,6 +219,8 @@ /* Make everything inside the video_info structure point to the values in the Forth dictionary. Hence everything is always in sync. */ + phandle_t options; + char buf[6]; video.mphys = phys; @@ -277,4 +280,11 @@ VIDEO_DICT_VALUE(video.rb) = (w * ((d + 7) / 8)); } #endif + + /* Setup screen-#rows/screen-#columns */ + options = find_dev("/options"); + snprintf(buf, sizeof(buf), FMT_ucell, VIDEO_DICT_VALUE(video.w) / FONT_WIDTH); + set_property(options, "screen-#columns", buf, strlen(buf) + 1); + snprintf(buf, sizeof(buf), FMT_ucell, VIDEO_DICT_VALUE(video.h) / FONT_HEIGHT); + set_property(options, "screen-#rows", buf, strlen(buf) + 1); }

1 0

[commit] r1207 - trunk/openbios-devel/drivers
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:07 2013 New Revision: 1207 URL: http://tracker.coreboot.org/trac/openbios/changeset/1207 Log: pci/vga: move PCI framebuffer map functions info Forth Here we move the code to map the PCI framebuffer into Forth. This is done by introducing a "pci-map-in" word on the /pci node to enable Forth code to perform memory-mapping as required. This is a slight departure from the specification which requires a "map-in" word, but this is because the OpenBIOS PCI bus enumerator *always* configures BARs regardless of whether or not an FCode payload is detected. In order to avoid having to rewrite the bus enumeration code in Forth, we instead create a "pci-bar>pci-region" word which takes the BAR register as a parameter and returns the configured BAR bus address and size. This can then be passed to the "pci-map-in" word in order to do the work. Finally with this in place, we can remove the mapping that takes place in vga_vbe_init(). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/pci.fs trunk/openbios-devel/drivers/vga.fs trunk/openbios-devel/drivers/vga_vbe.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Mon Aug 19 09:40:04 2013 (r1206) +++ trunk/openbios-devel/drivers/pci.c Mon Aug 19 09:40:07 2013 (r1207) @@ -17,6 +17,7 @@ #include "config.h" #include "libopenbios/bindings.h" +#include "libopenbios/ofmem.h" #include "kernel/kernel.h" #include "drivers/pci.h" #include "libc/byteorder.h" @@ -25,6 +26,7 @@ #include "drivers/drivers.h" #include "drivers/vga.h" #include "packages/video.h" +#include "libopenbios/video.h" #include "timer.h" #include "pci.h" #include "pci_database.h" @@ -139,6 +141,15 @@ } #endif +static unsigned long pci_bus_addr_to_host_addr(uint32_t ba) +{ +#ifdef CONFIG_SPARC64 + return arch->cfg_data + (unsigned long)ba; +#else + return (unsigned long)ba; +#endif +} + static void ob_pci_open(int *idx) { @@ -330,12 +341,50 @@ ss, dev, fn, buf); } +/* ( pci-addr.lo pci-addr.hi size -- virt ) */ + +static void +ob_pci_map_in(int *idx) +{ + phys_addr_t phys; + uint32_t ba; + ucell size, virt; + + PCI_DPRINTF("ob_pci_bar_map_in idx=%p\n", idx); + + size = POP(); + POP(); + ba = POP(); + + phys = pci_bus_addr_to_host_addr(ba); + +#if defined(CONFIG_OFMEM) + ofmem_claim_phys(phys, size, 0); + +#if defined(CONFIG_SPARC64) + /* Fix virtual address on SPARC64 somewhere else */ + virt = ofmem_claim_virt(0xfe000000ULL, size, 0); +#else + virt = ofmem_claim_virt(phys, size, 0); +#endif + + ofmem_map(phys, virt, size, ofmem_arch_io_translation_mode(phys)); + +#else + virt = size; /* Keep compiler quiet */ + virt = phys; +#endif + + PUSH(virt); +} + NODE_METHODS(ob_pci_bus_node) = { { NULL, ob_pci_initialize }, { "open", ob_pci_open }, { "close", ob_pci_close }, { "decode-unit", ob_pci_decode_unit }, { "encode-unit", ob_pci_encode_unit }, + { "pci-map-in", ob_pci_map_in }, }; NODE_METHODS(ob_pci_simple_node) = { @@ -485,15 +534,6 @@ set_property(dev, "ranges", (char *)props, ncells * sizeof(props[0])); } -static unsigned long pci_bus_addr_to_host_addr(uint32_t ba) -{ -#ifdef CONFIG_SPARC64 - return arch->cfg_data + (unsigned long)ba; -#else - return (unsigned long)ba; -#endif -} - int host_config_cb(const pci_config_t *config) { //XXX this overrides "reg" property Modified: trunk/openbios-devel/drivers/pci.fs ============================================================================== --- trunk/openbios-devel/drivers/pci.fs Mon Aug 19 09:40:04 2013 (r1206) +++ trunk/openbios-devel/drivers/pci.fs Mon Aug 19 09:40:07 2013 (r1207) @@ -12,4 +12,81 @@ rot encode-int encode+ ; +\ Get region offset for BAR reg +: pci-bar-offset@ ( bar-reg -- off.lo off.hi -1 | 0 ) + " reg" active-package get-package-property 0= if + begin + decode-phys \ ( reg prop prop-len phys.lo phys.mid phys.hi ) + ff and 5 pick = if + >r >r 3drop r> r> + -1 exit + else + 2drop + then + \ Drop the size as we don't need it + decode-int drop decode-int drop + dup 0= + until + 3drop + 0 exit + else + 0 + then + ; + +\ Get region size for BAR reg +: pci-bar-size@ ( bar-reg -- size ) + " reg" active-package get-package-property 0= if + begin + decode-phys \ ( reg prop prop-len phys.lo phys.mid phys.hi ) + ff and 5 pick = if + 2drop decode-int drop + decode-int + >r 3drop r> + exit + else + 2drop decode-int drop + decode-int drop + then + dup 0= + until + 3drop + 0 \ default size of 0 if BAR not found + then + ; + +\ Get base address for configured BAR reg +: pci-bar-base@ ( bar-reg -- addr.lo addr.hi -1 | 0 ) + " assigned-addresses" active-package get-package-property 0= if + begin + decode-phys \ ( reg prop prop-len phys.lo phys.mid phys.hi ) + ff and 5 pick = if + >r >r 3drop r> r> + -1 exit + else + 2drop + then + \ Drop the size as we don't need it + decode-int drop decode-int drop + dup 0= + until + 3drop + 0 exit + else + 0 + then + ; + +\ Get PCI bus address and size for configured BAR reg +: pci-bar>pci-region ( bar-reg -- addr.lo addr.hi size ) + dup + >r pci-bar-offset@ if + swap r@ pci-bar-base@ if + swap d+ + then + swap r@ pci-bar-size@ + then + r> drop + ; + [THEN] Modified: trunk/openbios-devel/drivers/vga.fs ============================================================================== --- trunk/openbios-devel/drivers/vga.fs Mon Aug 19 09:40:04 2013 (r1206) +++ trunk/openbios-devel/drivers/vga.fs Mon Aug 19 09:40:07 2013 (r1207) @@ -108,6 +108,22 @@ ; \ +\ PCI +\ + +" pci-bar>pci-region" (find-xt) value pci-bar>pci-region-xt +: pci-bar>pci-region pci-bar>pci-region-xt execute ; + +h# 10 constant cfg-bar0 \ Framebuffer BAR +-1 value fb-addr + +: map-fb ( -- ) + cfg-bar0 pci-bar>pci-region \ ( pci-addr.lo pci-addr.hi size ) + " pci-map-in" $call-parent + to fb-addr +; + +\ \ Publically visible words \ @@ -167,23 +183,27 @@ \ : qemu-vga-driver-install ( -- ) - openbios-video-addr to frame-buffer-adr - default-font set-font + fb-addr -1 = if + map-fb fb-addr to frame-buffer-adr + default-font set-font + + frame-buffer-adr encode-int " address" property + + openbios-video-width openbios-video-height over char-width / over char-height / + fb8-install + then +; - frame-buffer-adr encode-int " address" property +: qemu-vga-driver-init + + vbe-init openbios-video-width encode-int " width" property openbios-video-height encode-int " height" property depth-bits encode-int " depth" property line-bytes encode-int " linebytes" property - openbios-video-width openbios-video-height over char-width / over char-height / - fb8-install -; - -: qemu-vga-driver-init - vbe-init ['] qemu-vga-driver-install is-install - ; +; qemu-vga-driver-init Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:04 2013 (r1206) +++ trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:07 2013 (r1207) @@ -98,12 +98,4 @@ p + 8, size); } } - -#if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) - size = ((VIDEO_DICT_VALUE(video.h) * VIDEO_DICT_VALUE(video.rb)) + 0xfff) & ~0xfff; - - ofmem_claim_phys( video.mphys, size, 0 ); - ofmem_claim_virt( VIDEO_DICT_VALUE(video.mvirt), size, 0 ); - ofmem_map( video.mphys, VIDEO_DICT_VALUE(video.mvirt), size, ofmem_arch_io_translation_mode(video.mphys) ); -#endif }

1 0

[commit] r1206 - in trunk/openbios-devel: drivers forth/device packages
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:04 2013 New Revision: 1206 URL: http://tracker.coreboot.org/trac/openbios/changeset/1206 Log: video: move all non MOL-specific code from molvideo.c to vga.fs This now leaves just the MOL code in packages/molvideo.c and so now we no longer have a mixture of MOL and non-MOL methods in this packages. As a result of this, we can now conditionally build molvideo.c only if CONFIG_MOL is defined. (Note: I have no way of testing this as I gather that OpenBIOS was pulled from MOL due to compatibility issues at some point in the past. Perhaps one day someone will try and update and see what happens?) Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/vga.fs trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/forth/device/display.fs trunk/openbios-devel/packages/build.xml trunk/openbios-devel/packages/molvideo.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Mon Aug 19 09:40:01 2013 (r1205) +++ trunk/openbios-devel/drivers/pci.c Mon Aug 19 09:40:04 2013 (r1206) @@ -24,6 +24,7 @@ #include "drivers/drivers.h" #include "drivers/vga.h" +#include "packages/video.h" #include "timer.h" #include "pci.h" #include "pci_database.h" @@ -773,6 +774,12 @@ /* Currently we don't read FCode from the hardware but execute it directly */ feval("['] vga-driver-fcode 2 cells + 1 byte-load"); + +#ifdef CONFIG_MOL + /* Install special words for Mac On Linux */ + molvideo_init(); +#endif + } return 0; Modified: trunk/openbios-devel/drivers/vga.fs ============================================================================== --- trunk/openbios-devel/drivers/vga.fs Mon Aug 19 09:40:01 2013 (r1205) +++ trunk/openbios-devel/drivers/vga.fs Mon Aug 19 09:40:04 2013 (r1206) @@ -33,6 +33,9 @@ : depth-bits depth-bits-xt @ ; : line-bytes line-bytes-xt @ ; +" fb8-fillrect" (find-xt) value fb8-fillrect-xt +: fb8-fillrect fb8-fillrect-xt execute ; + \ \ IO port words \ @@ -114,6 +117,9 @@ defer mol-color! \ Hook for MOL (see packages/molvideo.c) +\ +\ Perhaps for neatness this there should be a separate molvga.fs +\ but let's leave it here for now. : hw-set-color ( r g b index -- ) mol-color! @@ -129,6 +135,31 @@ [THEN] +: color! ( r g b index -- ) + hw-set-color +; + +: fill-rectangle ( color_ind x y width height -- ) + fb8-fillrect +; + +: dimensions ( -- width height ) + openbios-video-width + openbios-video-height +; + +: set-colors ( table start count -- ) + 0 do + over dup \ ( table start table table ) + c@ swap 1+ \ ( table start r table-g ) + dup c@ swap 1+ \ ( table start r g table-b ) + c@ 3 pick \ ( table start r g b index ) + hw-set-color \ ( table start ) + 1+ + swap 3 + swap \ ( table+3 start+1 ) + loop +; + headerless \ Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:01 2013 (r1205) +++ trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:04 2013 (r1206) @@ -27,7 +27,6 @@ #include "drivers/vga.h" #include "libopenbios/video.h" #include "libopenbios/ofmem.h" -#include "packages/video.h" /* VGA init. We use the Bochs VESA VBE extensions */ #define VBE_DISPI_INDEX_ID 0x0 @@ -75,8 +74,6 @@ ph = get_cur_dev(); #endif - molvideo_init(); - chosen = find_dev("/chosen"); push_str(path); fword("open-dev"); Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Mon Aug 19 09:40:01 2013 (r1205) +++ trunk/openbios-devel/forth/device/display.fs Mon Aug 19 09:40:04 2013 (r1206) @@ -408,7 +408,7 @@ \ If we have a startup splash then display it [IFDEF] CONFIG_MOL - startup-splash 2000 ms + mol-startup-splash 2000 ms fb8-erase-screen [THEN] ; Modified: trunk/openbios-devel/packages/build.xml ============================================================================== --- trunk/openbios-devel/packages/build.xml Mon Aug 19 09:40:01 2013 (r1205) +++ trunk/openbios-devel/packages/build.xml Mon Aug 19 09:40:04 2013 (r1206) @@ -11,7 +11,7 @@ <object source="nvram.c"/> <object source="pc-parts.c" condition="PC_PARTS"/> <object source="sun-parts.c" condition="SUN_PARTS"/> - <object source="molvideo.c"/> + <object source="molvideo.c" condition="MOL"/> <object source="xcoff-loader.c" condition="LOADER_XCOFF"/> </library> Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Mon Aug 19 09:40:01 2013 (r1205) +++ trunk/openbios-devel/packages/molvideo.c Mon Aug 19 09:40:04 2013 (r1206) @@ -2,7 +2,7 @@ * Creation Date: <2002/10/23 20:26:40 samuel> * Time-stamp: <2004/01/07 19:39:15 samuel> * - * <video.c> + * <molvideo.c> * * Mac-on-Linux display node * @@ -30,47 +30,6 @@ DECLARE_NODE( video, 0, 0, "Tdisplay" ); -#ifdef CONFIG_MOL -static void -molvideo_refresh_palette( void ) -{ - - if( VIDEO_DICT_VALUE(video.depth) == 8 ) - OSI_RefreshPalette(); -} - -static void -molvideo_hw_set_color( void ) -{ - - if( VIDEO_DICT_VALUE(video.depth) == 8 ) - OSI_SetColor( ind, color ); -} -#endif - -/* ( -- width height ) (?) */ -static void -molvideo_dimensions( void ) -{ - fword("screen-width"); - fword("screen-height"); -} - -/* ( table start count -- ) (?) */ -static void -molvideo_set_colors( void ) -{ - int count = POP(); - int start = POP(); - unsigned char *p = (unsigned char*)cell2pointer(POP()); - int i; - - for( i=0; i<count; i++, p+=3 ) { - unsigned long col = (p[0] << 16) | (p[1] << 8) | p[2]; - video_set_color( i + start, col ); - } -} - /* ( r g b index -- ) */ static void molvideo_color_bang( void ) @@ -81,31 +40,26 @@ int r = POP(); unsigned long col = ((r << 16) & 0xff0000) | ((g << 8) & 0x00ff00) | (b & 0xff); /* printk("color!: %08lx %08lx %08lx %08lx\n", r, g, b, index ); */ - video_set_color( index, col ); -} -/* ( color_ind x y width height -- ) (?) */ -static void -molvideo_fill_rect ( void ) -{ - video_fill_rect(); + if( VIDEO_DICT_VALUE(video.depth) == 8 ) { + OSI_SetColor( index, col ); + OSI_RefreshPalette(); + } } /* ( -- ) - really should be reworked as draw-logo */ static void molvideo_startup_splash( void ) { -#ifdef CONFIG_MOL int fd, s, i, y, x, dx, dy; int width, height; char *pp, *p; char buf[64]; -#endif /* only draw logo in 24-bit mode (for now) */ if( VIDEO_DICT_VALUE(video.depth) < 15 ) return; -#ifdef CONFIG_MOL + for( i=0; i<2; i++ ) { if( !BootHGetStrResInd("bootlogo", buf, sizeof(buf), 0, i) ) return; @@ -141,23 +95,14 @@ } free( p ); } -#else + /* No bootlogo support yet on other platforms */ return; -#endif } NODE_METHODS( video ) = { -#ifdef CONFIG_MOL - {"hw-set-color", molvideo_hw_set_color }, - {"hw-refresh-palette", molvideo_refresh_palette}, -#endif - {"dimensions", molvideo_dimensions }, - {"set-colors", molvideo_set_colors }, - {"fill-rectangle", molvideo_fill_rect }, - {"color!", molvideo_color_bang }, - {"startup-splash", molvideo_startup_splash }, + {"mol-startup-splash", molvideo_startup_splash }, }; @@ -168,5 +113,12 @@ void molvideo_init(void) { + xt_t color_bang; + REGISTER_NODE( video ); + + /* Bind the MOL graphic routines to the mol-color! defer */ + color_bang = bind_noname_func(molvideo_color_bang); + PUSH(color_bang); + feval(" to mol-color!"); }

1 0

[commit] r1205 - trunk/openbios-devel/drivers
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:40:01 2013 New Revision: 1205 URL: http://tracker.coreboot.org/trac/openbios/changeset/1205 Log: vga: move VGA initialisation from C to Forth This includes the low-level VGA register accesses and also the package properties. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/vga.fs trunk/openbios-devel/drivers/vga_vbe.c Modified: trunk/openbios-devel/drivers/vga.fs ============================================================================== --- trunk/openbios-devel/drivers/vga.fs Mon Aug 19 09:39:58 2013 (r1204) +++ trunk/openbios-devel/drivers/vga.fs Mon Aug 19 09:40:01 2013 (r1205) @@ -4,40 +4,153 @@ \ This is the Forth source for an Fcode payload to initialise \ the QEMU VGA graphics card. \ +\ (C) Copyright 2013 Mark Cave-Ayland +\ fcode-version3 \ -\ Instead of using fixed values for the framebuffer address and the width -\ and height, grab the ones passed in by QEMU/generated by OpenBIOS +\ Dictionary lookups for words that don't have an FCode \ -: openbios-video-addr - " openbios-video-addr" $find if - cell+ @ +: (find-xt) \ ( str len -- xt | -1 ) + $find if + exit + else + -1 then ; -: openbios-video-width - " openbios-video-width" $find if - cell+ @ - then +" openbios-video-addr" (find-xt) cell+ value openbios-video-addr-xt +" openbios-video-width" (find-xt) cell+ value openbios-video-width-xt +" openbios-video-height" (find-xt) cell+ value openbios-video-height-xt +" depth-bits" (find-xt) cell+ value depth-bits-xt +" line-bytes" (find-xt) cell+ value line-bytes-xt + +: openbios-video-addr openbios-video-addr-xt @ ; +: openbios-video-width openbios-video-width-xt @ ; +: openbios-video-height openbios-video-height-xt @ ; +: depth-bits depth-bits-xt @ ; +: line-bytes line-bytes-xt @ ; + +\ +\ IO port words +\ + +" ioc!" (find-xt) value ioc!-xt +" iow!" (find-xt) value iow!-xt + +: ioc! ioc!-xt execute ; +: iow! iow!-xt execute ; + +\ +\ VGA registers +\ + +h# 3c0 constant vga-addr +h# 3c8 constant dac-write-addr +h# 3c9 constant dac-data-addr + +: vga-color! ( r g b index -- ) + \ Set the VGA colour registers + dac-write-addr ioc! rot + 2 >> dac-data-addr ioc! swap + 2 >> dac-data-addr ioc! + 2 >> dac-data-addr ioc! ; -: openbios-video-height - " openbios-video-height" $find if - cell+ @ - then +\ +\ VBE registers +\ + +h# 0 constant VBE_DISPI_INDEX_ID +h# 1 constant VBE_DISPI_INDEX_XRES +h# 2 constant VBE_DISPI_INDEX_YRES +h# 3 constant VBE_DISPI_INDEX_BPP +h# 4 constant VBE_DISPI_INDEX_ENABLE +h# 5 constant VBE_DISPI_INDEX_BANK +h# 6 constant VBE_DISPI_INDEX_VIRT_WIDTH +h# 7 constant VBE_DISPI_INDEX_VIRT_HEIGHT +h# 8 constant VBE_DISPI_INDEX_X_OFFSET +h# 9 constant VBE_DISPI_INDEX_Y_OFFSET +h# a constant VBE_DISPI_INDEX_NB + +h# 0 constant VBE_DISPI_DISABLED +h# 1 constant VBE_DISPI_ENABLED + +\ +\ Bochs VBE register writes +\ + +: vbe-iow! ( val addr -- ) + h# 1ce iow! + h# 1d0 iow! +; + +\ +\ Initialise Bochs VBE mode +\ + +: vbe-init ( -- ) + h# 0 vga-addr ioc! \ Enable blanking + VBE_DISPI_DISABLED VBE_DISPI_INDEX_ENABLE vbe-iow! + h# 0 VBE_DISPI_INDEX_X_OFFSET vbe-iow! + h# 0 VBE_DISPI_INDEX_Y_OFFSET vbe-iow! + openbios-video-width VBE_DISPI_INDEX_XRES vbe-iow! + openbios-video-height VBE_DISPI_INDEX_YRES vbe-iow! + depth-bits VBE_DISPI_INDEX_BPP vbe-iow! + VBE_DISPI_ENABLED VBE_DISPI_INDEX_ENABLE vbe-iow! + h# 0 vga-addr ioc! + h# 20 vga-addr ioc! \ Disable blanking +; + +\ +\ Publically visible words +\ + +external + +[IFDEF] CONFIG_MOL +defer mol-color! + +\ Hook for MOL (see packages/molvideo.c) + +: hw-set-color ( r g b index -- ) + mol-color! ; +[ELSE] + +\ Standard VGA + +: hw-set-color ( r g b index -- ) + vga-color! +; + +[THEN] + +headerless + +\ +\ Installation +\ + : qemu-vga-driver-install ( -- ) openbios-video-addr to frame-buffer-adr default-font set-font + + frame-buffer-adr encode-int " address" property + openbios-video-width encode-int " width" property + openbios-video-height encode-int " height" property + depth-bits encode-int " depth" property + line-bytes encode-int " linebytes" property + openbios-video-width openbios-video-height over char-width / over char-height / fb8-install ; : qemu-vga-driver-init + vbe-init ['] qemu-vga-driver-install is-install ; Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:39:58 2013 (r1204) +++ trunk/openbios-devel/drivers/vga_vbe.c Mon Aug 19 09:40:01 2013 (r1205) @@ -51,74 +51,6 @@ #define VBE_DISPI_LFB_ENABLED 0x40 #define VBE_DISPI_NOCLEARMEM 0x80 -static void vbe_outw(int index, int val) -{ - outw(index, 0x1ce); - outw(val, 0x1d0); -} - -/* for depth = 8 mode, set a hardware palette entry */ -void vga_set_color(int i, unsigned int r, unsigned int g, unsigned int b) -{ - r &= 0xff; - g &= 0xff; - b &= 0xff; - outb(i, 0x3c8); - outb(r >> 2, 0x3c9); - outb(g >> 2, 0x3c9); - outb(b >> 2, 0x3c9); -} - -/* build standard RGB palette */ -static void vga_build_rgb_palette(void) -{ - static const uint8_t pal_value[6] = { 0x00, 0x33, 0x66, 0x99, 0xcc, 0xff }; - int i, r, g, b; - - i = 0; - for(r = 0; r < 6; r++) { - for(g = 0; g < 6; g++) { - for(b = 0; b < 6; b++) { - vga_set_color(i, pal_value[r], pal_value[g], pal_value[b]); - i++; - } - } - } -} - -/* depth = 8, 15, 16 or 32 */ -void vga_vbe_set_mode(int width, int height, int depth) -{ - outb(0x00, 0x3c0); /* enable blanking */ - vbe_outw(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_DISABLED); - vbe_outw(VBE_DISPI_INDEX_X_OFFSET, 0); - vbe_outw(VBE_DISPI_INDEX_Y_OFFSET, 0); - vbe_outw(VBE_DISPI_INDEX_XRES, width); - vbe_outw(VBE_DISPI_INDEX_YRES, height); - vbe_outw(VBE_DISPI_INDEX_BPP, depth); - vbe_outw(VBE_DISPI_INDEX_ENABLE, VBE_DISPI_ENABLED); - outb(0x00, 0x3c0); - outb(0x20, 0x3c0); /* disable blanking */ - - if (depth == 8) - vga_build_rgb_palette(); -} - -/* Low-level Forth accessor to update VGA color registers */ - -/* ( r g b index -- ) */ -static -void vga_hw_set_color(void) -{ - int index = POP(); - int b = POP(); - int g = POP(); - int r = POP(); - - vga_set_color(index, (r & 0xff), - (g & 0xff), - (b & 0xff)); -} void vga_vbe_init(const char *path, unsigned long fb, uint32_t fb_size, unsigned long rom, uint32_t rom_size) @@ -136,9 +68,6 @@ #endif setup_video(phys, fb); - vga_vbe_set_mode(VIDEO_DICT_VALUE(video.w), - VIDEO_DICT_VALUE(video.h), - VIDEO_DICT_VALUE(video.depth)); #if 0 ph = find_dev(path); @@ -146,14 +75,6 @@ ph = get_cur_dev(); #endif - bind_func("hw-set-color", vga_hw_set_color); - - set_int_property(ph, "width", VIDEO_DICT_VALUE(video.w)); - set_int_property(ph, "height", VIDEO_DICT_VALUE(video.h)); - set_int_property(ph, "depth", VIDEO_DICT_VALUE(video.depth)); - set_int_property(ph, "linebytes", VIDEO_DICT_VALUE(video.rb)); - set_int_property(ph, "address", (u32)(fb & ~0x0000000F)); - molvideo_init(); chosen = find_dev("/chosen");

1 0

[commit] r1204 - trunk/openbios-devel/kernel
by repository service 19 Aug '13

19 Aug '13

Author: mcayland Date: Mon Aug 19 09:39:58 2013 New Revision: 1204 URL: http://tracker.coreboot.org/trac/openbios/changeset/1204 Log: forth.c: fix ioc!, iow! and iol! words The kernel implementation for the above words is incorrect because the value/reg parameters are the wrong way around. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/kernel/forth.c Modified: trunk/openbios-devel/kernel/forth.c ============================================================================== --- trunk/openbios-devel/kernel/forth.c Sun Aug 11 09:24:36 2013 (r1203) +++ trunk/openbios-devel/kernel/forth.c Mon Aug 19 09:39:58 2013 (r1204) @@ -1787,7 +1787,7 @@ cell reg = POP(); cell val = POP(); - outb(reg, val); + outb(val, reg); #else (void)POP(); (void)POP(); @@ -1805,7 +1805,7 @@ cell reg = POP(); cell val = POP(); - outw(reg, val); + outw(val, reg); #else (void)POP(); (void)POP(); @@ -1823,7 +1823,7 @@ ucell reg = POP(); ucell val = POP(); - outl(reg, val); + outl(val, reg); #else (void)POP(); (void)POP();

1 0

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

11 Aug '13

This should be the final in the display rework patch series which completes the conversion of the VGA/TCX drivers from C to Forth. 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. Updates for v2: - Fix typo in cover letter - x86/amd64 build fixes - Add copyrights to tcx.fs and vga.fs - Fix generation of stdin-path/stdout-path properties - Simplify out-of-package property assignments using (property) - Fix typo in map-out-sbus - Use new ofmem_release_io() function - Rebase onto SVN trunk 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/boot.c | 15 +- openbios-devel/arch/sparc32/console.c | 38 ----- openbios-devel/arch/sparc32/openbios.c | 32 +--- openbios-devel/arch/sparc32/romvec.c | 14 +- openbios-devel/arch/sparc32/tree.fs | 21 +-- openbios-devel/arch/sparc64/openbios.c | 18 --- openbios-devel/arch/x86/openbios.c | 2 +- openbios-devel/drivers/build.xml | 1 - openbios-devel/drivers/iommu.c | 32 ++++ openbios-devel/drivers/pci.c | 98 +++++++++--- openbios-devel/drivers/pci.fs | 77 +++++++++ openbios-devel/drivers/sbus.c | 238 ++++------------------------ openbios-devel/drivers/sbus.fs | 60 +++++++ openbios-devel/drivers/tcx.fs | 219 +++++++++++++++++++++++-- openbios-devel/drivers/vga.fs | 194 ++++++++++++++++++++--- openbios-devel/drivers/vga_vbe.c | 191 ---------------------- openbios-devel/forth/admin/iocontrol.fs | 26 +++ 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 ++------- 25 files changed, 746 insertions(+), 699 deletions(-) delete mode 100644 openbios-devel/drivers/vga_vbe.c -- 1.7.10.4

1 14

[commit] r1203 - trunk/openbios-devel/include/arch/amd64
by repository service 11 Aug '13

11 Aug '13

Author: mcayland Date: Sun Aug 11 09:24:36 2013 New Revision: 1203 URL: http://tracker.coreboot.org/trac/openbios/changeset/1203 Log: amd64: add mising FMT_* definitions required for the next display patchset Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/include/arch/amd64/types.h Modified: trunk/openbios-devel/include/arch/amd64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/amd64/types.h Sun Aug 11 09:24:33 2013 (r1202) +++ trunk/openbios-devel/include/arch/amd64/types.h Sun Aug 11 09:24:36 2013 (r1203) @@ -29,7 +29,9 @@ typedef __int128_t dcell; typedef __uint128_t ducell; +#define FMT_cell "%" PRId64 #define FMT_ucellx "%016" PRIx64 +#define FMT_ucell "%" PRIu64 typedef int64_t prom_arg_t; typedef uint64_t prom_uarg_t;

1 0

[commit] r1202 - in trunk/openbios-devel: include/libopenbios libopenbios
by repository service 11 Aug '13

11 Aug '13

Author: mcayland Date: Sun Aug 11 09:24:33 2013 New Revision: 1202 URL: http://tracker.coreboot.org/trac/openbios/changeset/1202 Log: OFMEM: add ofmem_release_io() function Similar to ofmem_release_phys() and ofmem_release_virt(), create a new function to release memory claimed with ofmem_claim_io(). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/include/libopenbios/ofmem.h trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Aug 11 09:24:30 2013 (r1201) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Aug 11 09:24:33 2013 (r1202) @@ -120,6 +120,7 @@ extern void ofmem_release( ucell virt, ucell size ); extern void ofmem_release_phys( phys_addr_t phys, ucell size ); extern void ofmem_release_virt( ucell virt, ucell size ); +extern void ofmem_release_io( ucell virt, ucell size ); extern phys_addr_t ofmem_translate( ucell virt, ucell *ret_mode ); /* memory and virtual-memory nodes */ Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Aug 11 09:24:30 2013 (r1201) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Aug 11 09:24:33 2013 (r1202) @@ -929,6 +929,16 @@ remove_range(virt, size, &ofmem->virt_range); } +/* release memory allocated by ofmem_claim_io */ +void ofmem_release_io( ucell virt, ucell size ) +{ + OFMEM_TRACE("ofmem_release_io addr=" FMT_ucellx " size=" FMT_ucellx "\n", + virt, size); + + ofmem_t *ofmem = ofmem_arch_get_private(); + remove_range(virt, size, &ofmem->io_range); +} + /* release memory allocated by ofmem_claim - 6.3.2.4 */ void ofmem_release( ucell virt, ucell size ) {

1 0

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

11 Aug '13

Author: mcayland Date: Sun Aug 11 09:24:30 2013 New Revision: 1201 URL: http://tracker.coreboot.org/trac/openbios/changeset/1201 Log: OFMEM: implement missing remove_range() function This means that when we call the OFMEM release functions, we actually return the memory range back to the pool for re-use rather than constantly allocating a new range every time. 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 Sun Aug 11 09:24:27 2013 (r1200) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Aug 11 09:24:30 2013 (r1201) @@ -878,9 +878,35 @@ return -1; } -static void remove_range( ucell ea, ucell size, range_t **r ) +static void remove_range_( phys_addr_t ea, ucell size, range_t **r ) { - OFMEM_TRACE("%s: not implemented\n", __func__); + range_t *cr; + + /* Handle special case if we're removing the first entry */ + if ((**r).start >= ea) { + cr = *r; + *r = (**r).next; + free(cr); + + return; + } + + for( ; *r && ((**r).next)->start < ea; r=&(**r).next ) { + } + + cr = (**r).next; + (**r).next = cr->next; + free(cr); +} + +static int remove_range( phys_addr_t ea, ucell size, range_t **r ) +{ + if( is_free( ea, size, *r ) ) { + OFMEM_TRACE("remove_range: range isn't occupied\n"); + return -1; + } + remove_range_( ea, size, r ); + return 0; } /* release memory allocated by ofmem_claim_phys */

1 0

[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

[commit] r1198 - trunk/openbios-devel/forth/device
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 15:17:49 2013 New Revision: 1198 URL: http://tracker.coreboot.org/trac/openbios/changeset/1198 Log: terminal.fs: fix handling of backspace (0x8) control code Annex B.2 of the IEEE1275 specification mentions that this code moves the cursor one position to the left on the current line (i.e. it shouldn't attempt to redraw any characters). Remove the character redraw code to bring in line with the specification which also has the side-effect of fixing the spinner used by quik. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/terminal.fs Modified: trunk/openbios-devel/forth/device/terminal.fs ============================================================================== --- trunk/openbios-devel/forth/device/terminal.fs Sat Jul 27 15:17:47 2013 (r1197) +++ trunk/openbios-devel/forth/device/terminal.fs Sat Jul 27 15:17:49 2013 (r1198) @@ -240,10 +240,8 @@ endof 8 of \ BS column# 0<> if - column# dup - to column# - 20 draw-character 1- - to column# + column# 1- to column# + toggle-cursor exit then endof 9 of \ TAB

1 0

[commit] r1197 - trunk/openbios-devel/forth/device
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 15:17:47 2013 New Revision: 1197 URL: http://tracker.coreboot.org/trac/openbios/changeset/1197 Log: terminal.fs: fix handling of NULL (0x0) control code NULL is defined as a no-op, so make sure that we detect it and exit (term-emit) immediately. Otherwise we fall through to the default code which redraws the character and advances the column by 1. This fixes the staggered line output that appear in quik. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/terminal.fs Modified: trunk/openbios-devel/forth/device/terminal.fs ============================================================================== --- trunk/openbios-devel/forth/device/terminal.fs Sat Jul 27 15:17:43 2013 (r1196) +++ trunk/openbios-devel/forth/device/terminal.fs Sat Jul 27 15:17:47 2013 (r1197) @@ -230,6 +230,9 @@ then case + 0 of \ NULL + toggle-cursor exit + endof 7 of \ BEL blink-screen s" /screen" s" ring-bell"

1 0

[commit] r1196 - trunk/openbios-devel/forth/device
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 15:17:43 2013 New Revision: 1196 URL: http://tracker.coreboot.org/trac/openbios/changeset/1196 Log: terminal.fs: fix accidental display of control characters and column position When processing a control code, make sure we exit (term-emit) immediately rather than falling through to the end of the function. Otherwise we still call draw-character and advance the column as per normal character codes. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/terminal.fs Modified: trunk/openbios-devel/forth/device/terminal.fs ============================================================================== --- trunk/openbios-devel/forth/device/terminal.fs Sat Jul 27 15:17:41 2013 (r1195) +++ trunk/openbios-devel/forth/device/terminal.fs Sat Jul 27 15:17:43 2013 (r1196) @@ -249,6 +249,7 @@ else 8 + -8 and ff and to column# then + toggle-cursor exit endof a of \ LF line# 1+ to line# @@ -264,6 +265,7 @@ line# 0<> if line# 1- to line# then + toggle-cursor exit endof c of \ FF 0 to column# 0 to line# @@ -271,6 +273,7 @@ endof d of \ CR 0 to column# + toggle-cursor exit endof 1b of \ ESC 1b (sequence) c!

1 0

[commit] r1195 - in trunk/openbios-devel: drivers forth/device libopenbios
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 15:17:41 2013 New Revision: 1195 URL: http://tracker.coreboot.org/trac/openbios/changeset/1195 Log: video: rename qemu-video-* words to openbios-video-* Now that the second half of the display rework is complete, the qemu-video-* words are no longer QEMU-specific. This is because we now initialise the defaults to the value of the VGA_DEFAULT_* constants and only attempt to override them with the values supplied by the QEMU firmware interface if built with CONFIG_QEMU enabled. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/tcx.fs trunk/openbios-devel/drivers/vga.fs trunk/openbios-devel/forth/device/display.fs trunk/openbios-devel/libopenbios/video_common.c Modified: trunk/openbios-devel/drivers/tcx.fs ============================================================================== --- trunk/openbios-devel/drivers/tcx.fs Sat Jul 27 13:22:06 2013 (r1194) +++ trunk/openbios-devel/drivers/tcx.fs Sat Jul 27 15:17:41 2013 (r1195) @@ -12,28 +12,28 @@ \ and height, grab the ones passed in by QEMU/generated by OpenBIOS \ -: qemu-video-addr - " qemu-video-addr" $find if +: openbios-video-addr + " openbios-video-addr" $find if cell+ @ then ; -: qemu-video-width - " qemu-video-width" $find if +: openbios-video-width + " openbios-video-width" $find if cell+ @ then ; -: qemu-video-height - " qemu-video-height" $find if +: openbios-video-height + " openbios-video-height" $find if cell+ @ then ; : qemu-tcx-driver-install ( -- ) - qemu-video-addr to frame-buffer-adr + openbios-video-addr to frame-buffer-adr default-font set-font - qemu-video-width qemu-video-height over char-width / over char-height / + openbios-video-width openbios-video-height over char-width / over char-height / fb8-install ; Modified: trunk/openbios-devel/drivers/vga.fs ============================================================================== --- trunk/openbios-devel/drivers/vga.fs Sat Jul 27 13:22:06 2013 (r1194) +++ trunk/openbios-devel/drivers/vga.fs Sat Jul 27 15:17:41 2013 (r1195) @@ -12,28 +12,28 @@ \ and height, grab the ones passed in by QEMU/generated by OpenBIOS \ -: qemu-video-addr - " qemu-video-addr" $find if +: openbios-video-addr + " openbios-video-addr" $find if cell+ @ then ; -: qemu-video-width - " qemu-video-width" $find if +: openbios-video-width + " openbios-video-width" $find if cell+ @ then ; -: qemu-video-height - " qemu-video-height" $find if +: openbios-video-height + " openbios-video-height" $find if cell+ @ then ; : qemu-vga-driver-install ( -- ) - qemu-video-addr to frame-buffer-adr + openbios-video-addr to frame-buffer-adr default-font set-font - qemu-video-width qemu-video-height over char-width / over char-height / + openbios-video-width openbios-video-height over char-width / over char-height / fb8-install ; Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Sat Jul 27 13:22:06 2013 (r1194) +++ trunk/openbios-devel/forth/device/display.fs Sat Jul 27 15:17:41 2013 (r1195) @@ -50,10 +50,10 @@ 0 value line-bytes 0 value display-ih -\ internal values read from QEMU firmware interface -0 value qemu-video-addr -0 value qemu-video-height -0 value qemu-video-width +\ internal values +0 value openbios-video-addr +0 value openbios-video-height +0 value openbios-video-width \ The following wordset is called the "defer word interface" of the \ terminal-emulator support package. It gets overloaded by fb1-install Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 13:22:06 2013 (r1194) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 15:17:41 2013 (r1195) @@ -224,11 +224,11 @@ feval("['] display-ih cell+"); video.ih = cell2pointer(POP()); - feval("['] qemu-video-addr cell+"); + feval("['] openbios-video-addr cell+"); video.mvirt = cell2pointer(POP()); - feval("['] qemu-video-width cell+"); + feval("['] openbios-video-width cell+"); video.w = cell2pointer(POP()); - feval("['] qemu-video-height cell+"); + feval("['] openbios-video-height cell+"); video.h = cell2pointer(POP()); feval("['] depth-bits cell+"); video.depth = cell2pointer(POP());

1 0

[commit] r1194 - in trunk/openbios-devel: arch/amd64 arch/ppc arch/sparc64 arch/x86 config/examples drivers
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 13:22:06 2013 New Revision: 1194 URL: http://tracker.coreboot.org/trac/openbios/changeset/1194 Log: x86/SPARC64/PPC/amd64: switch VGA driver over to FCode Currently we cannot read the FCode from the card, so for the moment simply execute the bytecode directly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/amd64/build.xml trunk/openbios-devel/arch/amd64/init.fs trunk/openbios-devel/arch/ppc/build.xml trunk/openbios-devel/arch/ppc/ppc.fs trunk/openbios-devel/arch/sparc64/build.xml trunk/openbios-devel/arch/sparc64/init.fs trunk/openbios-devel/arch/sparc64/tree.fs trunk/openbios-devel/arch/x86/build.xml trunk/openbios-devel/arch/x86/init.fs trunk/openbios-devel/config/examples/amd64_config.xml trunk/openbios-devel/drivers/build.xml trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/vga.fs Modified: trunk/openbios-devel/arch/amd64/build.xml ============================================================================== --- trunk/openbios-devel/arch/amd64/build.xml Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/amd64/build.xml Sat Jul 27 13:22:06 2013 (r1194) @@ -1,5 +1,6 @@ <build condition="AMD64"> <dictionary name="openbios-amd64" init="openbios" target="forth"> <object source="init.fs"/> + <object source="QEMU,VGA.bin" target="fcode" condition="DRIVER_VGA" /> </dictionary> </build> Modified: trunk/openbios-devel/arch/amd64/init.fs ============================================================================== --- trunk/openbios-devel/arch/amd64/init.fs Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/amd64/init.fs Sat Jul 27 13:22:06 2013 (r1194) @@ -1,3 +1,5 @@ +include config.fs + :noname ." Type 'help' for detailed information" cr \ ." boot secondary slave cdrom: " cr @@ -74,3 +76,8 @@ " keyboard" input ; CONSOLE-IN-initializer +\ Load VGA FCode driver blob +[IFDEF] CONFIG_DRIVER_VGA + -1 value vga-driver-fcode + " QEMU,VGA.bin" $encode-file to vga-driver-fcode +[THEN] Modified: trunk/openbios-devel/arch/ppc/build.xml ============================================================================== --- trunk/openbios-devel/arch/ppc/build.xml Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/ppc/build.xml Sat Jul 27 13:22:06 2013 (r1194) @@ -5,24 +5,28 @@ <object source="ppc.fs"/> <object source="briq/tree.fs"/> <object source="briq/briq.fs"/> + <object source="QEMU,VGA.bin" target="fcode" condition="DRIVER_VGA"/> </dictionary> <dictionary name="openbios-pearpc" init="openbios" target="forth" condition="PEARPC"> <object source="ppc.fs"/> <object source="pearpc/tree.fs"/> <object source="pearpc/pearpc.fs"/> + <object source="QEMU,VGA.bin" target="fcode" condition="DRIVER_VGA"/> </dictionary> <dictionary name="openbios-qemu" init="openbios" target="forth" condition="QEMU"> <object source="ppc.fs"/> <object source="qemu/tree.fs"/> <object source="qemu/qemu.fs"/> + <object source="QEMU,VGA.bin" target="fcode" condition="DRIVER_VGA"/> </dictionary> <dictionary name="openbios-mol" init="openbios" target="forth" condition="MOL"> <object source="ppc.fs"/> <object source="mol/tree.fs"/> <object source="mol/mol.fs"/> + <object source="QEMU,VGA.bin" target="fcode" condition="DRIVER_VGA"/> </dictionary>  Modified: trunk/openbios-devel/arch/ppc/ppc.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/ppc.fs Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/ppc/ppc.fs Sat Jul 27 13:22:06 2013 (r1194) @@ -1,3 +1,5 @@ +include config.fs + \ ------------------------------------------------------------------------- \ registers \ ------------------------------------------------------------------------- @@ -50,6 +52,15 @@ 0 value %sprg3 \ ------------------------------------------------------------------------- +\ Load VGA FCode driver blob +\ ------------------------------------------------------------------------- + +[IFDEF] CONFIG_DRIVER_VGA + -1 value vga-driver-fcode + " QEMU,VGA.bin" $encode-file to vga-driver-fcode +[THEN] + +\ ------------------------------------------------------------------------- \ other \ ------------------------------------------------------------------------- Modified: trunk/openbios-devel/arch/sparc64/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc64/build.xml Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/sparc64/build.xml Sat Jul 27 13:22:06 2013 (r1194) @@ -3,6 +3,7 @@ <dictionary name="openbios-sparc64" init="openbios"> <object source="tree.fs" target="forth"/> <object source="init.fs" target="forth"/> + <object source="QEMU,VGA.bin" target="fcode" condition="DRIVER_VGA"/> </dictionary> <library name="sparc64" type="static" target="target"> Modified: trunk/openbios-devel/arch/sparc64/init.fs ============================================================================== --- trunk/openbios-devel/arch/sparc64/init.fs Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/sparc64/init.fs Sat Jul 27 13:22:06 2013 (r1194) @@ -53,3 +53,9 @@ : rmap@ ( virt -- rmentry ) drop 0 ; + +\ Load VGA FCode driver blob +[IFDEF] CONFIG_DRIVER_VGA + -1 value vga-driver-fcode + " QEMU,VGA.bin" $encode-file to vga-driver-fcode +[THEN] Modified: trunk/openbios-devel/arch/sparc64/tree.fs ============================================================================== --- trunk/openbios-devel/arch/sparc64/tree.fs Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/sparc64/tree.fs Sat Jul 27 13:22:06 2013 (r1194) @@ -1,3 +1,5 @@ +include config.fs + \ ------------------------------------------------------------------------- \ UPA encode/decode unit \ ------------------------------------------------------------------------- Modified: trunk/openbios-devel/arch/x86/build.xml ============================================================================== --- trunk/openbios-devel/arch/x86/build.xml Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/x86/build.xml Sat Jul 27 13:22:06 2013 (r1194) @@ -2,6 +2,7 @@ <dictionary name="openbios-x86" init="openbios"> <object source="init.fs" target="forth"/> + <object source="QEMU,VGA.bin" target="fcode" condition="DRIVER_VGA"/> </dictionary> <library name="x86" type="static" target="target"> Modified: trunk/openbios-devel/arch/x86/init.fs ============================================================================== --- trunk/openbios-devel/arch/x86/init.fs Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/arch/x86/init.fs Sat Jul 27 13:22:06 2013 (r1194) @@ -1,3 +1,5 @@ +include config.fs + :noname ." Type 'help' for detailed information" cr \ ." boot secondary slave cdrom: " cr @@ -74,3 +76,9 @@ :noname " keyboard" input ; CONSOLE-IN-initializer + +\ Load VGA FCode driver blob +[IFDEF] CONFIG_DRIVER_VGA + -1 value vga-driver-fcode + " QEMU,VGA.bin" $encode-file to vga-driver-fcode +[THEN] Modified: trunk/openbios-devel/config/examples/amd64_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/amd64_config.xml Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/config/examples/amd64_config.xml Sat Jul 27 13:22:06 2013 (r1194) @@ -58,3 +58,4 @@ <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> + <option name="CONFIG_DRIVER_VGA" type="boolean" value="false"/> Modified: trunk/openbios-devel/drivers/build.xml ============================================================================== --- trunk/openbios-devel/drivers/build.xml Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/drivers/build.xml Sat Jul 27 13:22:06 2013 (r1194) @@ -29,9 +29,9 @@ <object source="pci.fs" condition="DRIVER_PCI"/> <object source="sbus.fs" condition="DRIVER_SBUS"/> <object source="esp.fs" condition="DRIVER_ESP"/> - <object source="vga.fs" condition="DRIVER_VGA"/> </dictionary> <fcode source="tcx.fs" name="QEMU,tcx.bin" condition="DRIVER_SBUS" /> + <fcode source="vga.fs" name="QEMU,VGA.bin" condition="DRIVER_VGA" /> </build> Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/drivers/pci.c Sat Jul 27 13:22:06 2013 (r1194) @@ -771,7 +771,8 @@ pci_bus_addr_to_host_addr(config->assigned[1] & ~0x0000000F), config->sizes[1]); - feval("['] qemu-vga-driver-init is-install"); + /* Currently we don't read FCode from the hardware but execute it directly */ + feval("['] vga-driver-fcode 2 cells + 1 byte-load"); } return 0; Modified: trunk/openbios-devel/drivers/vga.fs ============================================================================== --- trunk/openbios-devel/drivers/vga.fs Sat Jul 27 13:22:02 2013 (r1193) +++ trunk/openbios-devel/drivers/vga.fs Sat Jul 27 13:22:06 2013 (r1194) @@ -5,9 +5,42 @@ \ the QEMU VGA graphics card. \ -: qemu-vga-driver-init ( -- ) +fcode-version3 + +\ +\ Instead of using fixed values for the framebuffer address and the width +\ and height, grab the ones passed in by QEMU/generated by OpenBIOS +\ + +: qemu-video-addr + " qemu-video-addr" $find if + cell+ @ + then +; + +: qemu-video-width + " qemu-video-width" $find if + cell+ @ + then +; + +: qemu-video-height + " qemu-video-height" $find if + cell+ @ + then +; + +: qemu-vga-driver-install ( -- ) qemu-video-addr to frame-buffer-adr default-font set-font qemu-video-width qemu-video-height over char-width / over char-height / fb8-install ; + +: qemu-vga-driver-init + ['] qemu-vga-driver-install is-install + ; + +qemu-vga-driver-init + +end0

1 0

[commit] r1193 - in trunk/openbios-devel: arch/sparc32 drivers
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 13:22:02 2013 New Revision: 1193 URL: http://tracker.coreboot.org/trac/openbios/changeset/1193 Log: SPARC32: switch TCX driver over to FCode Currently we cannot read the FCode from the card, so for the moment simply execute the bytecode directly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/build.xml trunk/openbios-devel/arch/sparc32/init.fs trunk/openbios-devel/arch/sparc32/tree.fs trunk/openbios-devel/drivers/build.xml trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/tcx.fs Modified: trunk/openbios-devel/arch/sparc32/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc32/build.xml Sat Jul 27 13:21:59 2013 (r1192) +++ trunk/openbios-devel/arch/sparc32/build.xml Sat Jul 27 13:22:02 2013 (r1193) @@ -3,6 +3,7 @@ <dictionary name="openbios-sparc32" init="openbios"> <object source="tree.fs" target="forth"/> <object source="init.fs" target="forth"/> + <object source="QEMU,tcx.bin" target="fcode" condition="DRIVER_SBUS"/> </dictionary> <library name="sparc32" type="static" target="target"> Modified: trunk/openbios-devel/arch/sparc32/init.fs ============================================================================== --- trunk/openbios-devel/arch/sparc32/init.fs Sat Jul 27 13:21:59 2013 (r1192) +++ trunk/openbios-devel/arch/sparc32/init.fs Sat Jul 27 13:22:02 2013 (r1193) @@ -45,3 +45,9 @@ : obmem ( -- space ) 0 ; + +\ Load TCX FCode driver blob +[IFDEF] CONFIG_DRIVER_SBUS + -1 value tcx-driver-fcode + " QEMU,tcx.bin" $encode-file to tcx-driver-fcode +[THEN] Modified: trunk/openbios-devel/arch/sparc32/tree.fs ============================================================================== --- trunk/openbios-devel/arch/sparc32/tree.fs Sat Jul 27 13:21:59 2013 (r1192) +++ trunk/openbios-devel/arch/sparc32/tree.fs Sat Jul 27 13:22:02 2013 (r1193) @@ -1,3 +1,4 @@ +include config.fs " /" find-device 2 encode-int " #address-cells" property Modified: trunk/openbios-devel/drivers/build.xml ============================================================================== --- trunk/openbios-devel/drivers/build.xml Sat Jul 27 13:21:59 2013 (r1192) +++ trunk/openbios-devel/drivers/build.xml Sat Jul 27 13:22:02 2013 (r1193) @@ -29,8 +29,9 @@ <object source="pci.fs" condition="DRIVER_PCI"/> <object source="sbus.fs" condition="DRIVER_SBUS"/> <object source="esp.fs" condition="DRIVER_ESP"/> - <object source="tcx.fs" condition="DRIVER_SBUS"/> <object source="vga.fs" condition="DRIVER_VGA"/> </dictionary> + <fcode source="tcx.fs" name="QEMU,tcx.bin" condition="DRIVER_SBUS" /> + </build> Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sat Jul 27 13:21:59 2013 (r1192) +++ trunk/openbios-devel/drivers/sbus.c Sat Jul 27 13:22:02 2013 (r1193) @@ -342,7 +342,10 @@ } bind_func("hw-set-color", tcx_hw_set_color); - feval("['] qemu-tcx-driver-init is-install"); + + /* Currently we don't have an SBus probe routine, so execute FCode + directly */ + feval("['] tcx-driver-fcode 2 cells + 1 byte-load"); chosen = find_dev("/chosen"); push_str(path); Modified: trunk/openbios-devel/drivers/tcx.fs ============================================================================== --- trunk/openbios-devel/drivers/tcx.fs Sat Jul 27 13:21:59 2013 (r1192) +++ trunk/openbios-devel/drivers/tcx.fs Sat Jul 27 13:22:02 2013 (r1193) @@ -5,9 +5,42 @@ \ the QEMU TCX graphics card. \ -: qemu-tcx-driver-init ( -- ) +fcode-version3 + +\ +\ Instead of using fixed values for the framebuffer address and the width +\ and height, grab the ones passed in by QEMU/generated by OpenBIOS +\ + +: qemu-video-addr + " qemu-video-addr" $find if + cell+ @ + then +; + +: qemu-video-width + " qemu-video-width" $find if + cell+ @ + then +; + +: qemu-video-height + " qemu-video-height" $find if + cell+ @ + then +; + +: qemu-tcx-driver-install ( -- ) qemu-video-addr to frame-buffer-adr default-font set-font qemu-video-width qemu-video-height over char-width / over char-height / fb8-install ; + +: qemu-tcx-driver-init + ['] qemu-tcx-driver-install is-install +; + +qemu-tcx-driver-init + +end0

1 0

[commit] r1192 - in trunk/openbios-devel: . config/xml
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 13:21:59 2013 New Revision: 1192 URL: http://tracker.coreboot.org/trac/openbios/changeset/1192 Log: config: add new fcode tag and support for building Fcode into dictionaries Here we introduce a new <fcode> tag which will tokenise the specified source file into Fcode using the toke utility. Similarly add a new type attribute to the dictionary <object> tag which when set to "fcode" will add the fcode binary as a dependency for the specified target dictionary. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Added: trunk/openbios-devel/config/xml/fcode.xsl Modified: trunk/openbios-devel/Makefile.target trunk/openbios-devel/config/xml/dictionary.xsl trunk/openbios-devel/config/xml/makefile.xsl trunk/openbios-devel/config/xml/rules.xml Modified: trunk/openbios-devel/Makefile.target ============================================================================== --- trunk/openbios-devel/Makefile.target Sat Jul 27 13:21:56 2013 (r1191) +++ trunk/openbios-devel/Makefile.target Sat Jul 27 13:21:59 2013 (r1192) @@ -35,6 +35,9 @@ INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS+= -g +# FCode tokeniser +TOKE := toke + quiet-command = $(if $(V),$1,$(if $(2),@echo $2 && $1, @$1)) VPATH_SUFFIXES = %.c %.h %.S %.fs Modified: trunk/openbios-devel/config/xml/dictionary.xsl ============================================================================== --- trunk/openbios-devel/config/xml/dictionary.xsl Sat Jul 27 13:21:56 2013 (r1191) +++ trunk/openbios-devel/config/xml/dictionary.xsl Sat Jul 27 13:21:59 2013 (r1192) @@ -53,16 +53,23 @@ </xsl:variable> <xsl:if test="$conditions=0"> - <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY:=$(</xsl:text> - <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY) </xsl:text> - <xsl:value-of select="$path"/> - <xsl:value-of select="@source"/> - <xsl:text>
</xsl:text> + <xsl:variable name="source"><xsl:value-of select="@source" /></xsl:variable> + +  + <xsl:if test="not(@target = 'fcode')"> + <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY:=$(</xsl:text> + <xsl:value-of select="$dictname"/><xsl:text>-DICTIONARY) </xsl:text> + + <xsl:value-of select="$path"/> + <xsl:value-of select="$source"/> + <xsl:text>
</xsl:text> + </xsl:if> + </xsl:if> </xsl:for-each> - <xsl:text>
</xsl:text> + <xsl:text>

</xsl:text>  <xsl:for-each select="//dictionary"> @@ -92,6 +99,27 @@ <xsl:if test="$init!=''"> <xsl:text> $(ODIR)/</xsl:text><xsl:value-of select="$init"/><xsl:text>.dict</xsl:text> </xsl:if> + +  + <xsl:for-each select="object[@target = 'fcode']"> + + <xsl:variable name="conditions"> + <xsl:text>0</xsl:text> + <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> + <xsl:call-template name="resolve-condition"> + <xsl:with-param select="@condition" name="expression"/> + </xsl:call-template> + </xsl:for-each> + </xsl:variable> + + <xsl:if test="$conditions = 0"> + + <xsl:text> $(ODIR)/</xsl:text> + <xsl:value-of select="@source"/> + + </xsl:if> + </xsl:for-each> + <xsl:text>
</xsl:text>  <xsl:text>	$(call quiet-command,$(ODIR)/forthstrap</xsl:text> Added: trunk/openbios-devel/config/xml/fcode.xsl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/config/xml/fcode.xsl Sat Jul 27 13:21:59 2013 (r1192) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="ISO-8859-15" ?> + +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> + + <xsl:template match="/" mode="fcode"> + + <xsl:text>
#
# fcode rules
#

</xsl:text> + +  + <xsl:for-each select="//fcode"> + <xsl:variable name="outer-conditions"> + <xsl:text>0</xsl:text> + <xsl:for-each select="(ancestor-or-self::*)[@condition!='']"> + <xsl:call-template name="resolve-condition"> + <xsl:with-param select="@condition" name="expression"/> + </xsl:call-template> + </xsl:for-each> + </xsl:variable> + + <xsl:if test="$outer-conditions = 0"> + <xsl:if test="(ancestor-or-self::*)"> + + <xsl:variable name="path"> + <xsl:for-each select="ancestor::build"> + <xsl:call-template name="get-dirname"> + <xsl:with-param select="@base" name="path"/> + </xsl:call-template> + </xsl:for-each> + </xsl:variable> + +  + <xsl:text>$(ODIR)/</xsl:text> + <xsl:value-of select="@name"/> + <xsl:text>:</xsl:text> + + <xsl:text> $(SRCDIR)/</xsl:text> + <xsl:value-of select="$path"/> + <xsl:value-of select="@source"/> + +  + <xsl:value-of select="document('rules.xml',.)//rule[@target='host'][@entity='fcode']"/> + <xsl:text>
</xsl:text> + </xsl:if> + </xsl:if> + </xsl:for-each> + + </xsl:template> +</xsl:stylesheet> Modified: trunk/openbios-devel/config/xml/makefile.xsl ============================================================================== --- trunk/openbios-devel/config/xml/makefile.xsl Sat Jul 27 13:21:56 2013 (r1191) +++ trunk/openbios-devel/config/xml/makefile.xsl Sat Jul 27 13:21:59 2013 (r1192) @@ -5,10 +5,12 @@ <xsl:include href="util.xsl"/> <xsl:include href="dictionary.xsl"/> <xsl:include href="object.xsl"/> + <xsl:include href="fcode.xsl"/> <xsl:template match="/"> <xsl:value-of select="document('rules.xml',.)/rules/pre"/> <xsl:apply-templates select="." mode="dictionaries"/> + <xsl:apply-templates select="." mode="fcode"/> <xsl:apply-templates select="." mode="objects"/> </xsl:template> Modified: trunk/openbios-devel/config/xml/rules.xml ============================================================================== --- trunk/openbios-devel/config/xml/rules.xml Sat Jul 27 13:21:56 2013 (r1191) +++ trunk/openbios-devel/config/xml/rules.xml Sat Jul 27 13:21:59 2013 (r1192) @@ -13,6 +13,9 @@ <rule target="host" entity="library"> $(call quiet--command,$(AR) cru $@ $^; $(RANLIB) $@," HOSTAR $(TARGET_DIR)$@") </rule> +<rule target="host" entity="fcode"> + $(call quiet-command,$(TOKE) -o $@ $^," TOKE $(TARGET_DIR)$@") +</rule>  <rule target="target" entity="executable">

1 0

[commit] r1191 - trunk/openbios-devel/config/scripts
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 13:21:56 2013 New Revision: 1191 URL: http://tracker.coreboot.org/trac/openbios/changeset/1191 Log: switch-arch: make the fcode-utils tokeniser "toke" mandatory for the build Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sat Jul 27 12:15:11 2013 (r1190) +++ trunk/openbios-devel/config/scripts/switch-arch Sat Jul 27 13:21:56 2013 (r1191) @@ -117,6 +117,11 @@ echo "<option name=\"$option\" type=\"boolean\" value=\"true\" />" } +exists() +{ + type "$1" >/dev/null 2>&1 +} + SRCDIR=`dirname "$0"`/../.. BUILDDIR=`pwd` @@ -132,6 +137,13 @@ echo "Configuring OpenBIOS on $HOSTARCH for $*" +if exists toke; then + : +else + echo "Unable to locate toke executable from the fcode-utils package - aborting" + exit 1 +fi + target_list="" for target in $*; do case $target in

1 0

Re: [OpenBIOS] Secure BIOS for voting?
by SAVIOCvs＠aol.com 27 Jul '13

27 Jul '13

Thanks to all who commented on this thread. It seems clear that OpenBIOS won't enhance voting security. Special thanks to _tarl-b2(a)tarl.net_ (mailto:tarl-b2@tarl.net) for the tip on "trusted boot". That hardware/firmware solution appears to go a long way toward preventing any tampering with BIOS. It isn't really necessary to have a voting system that is impossible to subvert, as long as there are techniques like buying absentee ballots, gerrymandering and preventing certain groups from voting that are far easier to implement or provide far more votes per dollar. Chuck Gaston In a message dated 7/23/2013 4:28:55 P.M. Eastern Daylight Time, tarl-b2(a)tarl.net writes: On 2013-Jul-23 16:15 , Mark Morgan Lloyd wrote: >>> >> >> And having the USB keyboard work (which means USB HID support, USB hub >> support, USB controller support, PCI support, etc). > > Although IIRC there's a simplified protocol for the keyboard, > specifically for BIOS support. I've seen people discussing that in the > context of devices such as the Parallax Propeller which don't really > have USB support. Not for USB. Whatever they may be talking about, they aren't getting USB - there's no real way to enable EHCI/OHCI/UHCI/XHCI without implementing the entire shebang. >> >> Once the control of the hardware has been taken over, there is no way >> to take it back. > > > Or put another way, you might /think/ you've regained full control, > but you can never /know/ :-) The problem of secure execution is fairly well understood. Google "Verified Boot" or "Trusted Boot". The implementations that take it seriously do verification of their PROM, sign it, and the hardware won't let you start unless the PROM is good. Then the PROM verifies the signature of each component as it's brought in (I was recently involved in implementing public key verification for such). It doesn't guarantee bug-free code, but it verifies that the code you are running is what you think it is. -- OpenBIOS http://openbios.org/ Mailinglist: http://lists.openbios.org/mailman/listinfo Free your System - May the Forth be with you

1 0

[commit] r1190 - in trunk/openbios-devel/arch: sparc32 sparc64
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:15:11 2013 New Revision: 1190 URL: http://tracker.coreboot.org/trac/openbios/changeset/1190 Log: SPARC: remove cls() from the console startup The video_cls() function is no longer needed, since the fb8-install routines now handle the video initialisation instead. Remove the serial_cls() functions to make SPARC consistent with PPC and aid debugging. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.h trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/console.c trunk/openbios-devel/arch/sparc64/openbios.c Modified: trunk/openbios-devel/arch/sparc32/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Sat Jul 27 12:15:08 2013 (r1189) +++ trunk/openbios-devel/arch/sparc32/boot.h Sat Jul 27 12:15:11 2013 (r1190) @@ -22,9 +22,6 @@ extern unsigned int qemu_mem_size; extern void collect_sys_info(struct sys_info *info); -// console.c -void cls(void); - // romvec.c extern struct linux_arguments_v0 obp_arg; extern const void *romvec; Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:15:08 2013 (r1189) +++ trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:15:11 2013 (r1190) @@ -12,8 +12,6 @@ #include "libopenbios/ofmem.h" #include "libopenbios/video.h" -void cls(void); - #ifdef CONFIG_DEBUG_CONSOLE /* ****************************************************************** @@ -30,11 +28,6 @@ unsigned char *vmem; volatile uint32_t *dac; -static void video_cls(void) -{ - memset((void *)vmem, 0, VMEM_SIZE); -} - void tcx_init(uint64_t base) { vmem = (unsigned char *)ofmem_map_io(base + VMEM_BASE, VMEM_SIZE); @@ -97,15 +90,4 @@ return 0; } -void cls(void) -{ -#ifdef CONFIG_DEBUG_CONSOLE_SERIAL - serial_cls(); -#endif -#ifdef CONFIG_DEBUG_CONSOLE_VIDEO - video_cls(); -#endif -} - - #endif // CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sat Jul 27 12:15:08 2013 (r1189) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sat Jul 27 12:15:11 2013 (r1190) @@ -971,8 +971,6 @@ tcx_init(hwdef->tcx_base); kbd_init(hwdef->ms_kb_base); #endif - /* Clear the screen. */ - cls(); #endif collect_sys_info(&sys_info); Modified: trunk/openbios-devel/arch/sparc64/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/console.c Sat Jul 27 12:15:08 2013 (r1189) +++ trunk/openbios-devel/arch/sparc64/console.c Sat Jul 27 12:15:11 2013 (r1190) @@ -58,16 +58,4 @@ return 0; } -void cls(void) -{ -#ifdef CONFIG_DEBUG_CONSOLE_SERIAL - serial_putchar(27); - serial_putchar('['); - serial_putchar('H'); - serial_putchar(27); - serial_putchar('['); - serial_putchar('J'); -#endif -} - #endif // CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sat Jul 27 12:15:08 2013 (r1189) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sat Jul 27 12:15:11 2013 (r1190) @@ -619,8 +619,6 @@ #ifdef CONFIG_DEBUG_CONSOLE_SERIAL uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED); #endif - /* Clear the screen. */ - cls(); printk("OpenBIOS for Sparc64\n"); #endif

1 0

[commit] r1189 - trunk/openbios-devel/forth/bootstrap
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:15:08 2013 New Revision: 1189 URL: http://tracker.coreboot.org/trac/openbios/changeset/1189 Log: bootstrap.fs: add debug-type and debug-cr words These words always output to the debug (serial) port even if video mode is enabled. This makes debugging the video routines much easier when starting QEMU with the -serial stdio option. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs ============================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs Sat Jul 27 12:15:05 2013 (r1188) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs Sat Jul 27 12:15:08 2013 (r1189) @@ -660,6 +660,7 @@ \ : type 0 do count emit loop drop ; +: debug-type bounds ?do i c@ (emit) loop ; \ \ 7.3.4.1 Text Input @@ -863,6 +864,7 @@ \ : cr linefeed emit ; +: debug-cr linefeed (emit) ; : (cr carret emit ; : space bl emit ; : spaces 0 ?do space loop ;

1 0

[commit] r1188 - in trunk/openbios-devel: arch/sparc32 include/libopenbios libopenbios packages
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:15:05 2013 New Revision: 1188 URL: http://tracker.coreboot.org/trac/openbios/changeset/1188 Log: console: remove libopenbios/console.h After all of the shuffling, this file is no longer required. Remove it. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Deleted: trunk/openbios-devel/include/libopenbios/console.h Modified: trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/libopenbios/video_common.c trunk/openbios-devel/packages/molvideo.c Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:15:01 2013 (r1187) +++ trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:15:05 2013 (r1188) @@ -9,7 +9,6 @@ #include "kernel/kernel.h" #include "drivers/drivers.h" #include "openbios.h" -#include "libopenbios/console.h" #include "libopenbios/ofmem.h" #include "libopenbios/video.h" Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:15:01 2013 (r1187) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:15:05 2013 (r1188) @@ -16,7 +16,6 @@ #include "config.h" #include "libopenbios/bindings.h" -#include "libopenbios/console.h" #include "libopenbios/fontdata.h" #include "libopenbios/ofmem.h" #include "libopenbios/video.h" Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:15:01 2013 (r1187) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:15:05 2013 (r1188) @@ -21,7 +21,6 @@ #include "drivers/drivers.h" #include "packages/video.h" #include "libopenbios/video.h" -#include "libopenbios/console.h" #include "drivers/vga.h"

1 0

[commit] r1187 - in trunk/openbios-devel: arch/sparc32 drivers include/libopenbios libopenbios
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:15:01 2013 New Revision: 1187 URL: http://tracker.coreboot.org/trac/openbios/changeset/1187 Log: video_common.c: remove init_video() function Finally we now have a set of common video routines in video_common.c with per bus initialisers for SBus and PCI. Hence we can remove the now obsolete init_video() function. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sat Jul 27 12:14:56 2013 (r1186) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sat Jul 27 12:15:01 2013 (r1187) @@ -876,7 +876,6 @@ #ifdef CONFIG_DRIVER_SBUS #ifdef CONFIG_DEBUG_CONSOLE_VIDEO setup_video(hwdef->tcx_base + 0x00800000ULL, (unsigned long)vmem); - init_video(); #endif ob_sbus_init(hwdef->iommu_base + 0x1000ULL, qemu_machine_type); #endif Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sat Jul 27 12:14:56 2013 (r1186) +++ trunk/openbios-devel/drivers/vga_vbe.c Sat Jul 27 12:15:01 2013 (r1187) @@ -27,6 +27,7 @@ #include "drivers/vga.h" #include "libopenbios/video.h" #include "libopenbios/ofmem.h" +#include "packages/video.h" /* VGA init. We use the Bochs VESA VBE extensions */ #define VBE_DISPI_INDEX_ID 0x0 @@ -125,6 +126,7 @@ phys_addr_t phys; phandle_t ph, chosen, aliases, options; char buf[6]; + int size; phys = fb; @@ -152,6 +154,8 @@ set_int_property(ph, "linebytes", VIDEO_DICT_VALUE(video.rb)); set_int_property(ph, "address", (u32)(fb & ~0x0000000F)); + molvideo_init(); + chosen = find_dev("/chosen"); push_str(path); fword("open-dev"); @@ -168,7 +172,6 @@ if (rom_size >= 8) { const char *p; - int size; p = (const char *)rom; if (p[0] == 'N' && p[1] == 'D' && p[2] == 'R' && p[3] == 'V') { @@ -178,5 +181,11 @@ } } - init_video(); +#if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) + size = ((VIDEO_DICT_VALUE(video.h) * VIDEO_DICT_VALUE(video.rb)) + 0xfff) & ~0xfff; + + ofmem_claim_phys( video.mphys, size, 0 ); + ofmem_claim_virt( VIDEO_DICT_VALUE(video.mvirt), size, 0 ); + ofmem_map( video.mphys, VIDEO_DICT_VALUE(video.mvirt), size, ofmem_arch_io_translation_mode(video.mphys) ); +#endif } Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:56 2013 (r1186) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:15:01 2013 (r1187) @@ -20,7 +20,6 @@ #define VGA_DEFAULT_LINEBYTES (VGA_DEFAULT_WIDTH*((VGA_DEFAULT_DEPTH+7)/8)) void setup_video(phys_addr_t phys, ucell virt); -void init_video(void); unsigned long video_get_color(int col_ind); void video_set_color(int ind, unsigned long color); void video_mask_blit(void); @@ -28,8 +27,6 @@ void video_fill_rect(void); extern struct video_info { - int has_video; - volatile ihandle_t *ih; volatile phys_addr_t mphys; volatile ucell *mvirt; Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:56 2013 (r1186) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:15:01 2013 (r1187) @@ -31,7 +31,7 @@ video_get_color( int col_ind ) { unsigned long col; - if( !video.has_video || col_ind < 0 || col_ind > 255 ) + if( !VIDEO_DICT_VALUE(video.ih) || col_ind < 0 || col_ind > 255 ) return 0; if( VIDEO_DICT_VALUE(video.depth) == 8 ) return col_ind; @@ -48,7 +48,7 @@ { xt_t hw_xt = 0; - if( !video.has_video || ind < 0 || ind > 255 ) + if( !VIDEO_DICT_VALUE(video.ih) || ind < 0 || ind > 255 ) return; video.pal[ind] = color; @@ -138,7 +138,7 @@ bgcolor = video_get_color(bgcolor); fgcolor = video_get_color(fgcolor); - if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || + if (!VIDEO_DICT_VALUE(video.ih) || x < 0 || y < 0 || w <= 0 || h <= 0 || x + w > VIDEO_DICT_VALUE(video.w) || y + h > VIDEO_DICT_VALUE(video.h)) return; @@ -190,7 +190,7 @@ char *pp; unsigned long col = video_get_color(col_ind); - if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || + if (!VIDEO_DICT_VALUE(video.ih) || x < 0 || y < 0 || w <= 0 || h <= 0 || x + w > VIDEO_DICT_VALUE(video.w) || y + h > VIDEO_DICT_VALUE(video.h)) return; @@ -279,36 +279,3 @@ } #endif } - -void -init_video(void) -{ -#if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) - int size; -#endif - phandle_t ph=0, saved_ph=0; - - saved_ph = get_cur_dev(); - while( (ph=dt_iterate_type(ph, "display")) ) { - video.has_video = 1; - - set_int_property( ph, "width", VIDEO_DICT_VALUE(video.w) ); - set_int_property( ph, "height", VIDEO_DICT_VALUE(video.h) ); - set_int_property( ph, "depth", VIDEO_DICT_VALUE(video.depth) ); - set_int_property( ph, "linebytes", VIDEO_DICT_VALUE(video.rb) ); - set_int_property( ph, "address", VIDEO_DICT_VALUE(video.mvirt) ); - - activate_dev(ph); - - molvideo_init(); - } - activate_dev(saved_ph); - -#if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) - size = ((VIDEO_DICT_VALUE(video.h) * VIDEO_DICT_VALUE(video.rb)) + 0xfff) & ~0xfff; - - ofmem_claim_phys( video.mphys, size, 0 ); - ofmem_claim_virt( VIDEO_DICT_VALUE(video.mvirt), size, 0 ); - ofmem_map( video.mphys, VIDEO_DICT_VALUE(video.mvirt), size, ofmem_arch_io_translation_mode(video.mphys) ); -#endif -}

1 0

[commit] r1186 - trunk/openbios-devel/libopenbios
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:56 2013 New Revision: 1186 URL: http://tracker.coreboot.org/trac/openbios/changeset/1186 Log: video_common.c: fix 32-bit display modes on 64-bit architectures Switch from using unsigned long to uint32_t in the 32-bit primitives and unsigned short to uint16_t in the 16-bit primitives. While not a complete fix (endian-swapping, 24-bit mode) it does fix 32-bit display depth on 64-bit architectures such as SPARC64. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/libopenbios/video_common.c Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:53 2013 (r1185) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:56 2013 (r1186) @@ -107,9 +107,9 @@ } if( d >= 24 ) - *((unsigned long*)dst) = color; + *((uint32_t*)dst) = color; else if( d >= 15 ) - *((short*)dst) = color; + *((uint16_t*)dst) = color; else *dst = color; @@ -146,7 +146,7 @@ for( ; h--; pp += *(video.rb) ) { int ww = w; if( VIDEO_DICT_VALUE(video.depth) == 24 || VIDEO_DICT_VALUE(video.depth) == 32 ) { - unsigned long *p = (unsigned long*)pp + x; + uint32_t *p = (uint32_t*)pp + x; while( ww-- ) { if (*p == fgcolor) { *p++ = bgcolor; @@ -155,11 +155,11 @@ } } } else if( VIDEO_DICT_VALUE(video.depth) == 16 || VIDEO_DICT_VALUE(video.depth) == 15 ) { - unsigned short *p = (unsigned short*)pp + x; + uint16_t *p = (uint16_t*)pp + x; while( ww-- ) { - if (*p == (unsigned short)fgcolor) { + if (*p == (uint16_t)fgcolor) { *p++ = bgcolor; - } else if (*p == (unsigned short)bgcolor) { + } else if (*p == (uint16_t)bgcolor) { *p++ = fgcolor; } } @@ -198,11 +198,11 @@ for( ; h--; pp += VIDEO_DICT_VALUE(video.rb) ) { int ww = w; if( VIDEO_DICT_VALUE(video.depth) == 24 || VIDEO_DICT_VALUE(video.depth) == 32 ) { - unsigned long *p = (unsigned long*)pp + x; + uint32_t *p = (uint32_t*)pp + x; while( ww-- ) *p++ = col; } else if( VIDEO_DICT_VALUE(video.depth) == 16 || VIDEO_DICT_VALUE(video.depth) == 15 ) { - unsigned short *p = (unsigned short*)pp + x; + uint16_t *p = (uint16_t*)pp + x; while( ww-- ) *p++ = col; } else {

1 0

[commit] r1185 - trunk/openbios-devel/drivers
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:53 2013 New Revision: 1185 URL: http://tracker.coreboot.org/trac/openbios/changeset/1185 Log: sbus.c: fix TCX24 initialisation Even though we boot in 24-bit enabled mode, OpenBIOS only uses the 8-bit framebuffer. Hence we need to override the depth/linebytes obtained from QEMU to force the graphics subsystem into 8-bit mode, which was what seems to have been happening before this patch series. Note: it seems strange that we have to update the package linebytes property too, however Debian etch freezes if we don't set it to match the 8-bit framebuffer even though it correctly switches to 24-bit mode. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/sbus.c Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sat Jul 27 12:14:50 2013 (r1184) +++ trunk/openbios-devel/drivers/sbus.c Sat Jul 27 12:14:53 2013 (r1185) @@ -17,6 +17,7 @@ #include "libc/vsprintf.h" #include "drivers/drivers.h" #include "libopenbios/ofmem.h" +#include "libopenbios/video.h" #define SBUS_REGS 0x28 #define SBUS_SLOTS 16 @@ -329,6 +330,17 @@ fword("property"); } + /* Even with a 24-bit enabled TCX card, the control plane is + used in 8-bit mode. So force the video subsystem into 8-bit + mode before initialisation. */ + if (graphic_depth == 24) { + VIDEO_DICT_VALUE(video.depth) = 8; + VIDEO_DICT_VALUE(video.rb) = VIDEO_DICT_VALUE(video.w); + + chosen = get_cur_dev(); + set_int_property(chosen, "linebytes", VIDEO_DICT_VALUE(video.rb)); + } + bind_func("hw-set-color", tcx_hw_set_color); feval("['] qemu-tcx-driver-init is-install");

1 0

[commit] r1184 - in trunk/openbios-devel: arch/sparc32 drivers forth/device include/drivers include/libopenbios libopenbios packages
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:50 2013 New Revision: 1184 URL: http://tracker.coreboot.org/trac/openbios/changeset/1184 Log: video_common.c: move colour palette code into individual devices Instead if having a large #ifdef .. #endif section in video_set_color(), move the device-specific hardware setters into each display device package. To do this, we keep track of the display ihandle in the video structure and use it to invoke the low-level hardware setter routine (and optional palette refresh) if required. Also since the display-ih isn't called until is-install, defer the colour palette initialisation from init_video() to is-install. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/forth/device/display.fs trunk/openbios-devel/include/drivers/drivers.h trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c trunk/openbios-devel/packages/molvideo.c Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:14:47 2013 (r1183) +++ trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:14:50 2013 (r1184) @@ -11,6 +11,7 @@ #include "openbios.h" #include "libopenbios/console.h" #include "libopenbios/ofmem.h" +#include "libopenbios/video.h" void cls(void); @@ -41,6 +42,22 @@ dac = (uint32_t *)ofmem_map_io(base + DAC_BASE, DAC_SIZE); } +/* ( r g b index -- ) */ +void tcx_hw_set_color(void) +{ + int index = POP(); + int b = POP(); + int g = POP(); + int r = POP(); + + if( VIDEO_DICT_VALUE(video.depth) == 8 ) { + dac[0] = index << 24; + dac[1] = r << 24; // Red + dac[1] = g << 24; // Green + dac[1] = b << 24; // Blue + } +} + #endif /* ****************************************************************** Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sat Jul 27 12:14:47 2013 (r1183) +++ trunk/openbios-devel/drivers/sbus.c Sat Jul 27 12:14:50 2013 (r1184) @@ -329,6 +329,7 @@ fword("property"); } + bind_func("hw-set-color", tcx_hw_set_color); feval("['] qemu-tcx-driver-init is-install"); chosen = find_dev("/chosen"); Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sat Jul 27 12:14:47 2013 (r1183) +++ trunk/openbios-devel/drivers/vga_vbe.c Sat Jul 27 12:14:50 2013 (r1184) @@ -103,6 +103,22 @@ vga_build_rgb_palette(); } +/* Low-level Forth accessor to update VGA color registers */ + +/* ( r g b index -- ) */ +static +void vga_hw_set_color(void) +{ + int index = POP(); + int b = POP(); + int g = POP(); + int r = POP(); + + vga_set_color(index, (r & 0xff), + (g & 0xff), + (b & 0xff)); +} + void vga_vbe_init(const char *path, unsigned long fb, uint32_t fb_size, unsigned long rom, uint32_t rom_size) { @@ -128,6 +144,8 @@ ph = get_cur_dev(); #endif + bind_func("hw-set-color", vga_hw_set_color); + set_int_property(ph, "width", VIDEO_DICT_VALUE(video.w)); set_int_property(ph, "height", VIDEO_DICT_VALUE(video.h)); set_int_property(ph, "depth", VIDEO_DICT_VALUE(video.depth)); Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Sat Jul 27 12:14:47 2013 (r1183) +++ trunk/openbios-devel/forth/device/display.fs Sat Jul 27 12:14:50 2013 (r1184) @@ -48,6 +48,7 @@ 2 value font-spacing 0 value depth-bits 0 value line-bytes +0 value display-ih \ internal values read from QEMU firmware interface 0 value qemu-video-addr @@ -353,6 +354,8 @@ 0 to inverse? 0 to inverse-screen? + my-self to display-ih + \ set defer functions to 8bit versions ['] fb8-draw-character to draw-character @@ -375,6 +378,28 @@ then to foreground-color to background-color + \ setup palette + 10101 ['] color-palette cell+ ff 0 do + dup 2 pick i * swap ! cell+ + loop 2drop + + \ special background color + ffffcc ['] color-palette cell+ fe cells + ! + + \ load palette onto the hardware + ['] color-palette cell+ ff 0 do + dup @ ff0000 and d# 16 rshift + 1 pick @ ff00 and d# 8 rshift + 2 pick @ ff and + i + s" hw-set-color" $find if + execute + else + 2drop + then + cell+ + loop drop + \ ... but let's override with some better defaults fe to background-color 0 to foreground-color Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Sat Jul 27 12:14:47 2013 (r1183) +++ trunk/openbios-devel/include/drivers/drivers.h Sat Jul 27 12:14:50 2013 (r1184) @@ -47,6 +47,7 @@ /* arch/sparc32/console.c */ void tcx_init(uint64_t base); +void tcx_hw_set_color(void); void kbd_init(uint64_t base); #endif #ifdef CONFIG_DRIVER_IDE Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:47 2013 (r1183) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:50 2013 (r1184) @@ -30,6 +30,7 @@ extern struct video_info { int has_video; + volatile ihandle_t *ih; volatile phys_addr_t mphys; volatile ucell *mvirt; volatile ucell *rb, *w, *h, *depth; Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:47 2013 (r1183) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:50 2013 (r1184) @@ -46,27 +46,30 @@ void video_set_color( int ind, unsigned long color ) { + xt_t hw_xt = 0; + if( !video.has_video || ind < 0 || ind > 255 ) return; video.pal[ind] = color; -#ifdef CONFIG_MOL - if( VIDEO_DICT_VALUE(video.depth) == 8 ) - OSI_SetColor( ind, color ); -#elif defined(CONFIG_SPARC32) -#if defined(CONFIG_DEBUG_CONSOLE_VIDEO) - if( VIDEO_DICT_VALUE(video.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), - (color & 0xff)); -#endif + /* Call the low-level hardware setter in the + display package */ + hw_xt = find_ih_method("hw-set-color", VIDEO_DICT_VALUE(video.ih)); + if (hw_xt) { + PUSH((color >> 16) & 0xff); // Red + PUSH((color >> 8) & 0xff); // Green + PUSH(color & 0xff); // Blue + PUSH(ind); + PUSH(hw_xt); + fword("execute"); + } + + /* Call the low-level palette update if required */ + hw_xt = find_ih_method("hw-refresh-palette", VIDEO_DICT_VALUE(video.ih)); + if (hw_xt) { + PUSH(hw_xt); + fword("execute"); + } } /* ( fbaddr maskaddr width height fgcolor bgcolor -- ) */ @@ -219,6 +222,9 @@ video.mphys = phys; + feval("['] display-ih cell+"); + video.ih = cell2pointer(POP()); + feval("['] qemu-video-addr cell+"); video.mvirt = cell2pointer(POP()); feval("['] qemu-video-width cell+"); @@ -277,7 +283,6 @@ void init_video(void) { - int i; #if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) int size; #endif @@ -306,9 +311,4 @@ ofmem_claim_virt( VIDEO_DICT_VALUE(video.mvirt), size, 0 ); ofmem_map( video.mphys, VIDEO_DICT_VALUE(video.mvirt), size, ofmem_arch_io_translation_mode(video.mphys) ); #endif - - for( i=0; i<256; i++ ) - video_set_color( i, i * 0x010101 ); - - video_set_color( 254, 0xffffcc ); } Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:47 2013 (r1183) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:50 2013 (r1184) @@ -31,15 +31,24 @@ DECLARE_NODE( video, 0, 0, "Tdisplay" ); +#ifdef CONFIG_MOL static void molvideo_refresh_palette( void ) { -#ifdef CONFIG_MOL + if( VIDEO_DICT_VALUE(video.depth) == 8 ) OSI_RefreshPalette(); -#endif } +static void +molvideo_hw_set_color( void ) +{ + + if( VIDEO_DICT_VALUE(video.depth) == 8 ) + OSI_SetColor( ind, color ); +} +#endif + /* ( -- width height ) (?) */ static void molvideo_dimensions( void ) @@ -61,7 +70,6 @@ unsigned long col = (p[0] << 16) | (p[1] << 8) | p[2]; video_set_color( i + start, col ); } - molvideo_refresh_palette(); } /* ( r g b index -- ) */ @@ -75,7 +83,6 @@ unsigned long col = ((r << 16) & 0xff0000) | ((g << 8) & 0x00ff00) | (b & 0xff); /* printk("color!: %08lx %08lx %08lx %08lx\n", r, g, b, index ); */ video_set_color( index, col ); - molvideo_refresh_palette(); } /* ( color_ind x y width height -- ) (?) */ @@ -143,6 +150,10 @@ NODE_METHODS( video ) = { +#ifdef CONFIG_MOL + {"hw-set-color", molvideo_hw_set_color }, + {"hw-refresh-palette", molvideo_refresh_palette}, +#endif {"dimensions", molvideo_dimensions }, {"set-colors", molvideo_set_colors }, {"fill-rectangle", molvideo_fill_rect },

1 0

[commit] r1183 - in trunk/openbios-devel: include/libopenbios libopenbios packages
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:47 2013 New Revision: 1183 URL: http://tracker.coreboot.org/trac/openbios/changeset/1183 Log: video_common.c: remove the video_get_res() function Now that we've unified the video variables between C and Forth, there is no need to have a dedicated C function to return the current dimensions. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c trunk/openbios-devel/packages/molvideo.c Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:44 2013 (r1182) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:47 2013 (r1183) @@ -23,7 +23,6 @@ void init_video(void); unsigned long video_get_color(int col_ind); void video_set_color(int ind, unsigned long color); -int video_get_res(int *w, int *h); void video_mask_blit(void); void video_invert_rect(void); void video_fill_rect(void); Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:44 2013 (r1182) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:47 2013 (r1183) @@ -69,18 +69,6 @@ #endif } -int -video_get_res( int *w, int *h ) -{ - if( !video.has_video ) { - *w = *h = 0; - return -1; - } - *w = VIDEO_DICT_VALUE(video.w); - *h = VIDEO_DICT_VALUE(video.h); - return 0; -} - /* ( fbaddr maskaddr width height fgcolor bgcolor -- ) */ void Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:44 2013 (r1182) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:47 2013 (r1183) @@ -44,10 +44,8 @@ static void molvideo_dimensions( void ) { - int w, h; - (void) video_get_res( &w, &h ); - PUSH( w ); - PUSH( h ); + fword("screen-width"); + fword("screen-height"); } /* ( table start count -- ) (?) */

1 0

[commit] r1182 - in trunk/openbios-devel: arch/sparc32 arch/x86 config/scripts drivers forth/device include/arch/sparc32 include/libopenbios libopenbios
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:44 2013 New Revision: 1182 URL: http://tracker.coreboot.org/trac/openbios/changeset/1182 Log: video_common.c: split video setup routines into setup_video() Leave per-device work in init_video() for the moment. As part of this commit we fix up switch-arch so that CONFIG_QEMU works for SPARC32 - if we are given the framebuffer information via the QEMU firmware interface we use it. Otherwise fall back to the values of the VGA_DEFAULT_* constants. This commit requires a corresponding patch for QEMU as currently the framebuffer width/height are not passed via the firmware interface for SPARC32. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/config/scripts/switch-arch trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/forth/device/display.fs trunk/openbios-devel/include/arch/sparc32/io.h trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sat Jul 27 12:14:41 2013 (r1181) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sat Jul 27 12:14:44 2013 (r1182) @@ -875,7 +875,8 @@ #endif #ifdef CONFIG_DRIVER_SBUS #ifdef CONFIG_DEBUG_CONSOLE_VIDEO - init_video((unsigned long)vmem, 1024, 768, 8, 1024); + setup_video(hwdef->tcx_base + 0x00800000ULL, (unsigned long)vmem); + init_video(); #endif ob_sbus_init(hwdef->iommu_base + 0x1000ULL, qemu_machine_type); #endif Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sat Jul 27 12:14:41 2013 (r1181) +++ trunk/openbios-devel/arch/x86/openbios.c Sat Jul 27 12:14:44 2013 (r1182) @@ -16,6 +16,7 @@ #include "drivers/drivers.h" #include "drivers/pci.h" #include "libopenbios/sys_info.h" +#include "libopenbios/video.h" #include "openbios.h" #include "relocate.h" #include "boot.h" @@ -61,7 +62,12 @@ ob_floppy_init("/isa", "floppy0", 0x3f0, 0); #endif #ifdef CONFIG_XBOX - init_video(phys_to_virt(0x3C00000), 640, 480, 32, 2560); + setup_video(0x3C00000, phys_to_virt(0x3C00000)); + + /* Force video to 32-bit depth */ + VIDEO_DICT_VALUE(video.depth) = 32; + + init_video(); node_methods_init(); #endif device_end(); Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sat Jul 27 12:14:41 2013 (r1181) +++ trunk/openbios-devel/config/scripts/switch-arch Sat Jul 27 12:14:44 2013 (r1182) @@ -198,6 +198,10 @@ xbox-x86) xbox="yes" ;; + builtin-sparc32) + builtin="yes" + qemu="yes" + ;; builtin-sparc64) builtin="yes" qemu="yes" Modified: trunk/openbios-devel/drivers/vga_vbe.c ============================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c Sat Jul 27 12:14:41 2013 (r1181) +++ trunk/openbios-devel/drivers/vga_vbe.c Sat Jul 27 12:14:44 2013 (r1182) @@ -103,50 +103,24 @@ vga_build_rgb_palette(); } -#ifdef CONFIG_VGA_WIDTH -#define VGA_DEFAULT_WIDTH CONFIG_VGA_WIDTH -#else -#define VGA_DEFAULT_WIDTH 800 -#endif - -#ifdef CONFIG_VGA_HEIGHT -#define VGA_DEFAULT_HEIGHT CONFIG_VGA_HEIGHT -#else -#define VGA_DEFAULT_HEIGHT 600 -#endif - -#ifdef CONFIG_VGA_DEPTH -#define VGA_DEFAULT_DEPTH CONFIG_VGA_DEPTH -#else -#define VGA_DEFAULT_DEPTH 8 -#endif - -#define VGA_DEFAULT_LINEBYTES (VGA_DEFAULT_WIDTH*((VGA_DEFAULT_DEPTH+7)/8)) - void vga_vbe_init(const char *path, unsigned long fb, uint32_t fb_size, unsigned long rom, uint32_t rom_size) { + phys_addr_t phys; phandle_t ph, chosen, aliases, options; char buf[6]; - int width = VGA_DEFAULT_WIDTH; - int height = VGA_DEFAULT_HEIGHT; - int depth = VGA_DEFAULT_DEPTH; - int linebytes = VGA_DEFAULT_LINEBYTES; - -#if defined(CONFIG_QEMU) && (defined(CONFIG_PPC) || defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)) - int w, h, d; - w = fw_cfg_read_i16(FW_CFG_ARCH_WIDTH); - h = fw_cfg_read_i16(FW_CFG_ARCH_HEIGHT); - d = fw_cfg_read_i16(FW_CFG_ARCH_DEPTH); - if (w && h && d) { - width = w; - height = h; - depth = d; - linebytes = (width * ((depth + 7) / 8)); - } + + phys = fb; + +#if defined(CONFIG_SPARC64) + /* Fix virtual address on SPARC64 somewhere else */ + fb = 0xfe000000ULL; #endif - vga_vbe_set_mode(width, height, depth); + setup_video(phys, fb); + vga_vbe_set_mode(VIDEO_DICT_VALUE(video.w), + VIDEO_DICT_VALUE(video.h), + VIDEO_DICT_VALUE(video.depth)); #if 0 ph = find_dev(path); @@ -154,10 +128,10 @@ ph = get_cur_dev(); #endif - set_int_property(ph, "width", width); - set_int_property(ph, "height", height); - set_int_property(ph, "depth", depth); - set_int_property(ph, "linebytes", linebytes); + set_int_property(ph, "width", VIDEO_DICT_VALUE(video.w)); + set_int_property(ph, "height", VIDEO_DICT_VALUE(video.h)); + set_int_property(ph, "depth", VIDEO_DICT_VALUE(video.depth)); + set_int_property(ph, "linebytes", VIDEO_DICT_VALUE(video.rb)); set_int_property(ph, "address", (u32)(fb & ~0x0000000F)); chosen = find_dev("/chosen"); @@ -169,9 +143,9 @@ set_property(aliases, "screen", path, strlen(path) + 1); options = find_dev("/options"); - snprintf(buf, sizeof(buf), "%d", width / FONT_WIDTH); + snprintf(buf, sizeof(buf), FMT_ucell, VIDEO_DICT_VALUE(video.w) / FONT_WIDTH); set_property(options, "screen-#columns", buf, strlen(buf) + 1); - snprintf(buf, sizeof(buf), "%d", height / FONT_HEIGHT); + snprintf(buf, sizeof(buf), FMT_ucell, VIDEO_DICT_VALUE(video.h) / FONT_HEIGHT); set_property(options, "screen-#rows", buf, strlen(buf) + 1); if (rom_size >= 8) { @@ -186,5 +160,5 @@ } } - init_video(fb, width, height, depth, linebytes); + init_video(); } Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Sat Jul 27 12:14:41 2013 (r1181) +++ trunk/openbios-devel/forth/device/display.fs Sat Jul 27 12:14:44 2013 (r1182) @@ -72,7 +72,7 @@ defer fb-emit ( x -- ) -: depth-bytes ( bits -- bytes ) +: depth-bytes ( -- bytes ) depth-bits 1+ 8 / ; Modified: trunk/openbios-devel/include/arch/sparc32/io.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/io.h Sat Jul 27 12:14:41 2013 (r1181) +++ trunk/openbios-devel/include/arch/sparc32/io.h Sat Jul 27 12:14:44 2013 (r1182) @@ -191,4 +191,11 @@ extern void outsw(u32 reg, const void *addr, unsigned long count); #endif #endif + +#if defined(CONFIG_QEMU) +#define FW_CFG_ARCH_DEPTH (FW_CFG_ARCH_LOCAL + 0x00) +#define FW_CFG_ARCH_WIDTH (FW_CFG_ARCH_LOCAL + 0x01) +#define FW_CFG_ARCH_HEIGHT (FW_CFG_ARCH_LOCAL + 0x02) +#endif + #endif /* _ASM_IO_H */ Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:41 2013 (r1181) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:44 2013 (r1182) @@ -1,5 +1,26 @@ -void init_video(unsigned long fb, int width, int height, int depth, int rb); +#ifdef CONFIG_VGA_WIDTH +#define VGA_DEFAULT_WIDTH CONFIG_VGA_WIDTH +#else +#define VGA_DEFAULT_WIDTH 800 +#endif + +#ifdef CONFIG_VGA_HEIGHT +#define VGA_DEFAULT_HEIGHT CONFIG_VGA_HEIGHT +#else +#define VGA_DEFAULT_HEIGHT 600 +#endif + +#ifdef CONFIG_VGA_DEPTH +#define VGA_DEFAULT_DEPTH CONFIG_VGA_DEPTH +#else +#define VGA_DEFAULT_DEPTH 8 +#endif + +#define VGA_DEFAULT_LINEBYTES (VGA_DEFAULT_WIDTH*((VGA_DEFAULT_DEPTH+7)/8)) + +void setup_video(phys_addr_t phys, ucell virt); +void init_video(void); unsigned long video_get_color(int col_ind); void video_set_color(int ind, unsigned long color); int video_get_res(int *w, int *h); Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:41 2013 (r1181) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:44 2013 (r1182) @@ -22,6 +22,8 @@ #include "libopenbios/video.h" #include "packages/video.h" #include "drivers/vga.h" +#define NO_QEMU_PROTOS +#include "arch/common/fw_cfg.h" struct video_info video; @@ -221,21 +223,14 @@ } } -void -init_video( unsigned long fb, int width, int height, int depth, int rb ) +void setup_video(phys_addr_t phys, ucell virt) { - int i; -#if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) - int size; -#endif - phandle_t ph=0, saved_ph=0; - - video.mphys = fb; - /* Make everything inside the video_info structure point to the values in the Forth dictionary. Hence everything is always in sync. */ + video.mphys = phys; + feval("['] qemu-video-addr cell+"); video.mvirt = cell2pointer(POP()); feval("['] qemu-video-width cell+"); @@ -249,32 +244,6 @@ feval("['] color-palette cell+"); video.pal = cell2pointer(POP()); - VIDEO_DICT_VALUE(video.mvirt) = (ucell)fb; - VIDEO_DICT_VALUE(video.w) = (ucell)width; - VIDEO_DICT_VALUE(video.h) = (ucell)height; - VIDEO_DICT_VALUE(video.depth) = (ucell)depth; - VIDEO_DICT_VALUE(video.rb) = (ucell)rb; - -#if defined(CONFIG_SPARC64) - /* Fix virtual address on SPARC64 somewhere else */ - VIDEO_DICT_VALUE(video.mvirt) = 0xfe000000ULL; -#endif - - saved_ph = get_cur_dev(); - while( (ph=dt_iterate_type(ph, "display")) ) { - set_int_property( ph, "width", VIDEO_DICT_VALUE(video.w) ); - set_int_property( ph, "height", VIDEO_DICT_VALUE(video.h) ); - set_int_property( ph, "depth", VIDEO_DICT_VALUE(video.depth) ); - set_int_property( ph, "linebytes", VIDEO_DICT_VALUE(video.rb) ); - set_int_property( ph, "address", VIDEO_DICT_VALUE(video.mvirt) ); - - activate_dev(ph); - - molvideo_init(); - } - video.has_video = 1; - activate_dev(saved_ph); - /* Set global variables ready for fb8-install */ PUSH( pointer2cell(video_mask_blit) ); fword("is-noname-cfunc"); @@ -294,6 +263,54 @@ PUSH(FONT_WIDTH); feval("to (romfont-width)"); + /* Initialise the structure */ + VIDEO_DICT_VALUE(video.mvirt) = virt; + VIDEO_DICT_VALUE(video.w) = VGA_DEFAULT_WIDTH; + VIDEO_DICT_VALUE(video.h) = VGA_DEFAULT_HEIGHT; + VIDEO_DICT_VALUE(video.depth) = VGA_DEFAULT_DEPTH; + VIDEO_DICT_VALUE(video.rb) = VGA_DEFAULT_LINEBYTES; + +#if defined(CONFIG_QEMU) && (defined(CONFIG_PPC) || defined(CONFIG_SPARC32) || defined(CONFIG_SPARC64)) + /* If running from QEMU, grab the parameters from the firmware interface */ + int w, h, d; + + w = fw_cfg_read_i16(FW_CFG_ARCH_WIDTH); + h = fw_cfg_read_i16(FW_CFG_ARCH_HEIGHT); + d = fw_cfg_read_i16(FW_CFG_ARCH_DEPTH); + if (w && h && d) { + VIDEO_DICT_VALUE(video.w) = w; + VIDEO_DICT_VALUE(video.h) = h; + VIDEO_DICT_VALUE(video.depth) = d; + VIDEO_DICT_VALUE(video.rb) = (w * ((d + 7) / 8)); + } +#endif +} + +void +init_video(void) +{ + int i; +#if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) + int size; +#endif + phandle_t ph=0, saved_ph=0; + + saved_ph = get_cur_dev(); + while( (ph=dt_iterate_type(ph, "display")) ) { + video.has_video = 1; + + set_int_property( ph, "width", VIDEO_DICT_VALUE(video.w) ); + set_int_property( ph, "height", VIDEO_DICT_VALUE(video.h) ); + set_int_property( ph, "depth", VIDEO_DICT_VALUE(video.depth) ); + set_int_property( ph, "linebytes", VIDEO_DICT_VALUE(video.rb) ); + set_int_property( ph, "address", VIDEO_DICT_VALUE(video.mvirt) ); + + activate_dev(ph); + + molvideo_init(); + } + activate_dev(saved_ph); + #if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) size = ((VIDEO_DICT_VALUE(video.h) * VIDEO_DICT_VALUE(video.rb)) + 0xfff) & ~0xfff;

1 0

[commit] r1181 - in trunk/openbios-devel: forth/device include/libopenbios libopenbios packages
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:41 2013 New Revision: 1181 URL: http://tracker.coreboot.org/trac/openbios/changeset/1181 Log: video_common.c: unify the video_info structure with Forth At the moment there are two sets of video parameters being used: those internal to Forth and those internal to C. Unify these two structures by redefining video_info to contain pointers to relevant values, and then changing init_video() to set the pointers to the relevant values in the Forth dictionary. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/display.fs trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c trunk/openbios-devel/packages/molvideo.c Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Sat Jul 27 12:14:38 2013 (r1180) +++ trunk/openbios-devel/forth/device/display.fs Sat Jul 27 12:14:41 2013 (r1181) @@ -43,9 +43,10 @@ 0 value foreground-color 0 value background-color +create color-palette 100 cells allot 2 value font-spacing -0 value depth-bytes +0 value depth-bits 0 value line-bytes \ internal values read from QEMU firmware interface @@ -71,6 +72,10 @@ defer fb-emit ( x -- ) +: depth-bytes ( bits -- bytes ) + depth-bits 1+ 8 / +; + \ \ 5.3.6.2 Frame-buffer support routines \ Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:38 2013 (r1180) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:41 2013 (r1181) @@ -10,9 +10,11 @@ extern struct video_info { int has_video; - phys_addr_t mphys; - unsigned long mvirt; - int rb, w, h, depth; + volatile phys_addr_t mphys; + volatile ucell *mvirt; + volatile ucell *rb, *w, *h, *depth; - unsigned long *pal; /* 256 elements */ + volatile ucell *pal; /* 256 elements */ } video; + +#define VIDEO_DICT_VALUE(x) (*(ucell *)(x)) Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:38 2013 (r1180) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:41 2013 (r1181) @@ -31,12 +31,12 @@ unsigned long col; if( !video.has_video || col_ind < 0 || col_ind > 255 ) return 0; - if( video.depth == 8 ) + if( VIDEO_DICT_VALUE(video.depth) == 8 ) return col_ind; col = video.pal[col_ind]; - if( video.depth == 24 || video.depth == 32 ) + if( VIDEO_DICT_VALUE(video.depth) == 24 || VIDEO_DICT_VALUE(video.depth) == 32 ) return col; - if( video.depth == 15 ) + if( VIDEO_DICT_VALUE(video.depth) == 15 ) return ((col>>9) & 0x7c00) | ((col>>6) & 0x03e0) | ((col>>3) & 0x1f); return 0; } @@ -49,11 +49,11 @@ video.pal[ind] = color; #ifdef CONFIG_MOL - if( video.depth == 8 ) + if( VIDEO_DICT_VALUE(video.depth) == 8 ) OSI_SetColor( ind, color ); #elif defined(CONFIG_SPARC32) #if defined(CONFIG_DEBUG_CONSOLE_VIDEO) - if( video.depth == 8 ) { + if( VIDEO_DICT_VALUE(video.depth) == 8 ) { dac[0] = ind << 24; dac[1] = ((color >> 16) & 0xff) << 24; // Red dac[1] = ((color >> 8) & 0xff) << 24; // Green @@ -74,8 +74,8 @@ *w = *h = 0; return -1; } - *w = video.w; - *h = video.h; + *w = VIDEO_DICT_VALUE(video.w); + *h = VIDEO_DICT_VALUE(video.h); return 0; } @@ -97,8 +97,8 @@ fgcolor = video_get_color(fgcolor); bgcolor = video_get_color(bgcolor); - d = video.depth; - depthbytes = (video.depth + 1) >> 3; + d = VIDEO_DICT_VALUE(video.depth); + depthbytes = (d + 1) >> 3; dst = fbaddr; for( y = 0; y < height; y++) { @@ -125,7 +125,7 @@ mask++; } dst = rowdst; - dst += video.rb; + dst += VIDEO_DICT_VALUE(video.rb); } } @@ -146,13 +146,13 @@ fgcolor = video_get_color(fgcolor); if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || - x + w > video.w || y + h > video.h) + x + w > VIDEO_DICT_VALUE(video.w) || y + h > VIDEO_DICT_VALUE(video.h)) return; - pp = (char*)video.mvirt + video.rb * y; - for( ; h--; pp += video.rb ) { + pp = (char*)VIDEO_DICT_VALUE(video.mvirt) + VIDEO_DICT_VALUE(video.rb) * y; + for( ; h--; pp += *(video.rb) ) { int ww = w; - if( video.depth == 24 || video.depth == 32 ) { + if( VIDEO_DICT_VALUE(video.depth) == 24 || VIDEO_DICT_VALUE(video.depth) == 32 ) { unsigned long *p = (unsigned long*)pp + x; while( ww-- ) { if (*p == fgcolor) { @@ -161,7 +161,7 @@ *p++ = fgcolor; } } - } else if( video.depth == 16 || video.depth == 15 ) { + } else if( VIDEO_DICT_VALUE(video.depth) == 16 || VIDEO_DICT_VALUE(video.depth) == 15 ) { unsigned short *p = (unsigned short*)pp + x; while( ww-- ) { if (*p == (unsigned short)fgcolor) { @@ -198,17 +198,17 @@ unsigned long col = video_get_color(col_ind); if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || - x + w > video.w || y + h > video.h) + x + w > VIDEO_DICT_VALUE(video.w) || y + h > VIDEO_DICT_VALUE(video.h)) return; - pp = (char*)video.mvirt + video.rb * y; - for( ; h--; pp += video.rb ) { + pp = (char*)VIDEO_DICT_VALUE(video.mvirt) + VIDEO_DICT_VALUE(video.rb) * y; + for( ; h--; pp += VIDEO_DICT_VALUE(video.rb) ) { int ww = w; - if( video.depth == 24 || video.depth == 32 ) { + if( VIDEO_DICT_VALUE(video.depth) == 24 || VIDEO_DICT_VALUE(video.depth) == 32 ) { unsigned long *p = (unsigned long*)pp + x; while( ww-- ) *p++ = col; - } else if( video.depth == 16 || video.depth == 15 ) { + } else if( VIDEO_DICT_VALUE(video.depth) == 16 || VIDEO_DICT_VALUE(video.depth) == 15 ) { unsigned short *p = (unsigned short*)pp + x; while( ww-- ) *p++ = col; @@ -230,37 +230,51 @@ #endif phandle_t ph=0, saved_ph=0; - video.mphys = video.mvirt = fb; + video.mphys = fb; + + /* Make everything inside the video_info structure point to the + values in the Forth dictionary. Hence everything is always in + sync. */ + + feval("['] qemu-video-addr cell+"); + video.mvirt = cell2pointer(POP()); + feval("['] qemu-video-width cell+"); + video.w = cell2pointer(POP()); + feval("['] qemu-video-height cell+"); + video.h = cell2pointer(POP()); + feval("['] depth-bits cell+"); + video.depth = cell2pointer(POP()); + feval("['] line-bytes cell+"); + video.rb = cell2pointer(POP()); + feval("['] color-palette cell+"); + video.pal = cell2pointer(POP()); + + VIDEO_DICT_VALUE(video.mvirt) = (ucell)fb; + VIDEO_DICT_VALUE(video.w) = (ucell)width; + VIDEO_DICT_VALUE(video.h) = (ucell)height; + VIDEO_DICT_VALUE(video.depth) = (ucell)depth; + VIDEO_DICT_VALUE(video.rb) = (ucell)rb; #if defined(CONFIG_SPARC64) /* Fix virtual address on SPARC64 somewhere else */ - video.mvirt = 0xfe000000; + VIDEO_DICT_VALUE(video.mvirt) = 0xfe000000ULL; #endif - video.w = width; - video.h = height; - video.depth = depth; - video.rb = rb; - saved_ph = get_cur_dev(); while( (ph=dt_iterate_type(ph, "display")) ) { - set_int_property( ph, "width", video.w ); - set_int_property( ph, "height", video.h ); - set_int_property( ph, "depth", video.depth ); - set_int_property( ph, "linebytes", video.rb ); - set_int_property( ph, "address", video.mvirt ); + set_int_property( ph, "width", VIDEO_DICT_VALUE(video.w) ); + set_int_property( ph, "height", VIDEO_DICT_VALUE(video.h) ); + set_int_property( ph, "depth", VIDEO_DICT_VALUE(video.depth) ); + set_int_property( ph, "linebytes", VIDEO_DICT_VALUE(video.rb) ); + set_int_property( ph, "address", VIDEO_DICT_VALUE(video.mvirt) ); activate_dev(ph); molvideo_init(); } video.has_video = 1; - video.pal = malloc( 256 * sizeof(unsigned long) ); activate_dev(saved_ph); - PUSH(video.mvirt); - feval("to frame-buffer-adr"); - /* Set global variables ready for fb8-install */ PUSH( pointer2cell(video_mask_blit) ); fword("is-noname-cfunc"); @@ -272,29 +286,20 @@ fword("is-noname-cfunc"); feval("to fb8-invertrect"); - PUSH((video.depth + 1) >> 3); - feval("to depth-bytes"); - PUSH(video.rb); - feval("to line-bytes"); + /* Static information */ PUSH((ucell)fontdata); feval("to (romfont)"); PUSH(FONT_HEIGHT); feval("to (romfont-height)"); PUSH(FONT_WIDTH); feval("to (romfont-width)"); - PUSH(video.mvirt); - feval("to qemu-video-addr"); - PUSH(video.w); - feval("to qemu-video-width"); - PUSH(video.h); - feval("to qemu-video-height"); #if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) - size = ((video.h * video.rb) + 0xfff) & ~0xfff; + size = ((VIDEO_DICT_VALUE(video.h) * VIDEO_DICT_VALUE(video.rb)) + 0xfff) & ~0xfff; ofmem_claim_phys( video.mphys, size, 0 ); - ofmem_claim_virt( video.mvirt, size, 0 ); - ofmem_map( video.mphys, video.mvirt, size, ofmem_arch_io_translation_mode(video.mphys) ); + ofmem_claim_virt( VIDEO_DICT_VALUE(video.mvirt), size, 0 ); + ofmem_map( video.mphys, VIDEO_DICT_VALUE(video.mvirt), size, ofmem_arch_io_translation_mode(video.mphys) ); #endif for( i=0; i<256; i++ ) Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:38 2013 (r1180) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:41 2013 (r1181) @@ -35,7 +35,7 @@ molvideo_refresh_palette( void ) { #ifdef CONFIG_MOL - if( video.depth == 8 ) + if( VIDEO_DICT_VALUE(video.depth) == 8 ) OSI_RefreshPalette(); #endif } @@ -99,7 +99,7 @@ #endif /* only draw logo in 24-bit mode (for now) */ - if( video.depth < 15 ) + if( VIDEO_DICT_VALUE(video.depth) < 15 ) return; #ifdef CONFIG_MOL for( i=0; i<2; i++ ) { @@ -117,17 +117,17 @@ printk("bootlogo size error\n"); close_io( fd ); - dx = (video.w - width)/2; - dy = (video.h - height)/3; + dx = (VIDEO_DICT_VALUE(video.w) - width)/2; + dy = (VIDEO_DICT_VALUE(video.h) - height)/3; - pp = (char*)video.mvirt + dy * video.rb + dx * (video.depth >= 24 ? 4 : 2); + pp = (char*)VIDEO_DICT_VALUE(video.mvirt) + dy * VIDEO_DICT_VALUE(video.rb) + dx * (VIDEO_DICT_VALUE(video.depth) >= 24 ? 4 : 2); - for( y=0 ; y<height; y++, pp += video.rb ) { - if( video.depth >= 24 ) { + for( y=0 ; y<height; y++, pp += VIDEO_DICT_VALUE(video.rb) ) { + if( VIDEO_DICT_VALUE(video.depth) >= 24 ) { unsigned long *d = (unsigned long*)pp; for( x=0; x<width; x++, p+=3, d++ ) *d = ((int)p[0] << 16) | ((int)p[1] << 8) | p[2]; - } else if( video.depth == 15 ) { + } else if( VIDEO_DICT_VALUE(video.depth) == 15 ) { unsigned short *d = (unsigned short*)pp; for( x=0; x<width; x++, p+=3, d++ ) { int col = ((int)p[0] << 16) | ((int)p[1] << 8) | p[2];

1 0

[commit] r1180 - in trunk/openbios-devel: include/libopenbios libopenbios packages
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:38 2013 New Revision: 1180 URL: http://tracker.coreboot.org/trac/openbios/changeset/1180 Log: video_common.c: Move osi_fb_info_t struct contents directly into the video_info struct Despite the name, osi_fb_info_t doesn't seem to be used by MOL and is just a general holder for video parameters. So let's move everything into a single struct to make future dereferencing easier. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c trunk/openbios-devel/packages/molvideo.c Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:34 2013 (r1179) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:38 2013 (r1180) @@ -7,14 +7,12 @@ void video_invert_rect(void); void video_fill_rect(void); -typedef struct osi_fb_info { - unsigned long mphys; +extern struct video_info { + int has_video; + + phys_addr_t mphys; unsigned long mvirt; int rb, w, h, depth; -} osi_fb_info_t; -extern struct video_info { - int has_video; - osi_fb_info_t fb; unsigned long *pal; /* 256 elements */ } video; Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:34 2013 (r1179) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:38 2013 (r1180) @@ -31,12 +31,12 @@ unsigned long col; if( !video.has_video || col_ind < 0 || col_ind > 255 ) return 0; - if( video.fb.depth == 8 ) + if( video.depth == 8 ) return col_ind; col = video.pal[col_ind]; - if( video.fb.depth == 24 || video.fb.depth == 32 ) + if( video.depth == 24 || video.depth == 32 ) return col; - if( video.fb.depth == 15 ) + if( video.depth == 15 ) return ((col>>9) & 0x7c00) | ((col>>6) & 0x03e0) | ((col>>3) & 0x1f); return 0; } @@ -49,11 +49,11 @@ video.pal[ind] = color; #ifdef CONFIG_MOL - if( video.fb.depth == 8 ) + if( video.depth == 8 ) OSI_SetColor( ind, color ); #elif defined(CONFIG_SPARC32) #if defined(CONFIG_DEBUG_CONSOLE_VIDEO) - if( video.fb.depth == 8 ) { + if( video.depth == 8 ) { dac[0] = ind << 24; dac[1] = ((color >> 16) & 0xff) << 24; // Red dac[1] = ((color >> 8) & 0xff) << 24; // Green @@ -74,8 +74,8 @@ *w = *h = 0; return -1; } - *w = video.fb.w; - *h = video.fb.h; + *w = video.w; + *h = video.h; return 0; } @@ -97,8 +97,8 @@ fgcolor = video_get_color(fgcolor); bgcolor = video_get_color(bgcolor); - d = video.fb.depth; - depthbytes = (video.fb.depth + 1) >> 3; + d = video.depth; + depthbytes = (video.depth + 1) >> 3; dst = fbaddr; for( y = 0; y < height; y++) { @@ -125,7 +125,7 @@ mask++; } dst = rowdst; - dst += video.fb.rb; + dst += video.rb; } } @@ -146,13 +146,13 @@ fgcolor = video_get_color(fgcolor); if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || - x + w > video.fb.w || y + h > video.fb.h) + x + w > video.w || y + h > video.h) return; - pp = (char*)video.fb.mvirt + video.fb.rb * y; - for( ; h--; pp += video.fb.rb ) { + pp = (char*)video.mvirt + video.rb * y; + for( ; h--; pp += video.rb ) { int ww = w; - if( video.fb.depth == 24 || video.fb.depth == 32 ) { + if( video.depth == 24 || video.depth == 32 ) { unsigned long *p = (unsigned long*)pp + x; while( ww-- ) { if (*p == fgcolor) { @@ -161,7 +161,7 @@ *p++ = fgcolor; } } - } else if( video.fb.depth == 16 || video.fb.depth == 15 ) { + } else if( video.depth == 16 || video.depth == 15 ) { unsigned short *p = (unsigned short*)pp + x; while( ww-- ) { if (*p == (unsigned short)fgcolor) { @@ -198,17 +198,17 @@ unsigned long col = video_get_color(col_ind); if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || - x + w > video.fb.w || y + h > video.fb.h) + x + w > video.w || y + h > video.h) return; - pp = (char*)video.fb.mvirt + video.fb.rb * y; - for( ; h--; pp += video.fb.rb ) { + pp = (char*)video.mvirt + video.rb * y; + for( ; h--; pp += video.rb ) { int ww = w; - if( video.fb.depth == 24 || video.fb.depth == 32 ) { + if( video.depth == 24 || video.depth == 32 ) { unsigned long *p = (unsigned long*)pp + x; while( ww-- ) *p++ = col; - } else if( video.fb.depth == 16 || video.fb.depth == 15 ) { + } else if( video.depth == 16 || video.depth == 15 ) { unsigned short *p = (unsigned short*)pp + x; while( ww-- ) *p++ = col; @@ -230,25 +230,25 @@ #endif phandle_t ph=0, saved_ph=0; - video.fb.mphys = video.fb.mvirt = fb; + video.mphys = video.mvirt = fb; #if defined(CONFIG_SPARC64) /* Fix virtual address on SPARC64 somewhere else */ - video.fb.mvirt = 0xfe000000; + video.mvirt = 0xfe000000; #endif - video.fb.w = width; - video.fb.h = height; - video.fb.depth = depth; - video.fb.rb = rb; + video.w = width; + video.h = height; + video.depth = depth; + video.rb = rb; saved_ph = get_cur_dev(); while( (ph=dt_iterate_type(ph, "display")) ) { - set_int_property( ph, "width", video.fb.w ); - set_int_property( ph, "height", video.fb.h ); - set_int_property( ph, "depth", video.fb.depth ); - set_int_property( ph, "linebytes", video.fb.rb ); - set_int_property( ph, "address", video.fb.mvirt ); + set_int_property( ph, "width", video.w ); + set_int_property( ph, "height", video.h ); + set_int_property( ph, "depth", video.depth ); + set_int_property( ph, "linebytes", video.rb ); + set_int_property( ph, "address", video.mvirt ); activate_dev(ph); @@ -258,7 +258,7 @@ video.pal = malloc( 256 * sizeof(unsigned long) ); activate_dev(saved_ph); - PUSH(video.fb.mvirt); + PUSH(video.mvirt); feval("to frame-buffer-adr"); /* Set global variables ready for fb8-install */ @@ -272,9 +272,9 @@ fword("is-noname-cfunc"); feval("to fb8-invertrect"); - PUSH((video.fb.depth + 1) >> 3); + PUSH((video.depth + 1) >> 3); feval("to depth-bytes"); - PUSH(video.fb.rb); + PUSH(video.rb); feval("to line-bytes"); PUSH((ucell)fontdata); feval("to (romfont)"); @@ -282,19 +282,19 @@ feval("to (romfont-height)"); PUSH(FONT_WIDTH); feval("to (romfont-width)"); - PUSH(video.fb.mvirt); + PUSH(video.mvirt); feval("to qemu-video-addr"); - PUSH(video.fb.w); + PUSH(video.w); feval("to qemu-video-width"); - PUSH(video.fb.h); + PUSH(video.h); feval("to qemu-video-height"); #if defined(CONFIG_OFMEM) && defined(CONFIG_DRIVER_PCI) - size = ((video.fb.h * video.fb.rb) + 0xfff) & ~0xfff; + size = ((video.h * video.rb) + 0xfff) & ~0xfff; - ofmem_claim_phys( video.fb.mphys, size, 0 ); - ofmem_claim_virt( video.fb.mvirt, size, 0 ); - ofmem_map( video.fb.mphys, video.fb.mvirt, size, ofmem_arch_io_translation_mode(video.fb.mphys) ); + ofmem_claim_phys( video.mphys, size, 0 ); + ofmem_claim_virt( video.mvirt, size, 0 ); + ofmem_map( video.mphys, video.mvirt, size, ofmem_arch_io_translation_mode(video.mphys) ); #endif for( i=0; i<256; i++ ) Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:34 2013 (r1179) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:38 2013 (r1180) @@ -35,7 +35,7 @@ molvideo_refresh_palette( void ) { #ifdef CONFIG_MOL - if( video.fb.depth == 8 ) + if( video.depth == 8 ) OSI_RefreshPalette(); #endif } @@ -99,7 +99,7 @@ #endif /* only draw logo in 24-bit mode (for now) */ - if( video.fb.depth < 15 ) + if( video.depth < 15 ) return; #ifdef CONFIG_MOL for( i=0; i<2; i++ ) { @@ -117,17 +117,17 @@ printk("bootlogo size error\n"); close_io( fd ); - dx = (video.fb.w - width)/2; - dy = (video.fb.h - height)/3; + dx = (video.w - width)/2; + dy = (video.h - height)/3; - pp = (char*)video.fb.mvirt + dy * video.fb.rb + dx * (video.fb.depth >= 24 ? 4 : 2); + pp = (char*)video.mvirt + dy * video.rb + dx * (video.depth >= 24 ? 4 : 2); - for( y=0 ; y<height; y++, pp += video.fb.rb ) { - if( video.fb.depth >= 24 ) { + for( y=0 ; y<height; y++, pp += video.rb ) { + if( video.depth >= 24 ) { unsigned long *d = (unsigned long*)pp; for( x=0; x<width; x++, p+=3, d++ ) *d = ((int)p[0] << 16) | ((int)p[1] << 8) | p[2]; - } else if( video.fb.depth == 15 ) { + } else if( video.depth == 15 ) { unsigned short *d = (unsigned short*)pp; for( x=0; x<width; x++, p+=3, d++ ) { int col = ((int)p[0] << 16) | ((int)p[1] << 8) | p[2];

1 0

[commit] r1179 - in trunk/openbios-devel: include/libopenbios libopenbios packages
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:34 2013 New Revision: 1179 URL: http://tracker.coreboot.org/trac/openbios/changeset/1179 Log: video_common.c: rename get_color() and set_color() functions These are now called video_get_color() and video_set_color() respectively. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c trunk/openbios-devel/packages/molvideo.c Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:32 2013 (r1178) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:34 2013 (r1179) @@ -1,7 +1,7 @@ void init_video(unsigned long fb, int width, int height, int depth, int rb); -unsigned long get_color(int col_ind); -void set_color(int ind, unsigned long color); +unsigned long video_get_color(int col_ind); +void video_set_color(int ind, unsigned long color); int video_get_res(int *w, int *h); void video_mask_blit(void); void video_invert_rect(void); Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:32 2013 (r1178) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:34 2013 (r1179) @@ -26,7 +26,7 @@ struct video_info video; unsigned long -get_color( int col_ind ) +video_get_color( int col_ind ) { unsigned long col; if( !video.has_video || col_ind < 0 || col_ind > 255 ) @@ -42,7 +42,7 @@ } void -set_color( int ind, unsigned long color ) +video_set_color( int ind, unsigned long color ) { if( !video.has_video || ind < 0 || ind > 255 ) return; @@ -95,8 +95,8 @@ unsigned char *dst, *rowdst; int x, y, m, b, d, depthbytes; - fgcolor = get_color(fgcolor); - bgcolor = get_color(bgcolor); + fgcolor = video_get_color(fgcolor); + bgcolor = video_get_color(bgcolor); d = video.fb.depth; depthbytes = (video.fb.depth + 1) >> 3; @@ -142,8 +142,8 @@ int x = POP(); char *pp; - bgcolor = get_color(bgcolor); - fgcolor = get_color(fgcolor); + bgcolor = video_get_color(bgcolor); + fgcolor = video_get_color(fgcolor); if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || x + w > video.fb.w || y + h > video.fb.h) @@ -195,7 +195,7 @@ int col_ind = POP(); char *pp; - unsigned long col = get_color(col_ind); + unsigned long col = video_get_color(col_ind); if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || x + w > video.fb.w || y + h > video.fb.h) @@ -298,7 +298,7 @@ #endif for( i=0; i<256; i++ ) - set_color( i, i * 0x010101 ); + video_set_color( i, i * 0x010101 ); - set_color( 254, 0xffffcc ); + video_set_color( 254, 0xffffcc ); } Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:32 2013 (r1178) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:34 2013 (r1179) @@ -61,7 +61,7 @@ for( i=0; i<count; i++, p+=3 ) { unsigned long col = (p[0] << 16) | (p[1] << 8) | p[2]; - set_color( i + start, col ); + video_set_color( i + start, col ); } molvideo_refresh_palette(); } @@ -76,7 +76,7 @@ int r = POP(); unsigned long col = ((r << 16) & 0xff0000) | ((g << 8) & 0x00ff00) | (b & 0xff); /* printk("color!: %08lx %08lx %08lx %08lx\n", r, g, b, index ); */ - set_color( index, col ); + video_set_color( index, col ); molvideo_refresh_palette(); }

1 0

[commit] r1178 - in trunk/openbios-devel: include/libopenbios libopenbios
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:32 2013 New Revision: 1178 URL: http://tracker.coreboot.org/trac/openbios/changeset/1178 Log: video_common.c: remove video_scroll1() and draw_pixel() as they are no longer needed Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:29 2013 (r1177) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:32 2013 (r1178) @@ -3,8 +3,6 @@ unsigned long get_color(int col_ind); void set_color(int ind, unsigned long color); int video_get_res(int *w, int *h); -void draw_pixel(int x, int y, int colind); -void video_scroll(int height); void video_mask_blit(void); void video_invert_rect(void); void video_fill_rect(void); Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:29 2013 (r1177) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:32 2013 (r1178) @@ -184,47 +184,6 @@ } } -void -draw_pixel( int x, int y, int colind ) -{ - char *p = (char*)video.fb.mvirt + video.fb.rb * y; - int color, d = video.fb.depth; - - if( x < 0 || y < 0 || x >= video.fb.w || y >=video.fb.h ) - return; - color = get_color( colind ); - - if( d >= 24 ) - *((unsigned long*)p + x) = color; - else if( d >= 15 ) - *((short*)p + x) = color; - else - *(p + x) = color; -} - -void -video_scroll( int height ) -{ - int i, offs, size, *dest, *src; - - if (height <= 0 || height >= video.fb.h) { - return; - } - offs = video.fb.rb * height; - size = (video.fb.h * video.fb.rb - offs)/16; - dest = (int*)video.fb.mvirt; - src = (int*)(video.fb.mvirt + offs); - - for( i=0; i<size; i++ ) { - dest[0] = src[0]; - dest[1] = src[1]; - dest[2] = src[2]; - dest[3] = src[3]; - dest += 4; - src += 4; - } -} - /* ( color_ind x y width height -- ) (?) */ void video_fill_rect(void)

1 0

[commit] r1177 - in trunk/openbios-devel: include/libopenbios libopenbios
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:29 2013 New Revision: 1177 URL: http://tracker.coreboot.org/trac/openbios/changeset/1177 Log: video_common.c: now fill_rect() is no longer called directly, merge it into the video_fill_rect() Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:26 2013 (r1176) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:29 2013 (r1177) @@ -5,7 +5,6 @@ int video_get_res(int *w, int *h); void draw_pixel(int x, int y, int colind); void video_scroll(int height); -void fill_rect(int col_ind, int x, int y, int w, int h); void video_mask_blit(void); void video_invert_rect(void); void video_fill_rect(void); Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:26 2013 (r1176) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:29 2013 (r1177) @@ -225,9 +225,16 @@ } } +/* ( color_ind x y width height -- ) (?) */ void -fill_rect( int col_ind, int x, int y, int w, int h ) +video_fill_rect(void) { + int h = POP(); + int w = POP(); + int y = POP(); + int x = POP(); + int col_ind = POP(); + char *pp; unsigned long col = get_color(col_ind); @@ -255,19 +262,6 @@ } } -/* ( color_ind x y width height -- ) (?) */ -void -video_fill_rect(void) -{ - int h = POP(); - int w = POP(); - int y = POP(); - int x = POP(); - int color_ind = POP(); - - fill_rect( color_ind, x, y, w, h ); -} - void init_video( unsigned long fb, int width, int height, int depth, int rb ) {

1 0

[commit] r1176 - in trunk/openbios-devel: forth/device include/libopenbios libopenbios packages
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:26 2013 New Revision: 1176 URL: http://tracker.coreboot.org/trac/openbios/changeset/1176 Log: video_common.c: move startup_splash() and refresh_palette() to packages/molvideo.c These routines are MOL-specific and currently not required anywhere else. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/display.fs trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c trunk/openbios-devel/packages/molvideo.c Modified: trunk/openbios-devel/forth/device/display.fs ============================================================================== --- trunk/openbios-devel/forth/device/display.fs Sat Jul 27 12:14:22 2013 (r1175) +++ trunk/openbios-devel/forth/device/display.fs Sat Jul 27 12:14:26 2013 (r1176) @@ -375,4 +375,10 @@ 0 to foreground-color fb8-erase-screen + + \ If we have a startup splash then display it + [IFDEF] CONFIG_MOL + startup-splash 2000 ms + fb8-erase-screen + [THEN] ; Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:22 2013 (r1175) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:26 2013 (r1176) @@ -2,7 +2,6 @@ void init_video(unsigned long fb, int width, int height, int depth, int rb); unsigned long get_color(int col_ind); void set_color(int ind, unsigned long color); -void refresh_palette(void); int video_get_res(int *w, int *h); void draw_pixel(int x, int y, int colind); void video_scroll(int height); Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:22 2013 (r1175) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:26 2013 (r1176) @@ -67,61 +67,6 @@ #endif } -static void -startup_splash( void ) -{ -#ifdef CONFIG_MOL - int fd, s, i, y, x, dx, dy; - int width, height; - char *pp, *p; - char buf[64]; -#endif - - /* only draw logo in 24-bit mode (for now) */ - if( video.fb.depth < 15 ) - return; -#ifdef CONFIG_MOL - for( i=0; i<2; i++ ) { - if( !BootHGetStrResInd("bootlogo", buf, sizeof(buf), 0, i) ) - return; - *(!i ? &width : &height) = atol(buf); - } - - if( (s=width * height * 3) > 0x20000 ) - return; - - if( (fd=open_io("pseudo:,bootlogo")) >= 0 ) { - p = malloc( s ); - if( read_io(fd, p, s) != s ) - printk("bootlogo size error\n"); - close_io( fd ); - - dx = (video.fb.w - width)/2; - dy = (video.fb.h - height)/3; - - pp = (char*)video.fb.mvirt + dy * video.fb.rb + dx * (video.fb.depth >= 24 ? 4 : 2); - - for( y=0 ; y<height; y++, pp += video.fb.rb ) { - if( video.fb.depth >= 24 ) { - unsigned long *d = (unsigned long*)pp; - for( x=0; x<width; x++, p+=3, d++ ) - *d = ((int)p[0] << 16) | ((int)p[1] << 8) | p[2]; - } else if( video.fb.depth == 15 ) { - unsigned short *d = (unsigned short*)pp; - for( x=0; x<width; x++, p+=3, d++ ) { - int col = ((int)p[0] << 16) | ((int)p[1] << 8) | p[2]; - *d = ((col>>9) & 0x7c00) | ((col>>6) & 0x03e0) | ((col>>3) & 0x1f); - } - } - } - free( p ); - } -#else - /* No bootlogo support yet on other platforms */ - return; -#endif -} - int video_get_res( int *w, int *h ) { @@ -310,15 +255,6 @@ } } -void -refresh_palette( void ) -{ -#ifdef CONFIG_MOL - if( video.fb.depth == 8 ) - OSI_RefreshPalette(); -#endif -} - /* ( color_ind x y width height -- ) (?) */ void video_fill_rect(void) @@ -412,7 +348,4 @@ set_color( i, i * 0x010101 ); set_color( 254, 0xffffcc ); - - refresh_palette(); - startup_splash(); } Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:22 2013 (r1175) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:26 2013 (r1176) @@ -31,6 +31,15 @@ DECLARE_NODE( video, 0, 0, "Tdisplay" ); +static void +molvideo_refresh_palette( void ) +{ +#ifdef CONFIG_MOL + if( video.fb.depth == 8 ) + OSI_RefreshPalette(); +#endif +} + /* ( -- width height ) (?) */ static void molvideo_dimensions( void ) @@ -54,7 +63,7 @@ unsigned long col = (p[0] << 16) | (p[1] << 8) | p[2]; set_color( i + start, col ); } - refresh_palette(); + molvideo_refresh_palette(); } /* ( r g b index -- ) */ @@ -68,7 +77,7 @@ unsigned long col = ((r << 16) & 0xff0000) | ((g << 8) & 0x00ff00) | (b & 0xff); /* printk("color!: %08lx %08lx %08lx %08lx\n", r, g, b, index ); */ set_color( index, col ); - refresh_palette(); + molvideo_refresh_palette(); } /* ( color_ind x y width height -- ) (?) */ @@ -78,11 +87,69 @@ video_fill_rect(); } +/* ( -- ) - really should be reworked as draw-logo */ +static void +molvideo_startup_splash( void ) +{ +#ifdef CONFIG_MOL + int fd, s, i, y, x, dx, dy; + int width, height; + char *pp, *p; + char buf[64]; +#endif + + /* only draw logo in 24-bit mode (for now) */ + if( video.fb.depth < 15 ) + return; +#ifdef CONFIG_MOL + for( i=0; i<2; i++ ) { + if( !BootHGetStrResInd("bootlogo", buf, sizeof(buf), 0, i) ) + return; + *(!i ? &width : &height) = atol(buf); + } + + if( (s=width * height * 3) > 0x20000 ) + return; + + if( (fd=open_io("pseudo:,bootlogo")) >= 0 ) { + p = malloc( s ); + if( read_io(fd, p, s) != s ) + printk("bootlogo size error\n"); + close_io( fd ); + + dx = (video.fb.w - width)/2; + dy = (video.fb.h - height)/3; + + pp = (char*)video.fb.mvirt + dy * video.fb.rb + dx * (video.fb.depth >= 24 ? 4 : 2); + + for( y=0 ; y<height; y++, pp += video.fb.rb ) { + if( video.fb.depth >= 24 ) { + unsigned long *d = (unsigned long*)pp; + for( x=0; x<width; x++, p+=3, d++ ) + *d = ((int)p[0] << 16) | ((int)p[1] << 8) | p[2]; + } else if( video.fb.depth == 15 ) { + unsigned short *d = (unsigned short*)pp; + for( x=0; x<width; x++, p+=3, d++ ) { + int col = ((int)p[0] << 16) | ((int)p[1] << 8) | p[2]; + *d = ((col>>9) & 0x7c00) | ((col>>6) & 0x03e0) | ((col>>3) & 0x1f); + } + } + } + free( p ); + } +#else + /* No bootlogo support yet on other platforms */ + return; +#endif +} + + NODE_METHODS( video ) = { {"dimensions", molvideo_dimensions }, {"set-colors", molvideo_set_colors }, {"fill-rectangle", molvideo_fill_rect }, {"color!", molvideo_color_bang }, + {"startup-splash", molvideo_startup_splash }, };

1 0

[commit] r1175 - trunk/openbios-devel/libopenbios
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:22 2013 New Revision: 1175 URL: http://tracker.coreboot.org/trac/openbios/changeset/1175 Log: video_common.c: remove manual screen clear since fb8-erase-screen does this now Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/libopenbios/video_common.c Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:19 2013 (r1174) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:22 2013 (r1175) @@ -412,7 +412,6 @@ set_color( i, i * 0x010101 ); set_color( 254, 0xffffcc ); - fill_rect( 254, 0, 0, video.fb.w, video.fb.h ); refresh_palette(); startup_splash();

1 0

[commit] r1174 - trunk/openbios-devel/packages
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:19 2013 New Revision: 1174 URL: http://tracker.coreboot.org/trac/openbios/changeset/1174 Log: packages: rename video.c to molvideo.c ready for MOL-specific video routines While we are here, remove the INSTALL_OPEN flag since this is now handled by is-install (removing the "open is not unique" warning on the serial console during startup). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Added: trunk/openbios-devel/packages/molvideo.c - copied, changed from r1173, trunk/openbios-devel/packages/video.c Deleted: trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/packages/build.xml Modified: trunk/openbios-devel/packages/build.xml ============================================================================== --- trunk/openbios-devel/packages/build.xml Sat Jul 27 12:14:17 2013 (r1173) +++ trunk/openbios-devel/packages/build.xml Sat Jul 27 12:14:19 2013 (r1174) @@ -11,7 +11,7 @@ <object source="nvram.c"/> <object source="pc-parts.c" condition="PC_PARTS"/> <object source="sun-parts.c" condition="SUN_PARTS"/> - <object source="video.c"/> + <object source="molvideo.c"/> <object source="xcoff-loader.c" condition="LOADER_XCOFF"/> </library> Copied and modified: trunk/openbios-devel/packages/molvideo.c (from r1173, trunk/openbios-devel/packages/video.c) ============================================================================== --- trunk/openbios-devel/packages/video.c Sat Jul 27 12:14:17 2013 (r1173, copy source) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:19 2013 (r1174) @@ -29,11 +29,11 @@ /* OF methods */ /************************************************************************/ -DECLARE_NODE( video, INSTALL_OPEN, 0, "Tdisplay" ); +DECLARE_NODE( video, 0, 0, "Tdisplay" ); /* ( -- width height ) (?) */ static void -video_dimensions( void ) +molvideo_dimensions( void ) { int w, h; (void) video_get_res( &w, &h ); @@ -43,7 +43,7 @@ /* ( table start count -- ) (?) */ static void -video_set_colors( void ) +molvideo_set_colors( void ) { int count = POP(); int start = POP(); @@ -59,7 +59,7 @@ /* ( r g b index -- ) */ static void -video_color_bang( void ) +molvideo_color_bang( void ) { int index = POP(); int b = POP(); @@ -71,11 +71,18 @@ refresh_palette(); } +/* ( color_ind x y width height -- ) (?) */ +static void +molvideo_fill_rect ( void ) +{ + video_fill_rect(); +} + NODE_METHODS( video ) = { - {"dimensions", video_dimensions }, - {"set-colors", video_set_colors }, - {"fill-rectangle", video_fill_rect }, - {"color!", video_color_bang }, + {"dimensions", molvideo_dimensions }, + {"set-colors", molvideo_set_colors }, + {"fill-rectangle", molvideo_fill_rect }, + {"color!", molvideo_color_bang }, };

1 0

[commit] r1173 - in trunk/openbios-devel: arch/sparc32 libopenbios
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:17 2013 New Revision: 1173 URL: http://tracker.coreboot.org/trac/openbios/changeset/1173 Log: libopenbios: remove the C terminal emulator file console_common.c With the advent of the Forth terminal it is no longer required. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Deleted: trunk/openbios-devel/libopenbios/console_common.c Modified: trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/libopenbios/build.xml Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:14:14 2013 (r1172) +++ trunk/openbios-devel/arch/sparc32/console.c Sat Jul 27 12:14:17 2013 (r1173) @@ -39,8 +39,6 @@ { vmem = (unsigned char *)ofmem_map_io(base + VMEM_BASE, VMEM_SIZE); dac = (uint32_t *)ofmem_map_io(base + DAC_BASE, DAC_SIZE); - - console_init(); } #endif Modified: trunk/openbios-devel/libopenbios/build.xml ============================================================================== --- trunk/openbios-devel/libopenbios/build.xml Sat Jul 27 12:14:14 2013 (r1172) +++ trunk/openbios-devel/libopenbios/build.xml Sat Jul 27 12:14:17 2013 (r1173) @@ -6,7 +6,6 @@ <object source="bootcode_load.c" condition="LOADER_BOOTCODE"/> <object source="bootinfo_load.c" condition="LOADER_BOOTINFO"/> <object source="client.c"/> - <object source="console_common.c"/> <object source="elf_info.c" /> <object source="elf_load.c" condition="LOADER_ELF"/> <object source="font_8x8.c" condition="FONT_8X8"/>

1 0

[commit] r1172 - trunk/openbios-devel/libopenbios
by repository service 27 Jul '13

27 Jul '13

Author: mcayland Date: Sat Jul 27 12:14:14 2013 New Revision: 1172 URL: http://tracker.coreboot.org/trac/openbios/changeset/1172 Log: video_common.c: remove video_open() and video_write() methods These were only included to allow switching between the C terminal and the Forth terminal during development. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/libopenbios/video_common.c Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Thu Jul 11 18:49:27 2013 (r1171) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:14 2013 (r1172) @@ -319,26 +319,6 @@ #endif } -static void -video_open(void) -{ - PUSH(-1); -} - -/* ( addr len -- actual ) */ -static void -video_write(void) -{ - char *addr; - int len; - - len = POP(); - addr = (char *)cell2pointer(POP()); - - console_draw_fstr(addr, len); - PUSH(len); -} - /* ( color_ind x y width height -- ) (?) */ void video_fill_rect(void) @@ -383,14 +363,6 @@ activate_dev(ph); - if (!find_package_method("open", ph)) { - bind_func("open", video_open); - } - - if (!find_package_method("write", ph)) { - bind_func("write", video_write); - } - molvideo_init(); } video.has_video = 1;

1 0

Re: [OpenBIOS] Secure BIOS for voting?
by SAVIOCvs＠aol.com 23 Jul '13

23 Jul '13

The three responses I've seen so far were all negative, but also puzzling to me. I'll try to address the key points in the response that is copied below, as well as those in the other two responses. (1) Why floppies? -- (a) Because they are limited in storage, and non-electronic. The smaller the memory, the harder it is to hide something malicious in it, and the easier to check it. (b) Because they are inexpensive. Any entity wishing to verify voting results needs one memory device for every voting machine. (2) Aren't floppies unreliable? -- No. Since I started keeping track of my public voting demos in 2002, I have used 992 diskettes without a single failure between starting voting and archiving results. (That's not 992 different new diskettes; each is used over and over again unless a check done at startup reveals possible unreliability.) (3) Aren't floppy drives obsolete? -- No. USB-connected floppy drives are readily available for about $15, and computers can boot from them. (4) BIOS averages 8 MB? -- WOW! I still don't know how big OpenBIOS is, but I was hoping for something a bit closer to the 8 KB of the original IBM PC. The capabilities of a 386 computer are sufficient for my voting system. Is OpenBIOS really so huge? Does a BIOS have to be? (5) Hypervisor? Virtual machine? Address remapping? Infectious native BIOS? -- If a modern computer has no hard drive connected, what happens when it boots from a floppy? There is a boot sector on the diskette (which is verified by hash code); doesn't that control what happens next? Why can't the floppy contents take control of the computer? Obviously, I'm no BIOS expert. I'd appreciate recommendations of good texts or tutorials to bring me up to speed. Chuck Gaston In a message dated 7/19/2013 9:04:29 A.M. Eastern Daylight Time, Nick.Couchman(a)seakr.com writes: >>> On 2013/07/19 at 06:01, <SAVIOCvs(a)aol.com> wrote: > I developed a voting system (see _www.SAVIOC.com_ (http://www.SAVIOC.com) ) > that uses ordinary old PCs, yet is more transparent and trustworthy than > anything else in use today. All software, including the operating system > (FreeDOS) boots from a floppy that can be verified by hash code. The PC > never uses the hard drive, and doesn't even need one. Trustworthiness > comes > from people with different interests being able to prevent each other from > doing anything fraudulent. I think the only significant potential > vulnerability is that someone with physical access to the machines could > install a > malicious BIOS. Learning about the OpenBIOS project gave me hope of > overcoming that vulnerability. > > (1) Is my hope justified? Can a PC be booted from a floppy that > completely replaces the native BIOS in RAM, and then loads FreeDOS? (Can > the > possibility of a malicious BIOS be made a non-issue?) > > If all answers are YES, then the remaining very basic questions become > important. Perhaps this is a digression, but why a floppy? If you're using old hardware, that's fine, but at some point you probably want to use modern hardware, and I don't know of a modern hardware system that comes with a floppy drive, anymore. Furthermore, my many years of experience with floppy disks tells me that they are unreliable - very prone to failures of a variety of types (dirty heads, physical damage to the medium, etc.). Many of these types of failures mean mis-reads, which means bad checksums and failures in the security model you're trying to implement. If you're looking for something compatible with very old hardware - hardware that does not support booting from USB flash drives - I'd recommend finding some older IDE flash chips (disk on chip) that you can use, instead. These are probably pretty cheap, now, and should give you the capacity and reliability that you won't get with floppy disks. > > (2) Roughly how much space on the floppy would be required? You can build the OpenBIOS tree and see how large the binary is. I don't remember off the top of my head, so I can't tell you. Many modern BIOS implementations are several MB - I believe 8MB is the average BIOS size (not openBIOS, just BIOS in general), with some as large as 12MB. This presents another problem when using floppies...you'd need multiple ones. > (3) What downloads would I need? OpenBIOS AND OpenFirmware AND OpenBOOT? > Anything else? Probably just OpenBIOS. > (4) How are they downloaded? > http://www.openfirmware.info/index.php/Downloads displays a page > beginning, "This page has been deleted." All other links that imply the > possibility > of downloading reach a page headlined, "The page cannot be displayed". > SVN check-out of the current source tree and build. Decently modern versions are also included with Qemu, IIRC. -Nick -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR. -- OpenBIOS http://openbios.org/ Mailinglist: http://lists.openbios.org/mailman/listinfo Free your System - May the Forth be with you

4 12

Using the command key
by Programmingkid 20 Jul '13

20 Jul '13

Over half a year ago there was talk about making the command key work on QEMU. I have finally made a patch that allows users of QEMU on Mac OS X be able to do this. Just apply the patch to QEMU to make the command key work. You set the command key by using this option: -command-key 55. This will make the command key work in QEMU. To quit QEMU, type ALT - Q. Let me know if you like it. --- ui/cocoa.m | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 110 insertions(+), 13 deletions(-) diff --git a/ui/cocoa.m b/ui/cocoa.m index be49179..4884ccf 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -70,6 +70,7 @@ static DisplayChangeListener *dcl; int gArgc; char **gArgv; +bool substitutingForCommandKey = false; // keymap conversion int keymap[] = @@ -129,8 +130,8 @@ int keymap[] = 14, // 51 0x33 0x0e BKSP QZ_BACKSPACE 0, // 52 0x34 Undefined 1, // 53 0x35 0x01 ESC QZ_ESCAPE - 0, // 54 0x36 QZ_RMETA - 0, // 55 0x37 QZ_LMETA + 220, // 54 0x36 QZ_RMETA + 219, // 55 0x37 QZ_LMETA 42, // 56 0x38 0x2a L SHFT QZ_LSHIFT 58, // 57 0x39 0x3a CAPS QZ_CAPSLOCK 56, // 58 0x3A 0x38 L ALT QZ_LALT @@ -249,6 +250,72 @@ static int cocoa_keycode_to_qemu(int keycode) } +// Used to map the guest OS's command key to a key on the host keyboard. +// Uses the -command-key option. +static void handleCommandKeyOption(int * argc, char * argv[]) +{ + bool foundOption = false; + int newCommandKeyButtonValue, i; + + #define BUFFER_SIZE 10 + #define LEFT_COMMAND_KEY 0x37 + #define RIGHT_COMMAND_KEY 0x36 + #define GUEST_COMMAND_KEY 219 + + char keyValueString[BUFFER_SIZE]; + + for(i = 0; i < *argc; i++) { + if(strcmp(argv[i], "-command-key") == 0) { + foundOption = true; + break; + } + } + + // if the -command-key option is found + if(foundOption == true) + { + snprintf(keyValueString, BUFFER_SIZE, "%s", argv[i+1]); + if(strlen(keyValueString) == 0) { + printf("Usage: -command-key <host keyboard key value>\n"); + printf("This page will help: http://boredzo.org/blog/wp-content/uploads/2007/05/imtx-virtual-keycodes.pn…"); + exit(-1000); + } + + // if using hexadecimal notation (e.g. 0x37) + if(keyValueString[0] == '0' && toupper(keyValueString[1]) == 'X') { + sscanf(keyValueString, "%x", &newCommandKeyButtonValue); + } + + // for decimal notation + else { + newCommandKeyButtonValue = atoi(keyValueString); + } + + //in case the key specified is a negative value + if(newCommandKeyButtonValue < 0) { + printf("\aCan't use a negative value for the command key!\n"); + exit(-1001); + } + + // if the guest OS command key is set to the host keyboard's left or right command key + if(newCommandKeyButtonValue == LEFT_COMMAND_KEY || newCommandKeyButtonValue == RIGHT_COMMAND_KEY) { + substitutingForCommandKey = true; + printf("\nNote: since you are using the host command key, the ALT key can be used to send QEMU commands.\n"); + printf("Example: use ALT-q to quit QEMU.\n\n"); + } + + // do the mapping + keymap[newCommandKeyButtonValue] = GUEST_COMMAND_KEY; + + // Remove -command-key from the argument list. + // QEMU will complain if we don't. + for(int x = i; x < *argc - 2; x=x+2) { + argv[x] = argv[x+2]; + argv[x+1] = argv[x+3]; + } + *argc = *argc - 2; + } +} /* ------------------------------------------------------ @@ -491,20 +558,27 @@ QemuCocoaView *cocoaView; int keycode; NSPoint p = [event locationInWindow]; + // The key used to send QEMU commands (e.g. Quit, Full Screen). + // Change this if you don't like using the ALT key. + // Possible values: NSShiftKeyMask, NSControlKeyMask, NSFunctionKeyMask, NSAlternateKeyMask + const int substituteKeyMask = NSAlternateKeyMask; + switch ([event type]) { case NSFlagsChanged: - keycode = cocoa_keycode_to_qemu([event keyCode]); + keycode = cocoa_keycode_to_qemu([event keyCode]); if (keycode) { if (keycode == 58 || keycode == 69) { // emulate caps lock and num lock keydown and keyup kbd_put_keycode(keycode); kbd_put_keycode(keycode | 0x80); } else if (qemu_console_is_graphic(NULL)) { - if (keycode & 0x80) - kbd_put_keycode(0xe0); - if (modifiers_state[keycode] == 0) { // keydown + if (keycode & 0x80) // if keycode >= 0x80, for those keycodes that need a 0xe0 sent first + { + kbd_put_keycode(0xe0); + } + if (modifiers_state[keycode] == 0) { // keydown kbd_put_keycode(keycode & 0x7f); modifiers_state[keycode] = 1; - } else { // keyup + } else { // keyup kbd_put_keycode(keycode | 0x80); modifiers_state[keycode] = 0; } @@ -516,17 +590,37 @@ QemuCocoaView *cocoaView; [self ungrabMouse]; } break; - case NSKeyDown: + case NSKeyDown: + // if substituting for the host command key and the substitute key is being held down - have QEMU handle it + if((substitutingForCommandKey == true) && ([event modifierFlags] & substituteKeyMask)) { + // recreate the event with the command key as the modifier + int modifiers = [event modifierFlags]; + modifiers = modifiers | NSCommandKeyMask; // set the command key + modifiers = modifiers ^ substituteKeyMask; // unset the substitute key + + event = [NSEvent keyEventWithType: [event type] location: [event locationInWindow] modifierFlags: modifiers + timestamp: [event timestamp] windowNumber: [event windowNumber] context: [event context] characters: [event characters] + charactersIgnoringModifiers: [event charactersIgnoringModifiers] isARepeat: [event isARepeat] keyCode: [event keyCode] ]; + [NSApp sendEvent:event]; + return; + } - // forward command Key Combos - if ([event modifierFlags] & NSCommandKeyMask) { + // if the command key is held down and we want QEMU to handle the event - not the guest OS + else if([event modifierFlags] & NSCommandKeyMask && substitutingForCommandKey == false) { [NSApp sendEvent:event]; return; } + // if the command key is held down and we want the guest OS to handle it + if(([event modifierFlags] & NSCommandKeyMask) && (substitutingForCommandKey == true)) { + kbd_put_keycode(219); // command key + kbd_put_keycode(cocoa_keycode_to_qemu([event keyCode])); // any other keys + return; + } + // default keycode = cocoa_keycode_to_qemu([event keyCode]); - + // handle control + alt Key Combos (ctrl+alt is reserved for QEMU) if (([event modifierFlags] & NSControlKeyMask) && ([event modifierFlags] & NSAlternateKeyMask)) { switch (keycode) { @@ -584,7 +678,7 @@ QemuCocoaView *cocoaView; if (qemu_console_is_graphic(NULL)) { if (keycode & 0x80) kbd_put_keycode(0xe0); - kbd_put_keycode(keycode | 0x80); //add 128 to signal release of key + kbd_put_keycode(keycode | 0x80); //add 128 (0x80) to signal release of key } break; case NSMouseMoved: @@ -810,8 +904,9 @@ QemuCocoaView *cocoaView; - (void)startEmulationWithArgc:(int)argc argv:(char**)argv { COCOA_DEBUG("QemuCocoaAppController: startEmulationWithArgc\n"); - + int status; + handleCommandKeyOption(&argc, argv); status = qemu_main(argc, argv, *_NSGetEnviron()); exit(status); } @@ -1047,3 +1142,5 @@ void cocoa_display_init(DisplayState *ds, int full_screen) // register cleanup function atexit(cocoa_cleanup); } + + -- 1.7.5.4

1 0

Secure BIOS for voting?
by SAVIOCvs＠aol.com 19 Jul '13

19 Jul '13

I developed a voting system (see _www.SAVIOC.com_ (http://www.SAVIOC.com) ) that uses ordinary old PCs, yet is more transparent and trustworthy than anything else in use today. All software, including the operating system (FreeDOS) boots from a floppy that can be verified by hash code. The PC never uses the hard drive, and doesn't even need one. Trustworthiness comes from people with different interests being able to prevent each other from doing anything fraudulent. I think the only significant potential vulnerability is that someone with physical access to the machines could install a malicious BIOS. Learning about the OpenBIOS project gave me hope of overcoming that vulnerability. (1) Is my hope justified? Can a PC be booted from a floppy that completely replaces the native BIOS in RAM, and then loads FreeDOS? (Can the possibility of a malicious BIOS be made a non-issue?) If all answers are YES, then the remaining very basic questions become important. (2) Roughly how much space on the floppy would be required? (3) What downloads would I need? OpenBIOS AND OpenFirmware AND OpenBOOT? Anything else? (4) How are they downloaded? http://www.openfirmware.info/index.php/Downloads displays a page beginning, "This page has been deleted." All other links that imply the possibility of downloading reach a page headlined, "The page cannot be displayed". Chuck Gaston

4 3

Join list
by SAVIOCvs＠aol.com 15 Jul '13

15 Jul '13

I presume that this will (soon) make me eligible to post questions.

2 1

Fw: OpenBIOS Digest, Vol 99, Issue 5
by Mike 12 Jul '13

12 Jul '13

hmmm ... no dell under laptops at all ----- Forwarded Message ----- >From: "openbios-request(a)openbios.org" <openbios-request(a)openbios.org> >To: openbios(a)openbios.org >Sent: Friday, July 12, 2013 6:00 AM >Subject: OpenBIOS Digest, Vol 99, Issue 5 > > >Send OpenBIOS mailing list submissions to > openbios(a)openbios.org > >To subscribe or unsubscribe via the World Wide Web, visit > http://www.openfirmware.info/mailman/listinfo/openbios >or, via email, send a message with subject or body 'help' to > openbios-request(a)openbios.org > >You can reach the person managing the list at > openbios-owner(a)openbios.org > >When replying, please edit your Subject line so it is more specific >than "Re: Contents of OpenBIOS digest..." > > >Today's Topics: > > 1. Re: OpenBIOS Support (Artyom Tarasenko) > 2. [commit] r1170 - in trunk/openbios-devel: drivers > include/arch/common (repository service) > 3. [commit] r1171 - trunk/openbios-devel/include/arch/ppc > (repository service) > > >---------------------------------------------------------------------- > >Message: 1 >Date: Thu, 11 Jul 2013 14:27:22 +0200 >From: Artyom Tarasenko <atar4qemu(a)gmail.com> >To: The OpenBIOS Mailinglist <openbios(a)openbios.org> >Subject: Re: [OpenBIOS] OpenBIOS Support >Message-ID: > <CACXAS8C6Z=nypfyKSzvWLP8md2fL5pMaD4GbTkSUXUBkZyppcA(a)mail.gmail.com> >Content-Type: text/plain; charset=ISO-8859-1 > >Hi Mike, > >On Wed, Jul 10, 2013 at 6:52 PM, Mike <wmichaeltrout(a)yahoo.com> wrote: >> I'm a newbie on the list, and I'm just wondering about support forums for >> OpenBIOS ... is there an IRC channel that one could get help >> implenting/installing? I have an old Dell d600 I got cheap at a garage sale, >> that doesn't recognise its hdd, cd drive, or usb for booting -- people have >> said that I must have a bad BIOS. Is this machine a good candidate for >> OpenBIOS? > >Probably not. But you can check the list of motherboards supported by >coreboot here: >http://www.coreboot.org/Supported_Motherboards > >HTH, >Artyom > >-- >Regards, >Artyom Tarasenko > >linux/sparc and solaris/sparc under qemu blog: >http://tyom.blogspot.com/search/label/qemu > > > >------------------------------ > >Message: 2 >Date: Thu, 11 Jul 2013 18:49:26 +0200 >From: repository service <svn(a)openbios.org> >To: openbios(a)openbios.org >Subject: [OpenBIOS] [commit] r1170 - in trunk/openbios-devel: drivers > include/arch/common >Message-ID: <E1UxK3a-0004SB-RR(a)ra.coresystems.de> >Content-Type: text/plain; charset=UTF-8 > >Author: agraf >Date: Thu Jul 11 18:49:26 2013 >New Revision: 1170 >URL: http://tracker.coreboot.org/trac/openbios/changeset/1170 > >Log: >Macio: Fetch nvram offset from fw_cfg if available > >We want the hypervisor to tell us where NVRAM lies so that we do not have to >rely on hardcoded addresses for it. > >Introduce a new fw_cfg interface that allows us to receive it at runtime. > >Signed-off-by: Alexander Graf <agraf(a)suse.de> > >Modified: > trunk/openbios-devel/drivers/macio.c > trunk/openbios-devel/include/arch/common/fw_cfg.h > >Modified: trunk/openbios-devel/drivers/macio.c >============================================================================== >--- trunk/openbios-devel/drivers/macio.c Sun Jun 30 05:13:14 2013 (r1169) >+++ trunk/openbios-devel/drivers/macio.c Thu Jul 11 18:49:26 2013 (r1170) >@@ -43,6 +43,30 @@ > return NW_IO_NVRAM_SIZE >> NW_IO_NVRAM_SHIFT; >} > >+static unsigned long macio_nvram_offset(void) >+{ >+ unsigned long r; >+ >+ /* Hypervisor tells us where NVRAM lies */ >+ r = fw_cfg_read_i32(FW_CFG_PPC_NVRAM_ADDR); >+ if (r) >+ return r; >+ >+ /* Fall back to hardcoded addresses */ >+ if (is_oldworld()) >+ return OW_IO_NVRAM_OFFSET; >+ >+ return NW_IO_NVRAM_OFFSET; >+} >+ >+static unsigned long macio_nvram_size(void) >+{ >+ if (is_oldworld()) >+ return OW_IO_NVRAM_SIZE; >+ else >+ return NW_IO_NVRAM_SIZE; >+} >+ >void macio_nvram_init(const char *path, phys_addr_t addr) >{ > phandle_t chosen, aliases; >@@ -51,13 +75,9 @@ > char buf[64]; > unsigned long nvram_size, nvram_offset; > >- if (is_oldworld()) { >- nvram_offset = OW_IO_NVRAM_OFFSET; >- nvram_size = OW_IO_NVRAM_SIZE; >- } else { >- nvram_offset = NW_IO_NVRAM_OFFSET; >- nvram_size = NW_IO_NVRAM_SIZE; >- } >+ nvram_offset = macio_nvram_offset(); >+ nvram_size = macio_nvram_size(); >+ > nvram = (char*)addr + nvram_offset; > snprintf(buf, sizeof(buf), "%s/nvram", path); > nvram_init(buf); > >Modified: trunk/openbios-devel/include/arch/common/fw_cfg.h >============================================================================== >--- trunk/openbios-devel/include/arch/common/fw_cfg.h Sun Jun 30 05:13:14 2013 (r1169) >+++ trunk/openbios-devel/include/arch/common/fw_cfg.h Thu Jul 11 18:49:26 2013 (r1170) >@@ -44,6 +44,7 @@ >#define FW_CFG_PPC_IS_KVM (FW_CFG_ARCH_LOCAL + 0x05) >#define FW_CFG_PPC_KVM_HC (FW_CFG_ARCH_LOCAL + 0x06) >#define FW_CFG_PPC_KVM_PID (FW_CFG_ARCH_LOCAL + 0x07) >+#define FW_CFG_PPC_NVRAM_ADDR (FW_CFG_ARCH_LOCAL + 0x08) > >#define FW_CFG_INVALID 0xffff > > > > >------------------------------ > >Message: 3 >Date: Thu, 11 Jul 2013 18:49:28 +0200 >From: repository service <svn(a)openbios.org> >To: openbios(a)openbios.org >Subject: [OpenBIOS] [commit] r1171 - > trunk/openbios-devel/include/arch/ppc >Message-ID: <E1UxK3c-0004SM-6X(a)ra.coresystems.de> >Content-Type: text/plain; charset=UTF-8 > >Author: agraf >Date: Thu Jul 11 18:49:27 2013 >New Revision: 1171 >URL: http://tracker.coreboot.org/trac/openbios/changeset/1171 > >Log: >PPC: Add kernel header style typedefs > >When compiling OpenBIOS on openSUSE 12.3 ppc64 I end up getting real host >headers included that make use of the __uxx and __sxx types. > >Define those too in our asm copy of the types.h file, as that one overrides >the host's types.h that we would've used otherwise. > >Signed-off-by: Alexander Graf <agraf(a)suse.de> > >Modified: > trunk/openbios-devel/include/arch/ppc/types.h > >Modified: trunk/openbios-devel/include/arch/ppc/types.h >============================================================================== >--- trunk/openbios-devel/include/arch/ppc/types.h Thu Jul 11 18:49:26 2013 (r1170) >+++ trunk/openbios-devel/include/arch/ppc/types.h Thu Jul 11 18:49:27 2013 (r1171) >@@ -82,13 +82,21 @@ >/* size named types */ > >typedef unsigned char u8; >+typedef unsigned char __u8; >typedef unsigned short u16; >+typedef unsigned short __u16; >typedef unsigned int u32; >+typedef unsigned int __u32; >typedef unsigned long long u64; >+typedef unsigned long long __u64; > >typedef signed char s8; >+typedef signed char __s8; >typedef short s16; >+typedef short __s16; >typedef int s32; >+typedef int __s32; >typedef long long s64; >+typedef long long __s64; > >#endif > > > >------------------------------ > >-- >OpenBIOS mailing list >OpenBIOS(a)openbios.org >http://www.openfirmware.info/mailman/listinfo/openbios > >End of OpenBIOS Digest, Vol 99, Issue 5 >*************************************** > > >

1 0

[commit] r1171 - trunk/openbios-devel/include/arch/ppc
by repository service 11 Jul '13

11 Jul '13

Author: agraf Date: Thu Jul 11 18:49:27 2013 New Revision: 1171 URL: http://tracker.coreboot.org/trac/openbios/changeset/1171 Log: PPC: Add kernel header style typedefs When compiling OpenBIOS on openSUSE 12.3 ppc64 I end up getting real host headers included that make use of the __uxx and __sxx types. Define those too in our asm copy of the types.h file, as that one overrides the host's types.h that we would've used otherwise. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/include/arch/ppc/types.h Modified: trunk/openbios-devel/include/arch/ppc/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/types.h Thu Jul 11 18:49:26 2013 (r1170) +++ trunk/openbios-devel/include/arch/ppc/types.h Thu Jul 11 18:49:27 2013 (r1171) @@ -82,13 +82,21 @@ /* size named types */ typedef unsigned char u8; +typedef unsigned char __u8; typedef unsigned short u16; +typedef unsigned short __u16; typedef unsigned int u32; +typedef unsigned int __u32; typedef unsigned long long u64; +typedef unsigned long long __u64; typedef signed char s8; +typedef signed char __s8; typedef short s16; +typedef short __s16; typedef int s32; +typedef int __s32; typedef long long s64; +typedef long long __s64; #endif

1 0

[commit] r1170 - in trunk/openbios-devel: drivers include/arch/common
by repository service 11 Jul '13

11 Jul '13

Author: agraf Date: Thu Jul 11 18:49:26 2013 New Revision: 1170 URL: http://tracker.coreboot.org/trac/openbios/changeset/1170 Log: Macio: Fetch nvram offset from fw_cfg if available We want the hypervisor to tell us where NVRAM lies so that we do not have to rely on hardcoded addresses for it. Introduce a new fw_cfg interface that allows us to receive it at runtime. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/macio.c trunk/openbios-devel/include/arch/common/fw_cfg.h Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sun Jun 30 05:13:14 2013 (r1169) +++ trunk/openbios-devel/drivers/macio.c Thu Jul 11 18:49:26 2013 (r1170) @@ -43,6 +43,30 @@ return NW_IO_NVRAM_SIZE >> NW_IO_NVRAM_SHIFT; } +static unsigned long macio_nvram_offset(void) +{ + unsigned long r; + + /* Hypervisor tells us where NVRAM lies */ + r = fw_cfg_read_i32(FW_CFG_PPC_NVRAM_ADDR); + if (r) + return r; + + /* Fall back to hardcoded addresses */ + if (is_oldworld()) + return OW_IO_NVRAM_OFFSET; + + return NW_IO_NVRAM_OFFSET; +} + +static unsigned long macio_nvram_size(void) +{ + if (is_oldworld()) + return OW_IO_NVRAM_SIZE; + else + return NW_IO_NVRAM_SIZE; +} + void macio_nvram_init(const char *path, phys_addr_t addr) { phandle_t chosen, aliases; @@ -51,13 +75,9 @@ char buf[64]; unsigned long nvram_size, nvram_offset; - if (is_oldworld()) { - nvram_offset = OW_IO_NVRAM_OFFSET; - nvram_size = OW_IO_NVRAM_SIZE; - } else { - nvram_offset = NW_IO_NVRAM_OFFSET; - nvram_size = NW_IO_NVRAM_SIZE; - } + nvram_offset = macio_nvram_offset(); + nvram_size = macio_nvram_size(); + nvram = (char*)addr + nvram_offset; snprintf(buf, sizeof(buf), "%s/nvram", path); nvram_init(buf); Modified: trunk/openbios-devel/include/arch/common/fw_cfg.h ============================================================================== --- trunk/openbios-devel/include/arch/common/fw_cfg.h Sun Jun 30 05:13:14 2013 (r1169) +++ trunk/openbios-devel/include/arch/common/fw_cfg.h Thu Jul 11 18:49:26 2013 (r1170) @@ -44,6 +44,7 @@ #define FW_CFG_PPC_IS_KVM (FW_CFG_ARCH_LOCAL + 0x05) #define FW_CFG_PPC_KVM_HC (FW_CFG_ARCH_LOCAL + 0x06) #define FW_CFG_PPC_KVM_PID (FW_CFG_ARCH_LOCAL + 0x07) +#define FW_CFG_PPC_NVRAM_ADDR (FW_CFG_ARCH_LOCAL + 0x08) #define FW_CFG_INVALID 0xffff

1 0

OpenBIOS Support
by Mike 11 Jul '13

11 Jul '13

I'm a newbie on the list, and I'm just wondering about support forums for OpenBIOS ... is there an IRC channel that one could get help implenting/installing? I have an old Dell d600 I got cheap at a garage sale, that doesn't recognise its hdd, cd drive, or usb for booting -- people have said that I must have a bad BIOS. Is this machine a good candidate for OpenBIOS? And is there a live support forum for a noob to get some assistance?

2 1

Re: [OpenBIOS] [Qemu-devel] [Qemu-ppc] Mac OS X on QEMU
by Programmingkid 11 Jul '13

11 Jul '13

On Jul 4, 2013, at 10:51 AM, Stefan Hajnoczi wrote: > On Thu, Jul 4, 2013 at 4:45 PM, Alexander Graf <agraf(a)suse.de> wrote: >> >> On 04.07.2013, at 16:40, Programmingkid wrote: >> >>> We have made a lot of progress in the last month with making Mac OS X run in QEMU. A lot of people are to thank for this milestone. To everyone involved, thank you. >>> >>> There is one thing that we have to figure out. That is the command key issue. This key is a very important on the Macintosh. It is used to send keyboard shortcuts to applications. >>> >>> What I propose is adding a menu item to QEMU's menu called "Map Command key to ALT". This would allow a user to be able to send Macintosh applications command key shortcuts from both a PC and Mac keyboard. >>> >>> I welcome any and all ideas to solve this problem. >> >> This is the wrong mailing list for this. Your proposal would touch non-PPC code in QEMU, so this needs to go to qemu-devel. >> >> Keep in mind that the same thing arises with x86 Mac OS X running in QEMU. > > When I VNC into a Mac I find that the "Windows key" becomes the > Command key. And the same probably happens when you plug a non-Apple > USB keyboard into a Mac. I was thinking about the Windows key. It would be the perfect substitute - if it was available on all keyboards. > > If you are using a keyboard with a "Windows key" then that would be > the most natural option. If you don't have that key then you really > need to map something else... > > Stefan Maybe there should be two menu items: "Map command key to ALT" and "Map command key to Windows key". They would be mutually exclusive of course.

5 13

Mac OS X on QEMU
by Programmingkid 04 Jul '13

04 Jul '13

We have made a lot of progress in the last month with making Mac OS X run in QEMU. A lot of people are to thank for this milestone. To everyone involved, thank you. There is one thing that we have to figure out. That is the command key issue. This key is a very important on the Macintosh. It is used to send keyboard shortcuts to applications. What I propose is adding a menu item to QEMU's menu called "Map Command key to ALT". This would allow a user to be able to send Macintosh applications command key shortcuts from both a PC and Mac keyboard. I welcome any and all ideas to solve this problem.

4 4

[commit] r1169 - trunk/openbios-devel/drivers
by repository service 30 Jun '13

30 Jun '13

Author: agraf Date: Sun Jun 30 05:13:14 2013 New Revision: 1169 URL: http://tracker.coreboot.org/trac/openbios/changeset/1169 Log: Mac-io: Set device revision Mac OS X 10.5 requires device-rev to be set for mac-io. Make it happy. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/macio.c Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sun Jun 30 05:13:13 2013 (r1168) +++ trunk/openbios-devel/drivers/macio.c Sun Jun 30 05:13:14 2013 (r1169) @@ -256,6 +256,7 @@ dnode = find_dev("/uni-n"); set_property(dnode, "device_type", "memory-controller", 18); set_property(dnode, "compatible", "uni-north", 10); + set_int_property(dnode, "device-rev", 0); props[0] = __cpu_to_be32(0xf8000000); props[1] = __cpu_to_be32(0x1000000); set_property(dnode, "reg", (char *)&props, sizeof(props));

1 0

[commit] r1168 - trunk/openbios-devel/arch/ppc/qemu
by repository service 30 Jun '13

30 Jun '13

Author: agraf Date: Sun Jun 30 05:13:13 2013 New Revision: 1168 URL: http://tracker.coreboot.org/trac/openbios/changeset/1168 Log: Mac99: Expose as MacRISC2 platform The PowerMac2,1 is a MacRISC2 system. Expose it as compatible. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Fri Jun 28 23:08:38 2013 (r1167) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Jun 30 05:13:13 2013 (r1168) @@ -744,6 +744,9 @@ push_str("MacRISC"); fword("encode-string"); fword("encode+"); + push_str("MacRISC2"); + fword("encode-string"); + fword("encode+"); push_str("Power Macintosh"); fword("encode-string"); fword("encode+");

1 0

[PATCH] PPC: Add "real" CPU timebase-frequency override NVRAM variable
by Mark Cave-Ayland 29 Jun '13

29 Jun '13

Some older OS (particularly Darwin) will get stuck in a timing loop upon boot if the CPU clock-frequency and timebase-frequency aren't set close enough to "real" values. The clock-frequency property is already fairly realistic, so create a new boolean NVRAM variable "force-real-tbfreq?" which when set to true will override the timebase-frequency value supplied by QEMU/KVM with that similar to a real Mac. Hence it is possible to boot these old OS from QEMU by adding the following to the QEMU command line: -prom-env 'force-real-tbfreq?=true' (although of course the guest timing may be inaccurate). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> CC: Alexander Graf <agraf(a)csgraf.de> --- openbios-devel/arch/ppc/qemu/init.c | 10 +++++++++- openbios-devel/forth/admin/nvram.fs | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/openbios-devel/arch/ppc/qemu/init.c b/openbios-devel/arch/ppc/qemu/init.c index fcbd04d..60a5303 100644 --- a/openbios-devel/arch/ppc/qemu/init.c +++ b/openbios-devel/arch/ppc/qemu/init.c @@ -258,7 +258,15 @@ cpu_generic_init(const struct cpudef *cpu) push_str("icache-block-size"); fword("property"); - PUSH(fw_cfg_read_i32(FW_CFG_PPC_TBFREQ)); + /* Some OS (early Darwin) require a value of timebase-frequency + that closely matches real hardware in order to prevent a + timing loop hang. Use CLOCKFREQ / 16 as a good approximation. */ + fword("force-real-tbfreq?"); + if (POP()) { + PUSH(fw_cfg_read_i32(FW_CFG_PPC_CLOCKFREQ) / 0x10); + } else { + PUSH(fw_cfg_read_i32(FW_CFG_PPC_TBFREQ)); + } fword("encode-int"); push_str("timebase-frequency"); fword("property"); diff --git a/openbios-devel/forth/admin/nvram.fs b/openbios-devel/forth/admin/nvram.fs index 20f6462..cf3e905 100644 --- a/openbios-devel/forth/admin/nvram.fs +++ b/openbios-devel/forth/admin/nvram.fs @@ -336,6 +336,7 @@ s" -1" s" real-size" int-config s" 4000000" s" load-base" int-config s" -1" s" virt-base" int-config s" -1" s" virt-size" int-config +s" false" s" force-real-tbfreq?" bool-config [THEN] [IFDEF] CONFIG_X86 -- 1.7.10.4

3 4

sparc32 trap recovery
by Bob Breuer 29 Jun '13

29 Jun '13

I'm aiming for a cpeek that catches the data faults on sparc32, so I've coded up the attached test code. The fault handler here is almost trivially simple: set a new instruction pointer and return to it. All the magic is done in push_trap_handler and do_trap_handler, and they act similar to setjmp/longjmp. Nesting is allowed, so it should be possible to use this at the top level for printing out pretty error messages for any fault just like OBP. I'm looking for any comments and suggestions. This proof of concept only handles mmu data faults, but is extendable. Example tests: deadbeef try-fault returns false (0), 10000 try-fault returns true (-1) and the value at 0x10000 Bob

5 7

[commit] r1167 - in trunk/openbios-devel: forth/admin forth/debugging packages
by repository service 28 Jun '13

28 Jun '13

Author: mcayland Date: Fri Jun 28 23:08:38 2013 New Revision: 1167 URL: http://tracker.coreboot.org/trac/openbios/changeset/1167 Log: load: fix generation of /chosen bootpath property It seems that some OS require the bootpath property to be the full, unaliased path to the selected boot device, so use get-instance-path to ensure that this is the case. There is a slight issue here when auto-probing a partition, since the package arguments won't contain the chosen partition id which semms to be mandatory for bootpath. In order to resolve this, scan for a special selected-partition-args property in the instance chain before generating the bootpath, and if it exists use that for the device package arguments instead. Using this mechanism, we can set this property once we have auto-probed a partition in mac-parts.c so bootpath is generated correctly. Finally it is possible to remove the current hack of overwriting bootpath when calling open-dev on a mac-parts partition, which would confuse some bootloaders if they read bootpath after opening a new device. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/admin/userboot.fs trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/packages/mac-parts.c Modified: trunk/openbios-devel/forth/admin/userboot.fs ============================================================================== --- trunk/openbios-devel/forth/admin/userboot.fs Fri Jun 28 23:08:22 2013 (r1166) +++ trunk/openbios-devel/forth/admin/userboot.fs Fri Jun 28 23:08:38 2013 (r1167) @@ -16,7 +16,7 @@ execute then - (encode-bootpath) \ Setup bootpath/bootargs + (find-bootdevice) \ Setup bootargs $load \ load and go go ; Modified: trunk/openbios-devel/forth/debugging/client.fs ============================================================================== --- trunk/openbios-devel/forth/debugging/client.fs Fri Jun 28 23:08:22 2013 (r1166) +++ trunk/openbios-devel/forth/debugging/client.fs Fri Jun 28 23:08:38 2013 (r1167) @@ -59,12 +59,13 @@ then ; -: (encode-bootpath) ( param-str param-len -- bootpath-str bootpath-len) - \ Parse the <param> string from a load/boot command and set both - \ the bootargs and bootpath properties as appropriate. +: (find-bootdevice) ( param-str param-len -- bootpath-str bootpath-len) + \ Parse the <param> string which is a space-separated list of one or + \ more potential boot devices, and return the first one that can be + \ successfully opened. - \ bootpath - bl left-split \ argstr argstr-len bootdevstr bootdevstr-len + \ Space-separated bootpath string + bl left-split \ bootpathstr bootpathstr-len bootdevstr bootdevstr-len dup 0= if \ None specified. As per IEEE-1275 specification, search through each value @@ -89,12 +90,6 @@ 2drop then - \ Set the bootpath property - 2dup encode-string - " /chosen" (find-dev) if - " bootpath" rot (property) - then - \ bootargs 2swap dup 0= if \ None specified, use default from nvram @@ -108,6 +103,31 @@ then ; +\ Locate the boot-device opened by this ihandle (currently taken as being +\ the first non-interposed package in the instance chain) + +: ihandle>boot-device-handle ( ihandle -- 0 | device-ihandle -1 ) + >r 0 + begin r> dup >in.my-parent @ dup >r while + ( result ihandle R: ihandle.parent ) + dup >in.interposed @ 0= if + \ Find the first non-interposed package + over 0= if + swap drop + else + drop + then + else + drop + then + repeat + r> drop drop + + dup 0<> if + -1 + then +; + : $load ( devstr len ) open-dev ( ihandle ) dup 0= if @@ -118,13 +138,53 @@ " load-base" evaluate swap ( load-base ihandle ) dup ihandle>phandle " load" rot find-method ( xt 0|1 ) if swap call-package !load-size else cr ." Cannot find load for this package" 2drop then + + \ If the boot device path doesn't contain an explicit partition id, e.g. cd:,\\:tbxi + \ then the interposed partition package may have auto-probed a suitable partition. If + \ this is the case then it will have set the " selected-partition-args" property in + \ the partition package to contain the new device arguments. + \ + \ In order to ensure that bootpath contains the partition argument, we use the contents + \ of this property if it exists to override the boot device arguments when generating + \ the full bootpath using get-instance-path. + + my-self + r@ to my-self + " selected-partition-args" get-inherited-property 0= if + decode-string 2swap 2drop + ( myself-save partargs-str partargs-len ) + r@ ihandle>boot-device-handle if + ( myself-save partargs-str partargs-len block-ihandle ) + \ Override the arguments before get-instance-path + dup >in.arguments 2@ >r >r dup >r ( R: block-ihandle arg-len arg-str ) + >in.arguments 2! ( myself-save ) + r@ " get-instance-path" $find if + execute ( myself-save bootpathstr bootpathlen ) + then + \ Now write the original arguments back + r> r> r> rot >in.arguments 2! ( myself-save bootpathstr bootpathlen R: ) + rot ( bootpathstr bootpathlen myself-save ) + then + else + my-self " get-instance-path" $find if + execute ( myself-save bootpathstr pathlen ) + rot ( bootpathstr bootpathlen myself-save ) + then + then + to my-self + + \ Set bootpath property in /chosen + encode-string " /chosen" (find-dev) if + " bootpath" rot (property) + then + r> close-dev init-program ; : load ( "{params}<cr>" -- ) linefeed parse - (encode-bootpath) + (find-bootdevice) $load ; Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Fri Jun 28 23:08:22 2013 (r1166) +++ trunk/openbios-devel/packages/mac-parts.c Fri Jun 28 23:08:38 2013 (r1167) @@ -50,14 +50,14 @@ { char *str = my_args_copy(); char *parstr = NULL, *argstr = NULL; - char *tmpstr, *bootpath; + char *tmpstr; 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, chosen_ph; + phandle_t ph; ducell offs = 0, size = -1; DPRINTF("macparts_open '%s'\n", str ); @@ -260,35 +260,20 @@ if( ph ) { 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); + /* In case no partition was specified, set a special selected-partition-args property + giving the device parameters that we can use to generate bootpath */ + tmpstr = malloc(strlen(argstr) + 2 + 1); + if (strlen(argstr)) { + sprintf(tmpstr, "%d,%s", parnum, argstr); + } else { + sprintf(tmpstr, "%d", parnum); } + + push_str(tmpstr); + feval("strdup encode-string \" selected-partition-args\" property"); + + free(tmpstr); /* If we have been asked to open a particular file, interpose the filesystem package with the passed filename as an argument */

1 0

[commit] r1166 - trunk/openbios-devel/forth/device
by repository service 28 Jun '13

28 Jun '13

Author: mcayland Date: Fri Jun 28 23:08:22 2013 New Revision: 1166 URL: http://tracker.coreboot.org/trac/openbios/changeset/1166 Log: property.fs: fix off-by-one error in decode-string The sequence 's" test" encode-string decode-string' suffered from an off-by-one error whereby the trailing '\0' would still be left at the end of the decoded string. This fixes the extra "space" appearing at the end of property names, e.g. such as in the output of "show-devs". Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/device/property.fs Modified: trunk/openbios-devel/forth/device/property.fs ============================================================================== --- trunk/openbios-devel/forth/device/property.fs Fri Jun 28 23:08:08 2013 (r1165) +++ trunk/openbios-devel/forth/device/property.fs Fri Jun 28 23:08:22 2013 (r1166) @@ -185,7 +185,7 @@ >r >r >r ( R: prop-addr1 prop-addr2 prop-len2 nlen ) drop r> r> r> ( nlen prop-len2 prop-addr2 ) - -rot swap ( prop-addr2 prop-len2 nlen ) + -rot swap 1- ( prop-addr2 prop-len2 nlen ) r> swap ( prop-addr2 prop-len2 str len ) else 0 0

1 0

[commit] r1165 - trunk/openbios-devel/libopenbios
by repository service 28 Jun '13

28 Jun '13

Author: mcayland Date: Fri Jun 28 23:08:08 2013 New Revision: 1165 URL: http://tracker.coreboot.org/trac/openbios/changeset/1165 Log: PPC: Fix quik bootloader on New World Macs Currently quik assumes a fixed load-base of 0x3f4000, and only worked on Old World Macs because of a special exception in bootcode_load.c. Since quik seems to be the only user of %BOOT known to date, widen the check to all Apple machines as per conversation with Alex. PReP machines will continue to use the standard value of load-base as normal. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/libopenbios/bootcode_load.c Modified: trunk/openbios-devel/libopenbios/bootcode_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/bootcode_load.c Wed Jun 26 04:04:35 2013 (r1164) +++ trunk/openbios-devel/libopenbios/bootcode_load.c Fri Jun 28 23:08:08 2013 (r1165) @@ -33,8 +33,12 @@ loadbase = POP(); #ifdef CONFIG_PPC - /* However Old World Macs need to load to a different address */ - if (is_oldworld()) { + /* ...except that QUIK (the only known user of %BOOT to date) is built + with a hard-coded address of 0x3f4000. Let's just use this for the + moment on both New World and Old World Macs, allowing QUIK to also + work under a New World Mac. If we find another user of %BOOT we can + rethink this later. PReP machines should be left unaffected. */ + if (is_apple()) { loadbase = OLDWORLD_BOOTCODE_BASEADDR; } #endif

1 0

[PATCH] load: fix generation of /chosen bootpath property
by Mark Cave-Ayland 28 Jun '13

28 Jun '13

It seems that some OS require the bootpath property to be the full, unaliased path to the selected boot device, so use get-instance-path to ensure that this is the case. There is a slight issue here when auto-probing a partition, since the package arguments won't contain the chosen partition id which semms to be mandatory for bootpath. In order to resolve this, scan for a special selected-partition-args property in the instance chain before generating the bootpath, and if it exists use that for the device package arguments instead. Using the mechanism, we can set this property once we have auto-probed a partition in mac-parts.c so bootpath is generated correctly. Finally it is possible to remove the current hack of overwriting bootpath when calling open-dev on a mac-parts partition, which would confuse some bootloaders if they read bootpath after opening a new device. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/forth/admin/userboot.fs | 2 +- openbios-devel/forth/debugging/client.fs | 84 +++++++++++++++++++++++++----- openbios-devel/forth/device/property.fs | 2 +- openbios-devel/packages/mac-parts.c | 43 +++++---------- 4 files changed, 88 insertions(+), 43 deletions(-) diff --git a/openbios-devel/forth/admin/userboot.fs b/openbios-devel/forth/admin/userboot.fs index dd76958..3ae899c 100644 --- a/openbios-devel/forth/admin/userboot.fs +++ b/openbios-devel/forth/admin/userboot.fs @@ -16,7 +16,7 @@ execute then - (encode-bootpath) \ Setup bootpath/bootargs + (find-bootdevice) \ Setup bootargs $load \ load and go go ; diff --git a/openbios-devel/forth/debugging/client.fs b/openbios-devel/forth/debugging/client.fs index 9da9b33..e837e2a 100644 --- a/openbios-devel/forth/debugging/client.fs +++ b/openbios-devel/forth/debugging/client.fs @@ -59,12 +59,13 @@ variable file-size then ; -: (encode-bootpath) ( param-str param-len -- bootpath-str bootpath-len) - \ Parse the <param> string from a load/boot command and set both - \ the bootargs and bootpath properties as appropriate. +: (find-bootdevice) ( param-str param-len -- bootpath-str bootpath-len) + \ Parse the <param> string which is a space-separated list of one or + \ more potential boot devices, and return the first one that can be + \ successfully opened. - \ bootpath - bl left-split \ argstr argstr-len bootdevstr bootdevstr-len + \ Space-separated bootpath string + bl left-split \ bootpathstr bootpathstr-len bootdevstr bootdevstr-len dup 0= if \ None specified. As per IEEE-1275 specification, search through each value @@ -89,12 +90,6 @@ variable file-size 2drop then - \ Set the bootpath property - 2dup encode-string - " /chosen" (find-dev) if - " bootpath" rot (property) - then - \ bootargs 2swap dup 0= if \ None specified, use default from nvram @@ -108,6 +103,31 @@ variable file-size then ; +\ Locate the boot-device opened by this ihandle (currently taken as being +\ the first non-interposed package in the instance chain) + +: ihandle>boot-device-handle ( ihandle -- 0 | device-ihandle -1 ) + >r 0 + begin r> dup >in.my-parent @ dup >r while + ( result ihandle R: ihandle.parent ) + dup >in.interposed @ 0= if + \ Find the first non-interposed package + over 0= if + swap drop + else + drop + then + else + drop + then + repeat + r> drop drop + + dup 0<> if + -1 + then +; + : $load ( devstr len ) open-dev ( ihandle ) dup 0= if @@ -118,13 +138,53 @@ variable file-size " load-base" evaluate swap ( load-base ihandle ) dup ihandle>phandle " load" rot find-method ( xt 0|1 ) if swap call-package !load-size else cr ." Cannot find load for this package" 2drop then + + \ If the boot device path doesn't contain an explicit partition id, e.g. cd:,\\:tbxi + \ then the interposed partition package may have auto-probed a suitable partition. If + \ this is the case then it will have set the " selected-partition-args" property in + \ the partition package to contain the new device arguments. + \ + \ In order to ensure that bootpath contains the partition argument, we use the contents + \ of this property if it exists to override the boot device arguments when generating + \ the full bootpath using get-instance-path. + + my-self + r@ to my-self + " selected-partition-args" get-inherited-property 0= if + decode-string 2swap 2drop + ( myself-save partargs-str partargs-len ) + r@ ihandle>boot-device-handle if + ( myself-save partargs-str partargs-len block-ihandle ) + \ Override the arguments before get-instance-path + dup >in.arguments 2@ >r >r dup >r ( R: block-ihandle arg-len arg-str ) + >in.arguments 2! ( myself-save ) + r@ " get-instance-path" $find if + execute ( myself-save bootpathstr bootpathlen ) + then + \ Now write the original arguments back + r> r> r> rot >in.arguments 2! ( myself-save bootpathstr bootpathlen R: ) + rot ( bootpathstr bootpathlen myself-save ) + then + else + my-self " get-instance-path" $find if + execute ( myself-save bootpathstr pathlen ) + rot ( bootpathstr bootpathlen myself-save ) + then + then + to my-self + + \ Set bootpath property in /chosen + encode-string " /chosen" (find-dev) if + " bootpath" rot (property) + then + r> close-dev init-program ; : load ( "{params}<cr>" -- ) linefeed parse - (encode-bootpath) + (find-bootdevice) $load ; diff --git a/openbios-devel/forth/device/property.fs b/openbios-devel/forth/device/property.fs index d19546c..f9769fb 100644 --- a/openbios-devel/forth/device/property.fs +++ b/openbios-devel/forth/device/property.fs @@ -185,7 +185,7 @@ >r >r >r ( R: prop-addr1 prop-addr2 prop-len2 nlen ) drop r> r> r> ( nlen prop-len2 prop-addr2 ) - -rot swap ( prop-addr2 prop-len2 nlen ) + -rot swap 1- ( prop-addr2 prop-len2 nlen ) r> swap ( prop-addr2 prop-len2 str len ) else 0 0 diff --git a/openbios-devel/packages/mac-parts.c b/openbios-devel/packages/mac-parts.c index c29b554..67d58e7 100644 --- a/openbios-devel/packages/mac-parts.c +++ b/openbios-devel/packages/mac-parts.c @@ -50,14 +50,14 @@ macparts_open( macparts_info_t *di ) { char *str = my_args_copy(); char *parstr = NULL, *argstr = NULL; - char *tmpstr, *bootpath; + char *tmpstr; 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, chosen_ph; + phandle_t ph; ducell offs = 0, size = -1; DPRINTF("macparts_open '%s'\n", str ); @@ -260,35 +260,20 @@ macparts_open( macparts_info_t *di ) if( ph ) { 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); + /* In case no partition was specified, set a special selected-partition-args property + giving the device parameters that we can use to generate bootpath */ + tmpstr = malloc(strlen(argstr) + 2 + 1); + if (strlen(argstr)) { + sprintf(tmpstr, "%d,%s", parnum, argstr); + } else { + sprintf(tmpstr, "%d", parnum); } + + push_str(tmpstr); + feval("strdup encode-string \" selected-partition-args\" property"); + + free(tmpstr); /* If we have been asked to open a particular file, interpose the filesystem package with the passed filename as an argument */ -- 1.7.10.4

1 0

[commit] r1162 - trunk/openbios-devel/fs/hfsplus
by repository service 26 Jun '13

26 Jun '13

Author: agraf Date: Tue Jun 25 19:23:09 2013 New Revision: 1162 URL: http://tracker.coreboot.org/trac/openbios/changeset/1162 Log: hfsplus: Fix disk support for disks > 4GB The HFS+ driver was truncating the end of the disk to 32bit implicitly by multiplying a 32bit value with another 32bit value. Cast the first one to 64bit, making the result 64bit wide as well. This fixes booting from big disks for me. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/fs/hfsplus/hfsp_volume.c Modified: trunk/openbios-devel/fs/hfsplus/hfsp_volume.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_volume.c Tue Jun 25 18:11:57 2013 (r1161) +++ trunk/openbios-devel/fs/hfsplus/hfsp_volume.c Tue Jun 25 19:23:09 2013 (r1162) @@ -207,7 +207,7 @@ ret = volume_readbuf(vh, p); if( !ret ) { /* When reading the initial partition we must use 512 byte blocks */ - vol_size = vh->blocksize * vh->total_blocks; + vol_size = (uint64_t)vh->blocksize * vh->total_blocks; vol->maxblocks = vol_size / HFSP_BLOCKSZ; }

4 5

[commit] r1164 - trunk/openbios-devel/drivers
by repository service 26 Jun '13

26 Jun '13

Author: agraf Date: Wed Jun 26 04:04:35 2013 New Revision: 1164 URL: http://tracker.coreboot.org/trac/openbios/changeset/1164 Log: Revert "Cuda: Add device_type property" Oops, this shouldn't have gone into the repository. Sorry :(. This reverts commit 10a47b9ad8b95c7c06405163867ea3ad54f9441e. Modified: trunk/openbios-devel/drivers/cuda.c Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Wed Jun 26 03:49:20 2013 (r1163) +++ trunk/openbios-devel/drivers/cuda.c Wed Jun 26 04:04:35 2013 (r1164) @@ -190,7 +190,6 @@ set_int_property(ph, "#address-cells", 1); set_int_property(ph, "#size-cells", 0); - set_property(ph, "device_type", "via-cuda", 9); set_property(ph, "compatible", "cuda", 5); props[0] = __cpu_to_be32(IO_CUDA_OFFSET);

1 0

[commit] r1163 - trunk/openbios-devel/drivers
by repository service 26 Jun '13

26 Jun '13

Author: agraf Date: Wed Jun 26 03:49:20 2013 New Revision: 1163 URL: http://tracker.coreboot.org/trac/openbios/changeset/1163 Log: Cuda: Add device_type property Mac OS X wants to have a device_type property in the via-cuda node to find and identify it properly. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/cuda.c Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Tue Jun 25 19:23:09 2013 (r1162) +++ trunk/openbios-devel/drivers/cuda.c Wed Jun 26 03:49:20 2013 (r1163) @@ -190,6 +190,7 @@ set_int_property(ph, "#address-cells", 1); set_int_property(ph, "#size-cells", 0); + set_property(ph, "device_type", "via-cuda", 9); set_property(ph, "compatible", "cuda", 5); props[0] = __cpu_to_be32(IO_CUDA_OFFSET);

1 0

[commit] r1161 - trunk/openbios-devel/drivers
by repository service 25 Jun '13

25 Jun '13

Author: agraf Date: Tue Jun 25 18:11:57 2013 New Revision: 1161 URL: http://tracker.coreboot.org/trac/openbios/changeset/1161 Log: Mac99: Add power-mgt node to via-cuda Instead of spawning a half-broken via-pmu device tree node, let's create a power-mgt node below out already existing via-cuda node instead. This patch is inspired by a patch from Amadeusz Sławiński <amade(a)asmblr.net> Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/cuda.c trunk/openbios-devel/drivers/macio.c Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Tue Jun 25 03:55:45 2013 (r1160) +++ trunk/openbios-devel/drivers/cuda.c Tue Jun 25 18:11:57 2013 (r1161) @@ -369,6 +369,20 @@ } +static void +powermgt_init(char *path) +{ + phandle_t ph; + char buf[64]; + + snprintf(buf, sizeof(buf), "%s/power-mgt", path); + REGISTER_NAMED_NODE(rtc, buf); + + ph = find_dev(buf); + set_property(ph, "device_type", "power-mgt", 10); + set_property(ph, "compatible", "power-mgt", 10); +} + cuda_t *cuda_init (const char *path, phys_addr_t base) { cuda_t *cuda; @@ -399,6 +413,7 @@ #endif rtc_init(buf); + powermgt_init(buf); main_cuda = cuda; Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Tue Jun 25 03:55:45 2013 (r1160) +++ trunk/openbios-devel/drivers/macio.c Tue Jun 25 18:11:57 2013 (r1161) @@ -43,34 +43,6 @@ return NW_IO_NVRAM_SIZE >> NW_IO_NVRAM_SHIFT; } -/* XXX this is barely enough to make Mac OS happy, we really should just - emulate an actual PMU and have that behind the mac-io */ -static void -macio_pmu_init(const char *path) -{ - phandle_t dnode; - char buf[128]; - - push_str(path); - fword("find-device"); - fword("new-device"); - push_str("via-pmu"); - fword("device-name"); - fword("finish-device"); - - snprintf(buf, sizeof(buf), "%s/via-pmu", path); - push_str(buf); - fword("find-device"); - fword("new-device"); - push_str("power-mgt"); - fword("device-name"); - - snprintf(buf, sizeof(buf), "%s/via-pmu/power-mgt", path); - dnode = find_dev(buf); - set_property(dnode, "compatible", "via-pmu-99", 11); - fword("finish-device"); -} - void macio_nvram_init(const char *path, phys_addr_t addr) { phandle_t chosen, aliases; @@ -320,6 +292,5 @@ escc_init(path, addr); macio_ide_init(path, addr, 3); openpic_init(path, addr); - macio_pmu_init(path); ob_unin_init(); }

1 0

[commit] r1160 - trunk/openbios-devel/drivers
by repository service 25 Jun '13

25 Jun '13

Author: agraf Date: Tue Jun 25 03:55:45 2013 New Revision: 1160 URL: http://tracker.coreboot.org/trac/openbios/changeset/1160 Log: mac99: Add uni-n and pmu nodes With these device nodes the Mac OS X 10.4 kernel detects our Mac99 machine type. It still hangs shortly after though. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/macio.c Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Tue Jun 25 03:55:44 2013 (r1159) +++ trunk/openbios-devel/drivers/macio.c Tue Jun 25 03:55:45 2013 (r1160) @@ -43,6 +43,34 @@ return NW_IO_NVRAM_SIZE >> NW_IO_NVRAM_SHIFT; } +/* XXX this is barely enough to make Mac OS happy, we really should just + emulate an actual PMU and have that behind the mac-io */ +static void +macio_pmu_init(const char *path) +{ + phandle_t dnode; + char buf[128]; + + push_str(path); + fword("find-device"); + fword("new-device"); + push_str("via-pmu"); + fword("device-name"); + fword("finish-device"); + + snprintf(buf, sizeof(buf), "%s/via-pmu", path); + push_str(buf); + fword("find-device"); + fword("new-device"); + push_str("power-mgt"); + fword("device-name"); + + snprintf(buf, sizeof(buf), "%s/via-pmu/power-mgt", path); + dnode = find_dev(buf); + set_property(dnode, "compatible", "via-pmu-99", 11); + fword("finish-device"); +} + void macio_nvram_init(const char *path, phys_addr_t addr) { phandle_t chosen, aliases; @@ -241,6 +269,28 @@ { "encode-unit", ob_macio_encode_unit }, }; +static void +ob_unin_init(void) +{ + phandle_t dnode; + int props[2]; + + push_str("/"); + fword("find-device"); + fword("new-device"); + push_str("uni-n"); + fword("device-name"); + + dnode = find_dev("/uni-n"); + set_property(dnode, "device_type", "memory-controller", 18); + set_property(dnode, "compatible", "uni-north", 10); + props[0] = __cpu_to_be32(0xf8000000); + props[1] = __cpu_to_be32(0x1000000); + set_property(dnode, "reg", (char *)&props, sizeof(props)); + + fword("finish-device"); +} + void ob_macio_heathrow_init(const char *path, phys_addr_t addr) { @@ -270,4 +320,6 @@ escc_init(path, addr); macio_ide_init(path, addr, 3); openpic_init(path, addr); + macio_pmu_init(path); + ob_unin_init(); }

1 0

[commit] r1159 - trunk/openbios-devel/drivers
by repository service 25 Jun '13

25 Jun '13

Author: agraf Date: Tue Jun 25 03:55:44 2013 New Revision: 1159 URL: http://tracker.coreboot.org/trac/openbios/changeset/1159 Log: g3beige: Enable second ATA port on MacIO The macio on our g3beige (heathrow) machine has 2 ATA links. Enable the second one. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/macio.c Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sun Jun 23 00:32:07 2013 (r1158) +++ trunk/openbios-devel/drivers/macio.c Tue Jun 25 03:55:44 2013 (r1159) @@ -253,7 +253,7 @@ cuda_init(path, addr); macio_nvram_init(path, addr); escc_init(path, addr); - macio_ide_init(path, addr, 1); + macio_ide_init(path, addr, 2); } void

1 0

Re: [OpenBIOS] [Qemu-ppc] Changing CD-ROM path
by Alexander Graf 24 Jun '13

24 Jun '13

On 22.06.2013, at 19:53, Programmingkid wrote: > > On Jun 22, 2013, at 1:27 PM, Alexander Graf wrote: > >> >> On 22.06.2013, at 18:50, Programmingkid wrote: >> >>> Mac OS 10.2 requires the boot CD-ROM to be located here: /pci/mac-io/ide@1000/@0:9. It is currently located here: /pci@80000000/pci-ata@4/ata-2@500/cdrom@0. How would I go about changing the CD-ROM to this location? I'm looking for a specific file or files to make this change. >> >> This is an OF path, which is up to OpenBIOS to construct. >> >> What makes you think that Mac OS searches at that exact location? >> >> >> Alex >> > > XNU (Mac OS X's kernel) prints this line to the screen: > From path: “ide1/@0:9,\mach_kernel”, Waiting on <dict ID=”0”><key>IOPathMatch</key><string ID=”1”>IODeviceTree:/pci/mac-io/ide@1000/@0:9</string></dict> > > The key IOPathMatch means the location of the cdrom has to be at a certain location. In this case it is /pci/mac-io/ide@1000/@0:9. Yes, but I don't see where Mac OS X has this hardcoded. It gets passed in somehow. What machine type is this? g3beige? On there, I don't see an ide1 alias anywhere: 0 > dev /aliases ok 0 > ls ok 0 > .properties name "aliases" screen "/pci@80000000/mac-io@3/escc/ch-b" mac-io "/pci@80000000/mac-io@3" via-cuda "/pci@80000000/mac-io@3/via-cuda" adb-keyboard "/pci@80000000/mac-io@3/via-cuda/adb/keyboard" adb-mouse "/pci@80000000/mac-io@3/via-cuda/adb/mouse" rtc "/pci@80000000/mac-io@3/via-cuda/rtc" nvram "/pci@80000000/mac-io@3/nvram" ttya "/pci@80000000/mac-io@3/escc/ch-a" scca "/pci@80000000/mac-io@3/escc/ch-a" ttyb "/pci@80000000/mac-io@3/escc/ch-b" sccb "/pci@80000000/mac-io@3/escc/ch-b" ide0 "/pci@80000000/pci-ata@4/ata-2/cdrom" cd "/pci@80000000/pci-ata@4/ata-2/cdrom" cdrom "/pci@80000000/pci-ata@4/ata-2/cdrom" keyboard "/pci@80000000/mac-io@3/via-cuda@16000/adb/keyboard@8" ok Somehow Mac OS resolves "ide1" into "/pci/mac-io/ide@1000". That's the part where the logic fails. Please don't drop the CCs. There's a good reason I added Mark and the OpenBIOS list. This issue is very likely completely QEMU unrelated. Alex > > You say OpenBIOS construct's this path. In the file mac_oldworld.c, around line 280, it looks like it sets the location. Here is the code: > macio = pci_create(pci_bus, -1, TYPE_OLDWORLD_MACIO); > dev = DEVICE(macio); > qdev_connect_gpio_out(dev, 0, pic[0x12]); /* CUDA */ > qdev_connect_gpio_out(dev, 1, pic[0x0D]); /* IDE */ > qdev_connect_gpio_out(dev, 2, pic[0x02]); /* IDE DMA */ > macio_init(macio, pic_mem, escc_bar); > > /* First IDE channel is a MAC IDE on the MacIO bus */ > macio_ide = MACIO_IDE(object_resolve_path_component(OBJECT(macio), > "ide")); > macio_ide_init_drives(macio_ide, hd); > > /* Second IDE channel is a CMD646 on the PCI bus */ > hd[0] = hd[MAX_IDE_DEVS]; > hd[1] = hd[MAX_IDE_DEVS + 1]; > hd[3] = hd[2] = NULL; > pci_cmd646_ide_init(pci_bus, hd, 0); >

5 9

[PATCH 0/4] Switch TCX/VGA drivers from Forth to FCode
by Mark Cave-Ayland 24 Jun '13

24 Jun '13

Note: this patchset should be applied on top of my last display patchset here: http://www.openfirmware.info/pipermail/openbios/2013-June/007753.html. At the moment the IEEE1275 initialisers for TCX/VGA are setup by calling is-install directly; in actual fact what we need to do is convert the drivers over to FCode and execute them during a bus probe. This patchset switches the tcx.fs and vga.fs drivers over to FCode from Forth, includes the FCode binaries as part of the OpenBIOS image, and executes the drivers using byte-load during probe. Currently both drivers are reasonably bare (with most of the work still being done in C), however it is a starting point for moving more functionality into the FCode drivers and makes it possible to implement a "probe-self" word in the near future. This patch shouldn't alter any functionality, but the most significant change is that it does introduce "toke" from the OpenFirmware fcode-utils suite as a mandatory dependency for building OpenBIOS. Mark Cave-Ayland (4): switch-arch: make the fcode-utils tokeniser "toke" mandatory for the build config: add new fcode tag and support for building Fcode into dictionaries SPARC32: switch TCX driver over to FCode x86/SPARC64/PPC/amd64: switch VGA driver over to FCode openbios-devel/Makefile.target | 3 ++ openbios-devel/arch/amd64/build.xml | 1 + openbios-devel/arch/amd64/init.fs | 7 ++++ openbios-devel/arch/ppc/build.xml | 5 +++ openbios-devel/arch/ppc/ppc.fs | 11 ++++++ openbios-devel/arch/sparc32/build.xml | 1 + openbios-devel/arch/sparc32/init.fs | 6 +++ openbios-devel/arch/sparc32/tree.fs | 1 + openbios-devel/arch/sparc64/build.xml | 1 + openbios-devel/arch/sparc64/init.fs | 6 +++ openbios-devel/arch/sparc64/tree.fs | 2 + openbios-devel/arch/x86/build.xml | 1 + openbios-devel/arch/x86/init.fs | 8 ++++ openbios-devel/config/examples/amd64_config.xml | 1 + openbios-devel/config/scripts/switch-arch | 12 ++++++ openbios-devel/config/xml/dictionary.xsl | 40 ++++++++++++++++--- openbios-devel/config/xml/fcode.xsl | 48 +++++++++++++++++++++++ openbios-devel/config/xml/makefile.xsl | 2 + openbios-devel/config/xml/rules.xml | 3 ++ openbios-devel/drivers/build.xml | 5 ++- openbios-devel/drivers/pci.c | 3 +- openbios-devel/drivers/sbus.c | 5 ++- openbios-devel/drivers/tcx.fs | 35 ++++++++++++++++- openbios-devel/drivers/vga.fs | 35 ++++++++++++++++- 24 files changed, 230 insertions(+), 12 deletions(-) create mode 100644 openbios-devel/config/xml/fcode.xsl -- 1.7.10.4

1 4

[commit] r1158 - in trunk/openbios-devel: arch/ppc/qemu include/arch/common
by repository service 23 Jun '13

23 Jun '13

Author: agraf Date: Sun Jun 23 00:32:07 2013 New Revision: 1158 URL: http://tracker.coreboot.org/trac/openbios/changeset/1158 Log: fwcfg: Rename CPUFREQ to CLOCKFREQ The CPUFREQ fwcfg variable was a misnomer that never got into QEMU in that form. What we really implemented was a variable that exposes the "clock-frequency" property, so name it accordingly. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/include/arch/common/fw_cfg.h Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Jun 23 00:30:31 2013 (r1157) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Jun 23 00:32:07 2013 (r1158) @@ -263,7 +263,7 @@ push_str("timebase-frequency"); fword("property"); - PUSH(fw_cfg_read_i32(FW_CFG_PPC_CPUFREQ)); + PUSH(fw_cfg_read_i32(FW_CFG_PPC_CLOCKFREQ)); fword("encode-int"); push_str("clock-frequency"); fword("property"); Modified: trunk/openbios-devel/include/arch/common/fw_cfg.h ============================================================================== --- trunk/openbios-devel/include/arch/common/fw_cfg.h Sun Jun 23 00:30:31 2013 (r1157) +++ trunk/openbios-devel/include/arch/common/fw_cfg.h Sun Jun 23 00:32:07 2013 (r1158) @@ -40,7 +40,7 @@ #define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01) #define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02) #define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03) -#define FW_CFG_PPC_CPUFREQ (FW_CFG_ARCH_LOCAL + 0x04) +#define FW_CFG_PPC_CLOCKFREQ (FW_CFG_ARCH_LOCAL + 0x04) #define FW_CFG_PPC_IS_KVM (FW_CFG_ARCH_LOCAL + 0x05) #define FW_CFG_PPC_KVM_HC (FW_CFG_ARCH_LOCAL + 0x06) #define FW_CFG_PPC_KVM_PID (FW_CFG_ARCH_LOCAL + 0x07)

1 0