October 2010 - OpenBIOS - mail.coreboot.org

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

Oct. 16, 2010

Author: blueswirl Date: Sat Oct 16 19:36:12 2010 New Revision: 906 URL: http://tracker.coreboot.org/trac/openbios/changeset/906 Log: ppc: Move hash table To avoid complications with ppc64, always use the ppc64 alignment. v2: * Initial. Suggested by Segher Boessenkool. Cc: Segher Boessenkool <segher(a)kernel.crashing.org> Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Oct 16 19:36:08 2010 (r905) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:36:12 2010 (r906) @@ -389,14 +389,11 @@ ofmem_t *ofmem; unsigned long sdr1, sr_base, msr; unsigned long hash_base; - unsigned long hash_mask = 0xffff0000; + unsigned long hash_mask = 0xfff00000; /* alignment for ppc64 */ int i; /* SDR1: Storage Description Register 1 */ - if(is_ppc64()) - hash_mask = 0xfff00000; - hash_base = (ramsize - 0x00100000 - HASH_SIZE) & hash_mask; memset((void *)hash_base, 0, HASH_SIZE); sdr1 = hash_base | ((HASH_SIZE-1) >> 16);

1 0

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

Oct. 16, 2010

Author: blueswirl Date: Sat Oct 16 19:36:08 2010 New Revision: 905 URL: http://tracker.coreboot.org/trac/openbios/changeset/905 Log: ppc: Move malloc zone ofmem was fixed at 0x05400000, followed by the malloc zone. The latter was bounded by the stack (now client stack), relative to the top of RAM. An increase of RAM would therefore only enlarge the malloc zone. Move the malloc zone below the client stack, with a fixed size of 2 MiB. The size is derived from the memory map depicted in ofmem.c; having a fixed size leaves room for memory claim'ed by clients and by OpenBIOS. v2: * Through the preceding patch the malloc zone goes below the client stack rather than below the stack. Adjust and prettify the illustration. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/ppc/qemu/start.S Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:36:04 2010 (r904) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:36:08 2010 (r905) @@ -47,11 +47,9 @@ #define FREE_BASE 0x00004000 #define OF_CODE_START 0xfff00000UL #define IO_BASE 0x80000000 -#define OFMEM ((ofmem_t*)0x05400000) - -#define OF_MALLOC_BASE ((char*)OFMEM + ((sizeof(ofmem_t) + 3) & ~3)) #define HASH_SIZE (2 << 15) +#define OFMEM_SIZE (2 * 1024 * 1024) #define SEGR_USER BIT(2) #define SEGR_BASE 0x0400 @@ -86,7 +84,7 @@ unsigned long get_ram_top( void ) { - return get_hash_base() - (32 + 64 + 64) * 1024; + return get_hash_base() - (32 + 64 + 64) * 1024 - OFMEM_SIZE; } unsigned long @@ -107,12 +105,12 @@ ofmem_t* ofmem_arch_get_private(void) { - return OFMEM; + return (ofmem_t*)(get_heap_top() - OFMEM_SIZE); } void* ofmem_arch_get_malloc_base(void) { - return OF_MALLOC_BASE; + return (char*)ofmem_arch_get_private() + ALIGN_SIZE(sizeof(ofmem_t), 4); } ucell ofmem_arch_get_heap_top(void) @@ -388,15 +386,12 @@ void setup_mmu( unsigned long ramsize ) { - ofmem_t *ofmem = OFMEM; + ofmem_t *ofmem; unsigned long sdr1, sr_base, msr; unsigned long hash_base; unsigned long hash_mask = 0xffff0000; int i; - memset(ofmem, 0, sizeof(ofmem_t)); - ofmem->ramsize = ramsize; - /* SDR1: Storage Description Register 1 */ if(is_ppc64()) @@ -415,6 +410,10 @@ asm volatile("mtsrin %0,%1" :: "r" (sr_base + i), "r" (j) ); } + ofmem = ofmem_arch_get_private(); + memset(ofmem, 0, sizeof(ofmem_t)); + ofmem->ramsize = ramsize; + memcpy((void *)get_rom_base(), (void *)OF_CODE_START, 0x00100000); /* Enable MMU */ Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Sat Oct 16 19:36:04 2010 (r904) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Sat Oct 16 19:36:08 2010 (r905) @@ -313,17 +313,21 @@ * | | * +-------------------------+ * | | - * | Exception Stack (32 kB) + * | Exception Stack (32 kB) | * | | * +-------------------------+ * | | - * | Stack (64 kB) + * | Stack (64 kB) | * | | * +-------------------------+ * | | * | Client Stack (64 kB) | * | | * +-------------------------+ + * | | + * | Malloc Zone (2 MiB) | + * | | + * +-------------------------+ * : : * Bottom */

1 0

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

Oct. 16, 2010

Author: blueswirl Date: Sat Oct 16 19:36:04 2010 New Revision: 904 URL: http://tracker.coreboot.org/trac/openbios/changeset/904 Log: ppc: Claim memory used by OpenBIOS OpenBIOS kept getting overwritten in RAM by clients such as Haiku. Make sure memory used by OpenBIOS cannot accidentally be claimed by someone else. This also sets up the "available" property as expected. Note that we avoid ofmem_claim() as it would map the pages using a default mode, followed by a remap with the desired mode. v2: * Reordered. * Added spacing. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Oct 16 19:36:00 2010 (r903) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:36:04 2010 (r904) @@ -429,6 +429,11 @@ { ofmem_t *ofmem = ofmem_arch_get_private(); + ofmem_claim_phys(0, get_ram_bottom(), 0); + ofmem_claim_virt(0, get_ram_bottom(), 0); ofmem_map( 0, 0, get_ram_bottom(), 0 ); + + ofmem_claim_phys(get_ram_top(), ofmem->ramsize - get_ram_top(), 0); + ofmem_claim_virt(get_ram_top(), ofmem->ramsize - get_ram_top(), 0); ofmem_map( get_ram_top(), get_ram_top(), ofmem->ramsize - get_ram_top(), 0); }

1 0

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

Oct. 16, 2010

Author: blueswirl Date: Sat Oct 16 19:36:00 2010 New Revision: 903 URL: http://tracker.coreboot.org/trac/openbios/changeset/903 Log: ppc: Fix heap top Don't let the client stack and the heap overlap. v2: * Initial. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Oct 16 19:35:56 2010 (r902) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:36:00 2010 (r903) @@ -97,7 +97,7 @@ static ucell get_heap_top( void ) { - return get_hash_base() - (32 + 64) * 1024; + return get_hash_base() - (32 + 64 + 64) * 1024; } static inline size_t ALIGN_SIZE(size_t x, size_t a)

1 0

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

Oct. 16, 2010

Author: blueswirl Date: Sat Oct 16 19:35:56 2010 New Revision: 902 URL: http://tracker.coreboot.org/trac/openbios/changeset/902 Log: ppc: Fix RAM top (2/2) The hash base is not get_rom_base() - HASH_SIZE. It gets rounded down, depending on the PVR, so read its true value from SDR1. v2: * Split up. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Oct 16 19:35:53 2010 (r901) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:35:56 2010 (r902) @@ -86,7 +86,7 @@ unsigned long get_ram_top( void ) { - return get_rom_base() - HASH_SIZE - (32 + 64 + 64) * 1024; + return get_hash_base() - (32 + 64 + 64) * 1024; } unsigned long

1 0

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

Oct. 16, 2010

Author: blueswirl Date: Sat Oct 16 19:35:53 2010 New Revision: 901 URL: http://tracker.coreboot.org/trac/openbios/changeset/901 Log: ppc: Fix RAM top (1/2) According to the illustration in start.S, the stack size is supposed to be 64 KiB. v2: * Split up. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Oct 16 19:35:51 2010 (r900) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:35:53 2010 (r901) @@ -86,7 +86,7 @@ unsigned long get_ram_top( void ) { - return get_rom_base() - HASH_SIZE - (32 + 32 + 64) * 1024; + return get_rom_base() - HASH_SIZE - (32 + 64 + 64) * 1024; } unsigned long

1 0

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

Oct. 16, 2010

Author: blueswirl Date: Sat Oct 16 19:35:51 2010 New Revision: 900 URL: http://tracker.coreboot.org/trac/openbios/changeset/900 Log: ppc: Remove bogus return ofmem_free() has no return value and neither does free(). Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Oct 16 19:35:49 2010 (r899) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:35:51 2010 (r900) @@ -178,7 +178,7 @@ void free( void *ptr ) { - return ofmem_free(ptr); + ofmem_free(ptr); } void *

1 0

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

Oct. 16, 2010

Author: blueswirl Date: Sat Oct 16 19:35:49 2010 New Revision: 899 URL: http://tracker.coreboot.org/trac/openbios/changeset/899 Log: ppc: Use symbolic OpenBIOS origin address This will simplify moving OpenBIOS around in memory. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Oct 16 17:09:18 2010 (r898) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:35:49 2010 (r899) @@ -415,7 +415,7 @@ asm volatile("mtsrin %0,%1" :: "r" (sr_base + i), "r" (j) ); } - memcpy((void *)get_rom_base(), (void *)0xfff00000, 0x00100000); + memcpy((void *)get_rom_base(), (void *)OF_CODE_START, 0x00100000); /* Enable MMU */

1 0

libgcc problem
by Blue Swirl Oct. 16, 2010

Oct. 16, 2010

Hi, I finally found out the cause of the problem that prevented us to remove our copy of libgcc. The problem was that when switching to the libgcc provided by GCC, there would be strange crashes. The cause of these crashes is that the libgcc shipped with GCC is compiled with default options, in Sparc64 case the machine model is 'embmedany'. This makes memory accesses use %g4 as base register and since we don't initialize it (because other code uses machine model 'medany'), there will be crashes due to random base with some memory accesses in libgcc. It's clear that the default machine model for Sparc64 is not compatible with OpenBIOS, as is any libgcc compiled with this model. I also found out how to make GCC compile and use separate libgccs ('multilib') for each machine model. This is enabled for sparc64-elf target case with the following patch (applies to gcc-4.6-20100925). --- gcc/config/sparc/t-crtfm.orig 2002-06-20 18:00:02.000000000 +0000 +++ gcc/config/sparc/t-crtfm 2010-10-03 14:45:31.000000000 +0000 @@ -1,4 +1,11 @@ EXTRA_PARTS += crtfastmath.o +MULTILIB_OPTIONS = mcmodel=medany/mcmodel=medmid/mcmodel=medlow +MULTILIB_DIRNAMES = medany medmid medlow +MULTILIB_MATCHES = + +LIBGCC = stmp-multilib +INSTALL_LIBGCC = install-multilib + $(T)crtfastmath.o: $(srcdir)/config/sparc/crtfastmath.c $(GCC_PASSES) $(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) $(LIBGCC2_CFLAGS) -c -o $(T)crtfastmath.o $(srcdir)/config/sparc/crtfastmath.c The correct configuration can be seen with this command: $ sparc64-elf-gcc --print-multi-lib .; medany;@mcmodel=medany medmid;@mcmodel=medmid medlow;@mcmodel=medlow $ sparc64-elf-gcc -v Using built-in specs. COLLECT_GCC=sparc64-elf-gcc COLLECT_LTO_WRAPPER=/usr/local/libexec/gcc/sparc64-elf/4.6.0/lto-wrapper Target: sparc64-elf Configured with: ../configure --target=sparc64-elf --enable-targets=sparc64-elf --disable-nls --disable-threads --enable-languages=c --disable-shared --disable-libssp --enable-multilib Thread model: single gcc version 4.6.0 20100925 (experimental) (GCC) With this version, openbios-sparc64 without our local libgcc works as well as the old version. It may also be possible to change the default machine model, but I didn't try that. This way may be easier if the GCC is not new enough to support multilib. Now the big question is, should we still aim for removal? I'm not sure if libgccs shipped with native GCCs are compatible. Requiring a specifically patched GCC does not seem so attractive, though most people probably make a cross compiler anyway.

2 3

[commit] r897 - trunk/openbios-devel/arch/sparc64
by repository service Oct. 16, 2010

Oct. 16, 2010

Author: mcayland Date: Sat Oct 16 16:13:15 2010 New Revision: 897 URL: http://tracker.coreboot.org/trac/openbios/changeset/897 Log: Replace hardcoded value with the correct constant from spitfire.h. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/lib.c Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sat Oct 16 16:02:18 2010 (r896) +++ trunk/openbios-devel/arch/sparc64/lib.c Sat Oct 16 16:13:15 2010 (r897) @@ -154,7 +154,7 @@ if (va >= t->virt && va < (t->virt + t->size)) { /* valid tte, 8k size */ - tte_data = 0x8000000000000000UL; + tte_data = SPITFIRE_TTE_VALID; /* mix in phys address mode */ tte_data |= t->mode;

1 0