OpenBIOS May 2014

openbios@openbios.org

10 participants
35 discussions

[commit] r1304 - in trunk/openbios-devel: arch/ppc/qemu include/arch/common
by repository service 25 May '14

25 May '14

Author: agraf Date: Sun May 25 11:50:05 2014 New Revision: 1304 URL: http://tracker.coreboot.org/trac/openbios/changeset/1304 Log: arch/ppc/qemu: Clean up and add more cpu infos Removed unused clock_frequency member from struct cpudef which is get from FW_CFG and added bus-frequency property to complete the frequency properties. Also added tlb infos to CPU properties. Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> 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 Fri May 23 14:24:32 2014 (r1303) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun May 25 11:50:05 2014 (r1304) @@ -44,7 +44,7 @@ int icache_size, dcache_size; int icache_sets, dcache_sets; int icache_block_size, dcache_block_size; - int clock_frequency; + int tlb_sets, tlb_size; void (*initfn)(const struct cpudef *cpu); }; @@ -269,6 +269,16 @@ push_str("i-cache-block-size"); fword("property"); + PUSH(cpu->tlb_sets); + fword("encode-int"); + push_str("tlb-sets"); + fword("property"); + + PUSH(cpu->tlb_size); + fword("encode-int"); + push_str("tlb-size"); + fword("property"); + PUSH(fw_cfg_read_i32(FW_CFG_PPC_TBFREQ)); fword("encode-int"); push_str("timebase-frequency"); @@ -279,6 +289,11 @@ push_str("clock-frequency"); fword("property"); + PUSH(fw_cfg_read_i32(FW_CFG_PPC_BUSFREQ)); + fword("encode-int"); + push_str("bus-frequency"); + fword("property"); + push_str("running"); fword("encode-string"); push_str("state"); @@ -391,7 +406,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x07de2900, + .tlb_sets = 0x40, + .tlb_size = 0x80, .initfn = cpu_604_init, }, { // XXX find out real values @@ -403,7 +419,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x07de2900, + .tlb_sets = 0x40, + .tlb_size = 0x80, .initfn = cpu_604_init, }, { // XXX find out real values @@ -415,7 +432,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x07de2900, + .tlb_sets = 0x40, + .tlb_size = 0x80, .initfn = cpu_604_init, }, { // XXX find out real values @@ -427,7 +445,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x40, + .tlb_size = 0x80, .initfn = cpu_750_init, }, { @@ -439,7 +458,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x40, + .tlb_size = 0x80, .initfn = cpu_750_init, }, { // XXX find out real values @@ -451,7 +471,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x40, + .tlb_size = 0x80, .initfn = cpu_750_init, }, { // XXX find out real values @@ -463,7 +484,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x40, + .tlb_size = 0x80, .initfn = cpu_750_init, }, { // XXX find out real values @@ -475,7 +497,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x40, + .tlb_size = 0x80, .initfn = cpu_750_init, }, { // XXX find out real values @@ -487,7 +510,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x14dc9380, + .tlb_sets = 0x40, + .tlb_size = 0x80, .initfn = cpu_750_init, }, { @@ -499,7 +523,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x20, .dcache_block_size = 0x20, - .clock_frequency = 0x1dcd6500, + .tlb_sets = 0x40, + .tlb_size = 0x80, .initfn = cpu_g4_init, }, { @@ -511,7 +536,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x80, .dcache_block_size = 0x80, - .clock_frequency = 0x5f5e1000, + .tlb_sets = 0x100, + .tlb_size = 0x1000, .initfn = cpu_970_init, }, { // XXX find out real values @@ -523,7 +549,8 @@ .dcache_sets = 0x80, .icache_block_size = 0x80, .dcache_block_size = 0x80, - .clock_frequency = 0x1dcd6500, + .tlb_sets = 0x100, + .tlb_size = 0x1000, .initfn = cpu_970_init, }, { @@ -535,7 +562,8 @@ .dcache_sets = 0x40, .icache_block_size = 0x80, .dcache_block_size = 0x80, - .clock_frequency = 0x629b4940, + .tlb_sets = 0x100, + .tlb_size = 0x1000, .initfn = cpu_970_init, }, }; Modified: trunk/openbios-devel/include/arch/common/fw_cfg.h ============================================================================== --- trunk/openbios-devel/include/arch/common/fw_cfg.h Fri May 23 14:24:32 2014 (r1303) +++ trunk/openbios-devel/include/arch/common/fw_cfg.h Sun May 25 11:50:05 2014 (r1304) @@ -45,6 +45,7 @@ #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_PPC_BUSFREQ (FW_CFG_ARCH_LOCAL + 0x09) #define FW_CFG_INVALID 0xffff

1 0

[PATCH v2] arch/ppc/qemu: do not override boot-device if already set
by BALATON Zoltan 23 May '14

23 May '14

Only set the boot-device env variable if it is not yet set, do not override values set e.g. by -prom-env option of QEMU. 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 1298) +++ openbios-devel/arch/ppc/qemu/init.c (working copy) @@ -659,7 +689,7 @@ char buf[64], qemu_uuid[16]; const char *stdin_path, *stdout_path, *boot_path; uint32_t temp = 0; - + char *boot_device; ofmem_t *ofmem = ofmem_arch_get_private(); openbios_init(); @@ -867,24 +903,28 @@ push_str("/options"); fword("find-device"); - uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); - switch (boot_device) { - case 'c': - boot_path = "hd"; - break; - default: - case 'd': - boot_path = "cd"; - break; + /* Setup default boot devices (not overriding user settings) */ + fword("boot-device"); + boot_device = pop_fstr_copy(); + if (boot_device && strcmp(boot_device, "disk") == 0) { + switch (fw_cfg_read_i16(FW_CFG_BOOT_DEVICE)) { + case 'c': + boot_path = "hd"; + break; + default: + case 'd': + boot_path = "cd"; + break; + } + + snprintf(buf, sizeof(buf), "%s:,\\\\:tbxi %s:,\\ppc\\bootinfo.txt %s:,%%BOOT", boot_path, boot_path, boot_path); + push_str(buf); + fword("encode-string"); + push_str("boot-device"); + fword("property"); } + free(boot_device); - /* Setup default boot devices */ - snprintf(buf, sizeof(buf), "%s:,\\\\:tbxi %s:,\\ppc\\bootinfo.txt %s:,%%BOOT", boot_path, boot_path, boot_path); - push_str(buf); - fword("encode-string"); - push_str("boot-device"); - fword("property"); - /* Set up other properties */ push_str("/chosen");

2 1

[commit] r1303 - trunk/openbios-devel/arch/ppc/qemu
by repository service 23 May '14

23 May '14

Author: mcayland Date: Fri May 23 14:24:32 2014 New Revision: 1303 URL: http://tracker.coreboot.org/trac/openbios/changeset/1303 Log: arch/ppc/qemu: do not override boot-device if already set Only set the boot-device env variable if it is not yet set, do not override values set e.g. by -prom-env option of QEMU. 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 Fri May 23 14:01:51 2014 (r1302) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Fri May 23 14:24:32 2014 (r1303) @@ -659,7 +659,7 @@ char buf[64], qemu_uuid[16]; const char *stdin_path, *stdout_path, *boot_path; uint32_t temp = 0; - + char *boot_device; ofmem_t *ofmem = ofmem_arch_get_private(); openbios_init(); @@ -867,23 +867,27 @@ push_str("/options"); fword("find-device"); - uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); - switch (boot_device) { - case 'c': - boot_path = "hd"; - break; - default: - case 'd': - boot_path = "cd"; - break; - } + /* Setup default boot devices (not overriding user settings) */ + fword("boot-device"); + boot_device = pop_fstr_copy(); + if (boot_device && strcmp(boot_device, "disk") == 0) { + switch (fw_cfg_read_i16(FW_CFG_BOOT_DEVICE)) { + case 'c': + boot_path = "hd"; + break; + default: + case 'd': + boot_path = "cd"; + break; + } - /* Setup default boot devices */ - snprintf(buf, sizeof(buf), "%s:,\\\\:tbxi %s:,\\ppc\\bootinfo.txt %s:,%%BOOT", boot_path, boot_path, boot_path); - push_str(buf); - fword("encode-string"); - push_str("boot-device"); - fword("property"); + snprintf(buf, sizeof(buf), "%s:,\\\\:tbxi %s:,\\ppc\\bootinfo.txt %s:,%%BOOT", boot_path, boot_path, boot_path); + push_str(buf); + fword("encode-string"); + push_str("boot-device"); + fword("property"); + } + free(boot_device); /* Set up other properties */

1 0

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

23 May '14

Author: mcayland Date: Fri May 23 14:01:51 2014 New Revision: 1302 URL: http://tracker.coreboot.org/trac/openbios/changeset/1302 Log: SPARC64: preserve window state when invoking CIF functions Members of the *BSD family have a restriction that no window spill/fill traps can occur in the short time between calling SUNW,set-trap-table in OF and returning back to the caller. In order to ensure we minimise window spill/fill traps, preserve the entire window state across the CIF calls (probably similar to OBP) to ensure that we don't breach this restriction. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/call-client.S Modified: trunk/openbios-devel/arch/sparc64/call-client.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/call-client.S Fri May 23 14:01:43 2014 (r1301) +++ trunk/openbios-devel/arch/sparc64/call-client.S Fri May 23 14:01:51 2014 (r1302) @@ -1,5 +1,153 @@ .globl sparc64_of_client_interface, client_tba + +/* + * SAVE_WINDOW_STATE and RESTORE_WINDOW_STATE are used to ensure + * that the CPU window state is preserved across CIF calls. This is + * to workaround a *BSD restriction that window fill/spill traps must + * be minimised during trap table takeover, and likely emulates the + * behaviour of OBP. + */ + +#define SAVE_WINDOW_STATE(type) \ + setx client_window, %g6, %g1; \ + rdpr %cwp, %g7; \ + stx %g7, [%g1]; \ + rdpr %cansave, %g7; \ + stx %g7, [%g1 + 0x8]; \ + rdpr %canrestore, %g7; \ + stx %g7, [%g1 + 0x10]; \ + rdpr %otherwin, %g7; \ + stx %g7, [%g1 + 0x18]; \ + rdpr %wstate, %g7; \ + stx %g7, [%g1 + 0x20]; \ + rdpr %cleanwin, %g7; \ + stx %g7, [%g1 + 0x28]; \ + \ + stx %o0, [%g1 + 0x30]; \ + stx %o1, [%g1 + 0x38]; \ + stx %o2, [%g1 + 0x40]; \ + stx %o3, [%g1 + 0x48]; \ + stx %o4, [%g1 + 0x50]; \ + stx %o5, [%g1 + 0x58]; \ + stx %o6, [%g1 + 0x60]; \ + stx %o7, [%g1 + 0x68]; \ + \ + rdpr %pstate, %g7; \ + stx %g7, [%g1 + 0x70]; \ + rd %y, %g7; \ + stx %g7, [%g1 + 0x78]; \ + rd %fprs, %g7; \ + stx %g7, [%g1 + 0x80]; \ + \ + /* Now iterate through all of the windows saving all l and i registers */ \ + add %g1, 0x90, %g5; \ + \ + /* Get the number of windows in %g6 */ \ + rdpr %ver, %g6; \ + and %g6, 0xf, %g6; \ + inc %g6; \ + \ +save_cpu_window_##type: \ + deccc %g6; \ + wrpr %g6, %cwp; \ + stx %l0, [%g5]; \ + stx %l1, [%g5 + 0x8]; \ + stx %l2, [%g5 + 0x10]; \ + stx %l3, [%g5 + 0x18]; \ + stx %l4, [%g5 + 0x20]; \ + stx %l5, [%g5 + 0x28]; \ + stx %l6, [%g5 + 0x30]; \ + stx %l7, [%g5 + 0x38]; \ + stx %i0, [%g5 + 0x40]; \ + stx %i1, [%g5 + 0x48]; \ + stx %i2, [%g5 + 0x50]; \ + stx %i3, [%g5 + 0x58]; \ + stx %i4, [%g5 + 0x60]; \ + stx %i5, [%g5 + 0x68]; \ + stx %i6, [%g5 + 0x70]; \ + stx %i7, [%g5 + 0x78]; \ + bne save_cpu_window_##type; \ + add %g5, 0x80, %g5; \ + \ + /* For 8 windows with 16 registers to save in the window, memory required \ + is 16*8*8 = 0x400 bytes */ \ + \ + /* Now we should be in window 0 so update the other window registers */ \ + rdpr %ver, %g6; \ + and %g6, 0xf, %g6; \ + dec %g6; \ + wrpr %g6, %cansave; \ + \ + wrpr %g0, %cleanwin; \ + wrpr %g0, %canrestore; \ + wrpr %g0, %otherwin; + + +#define RESTORE_WINDOW_STATE(type) \ + setx client_window, %g6, %g1; \ + \ + /* Get the number of windows in %g6 */ \ + rdpr %ver, %g6; \ + and %g6, 0xf, %g6; \ + inc %g6; \ + \ + /* Now iterate through all of the windows restoring all l and i registers */ \ + add %g1, 0x90, %g5; \ + \ +restore_cpu_window_##type: \ + deccc %g6; \ + wrpr %g6, %cwp; \ + ldx [%g5], %l0; \ + ldx [%g5 + 0x8], %l1; \ + ldx [%g5 + 0x10], %l2; \ + ldx [%g5 + 0x18], %l3; \ + ldx [%g5 + 0x20], %l4; \ + ldx [%g5 + 0x28], %l5; \ + ldx [%g5 + 0x30], %l6; \ + ldx [%g5 + 0x38], %l7; \ + ldx [%g5 + 0x40], %i0; \ + ldx [%g5 + 0x48], %i1; \ + ldx [%g5 + 0x50], %i2; \ + ldx [%g5 + 0x58], %i3; \ + ldx [%g5 + 0x60], %i4; \ + ldx [%g5 + 0x68], %i5; \ + ldx [%g5 + 0x70], %i6; \ + ldx [%g5 + 0x78], %i7; \ + bne restore_cpu_window_##type; \ + add %g5, 0x80, %g5; \ + \ + /* Restore the window registers to their original value */ \ + ldx [%g1], %g7; \ + wrpr %g7, %cwp; \ + ldx [%g1 + 0x8], %g7; \ + wrpr %g7, %cansave; \ + ldx [%g1 + 0x10], %g7; \ + wrpr %g7, %canrestore; \ + ldx [%g1 + 0x18], %g7; \ + wrpr %g7, %otherwin; \ + ldx [%g1 + 0x20], %g7; \ + wrpr %g7, %wstate; \ + ldx [%g1 + 0x28], %g7; \ + wrpr %g7, %cleanwin; \ + \ + ldx [%g1 + 0x30], %o0; \ + ldx [%g1 + 0x38], %o1; \ + ldx [%g1 + 0x40], %o2; \ + ldx [%g1 + 0x48], %o3; \ + ldx [%g1 + 0x50], %o4; \ + ldx [%g1 + 0x58], %o5; \ + ldx [%g1 + 0x60], %o6; \ + ldx [%g1 + 0x68], %o7; \ + \ + ldx [%g1 + 0x70], %g7; \ + wrpr %g7, %pstate; \ + ldx [%g1 + 0x78], %g7; \ + wr %g7, 0, %y; \ + ldx [%g1 + 0x80], %g7; \ + wr %g7, 0, %fprs + + .data .align 8 @@ -10,6 +158,9 @@ .xword 0 client_tba: .xword 0 +client_window: + .skip 2048 + .text .align 4 @@ -23,8 +174,6 @@ */ sparc64_of_client_interface: - /* make sure caller's windows are on caller's stack */ - flushw /* Save globals on callers stack */ add %sp, -56, %sp @@ -42,20 +191,26 @@ rdpr %tba, %g6 stx %g6, [%g7] - /* Save existing stack and move to openbios stack */ + /* Save existing stack */ setx client_stack, %g6, %g7 stx %sp, [%g7] + + /* Save windows */ + SAVE_WINDOW_STATE(cif) + + /* Move to OpenBIOS stack */ setx openbios_stack - 2047 - 192, %g6, %g7 mov %g7, %sp /* Call client inteface */ - save %sp, -192, %sp - call of_client_interface - mov %i0, %o0 + ldx [%g1 + 0x30], %o0 + + setx client_window, %g6, %g1 + stx %o0, [%g1 + 0x30] - mov %o0, %i0 - restore %sp, 192, %sp + /* Restore windows */ + RESTORE_WINDOW_STATE(cif) /* Restore stack */ setx client_stack, %g6, %g7

1 0

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

23 May '14

Author: mcayland Date: Fri May 23 14:01:43 2014 New Revision: 1301 URL: http://tracker.coreboot.org/trac/openbios/changeset/1301 Log: SPARC64: defer set_trap_table effect until CIF exit Since OpenBIOS invokes window fill/spill traps during normal operation, make sure that we defer setting the client trap table until we return control back to the client. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/call-client.S trunk/openbios-devel/arch/sparc64/openbios.c Modified: trunk/openbios-devel/arch/sparc64/call-client.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/call-client.S Fri May 23 14:01:40 2014 (r1300) +++ trunk/openbios-devel/arch/sparc64/call-client.S Fri May 23 14:01:43 2014 (r1301) @@ -1,4 +1,4 @@ - .globl sparc64_of_client_interface + .globl sparc64_of_client_interface, client_tba .data .align 8 @@ -8,6 +8,8 @@ client_stack: .xword 0 +client_tba: + .xword 0 .text .align 4 @@ -35,6 +37,11 @@ stx %g6, [%sp + 2047 + 40] stx %g7, [%sp + 2047 + 48] + /* Save client trap table */ + setx client_tba, %g6, %g7 + rdpr %tba, %g6 + stx %g6, [%g7] + /* Save existing stack and move to openbios stack */ setx client_stack, %g6, %g7 stx %sp, [%g7] @@ -54,6 +61,11 @@ setx client_stack, %g6, %g7 ldx [%g7], %sp + /* Restore client trap table */ + setx client_tba, %g6, %g7 + ldx [%g7], %g6 + wrpr %g6, %tba + /* Restore globals */ ldx [%sp + 2047 + 0], %g1 ldx [%sp + 2047 + 8], %g2 Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Fri May 23 14:01:40 2014 (r1300) +++ trunk/openbios-devel/arch/sparc64/openbios.c Fri May 23 14:01:43 2014 (r1301) @@ -91,14 +91,18 @@ /* ( addr -- ? ) */ + +extern volatile uint64_t client_tba; + static void set_trap_table(void) { unsigned long addr; addr = POP(); - asm("wrpr %0, %%tba\n" - : : "r" (addr)); + + /* Update client_tba to be updated on CIF exit */ + client_tba = addr; } /* Reset control register is defined in 17.2.7.3 of US IIi User Manual */

1 0

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

23 May '14

Author: mcayland Date: Fri May 23 14:01:40 2014 New Revision: 1300 URL: http://tracker.coreboot.org/trac/openbios/changeset/1300 Log: SPARC64: reduce client interface stack usage Currently the client interface entrypoint uses the existing client stack to save state before invoking the main C implementation function. Unfortunately some clients such as OpenBSD have a very small stack available which can be exhausted by internal OpenBIOS calls. Reduce the stack space required by just saving the globals onto the existing stack and instead switching to a separate stack when invoking the OpenBIOS client interface. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/call-client.S Modified: trunk/openbios-devel/arch/sparc64/call-client.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/call-client.S Fri May 23 13:58:09 2014 (r1299) +++ trunk/openbios-devel/arch/sparc64/call-client.S Fri May 23 14:01:40 2014 (r1300) @@ -2,8 +2,12 @@ .data .align 8 -client_globals: - .skip 64 + + .skip 16384 +openbios_stack: + +client_stack: + .xword 0 .text .align 4 @@ -19,26 +23,47 @@ sparc64_of_client_interface: /* make sure caller's windows are on caller's stack */ flushw - save %sp, -248, %sp - stx %g1, [%sp + 2047 + 192 + 0] - stx %g2, [%sp + 2047 + 192 + 8] - stx %g3, [%sp + 2047 + 192 + 16] - stx %g4, [%sp + 2047 + 192 + 24] - stx %g5, [%sp + 2047 + 192 + 32] - stx %g6, [%sp + 2047 + 192 + 40] - stx %g7, [%sp + 2047 + 192 + 48] + + /* Save globals on callers stack */ + add %sp, -56, %sp + + stx %g1, [%sp + 2047 + 0] + stx %g2, [%sp + 2047 + 8] + stx %g3, [%sp + 2047 + 16] + stx %g4, [%sp + 2047 + 24] + stx %g5, [%sp + 2047 + 32] + stx %g6, [%sp + 2047 + 40] + stx %g7, [%sp + 2047 + 48] + + /* Save existing stack and move to openbios stack */ + setx client_stack, %g6, %g7 + stx %sp, [%g7] + setx openbios_stack - 2047 - 192, %g6, %g7 + mov %g7, %sp + + /* Call client inteface */ + save %sp, -192, %sp call of_client_interface mov %i0, %o0 - mov %o0, %i0 - ldx [%sp + 2047 + 192 + 0], %g1 - ldx [%sp + 2047 + 192 + 8], %g2 - ldx [%sp + 2047 + 192 + 16], %g3 - ldx [%sp + 2047 + 192 + 24], %g4 - ldx [%sp + 2047 + 192 + 32], %g5 - ldx [%sp + 2047 + 192 + 40], %g6 - ldx [%sp + 2047 + 192 + 48], %g7 - return %i7+8 - nop + mov %o0, %i0 + restore %sp, 192, %sp + + /* Restore stack */ + setx client_stack, %g6, %g7 + ldx [%g7], %sp + + /* Restore globals */ + ldx [%sp + 2047 + 0], %g1 + ldx [%sp + 2047 + 8], %g2 + ldx [%sp + 2047 + 16], %g3 + ldx [%sp + 2047 + 24], %g4 + ldx [%sp + 2047 + 32], %g5 + ldx [%sp + 2047 + 40], %g6 + ldx [%sp + 2047 + 48], %g7 + add %sp, 56, %sp + + jmp %o7+8 + nop

1 0

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

23 May '14

Author: mcayland Date: Fri May 23 13:58:09 2014 New Revision: 1299 URL: http://tracker.coreboot.org/trac/openbios/changeset/1299 Log: SPARC64: mark PROM memory allocation TTEs as privileged This brings the behaviour in line with OBP. 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:44:03 2014 (r1298) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Fri May 23 13:58:09 2014 (r1299) @@ -215,14 +215,14 @@ ucell ofmem_arch_default_translation_mode( phys_addr_t phys ) { /* Writable, cacheable */ - /* not privileged and not locked */ - return SPITFIRE_TTE_CP | SPITFIRE_TTE_CV | SPITFIRE_TTE_WRITABLE; + /* Privileged and not locked */ + return SPITFIRE_TTE_CP | SPITFIRE_TTE_CV | SPITFIRE_TTE_WRITABLE | SPITFIRE_TTE_PRIVILEGED; } ucell ofmem_arch_io_translation_mode( phys_addr_t phys ) { - /* Writable, not privileged and not locked */ - return SPITFIRE_TTE_CV | SPITFIRE_TTE_WRITABLE; + /* Writable, privileged and not locked */ + return SPITFIRE_TTE_CV | SPITFIRE_TTE_WRITABLE | SPITFIRE_TTE_PRIVILEGED; } /* Architecture-specific OFMEM helpers */

1 0

[PATCH 0/4] SPARC64: more *BSD fixups
by Mark Cave-Ayland 22 May '14

22 May '14

This patchset follows on from my previous series and gets NetBSD/OpenBSD to the same point as FreeBSD, i.e. the kernel starts to execute and we begin enumerating hardware. OpenBSD: OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 kernel cmdline CPUs: 1 x SUNW,UltraSPARC-IIi UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.1 built on May 19 2014 21:06 Type 'help' for detailed information Trying cdrom:f... Not a bootable ELF image Not a bootable a.out image Loading FCode image... Loaded 4829 bytes entry point is 0x4000 OpenBSD IEEE 1275 Bootblock 1.3 .. Jumping to entry point 0000000000100000 for type 0000000000000001... switching to new context: entry point 0x100000 stack 0x00000000ffe8aa09 >> OpenBSD BOOT 1.6 Trying bsd... open /pci@1fe,0/pci-ata@5/ide1@600/cdrom@0:f/etc/random.seed: No such file or directory Booting /pci@1fe,0/pci-ata@5/ide1@600/cdrom@0:f/bsd 3901336@0x1000000+6248@0x13b8798+3261984@0x1800000+932320@0x1b1c620 symbols @ 0xffc5a300 119 start=0x1000000 Unexpected client interface exception: -1 console is /pci@1fe,0/ebus@3/su Copyright (c) 1982, 1986, 1989, 1991, 1993 The Regents of the University of California. All rights reserved. Copyright (c) 1995-2014 OpenBSD. All rights reserved. http://www.OpenBSD.org OpenBSD 5.5 (RAMDISK) #153: Tue Mar 4 15:12:10 MST 2014 deraadt@sparc64.openbsd.org:/usr/src/sys/arch/sparc64/compile/RAMDISK real mem = 134217728 (128MB) avail mem = 122011648 (116MB) mainbus0 at root: OpenBiosTeam,OpenBIOS cpu0 at mainbus0: SUNW,UltraSPARC-IIi (rev 9.1) @ 100 MHz cpu0: physical 256K instruction (64 b/l), 16K data (32 b/l), 256K external (64 b/l) psycho0 at mainbus0: SUNW,sabre, impl 0, version 0, ign 7c0 psycho0: bus range 0-2, PCI bus 0 panic: intr_establish: bad intr number 0 halted EXIT 0 > NetBSD: OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 kernel cmdline CPUs: 1 x SUNW,UltraSPARC-IIi UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.1 built on May 19 2014 21:06 Type 'help' for detailed information Trying cdrom:f... Not a bootable ELF image Not a bootable a.out image Loading FCode image... Loaded 7478 bytes entry point is 0x4000 NetBSD IEEE 1275 Multi-FS Bootblock Version $NetBSD: bootblk.fth,v 1.13 2010/06/24 00:54:12 eeh Exp $ .. Jumping to entry point 0000000000100000 for type 0000000000000001... switching to new context: entry point 0x100000 stack 0x00000000ffe8aa09 >> NetBSD/sparc64 OpenFirmware Boot, Revision 1.16 =0x8870a0 Loading netbsd: 8071888+553056+339856 [601032+393301]=0x9cd528 Unimplemented service set-symbol-lookup ([2] -- [0]) Unexpected client interface exception: -1 Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The NetBSD Foundation, Inc. All rights reserved. Copyright (c) 1982, 1986, 1989, 1991, 1993 The Regents of the University of California. All rights reserved. NetBSD 6.1.2 (GENERIC) total memory = 128 MB avail memory = 111 MB mainbus0 (root): OpenBiosTeam,OpenBIOS: hostid 80123456 cpu0 at mainbus0: SUNW,UltraSPARC-IIi @ 100 MHz, UPA id 0 cpu0: 256K instruction (64 b/l), 16K data (32 b/l), 256K external (64 b/l) psycho0 at mainbus0 psycho0: SUNW,sabre: impl 0, version 0: ign 7c0 bus range 0 to 2; PCI bus 0 psycho_alloc_extent: no "available" property psycho_alloc_extent: no "available" property pci0 at psycho0 ppb0 at pci0 dev 1 function 0: Sun Microsystems Simba PCI Bridge (rev. 0x11) pci1 at ppb0 bus 1 ppb1 at pci0 dev 1 function 1: Sun Microsystems Simba PCI Bridge (rev. 0x11) pci2 at ppb1 bus 2 genfb0 at pci0 dev 2 function 0: unmatched vendor 0x1234 product 0x1111 (rev. 0x00) ebus0 at pci0 dev 3 function 0 ebus0: Sun Microsystems PCIO Ebus2, revision 0x01 panic: ebus ranges: error 2 Stopped in pid 0.1 (system) at netbsd:cpu_Debugger+0x4: nop db{0}> Getting these kernels to a point where they start to execute and enumerate hardware is a big milestone. Next step will be to fix up the extra properties required by the *BSDs in the device tree. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (4): SPARC64: mark PROM memory allocations TTEs as privileged SPARC64: reduce client interface stack usage SPARC64: defer set_trap_table effect until CIF exit SPARC64: preserve window state when invoking CIF functions openbios-devel/arch/sparc64/call-client.S | 242 ++++++++++++++++++++++++--- openbios-devel/arch/sparc64/ofmem_sparc64.c | 8 +- openbios-devel/arch/sparc64/openbios.c | 8 +- 3 files changed, 227 insertions(+), 31 deletions(-) -- 1.7.10.4

1 4

[PATCH] arch/ppc/qemu: do not override boot-device if already set
by BALATON Zoltan 19 May '14

19 May '14

Only set the boot-device env variable if it is not yet set, do not override values set e.g. by -prom-env option of QEMU. Signed-off-by: BALATON Zoltan <balaton at eik.bme.hu> Index: openbios-devel/arch/ppc/qemu/init.c =================================================================== --- openbios-devel/arch/ppc/qemu/init.c (revision 1298) +++ openbios-devel/arch/ppc/qemu/init.c (working copy) @@ -659,7 +689,7 @@ char buf[64], qemu_uuid[16]; const char *stdin_path, *stdout_path, *boot_path; uint32_t temp = 0; - + char *boot_device; ofmem_t *ofmem = ofmem_arch_get_private(); openbios_init(); @@ -867,24 +903,28 @@ push_str("/options"); fword("find-device"); - uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); - switch (boot_device) { - case 'c': - boot_path = "hd"; - break; - default: - case 'd': - boot_path = "cd"; - break; + /* Setup default boot devices (not overriding user settings) */ + fword("boot-device"); + boot_device = pop_fstr_copy(); + if (strcmp(boot_device, "disk") == 0) { + switch (fw_cfg_read_i16(FW_CFG_BOOT_DEVICE)) { + case 'c': + boot_path = "hd"; + break; + default: + case 'd': + boot_path = "cd"; + break; + } + + snprintf(buf, sizeof(buf), "%s:,\\\\:tbxi %s:,\\ppc\\bootinfo.txt %s:,%%BOOT", boot_path, boot_path, boot_path); + push_str(buf); + fword("encode-string"); + push_str("boot-device"); + fword("property"); } + free(boot_device); - /* Setup default boot devices */ - snprintf(buf, sizeof(buf), "%s:,\\\\:tbxi %s:,\\ppc\\bootinfo.txt %s:,%%BOOT", boot_path, boot_path, boot_path); - push_str(buf); - fword("encode-string"); - push_str("boot-device"); - fword("property"); - /* Set up other properties */ push_str("/chosen");

2 4

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

12 May '14

Author: mcayland Date: Mon May 12 17:44:03 2014 New Revision: 1298 URL: http://tracker.coreboot.org/trac/openbios/changeset/1298 Log: SPARC64: only map 8MB RAM on startup Due to a (bug?) in OpenBSD's pmap_bootstrap(), the kernel attempts to locate its text segment and size by searching the translations property for continuous regions in use starting from the kernel load address. Unfortunately if we have already mapped memory above the kernel load address of 0x1000000 then the kernel extends the text region way beyond the text segement causing an exception when eventually trying to set non-existent mappings in the TLB. Fix this by only mapping 8MB of RAM so that we guarantee that the region above 0x1000000 will always be free, and hence the text/data regions will be discrete so that the sizing algorithms return the correct answer. 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:44:01 2014 (r1297) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon May 12 17:44:03 2014 (r1298) @@ -366,7 +366,7 @@ ofmem_walk_boot_map(remap_page_range); /* Map the memory */ - ofmem_map_page_range(PAGE_SIZE, PAGE_SIZE, qemu_mem_size, 0x36); + ofmem_map_page_range(PAGE_SIZE, PAGE_SIZE, 0x800000, 0x36); if (!(retained->magic == RETAIN_MAGIC)) { OFMEM_TRACE("ofmem_init: no retained magic found, creating\n");

1 0