OpenBIOS May 2014

openbios@openbios.org

10 participants
35 discussions

[commit] r1297 - trunk/openbios-devel/forth/system
by repository service 12 May '14

12 May '14

Author: mcayland Date: Mon May 12 17:44:01 2014 New Revision: 1297 URL: http://tracker.coreboot.org/trac/openbios/changeset/1297 Log: ciface.fs: handle buggy callers to test-method SPARC64 *BSDs accidentally call test-method with an ihandle rather than a phandle which causes OpenBIOS to crash. Work around this by checking to ensure that the phandle exists within the tree before trying to use it. 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 May 12 17:43:57 2014 (r1296) +++ trunk/openbios-devel/forth/system/ciface.fs Mon May 12 17:44:01 2014 (r1297) @@ -55,6 +55,17 @@ ." <" dup cstrlen dup 20 < if type else 2drop ." BAD" then ." >" ; +: phandle-exists? ( phandle -- found? ) + false swap 0 + begin iterate-tree ?dup while + ( found? find-ph current-ph ) + over over = if + rot drop true -rot + then + repeat + drop +; + \ ------------------------------------------------------------- \ public interface \ ------------------------------------------------------------- @@ -318,11 +329,15 @@ outer-interpreter ; -( cstring-method phandle -- missing ) - -: test-method - swap dup cstrlen rot - find-method 0= if -1 else drop 0 then +: test-method ( cstring-method phandle -- missing? ) + swap dup cstrlen rot + + \ Check for incorrect phandle + dup phandle-exists? false = if + -1 throw + then + + find-method 0= if -1 else drop 0 then ; finish-device

1 0

[commit] r1296 - trunk/openbios-devel/arch/sparc64
by repository service 12 May '14

12 May '14

Author: mcayland Date: Mon May 12 17:43:57 2014 New Revision: 1296 URL: http://tracker.coreboot.org/trac/openbios/changeset/1296 Log: SPARC64: fix up translations property mode to make it a valid TTE NetBSD attempts to parse the translations property in order to set up the virtual to physical translations for the kernel. Alter the mode cell to include the physical address and valid bit so that it represents a real TTE entry for the given start adddress. This is confirmed by checking real dumps from prtconf examples, plus the NetBSD kernel now starts to boot. 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 May 12 17:43:52 2014 (r1295) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon May 12 17:43:57 2014 (r1296) @@ -103,12 +103,12 @@ virtual address length - mode + mode (valid TTE for start of translation region) */ transentry[0] = t->virt; transentry[1] = t->size; - transentry[2] = t->mode; + transentry[2] = t->phys | t->mode | SPITFIRE_TTE_VALID; } /* Return the size of a memory available entry given the phandle in cells */

1 0

[commit] r1295 - trunk/openbios-devel/arch/sparc64
by repository service 12 May '14

12 May '14

Author: mcayland Date: Mon May 12 17:43:52 2014 New Revision: 1295 URL: http://tracker.coreboot.org/trac/openbios/changeset/1295 Log: SPARC64: Remove zero page mapping from MMU to enable detection of NULL pointer dereferences 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 May 12 17:43:50 2014 (r1294) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon May 12 17:43:52 2014 (r1295) @@ -366,7 +366,7 @@ ofmem_walk_boot_map(remap_page_range); /* Map the memory */ - ofmem_map_page_range(0, 0, qemu_mem_size, 0x36); + ofmem_map_page_range(PAGE_SIZE, PAGE_SIZE, qemu_mem_size, 0x36); if (!(retained->magic == RETAIN_MAGIC)) { OFMEM_TRACE("ofmem_init: no retained magic found, creating\n");

1 0

[commit] r1294 - trunk/openbios-devel/arch/sparc64
by repository service 12 May '14

12 May '14

Author: mcayland Date: Mon May 12 17:43:50 2014 New Revision: 1294 URL: http://tracker.coreboot.org/trac/openbios/changeset/1294 Log: SPARC64: fix NULL pointer reference when attempting kernel boot When checking to determine whether to boot a standalone kernel, we would inadvertently reference a NULL pointer if no path was found. Make sure subsequent path processing is ignored when not booting a standalone kernel so we fall through to normal Forth boot. 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 Mon May 12 17:43:46 2014 (r1293) +++ trunk/openbios-devel/arch/sparc64/boot.c Mon May 12 17:43:50 2014 (r1294) @@ -105,24 +105,26 @@ path = pop_fstr_copy(); } - param = strchr(path, ' '); - if(param) { - *param = '\0'; - param++; - } else if (cmdline_size) { - param = (char *)qemu_cmdline; - } else { - push_str("boot-args"); - push_str("/options"); - fword("(find-dev)"); - POP(); - fword("get-package-property"); - POP(); - param = pop_fstr_copy(); - } - - /* Invoke platform-specific Linux loader */ - linux_load(&sys_info, path, param); + if (path) { + param = strchr(path, ' '); + if(param) { + *param = '\0'; + param++; + } else if (cmdline_size) { + param = (char *)qemu_cmdline; + } else { + push_str("boot-args"); + push_str("/options"); + fword("(find-dev)"); + POP(); + fword("get-package-property"); + POP(); + param = pop_fstr_copy(); + } + + /* Invoke platform-specific Linux loader */ + linux_load(&sys_info, path, param); - free(path); + free(path); + } }

1 0

[commit] r1293 - trunk/openbios-devel/drivers
by repository service 12 May '14

12 May '14

Author: mcayland Date: Mon May 12 17:43:46 2014 New Revision: 1293 URL: http://tracker.coreboot.org/trac/openbios/changeset/1293 Log: pc_kbd.c: fix up reg property and missing address property Create the missing address property for the PC serial keyboard, otherwise pc_kbd_open() will dereference a NULL pointer when opening the serial keyboard device. Similarly fix up the reg property to match the PC serial port which appears to give values matching those found in SPARC64 device trees. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pc_kbd.c Modified: trunk/openbios-devel/drivers/pc_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/pc_kbd.c Mon May 12 17:43:44 2014 (r1292) +++ trunk/openbios-devel/drivers/pc_kbd.c Mon May 12 17:43:46 2014 (r1293) @@ -15,6 +15,8 @@ * simple polling video/keyboard console functions * ****************************************************************** */ +#define SER_SIZE 8 + /* * keyboard driver */ @@ -206,10 +208,21 @@ push_str("keyboard"); fword("property"); - PUSH(0); + PUSH((base + offset) >> 32); + fword("encode-int"); + PUSH((base + offset) & 0xffffffff); + fword("encode-int"); + fword("encode+"); + PUSH(SER_SIZE); fword("encode-int"); + fword("encode+"); push_str("reg"); fword("property"); + + PUSH(offset); + fword("encode-int"); + push_str("address"); + fword("property"); chosen = find_dev("/chosen"); push_str(nodebuff);

1 0

[commit] r1292 - trunk/openbios-devel/drivers
by repository service 12 May '14

12 May '14

Author: mcayland Date: Mon May 12 17:43:44 2014 New Revision: 1292 URL: http://tracker.coreboot.org/trac/openbios/changeset/1292 Log: pc_serial.c: fix up missing address property Create the missing address property for the PC serial port, otherwise pc_serial_open() will dereference a NULL pointer when opening the serial port device. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pc_serial.c Modified: trunk/openbios-devel/drivers/pc_serial.c ============================================================================== --- trunk/openbios-devel/drivers/pc_serial.c Mon May 12 17:43:41 2014 (r1291) +++ trunk/openbios-devel/drivers/pc_serial.c Mon May 12 17:43:44 2014 (r1292) @@ -190,6 +190,12 @@ fword("encode+"); push_str("reg"); fword("property"); + + PUSH(offset); + fword("encode-int"); + push_str("address"); + fword("property"); + #if defined(CONFIG_SPARC64) set_int_property(get_cur_dev(), "interrupts", 1); #endif

1 0

[commit] r1291 - trunk/openbios-devel/forth/system
by repository service 12 May '14

12 May '14

Author: mcayland Date: Mon May 12 17:43:41 2014 New Revision: 1291 URL: http://tracker.coreboot.org/trac/openbios/changeset/1291 Log: ciface.fs: implement milliseconds service Now that all platforms have at least some implementation of get-msecs we can just call it in order to implement the milliseconds service. 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 May 12 17:43:38 2014 (r1290) +++ trunk/openbios-devel/forth/system/ciface.fs Mon May 12 17:43:41 2014 (r1291) @@ -296,8 +296,9 @@ \ 6.3.2.7 Time \ ------------------------------------------------------------- -\ : milliseconds ( -- ms ) ; - +: milliseconds ( -- ms ) + get-msecs +; \ ------------------------------------------------------------- \ arch?

1 0

[commit] r1290 - trunk/openbios-devel/forth/device
by repository service 12 May '14

12 May '14

Author: mcayland Date: Mon May 12 17:43:38 2014 New Revision: 1290 URL: http://tracker.coreboot.org/trac/openbios/changeset/1290 Log: other.fs: rework get-msecs word so it can be shared cross-platform Rather than mess with [IFDEF]s, just have one implementation which falls back to a simple incrementing dummy counter if a pointer to a real counter hasn't been configured. 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 May 12 17:43:35 2014 (r1289) +++ trunk/openbios-devel/forth/device/other.fs Mon May 12 17:43:38 2014 (r1290) @@ -93,25 +93,22 @@ \ 5.3.7.3 Time -[IFDEF] CONFIG_PPC +\ Pointer to OBP tick value updated by timer interrupt +variable obp-ticks +\ Dummy implementation for platforms without a timer interrupt 0 value dummy-msecs : get-msecs ( -- n ) - dummy-msecs dup 1+ to dummy-msecs - ; - -[ELSE] - -\ OBP tick value updated by timer interrupt -variable obp-ticks - -: get-msecs ( -- n ) - obp-ticks @ + \ If obp-ticks pointer is set, use it. Otherwise fall back to + \ dummy implementation + obp-ticks @ 0<> if + obp-ticks @ + else + dummy-msecs dup 1+ to dummy-msecs + then ; -[THEN] - : ms ( n -- ) get-msecs + begin dup get-msecs < until

1 0

[commit] r1289 - in trunk/openbios-devel: arch/sparc64 forth/device
by repository service 12 May '14

12 May '14

Author: mcayland Date: Mon May 12 17:43:35 2014 New Revision: 1289 URL: http://tracker.coreboot.org/trac/openbios/changeset/1289 Log: SPARC64: add basic get-msecs implementation This is currently based upon the %tick register, although at some point it should be moved to a per-CPU timer. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/forth/device/other.fs Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Mon May 12 17:43:22 2014 (r1288) +++ trunk/openbios-devel/arch/sparc64/openbios.c Mon May 12 17:43:35 2014 (r1289) @@ -561,6 +561,8 @@ PUSH(virt + MEMORY_SIZE); } +extern volatile uint64_t *obp_ticks_pointer; + static void arch_init( void ) { @@ -572,6 +574,10 @@ nvconf_init(); device_end(); + /* Point to the Forth obp-ticks variable */ + fword("obp-ticks"); + obp_ticks_pointer = cell2pointer(POP()); + bind_func("platform-boot", boot ); bind_func("(go)", go); } Modified: trunk/openbios-devel/forth/device/other.fs ============================================================================== --- trunk/openbios-devel/forth/device/other.fs Mon May 12 17:43:22 2014 (r1288) +++ trunk/openbios-devel/forth/device/other.fs Mon May 12 17:43:35 2014 (r1289) @@ -93,21 +93,21 @@ \ 5.3.7.3 Time -[IFDEF] CONFIG_SPARC32 +[IFDEF] CONFIG_PPC -\ OBP tick value updated by timer interrupt -variable obp-ticks +0 value dummy-msecs : get-msecs ( -- n ) - obp-ticks @ + dummy-msecs dup 1+ to dummy-msecs ; [ELSE] -0 value dummy-msecs +\ OBP tick value updated by timer interrupt +variable obp-ticks : get-msecs ( -- n ) - dummy-msecs dup 1+ to dummy-msecs + obp-ticks @ ; [THEN]

1 0

[commit] r1288 - trunk/openbios-devel/arch/sparc64
by repository service 12 May '14

12 May '14

Author: mcayland Date: Mon May 12 17:43:22 2014 New Revision: 1288 URL: http://tracker.coreboot.org/trac/openbios/changeset/1288 Log: SPARC64: increment ms counter at obp_tick_pointer on every timer interrupt This is in preparation for a get-ms implementation for SPARC64. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/vectors.S Modified: trunk/openbios-devel/arch/sparc64/vectors.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/vectors.S Mon May 12 17:43:18 2014 (r1287) +++ trunk/openbios-devel/arch/sparc64/vectors.S Mon May 12 17:43:22 2014 (r1288) @@ -276,7 +276,7 @@ .section ".data" .align 8 - .globl tlb_handler_stack_top, tlb_handler_stack_pointer + .globl tlb_handler_stack_top, tlb_handler_stack_pointer, obp_ticks_pointer ! Stack for the tlb MMU trap handlers tlb_handler_stack_bottom: @@ -288,6 +288,10 @@ tlb_handler_stack_pointer: .xword tlb_handler_stack_top + ! Pointer to current tick value +obp_ticks_pointer: + .xword 0 + .section ".text", "ax" spill_32bit: @@ -618,6 +622,18 @@ and %g1, %g2, %g1 brnz,pn %g1, tick_compare_disabled nop + + /* update tick value if pointer set */ + setx obp_ticks_pointer, %g3, %g1 + ldx [%g1], %g3 + brz %g3, tick_rearm + nop + + ldx [%g3], %g1 + add %g1, 10, %g1 ! 100Hz = 10ms + stx %g1, [%g3] + +tick_rearm: set TICK_INTERVAL, %g1 add %g1, %g2, %g1 wr %g1, 0, %tick_cmpr

1 0