October 2010 - OpenBIOS - mail.coreboot.org

[commit] r896 - trunk/openbios-devel/libopenbios
by repository service Oct. 16, 2010

Oct. 16, 2010

Author: mcayland Date: Sat Oct 16 16:02:18 2010 New Revision: 896 URL: http://tracker.coreboot.org/trac/openbios/changeset/896 Log: Change OFMEM so that the generated available, physical and virtual properties are passed by reference into Forth. The previous code used the standard set_property() function which copies the new property into the dictionary each time the property is set. During OpenSolaris boot, this would cause OpenBIOS to run out of memory due to large number of changes to the memory regions. Now for each property we have a static buffer allocated within OpenBIOS which starts from 2K and doubles in size everytime the memory region is exhausted, and set the address directly to the relevant buffer. This saves a great deal of memory and prevents the dictionary and internal memory regions from being exhausted during OpenSolaris boot. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.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 Oct 13 16:01:51 2010 (r895) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sat Oct 16 16:02:18 2010 (r896) @@ -1,5 +1,5 @@ /* - * <ofmem_sparc64.c> + * <ofmem_common.c> * * OF Memory manager * @@ -16,6 +16,9 @@ #include "libopenbios/bindings.h" #include "libopenbios/ofmem.h" +/* Default size of memory allocated for each of the MMU properties (in bytes) */ +#define OFMEM_DEFAULT_PROP_SIZE 2048 + /* * define OFMEM_FILL_RANGE to claim any unclaimed virtual and * physical memory in the range for ofmem_map @@ -166,6 +169,28 @@ /* "translations" and "available" property tracking */ /************************************************************************/ +static int trans_prop_size = 0, phys_range_prop_size = 0, virt_range_prop_size = 0; +static int trans_prop_used = 0, phys_range_prop_used = 0, virt_range_prop_used = 0; +static ucell *trans_prop, *phys_range_prop, *virt_range_prop; + +static void +ofmem_set_property( phandle_t ph, const char *name, const char *buf, int len ) +{ + /* This is very similar to set_property() in libopenbios/bindings.c but allows + us to set the property pointer directly, rather than having to copy it + into the Forth dictonary every time we update the memory properties */ + if( !ph ) { + printk("ofmem_set_property: NULL phandle\n"); + return; + } + PUSH((ucell)buf); + PUSH(len); + PUSH((ucell)name); + PUSH(strlen(name)); + PUSH_ph(ph); + fword("encode-property"); +} + static phandle_t s_phandle_memory = 0; static phandle_t s_phandle_mmu = 0; @@ -173,8 +198,7 @@ { ofmem_t *ofmem = ofmem_arch_get_private(); translation_t *t; - int ncells; - ucell *props; + int ncells, prop_used, prop_size; if (s_phandle_mmu == 0) return; @@ -182,31 +206,49 @@ for( t = ofmem->trans, ncells = 0; t ; t=t->next, ncells++ ) { } - props = malloc(ncells * sizeof(ucell) * ofmem_arch_get_translation_entry_size()); + /* Get the current number of bytes required for the MMU translation property */ + prop_used = ncells * sizeof(ucell) * ofmem_arch_get_translation_entry_size(); + + if (prop_used > trans_prop_size) { + + /* The property doesn't fix within the existing space, so keep doubling it + until it does */ + prop_size = trans_prop_size; + while (prop_size < prop_used) { + prop_size *= 2; + } + + /* Allocate the new memory and copy all of the existing information across */ + trans_prop = realloc(trans_prop, prop_size); + trans_prop_size = prop_size; + trans_prop_used = prop_used; + } - if (props == NULL) + if (trans_prop == NULL) { + /* out of memory! */ + printk("Unable to allocate memory for translations property!\n"); return; + } /* Call architecture-specific routines to generate translation entries */ for( t = ofmem->trans, ncells = 0 ; t ; t=t->next ) { - ofmem_arch_create_translation_entry(&props[ncells], t); + ofmem_arch_create_translation_entry(&trans_prop[ncells], t); ncells += ofmem_arch_get_translation_entry_size(); } - set_property(s_phandle_mmu, "translations", - (char*)props, ncells * sizeof(props[0])); + ofmem_set_property(s_phandle_mmu, "translations", + (char*)trans_prop, ncells * sizeof(trans_prop[0])); - free(props); } + static void ofmem_update_memory_available( phandle_t ph, range_t *range, - u64 top_address ) + ucell **mem_prop, int *mem_prop_size, int *mem_prop_used, u64 top_address ) { range_t *r; - int ncells; - ucell *props; + int ncells, prop_used, prop_size; - ucell start, size; + ucell start, size, *prop; if (s_phandle_memory == 0) return; @@ -216,15 +258,32 @@ } /* inverse of phys_range list could take 2 more cells for the tail */ - props = malloc((ncells+1) * sizeof(ucell) * 2); + prop_used = (ncells+1) * sizeof(ucell) * 2; + + if (prop_used > *mem_prop_size) { - if (props == NULL) { + /* The property doesn't fix within the existing space, so keep doubling it + until it does */ + prop_size = *mem_prop_size; + while (prop_size < prop_used) { + prop_size *= 2; + } + + /* Allocate the new memory and copy all of the existing information across */ + *mem_prop = realloc(*mem_prop, prop_size); + *mem_prop_size = prop_size; + *mem_prop_used = prop_used; + } + + if (*mem_prop == NULL) { /* out of memory! */ + printk("Unable to allocate memory for memory range property!\n"); return; } start = 0; ncells = 0; + prop = *mem_prop; for (r = range; r; r=r->next) { if (r->start >= top_address) { @@ -233,32 +292,30 @@ size = r->start - start; if (size) { - props[ncells++] = start; - props[ncells++] = size; + prop[ncells++] = start; + prop[ncells++] = size; } start = r->start + r->size; } /* tail */ if (start < top_address) { - props[ncells++] = start; - props[ncells++] = top_address - start; + prop[ncells++] = start; + prop[ncells++] = top_address - start; } - set_property(ph, "available", - (char*)props, ncells * sizeof(props[0])); - - free(props); + ofmem_set_property(ph, "available", + (char*)prop, ncells * sizeof(prop[0])); } static void ofmem_update_translations( void ) { ofmem_t *ofmem = ofmem_arch_get_private(); - ofmem_update_memory_available(s_phandle_memory, - ofmem->phys_range, get_ram_size()); - ofmem_update_memory_available(s_phandle_mmu, - ofmem->virt_range, -1ULL); + ofmem_update_memory_available(s_phandle_memory, ofmem->phys_range, + &phys_range_prop, &phys_range_prop_size, &phys_range_prop_used, get_ram_size()); + ofmem_update_memory_available(s_phandle_mmu, ofmem->virt_range, + &virt_range_prop, &virt_range_prop_size, &virt_range_prop_used, -1ULL); ofmem_update_mmu_translations(); } @@ -741,5 +798,11 @@ s_phandle_memory = ph_memory; s_phandle_mmu = ph_mmu; + /* Initialise some default property sizes */ + trans_prop_size = phys_range_prop_size = virt_range_prop_size = OFMEM_DEFAULT_PROP_SIZE; + trans_prop = malloc(trans_prop_size); + phys_range_prop = malloc(phys_range_prop_size); + virt_range_prop = malloc(virt_range_prop_size); + ofmem_update_translations(); }

1 0

Hello Solaris :)
by Mark Cave-Ayland Oct. 14, 2010

Oct. 14, 2010

Hi everyone, For those of you interested in the progress of Solaris on OpenBIOS, I'm pleased to report the following output from SVN trunk (r886) with the attached patch applied (this is because the OpenSolaris 10 kernel seems to want quite a lot of run-time memory - more on this later): Solaris 9 installation CD: 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.0 built on Oct 3 2010 20:40 Type 'help' for detailed information Trying cdrom:f... Not a bootable ELF image Not a bootable a.out image Loading FCode image... Loaded 5936 bytes entry point is 0x4000 open isn't unique. Jumping to entry point 0000000000100000 for type 0000000000000001... switching to new context: entry point 0x100000 stack 0x00000000ffe06b49 warning:interpret: exception -13 caught SunOS Release 5.9 Version Generic 64-bit Copyright 1983-2002 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. Milax CD (OpenSolaris): 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.0 built on Oct 3 2010 20:40 Type 'help' for detailed information Trying cdrom:f... Not a bootable ELF image Not a bootable a.out image Loading FCode image... Loaded 7084 bytes entry point is 0x4000 Ignoring failed claim for va 1000000 memsz bf34e! Ignoring failed claim for va 1402000 memsz 303b3! Ignoring failed claim for va 1800000 memsz 60a30! Jumping to entry point 00000000010071d8 for type 0000000000000001... switching to new context: entry point 0x10071d8 stack 0x00000000ffe06b49 warning:interpret: exception -13 caught SunOS Release 5.11 Version MilaX_0.3.2 64-bit Copyright 1983-2008 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. spacex@:interpret: exception -13 caught kdbg-words:interpret: exception -13 caught cb-r/w:interpret: exception -13 caught out of malloc memory (f28)! out of malloc memory (a10)! out of malloc memory (a70)! out of malloc memory (f28)! out of malloc memory (a10)! out of malloc memory (a70)! ...etc... A couple of things that will be of interest to other developers: - Solaris 9 seems to get stuck in a tight loop at the bottom of memory and doesn't want to proceed any further. - In order to get Milax to boot this far, I had to keep increasing the memory requirements (and as you can see, it still wants more). There is a lot of MMU mapping activity, and so I suspect most of the dictionary space is being used to update the translations properties. We really need to optimise OFMEM so that it doesn't keep allocating new space from the dictionary all the time which should help reduce this immensely. - Building with -O0 rather than -Os breaks Milax boot (the new SAVE_CPU_STATE handler falls over). This suggests that the stack is getting clobbered somewhere - Igor, any pointers on this one? But all in all, I think we're looking quite good :) ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

3 3

[commit] r885 - trunk/openbios-devel/libgcc
by repository service Oct. 13, 2010

Oct. 13, 2010

Author: blueswirl Date: Sun Oct 3 21:18:28 2010 New Revision: 885 URL: http://tracker.coreboot.org/trac/openbios/changeset/885 Log: ppc: fix build with newer GCCs New GCCs (for example 4.6.0) needed a few more functions to libgcc. Without the functions, there were a lot of linker errors: LINK openbios-qemu.elf libqemu.a(ofmem.o): In function `hash_page': /src/openbios-devel/obj-ppc/../arch/ppc/qemu/ofmem.c:353: undefined reference to `_restgpr_25_x' libqemu.a(ofmem.o): In function `ea_to_phys': /src/openbios-devel/obj-ppc/../arch/ppc/qemu/ofmem.c:231: undefined reference to `_restgpr_30_x' etc. Copy the needed functions from Linux. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Added: trunk/openbios-devel/libgcc/crtsavres.S Modified: trunk/openbios-devel/libgcc/build.xml Modified: trunk/openbios-devel/libgcc/build.xml ============================================================================== --- trunk/openbios-devel/libgcc/build.xml Sun Oct 3 21:18:26 2010 (r884) +++ trunk/openbios-devel/libgcc/build.xml Sun Oct 3 21:18:28 2010 (r885) @@ -10,6 +10,8 @@ <object source="__udivmoddi4.c"/> <object source="__umoddi3.c"/> + <object source="crtsavres.S" condition="PPC"/> +  <object source="__divti3.c" condition="SPARC64"/> <object source="__udivti3.c" condition="SPARC64"/> @@ -17,7 +19,6 @@ <object source="__umodti3.c" condition="SPARC64"/> <object source="multi3.c" condition="SPARC64"/> <object source="__negti2.c" condition="SPARC64"/> - </library> </build> Added: trunk/openbios-devel/libgcc/crtsavres.S ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/libgcc/crtsavres.S Sun Oct 3 21:18:28 2010 (r885) @@ -0,0 +1,401 @@ +/* + * Special support for eabi and SVR4 + * + * Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc. + * Copyright 2008 Freescale Semiconductor, Inc. + * Written By Michael Meissner + * + * Based on gcc/config/rs6000/crtsavres.asm from gcc + * 64 bit additions from reading the PPC elf64abi document. + * + * This file 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; either version 2, or (at your option) any + * later version. + * + * In addition to the permissions in the GNU General Public License, the + * Free Software Foundation gives you unlimited permission to link the + * compiled version of this file with other programs, and to distribute + * those programs without any restriction coming from the use of this + * file. (The General Public License restrictions do apply in other + * respects; for example, they cover modification of the file, and + * distribution when not linked into another program.) + * + * This file is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + * As a special exception, if you link this library with files + * compiled with GCC to produce an executable, this does not cause + * the resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + */ + +/* taken from Linux arch/powerpc/lib/crtsavres.S */ + +/* arch/powerpc/include/asm/ppc_asm.h */ +#ifdef CONFIG_PPC64 + +#define XGLUE(a,b) a##b +#define GLUE(a,b) XGLUE(a,b) + +#define _GLOBAL(name) \ + .section ".text"; \ + .align 2 ; \ + .globl name; \ + .globl GLUE(.,name); \ + .section ".opd","aw"; \ +name: \ + .quad GLUE(.,name); \ + .quad .TOC.@tocbase; \ + .quad 0; \ + .previous; \ + .type GLUE(.,name),@function; \ +GLUE(.,name): + +#else /* 32-bit */ + +/* include/linux/stringify.h */ + +/* Indirect stringification. Doing two levels allows the parameter to be a + * macro itself. For example, compile with -DFOO=bar, __stringify(FOO) + * converts to "bar". + */ + +#define __stringify_1(x...) #x +#define __stringify(x...) __stringify_1(x) + +/* arch/powerpc/include/asm/ppc_asm.h continues */ + +#define _GLOBAL(n) \ + .text; \ + .stabs __stringify(n:F-1),N_FUN,0,0,n;\ + .globl n; \ +n: + +/* some stab codes */ +#define N_FUN 36 + +#endif + +/* arch/powerpc/lib/crtsavres.S continues */ + + .file "crtsavres.S" + .section ".text" + +#ifndef CONFIG_PPC64 + +/* Routines for saving integer registers, called by the compiler. */ +/* Called with r11 pointing to the stack header word of the caller of the */ +/* function, just beyond the end of the integer save area. */ + +_GLOBAL(_savegpr_14) +_GLOBAL(_save32gpr_14) + stw 14,-72(11) /* save gp registers */ +_GLOBAL(_savegpr_15) +_GLOBAL(_save32gpr_15) + stw 15,-68(11) +_GLOBAL(_savegpr_16) +_GLOBAL(_save32gpr_16) + stw 16,-64(11) +_GLOBAL(_savegpr_17) +_GLOBAL(_save32gpr_17) + stw 17,-60(11) +_GLOBAL(_savegpr_18) +_GLOBAL(_save32gpr_18) + stw 18,-56(11) +_GLOBAL(_savegpr_19) +_GLOBAL(_save32gpr_19) + stw 19,-52(11) +_GLOBAL(_savegpr_20) +_GLOBAL(_save32gpr_20) + stw 20,-48(11) +_GLOBAL(_savegpr_21) +_GLOBAL(_save32gpr_21) + stw 21,-44(11) +_GLOBAL(_savegpr_22) +_GLOBAL(_save32gpr_22) + stw 22,-40(11) +_GLOBAL(_savegpr_23) +_GLOBAL(_save32gpr_23) + stw 23,-36(11) +_GLOBAL(_savegpr_24) +_GLOBAL(_save32gpr_24) + stw 24,-32(11) +_GLOBAL(_savegpr_25) +_GLOBAL(_save32gpr_25) + stw 25,-28(11) +_GLOBAL(_savegpr_26) +_GLOBAL(_save32gpr_26) + stw 26,-24(11) +_GLOBAL(_savegpr_27) +_GLOBAL(_save32gpr_27) + stw 27,-20(11) +_GLOBAL(_savegpr_28) +_GLOBAL(_save32gpr_28) + stw 28,-16(11) +_GLOBAL(_savegpr_29) +_GLOBAL(_save32gpr_29) + stw 29,-12(11) +_GLOBAL(_savegpr_30) +_GLOBAL(_save32gpr_30) + stw 30,-8(11) +_GLOBAL(_savegpr_31) +_GLOBAL(_save32gpr_31) + stw 31,-4(11) + blr + +/* Routines for restoring integer registers, called by the compiler. */ +/* Called with r11 pointing to the stack header word of the caller of the */ +/* function, just beyond the end of the integer restore area. */ + +_GLOBAL(_restgpr_14) +_GLOBAL(_rest32gpr_14) + lwz 14,-72(11) /* restore gp registers */ +_GLOBAL(_restgpr_15) +_GLOBAL(_rest32gpr_15) + lwz 15,-68(11) +_GLOBAL(_restgpr_16) +_GLOBAL(_rest32gpr_16) + lwz 16,-64(11) +_GLOBAL(_restgpr_17) +_GLOBAL(_rest32gpr_17) + lwz 17,-60(11) +_GLOBAL(_restgpr_18) +_GLOBAL(_rest32gpr_18) + lwz 18,-56(11) +_GLOBAL(_restgpr_19) +_GLOBAL(_rest32gpr_19) + lwz 19,-52(11) +_GLOBAL(_restgpr_20) +_GLOBAL(_rest32gpr_20) + lwz 20,-48(11) +_GLOBAL(_restgpr_21) +_GLOBAL(_rest32gpr_21) + lwz 21,-44(11) +_GLOBAL(_restgpr_22) +_GLOBAL(_rest32gpr_22) + lwz 22,-40(11) +_GLOBAL(_restgpr_23) +_GLOBAL(_rest32gpr_23) + lwz 23,-36(11) +_GLOBAL(_restgpr_24) +_GLOBAL(_rest32gpr_24) + lwz 24,-32(11) +_GLOBAL(_restgpr_25) +_GLOBAL(_rest32gpr_25) + lwz 25,-28(11) +_GLOBAL(_restgpr_26) +_GLOBAL(_rest32gpr_26) + lwz 26,-24(11) +_GLOBAL(_restgpr_27) +_GLOBAL(_rest32gpr_27) + lwz 27,-20(11) +_GLOBAL(_restgpr_28) +_GLOBAL(_rest32gpr_28) + lwz 28,-16(11) +_GLOBAL(_restgpr_29) +_GLOBAL(_rest32gpr_29) + lwz 29,-12(11) +_GLOBAL(_restgpr_30) +_GLOBAL(_rest32gpr_30) + lwz 30,-8(11) +_GLOBAL(_restgpr_31) +_GLOBAL(_rest32gpr_31) + lwz 31,-4(11) + blr + +/* Routines for restoring integer registers, called by the compiler. */ +/* Called with r11 pointing to the stack header word of the caller of the */ +/* function, just beyond the end of the integer restore area. */ + +_GLOBAL(_restgpr_14_x) +_GLOBAL(_rest32gpr_14_x) + lwz 14,-72(11) /* restore gp registers */ +_GLOBAL(_restgpr_15_x) +_GLOBAL(_rest32gpr_15_x) + lwz 15,-68(11) +_GLOBAL(_restgpr_16_x) +_GLOBAL(_rest32gpr_16_x) + lwz 16,-64(11) +_GLOBAL(_restgpr_17_x) +_GLOBAL(_rest32gpr_17_x) + lwz 17,-60(11) +_GLOBAL(_restgpr_18_x) +_GLOBAL(_rest32gpr_18_x) + lwz 18,-56(11) +_GLOBAL(_restgpr_19_x) +_GLOBAL(_rest32gpr_19_x) + lwz 19,-52(11) +_GLOBAL(_restgpr_20_x) +_GLOBAL(_rest32gpr_20_x) + lwz 20,-48(11) +_GLOBAL(_restgpr_21_x) +_GLOBAL(_rest32gpr_21_x) + lwz 21,-44(11) +_GLOBAL(_restgpr_22_x) +_GLOBAL(_rest32gpr_22_x) + lwz 22,-40(11) +_GLOBAL(_restgpr_23_x) +_GLOBAL(_rest32gpr_23_x) + lwz 23,-36(11) +_GLOBAL(_restgpr_24_x) +_GLOBAL(_rest32gpr_24_x) + lwz 24,-32(11) +_GLOBAL(_restgpr_25_x) +_GLOBAL(_rest32gpr_25_x) + lwz 25,-28(11) +_GLOBAL(_restgpr_26_x) +_GLOBAL(_rest32gpr_26_x) + lwz 26,-24(11) +_GLOBAL(_restgpr_27_x) +_GLOBAL(_rest32gpr_27_x) + lwz 27,-20(11) +_GLOBAL(_restgpr_28_x) +_GLOBAL(_rest32gpr_28_x) + lwz 28,-16(11) +_GLOBAL(_restgpr_29_x) +_GLOBAL(_rest32gpr_29_x) + lwz 29,-12(11) +_GLOBAL(_restgpr_30_x) +_GLOBAL(_rest32gpr_30_x) + lwz 30,-8(11) +_GLOBAL(_restgpr_31_x) +_GLOBAL(_rest32gpr_31_x) + lwz 0,4(11) + lwz 31,-4(11) + mtlr 0 + mr 1,11 + blr + +#else /* CONFIG_PPC64 */ + +.globl _savegpr0_14 +_savegpr0_14: + std r14,-144(r1) +.globl _savegpr0_15 +_savegpr0_15: + std r15,-136(r1) +.globl _savegpr0_16 +_savegpr0_16: + std r16,-128(r1) +.globl _savegpr0_17 +_savegpr0_17: + std r17,-120(r1) +.globl _savegpr0_18 +_savegpr0_18: + std r18,-112(r1) +.globl _savegpr0_19 +_savegpr0_19: + std r19,-104(r1) +.globl _savegpr0_20 +_savegpr0_20: + std r20,-96(r1) +.globl _savegpr0_21 +_savegpr0_21: + std r21,-88(r1) +.globl _savegpr0_22 +_savegpr0_22: + std r22,-80(r1) +.globl _savegpr0_23 +_savegpr0_23: + std r23,-72(r1) +.globl _savegpr0_24 +_savegpr0_24: + std r24,-64(r1) +.globl _savegpr0_25 +_savegpr0_25: + std r25,-56(r1) +.globl _savegpr0_26 +_savegpr0_26: + std r26,-48(r1) +.globl _savegpr0_27 +_savegpr0_27: + std r27,-40(r1) +.globl _savegpr0_28 +_savegpr0_28: + std r28,-32(r1) +.globl _savegpr0_29 +_savegpr0_29: + std r29,-24(r1) +.globl _savegpr0_30 +_savegpr0_30: + std r30,-16(r1) +.globl _savegpr0_31 +_savegpr0_31: + std r31,-8(r1) + std r0,16(r1) + blr + +.globl _restgpr0_14 +_restgpr0_14: + ld r14,-144(r1) +.globl _restgpr0_15 +_restgpr0_15: + ld r15,-136(r1) +.globl _restgpr0_16 +_restgpr0_16: + ld r16,-128(r1) +.globl _restgpr0_17 +_restgpr0_17: + ld r17,-120(r1) +.globl _restgpr0_18 +_restgpr0_18: + ld r18,-112(r1) +.globl _restgpr0_19 +_restgpr0_19: + ld r19,-104(r1) +.globl _restgpr0_20 +_restgpr0_20: + ld r20,-96(r1) +.globl _restgpr0_21 +_restgpr0_21: + ld r21,-88(r1) +.globl _restgpr0_22 +_restgpr0_22: + ld r22,-80(r1) +.globl _restgpr0_23 +_restgpr0_23: + ld r23,-72(r1) +.globl _restgpr0_24 +_restgpr0_24: + ld r24,-64(r1) +.globl _restgpr0_25 +_restgpr0_25: + ld r25,-56(r1) +.globl _restgpr0_26 +_restgpr0_26: + ld r26,-48(r1) +.globl _restgpr0_27 +_restgpr0_27: + ld r27,-40(r1) +.globl _restgpr0_28 +_restgpr0_28: + ld r28,-32(r1) +.globl _restgpr0_29 +_restgpr0_29: + ld r0,16(r1) + ld r29,-24(r1) + mtlr r0 + ld r30,-16(r1) + ld r31,-8(r1) + blr + +.globl _restgpr0_30 +_restgpr0_30: + ld r30,-16(r1) +.globl _restgpr0_31 +_restgpr0_31: + ld r0,16(r1) + ld r31,-8(r1) + mtlr r0 + blr + +#endif /* CONFIG_PPC64 */

2 1

[PATCH, RFT] ppc: Suppress /hypervisor outside KVM
by Andreas Färber Oct. 13, 2010

Oct. 13, 2010

My New World PowerMac G3 does not have a /hypervisor node. Move all Forth code to kvm_of_init() to make it match the comment: Don't expose /hypervisor when not in KVM. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- Hello Alex, Could you please test this on the KVM side of things? Thanks! Andreas arch/ppc/qemu/init.c | 12 +++++++++++- arch/ppc/qemu/tree.fs | 5 ----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 3979f5d..6601b7c 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -526,9 +526,17 @@ static void kvm_of_init(void) if (!fw_cfg_read_i32(FW_CFG_PPC_IS_KVM)) return; - push_str("/hypervisor"); + push_str("/"); fword("find-device"); + fword("new-device"); + + push_str("hypervisor"); + fword("device-name"); + + push_str("hypervisor"); + fword("device-type"); + /* compatible */ push_str("linux,kvm"); @@ -567,6 +575,8 @@ static void kvm_of_init(void) fword("encode-string"); push_str("guest-name"); fword("property"); + + fword("finish-device"); } void diff --git a/arch/ppc/qemu/tree.fs b/arch/ppc/qemu/tree.fs index b7bb706..4d107a9 100644 --- a/arch/ppc/qemu/tree.fs +++ b/arch/ppc/qemu/tree.fs @@ -39,11 +39,6 @@ new-device : close ; finish-device -new-device - " hypervisor" device-name - " hypervisor" device-type -finish-device - \ ------------------------------------------------------------- \ /packages \ ------------------------------------------------------------- -- 1.7.3

2 1

[commit] r895 - trunk/openbios-devel/arch/ppc/qemu
by repository service Oct. 13, 2010

Oct. 13, 2010

Author: agraf Date: Wed Oct 13 16:01:51 2010 New Revision: 895 URL: http://tracker.coreboot.org/trac/openbios/changeset/895 Log: ppc: Suppress /hypervisor outside KVM My New World PowerMac G3 does not have a /hypervisor node. Move all Forth code to kvm_of_init() to make it match the comment: Don't expose /hypervisor when not in KVM. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/tree.fs Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Oct 9 12:16:33 2010 (r894) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Wed Oct 13 16:01:51 2010 (r895) @@ -526,9 +526,17 @@ if (!fw_cfg_read_i32(FW_CFG_PPC_IS_KVM)) return; - push_str("/hypervisor"); + push_str("/"); fword("find-device"); + fword("new-device"); + + push_str("hypervisor"); + fword("device-name"); + + push_str("hypervisor"); + fword("device-type"); + /* compatible */ push_str("linux,kvm"); @@ -567,6 +575,8 @@ fword("encode-string"); push_str("guest-name"); fword("property"); + + fword("finish-device"); } void Modified: trunk/openbios-devel/arch/ppc/qemu/tree.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/tree.fs Sat Oct 9 12:16:33 2010 (r894) +++ trunk/openbios-devel/arch/ppc/qemu/tree.fs Wed Oct 13 16:01:51 2010 (r895) @@ -39,11 +39,6 @@ : close ; finish-device -new-device - " hypervisor" device-name - " hypervisor" device-type -finish-device - \ ------------------------------------------------------------- \ /packages \ -------------------------------------------------------------

1 0

Re: [OpenBIOS] PReP PowerPC "emulation"
by Massimo Montecchi Oct. 12, 2010

Oct. 12, 2010

Until r828 was in this way ... then somethink was wrong.... 2010/9/13 Laurent Vivier <Laurent(a)vivier.eu> > > Hi, > > the last time I tried to boot AIX (6 or 7 monthes ago...), OpenBIOS was > able to load the bootloader but as RTAS is not provided by OpenBIOS, > bootloader failed and didn't go further. I think it was with the CHRP > emulation. > > Regards, > Laurent > > > > > Hi, > > I have tried qemu from 0.11 to latest git (as of 11/09/2010) with latest > openbios inside, but if i want to use PREP PPC "machine" the error is the > same: > > qemu: hardware error: PowerPC 601 / 620 / 970 need a 1MB BIOS > > CPU #0: > NIP 00000000 LR 00000000 CTR 00000000 XER 00000000 > MSR 00000000 HID0 00000000 HF 00000000 idx 0 > TB 00000000 00000000 DECR ffffffff > GPR00 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR04 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR08 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR12 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR16 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR20 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR24 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR28 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > CR 00000000 [ - - - - - - - - ] RES 00000000 > FPR00 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR04 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR08 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR12 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR16 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR20 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR24 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR28 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPSCR 00000000 > SRR0 00000000 SRR1 00000000 SDR1 00000000 > > How can I use openbios to start an AIX with qemu ? > > -- > Cordiali Saluti/Best Regards > > Massimo Montecchi > Modena - Italy > > > > > -- > --------------------- Laurent(a)vivier.eu --------------------- > "Tout ce qui est impossible reste à accomplir" Jules Verne > "Things are only impossible until they're not" Jean-Luc Picard > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you > -- Cordiali Saluti/Best Regards Massimo Montecchi Modena - Italy

4 12

[PATCH] ppc: Fix typos in comment
by Andreas Färber Oct. 9, 2010

Oct. 9, 2010

Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- arch/ppc/qemu/start.S | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/ppc/qemu/start.S b/arch/ppc/qemu/start.S index d6777a8..d74fb9c 100644 --- a/arch/ppc/qemu/start.S +++ b/arch/ppc/qemu/start.S @@ -351,9 +351,9 @@ GLOBL(_entry): * * MSR = FP, ME + (DR|IR) * r1 = stack (32 K + 32 bytes link area above) - * r5 = clint interface handler + * r5 = client interface handler * r6 = address of client program arguments (unused) - * r7 = length of client program arguments (unsed) + * r7 = length of client program arguments (unused) * * Yaboot and Linux use r3 and r4 for initrd address and size */ -- 1.7.3

2 1

[PATCH] Fix test-method argument order
by Andreas Färber Oct. 9, 2010

Oct. 9, 2010

test-method for "instantiate-rtas" would fail on the /rtas node. According to CHRP 1.5 draft, the stack order seems reversed. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- forth/system/ciface.fs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forth/system/ciface.fs b/forth/system/ciface.fs index 27a1deb..ff87608 100644 --- a/forth/system/ciface.fs +++ b/forth/system/ciface.fs @@ -315,10 +315,10 @@ external \ PowerPC Microprocessor CHRP binding \ 10.5.2. Client Interface -( phandle cstring-method -- missing ) +( cstring-method phandle -- missing ) : test-method - dup cstrlen rot + swap dup cstrlen rot find-method 0= if -1 else drop 0 then ; [THEN] -- 1.7.3

2 1

[PATCH 1/3] Fix getprop return value trace
by Andreas Färber Oct. 9, 2010

Oct. 9, 2010

Don't trace the buffer length in place of the property size. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- libopenbios/client.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libopenbios/client.c b/libopenbios/client.c index 16e4323..2b78dcc 100644 --- a/libopenbios/client.c +++ b/libopenbios/client.c @@ -170,7 +170,7 @@ static void dump_return(prom_args_t *pb) } else if (strcmp(pb->service, "getproplen") == 0) { printk("0x%08lx\n", pb->args[pb->nargs]); } else if (strcmp(pb->service, "getprop") == 0) { - printk("%ld\n", pb->args[3]); + printk("%ld\n", pb->args[pb->nargs]); memdump((char*)pb->args[2], pb->args[3]); } else if (strcmp(pb->service, "nextprop") == 0) { printk("%ld\n", pb->args[pb->nargs]); -- 1.7.3

2 3

[commit] r894 - trunk/openbios-devel/forth/system
by repository service Oct. 9, 2010

Oct. 9, 2010

Author: blueswirl Date: Sat Oct 9 12:16:33 2010 New Revision: 894 URL: http://tracker.coreboot.org/trac/openbios/changeset/894 Log: Fix getprop return value According to IEEE 1275, "Size is either the actual size of the property, or –1 if name does not exist." The property might be larger than the client's buffer, so don't dup the min used for writing into the buffer but the original proplen value. Insert a comment to show what's going on. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/forth/system/ciface.fs Modified: trunk/openbios-devel/forth/system/ciface.fs ============================================================================== --- trunk/openbios-devel/forth/system/ciface.fs Sat Oct 9 12:16:29 2010 (r893) +++ trunk/openbios-devel/forth/system/ciface.fs Sat Oct 9 12:16:33 2010 (r894) @@ -97,8 +97,9 @@ over cstrlen swap ?phandle get-package-property if 2drop -1 exit then ( buflen buf prop proplen ) - >r swap rot r> min - dup >r move r> + >r swap rot r> + ( prop buf buflen proplen ) + dup >r min move r> ; \ 1 OK, 0 no more prop, -1 prev invalid

1 0