OpenBIOS December 2010

openbios@openbios.org

12 participants
64 discussions

Re: [OpenBIOS] [PATCH 15/16] Switch remaining SPARC32 code over to OFMEM.
by Blue Swirl 30 Dec '10

30 Dec '10

On Thu, Dec 30, 2010 at 6:07 PM, Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> wrote: > This patch removes the SPARC32-specific map_pages() function from the IOMMU driver, plus switches obp_dumb_memalloc() > over to use OFMEM. OFMEM property generation is enabled for the /memory and /virtual-memory nodes, and any remaining > traces of the old memory variables are removed. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> > --- > openbios-devel/arch/sparc32/lib.c | 69 +++++++++------------------ > openbios-devel/drivers/iommu.c | 2 +- > openbios-devel/include/libopenbios/ofmem.h | 1 - > 3 files changed, 24 insertions(+), 48 deletions(-) > > diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c > index 74ac5e7..6b51f1c 100644 > --- a/openbios-devel/arch/sparc32/lib.c > +++ b/openbios-devel/arch/sparc32/lib.c > @@ -53,8 +53,6 @@ struct mem { > char *curp; > }; > > -static struct mem cmem; /* Current memory, virtual */ > -static struct mem cio; /* Current I/O space */ > struct mem cdvmem; /* Current device virtual memory space */ > > unsigned int va_shift; > @@ -190,7 +188,7 @@ find_pte(unsigned long va, int alloc) > return pa2va(pa); > } > > -void > +static void > map_pages(phys_addr_t phys, unsigned long virt, > unsigned long size, unsigned long mode) > { > @@ -353,29 +351,19 @@ void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell > > char *obp_dumb_memalloc(char *va, unsigned int size) > { > - size = (size + 7) & ~7; > - // XXX should use normal memory alloc > - totavail[0].num_bytes -= size; > - DPRINTF("obp_dumb_memalloc va 0x%p size %x at 0x%x\n", va, size, > - totavail[0].num_bytes); > - > - // If va is null, the allocator is supposed to pick a "suitable" address. > - // (See OpenSolaric prom_alloc.c) There's not any real guidance as > - // to what might be "suitable". So we mimic the behavior of a Sun boot > - // ROM. > - > - if (va == NULL) { > - va = (char *)(totmap[0].start_adr - size); > - totmap[0].start_adr -= size; > - totmap[0].num_bytes += size; > - DPRINTF("obp_dumb_memalloc req null -> 0x%p\n", va); > - } > + phys_addr_t phys; > + ucell virt; > + > + /* Claim physical memory */ > + phys = ofmem_claim_phys(-1, size, CONFIG_OFMEM_MALLOC_ALIGN); > + > + /* Claim virtual memory */ > + virt = ofmem_claim_virt(pointer2cell(va), size, 0); > > - map_pages(totavail[0].num_bytes, (unsigned long)va, size, ofmem_arch_default_translation_mode(totavail[0].num_bytes)); > + /* Map the memory */ > + ofmem_map(phys, virt, size, ofmem_arch_default_translation_mode(phys)); > > - update_memory_properties(); > - > - return va; > + return cell2pointer(virt); > } > > void obp_dumb_memfree(__attribute__((unused))char *va, > @@ -387,6 +375,9 @@ void obp_dumb_memfree(__attribute__((unused))char *va, > void > ob_init_mmu(void) > { > + ucell *reg; > + ofmem_t *ofmem; This variable is not read after it has been initialized, so GCC 4.6.0 complains: CC target/arch/sparc32/lib.o ../arch/sparc32/lib.c: In function 'ob_init_mmu': ../arch/sparc32/lib.c:379:14: error: variable 'ofmem' set but not used [-Werror=unused-but-set-variable] Please remove the variable: diff --git a/arch/sparc32/lib.c b/arch/sparc32/lib.c index 37b33f0..f9956ce 100644 --- a/arch/sparc32/lib.c +++ b/arch/sparc32/lib.c @@ -376,7 +376,6 @@ void ob_init_mmu(void) { ucell *reg; - ofmem_t *ofmem; init_romvec_mem(); @@ -394,7 +393,7 @@ ob_init_mmu(void) ofmem_register(s_phandle_memory, s_phandle_mmu); /* Setup /memory:reg (totphys) property */ - ofmem = ofmem_arch_get_private(); + ofmem_arch_get_private(); reg = malloc(3 * sizeof(ucell)); ofmem_arch_encode_physaddr(reg, 0); /* physical base */ reg[2] = (ucell)ofmem_arch_get_phys_top(); /* size */

1 0

Re: [OpenBIOS] [PATCH 00/16] Convert SPARC32 to OFMEM
by Mark Cave-Ayland 30 Dec '10

30 Dec '10

Hmmmm - it looks like git send-mail found some old files from a previous test checkout and decided to email those out too :( Based upon SVN trunk, patch 4/16 is the first one to applied. Shall I resend a clean patchset? 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

2 1

Re: [OpenBIOS] [PATCH 16/16] Fix the FMT_cell and FMT_ucell definitions for SPARC32.
by Andreas Färber 30 Dec '10

30 Dec '10

Am 30.12.2010 um 19:07 schrieb Mark Cave-Ayland: > This is required to enable a build with CONFIG_DEBUG_OFMEM set to > true to complete successfully. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> > --- > openbios-devel/include/arch/sparc32/types.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/openbios-devel/include/arch/sparc32/types.h b/openbios- > devel/include/arch/sparc32/types.h > index 444d648..e4f0f0d 100644 > --- a/openbios-devel/include/arch/sparc32/types.h > +++ b/openbios-devel/include/arch/sparc32/types.h > @@ -46,8 +46,8 @@ typedef uint32_t ucell; > typedef long long dcell; > typedef unsigned long long ducell; > > -#define FMT_cell "%ld" > -#define FMT_ucell "%lu" > +#define FMT_cell "%d" > +#define FMT_ucell "%u" Please use PRI{d,x}32. This may or may not require a pending patch of mine from the prom_args_t series. > #define FMT_ucellx "%08x" > #define FMT_ucellX "%08X" > > -- > 1.7.2.3 > > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you

1 1

[commit] r996 - trunk/openbios-devel/libopenbios
by repository service 30 Dec '10

30 Dec '10

Author: mcayland Date: Thu Dec 30 14:56:28 2010 New Revision: 996 URL: http://tracker.coreboot.org/trac/openbios/changeset/996 Log: Change OFMEM to allocate memory from the top of RAM downwards. At the moment OFMEM allocates memory from the bottom of RAM upwards, however many loaders/kernels initialise themselves in lower memory areas which can cause them to be overwritten by subsequent memory allocations. Mimic the existing SPARC32 behaviour by allocating physical and virtual memory from the top of RAM downwards. 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 Thu Dec 30 14:56:24 2010 (r995) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Thu Dec 30 14:56:28 2010 (r996) @@ -511,7 +511,7 @@ " align=" FMT_ucellx "\n", phys, size, align); - return ofmem_claim_phys_( phys, size, align, 0, ofmem_arch_get_phys_top(), 0 ); + return ofmem_claim_phys_( phys, size, align, 0, ofmem_arch_get_phys_top(), 1 ); } static ucell ofmem_claim_virt_( ucell virt, ucell size, ucell align, @@ -544,7 +544,7 @@ /* printk("+ ofmem_claim virt %08lx %lx %ld\n", virt, size, align ); */ return ofmem_claim_virt_( virt, size, align, - get_ram_size(), ofmem_arch_get_virt_top(), 0 ); + get_ram_size(), ofmem_arch_get_virt_top(), 1 ); } /* if align != 0, phys is ignored. Returns -1 on error */

1 0

[commit] r995 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc64 include/libopenbios libopenbios
by repository service 30 Dec '10

30 Dec '10

Author: mcayland Date: Thu Dec 30 14:56:24 2010 New Revision: 995 URL: http://tracker.coreboot.org/trac/openbios/changeset/995 Log: Introduce ofmem_arch_get_phys_top() for specifying the top of physical memory in OFMEM. At the same time, teach OFMEM to make use of it when calculating the /memory available property. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/include/libopenbios/ofmem.h trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Thu Dec 30 14:56:20 2010 (r994) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Thu Dec 30 14:56:24 2010 (r995) @@ -115,6 +115,13 @@ return IO_BASE; } +phys_addr_t ofmem_arch_get_phys_top(void) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + + return ofmem->ramsize; +} + void ofmem_arch_unmap_pages(ucell virt, ucell size) { /* kill page mappings in provided range */ Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Thu Dec 30 14:56:20 2010 (r994) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Thu Dec 30 14:56:24 2010 (r995) @@ -63,6 +63,13 @@ return (ucell)TOP_OF_RAM; } +phys_addr_t ofmem_arch_get_phys_top(void) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + + return ofmem->ramsize; +} + retain_t *ofmem_arch_get_retained(void) { /* Retained area is at the top of physical RAM */ Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Thu Dec 30 14:56:20 2010 (r994) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Thu Dec 30 14:56:24 2010 (r995) @@ -62,6 +62,7 @@ extern void* ofmem_arch_get_malloc_base(void); extern ucell ofmem_arch_get_heap_top(void); extern ucell ofmem_arch_get_virt_top(void); +extern phys_addr_t ofmem_arch_get_phys_top(void); extern retain_t* ofmem_arch_get_retained(void); extern int ofmem_arch_get_physaddr_cellsize(void); extern int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value); Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Thu Dec 30 14:56:20 2010 (r994) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Thu Dec 30 14:56:24 2010 (r995) @@ -354,7 +354,7 @@ ofmem_t *ofmem = ofmem_arch_get_private(); ofmem_update_memory_available(s_phandle_memory, ofmem->phys_range, - &phys_range_prop, &phys_range_prop_size, &phys_range_prop_used, get_ram_size()); + &phys_range_prop, &phys_range_prop_size, &phys_range_prop_used, ofmem_arch_get_phys_top()); 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(); @@ -481,7 +481,7 @@ } static phys_addr_t ofmem_claim_phys_( phys_addr_t phys, ucell size, ucell align, - ucell min, ucell max, int reverse ) + phys_addr_t min, phys_addr_t max, int reverse ) { ofmem_t *ofmem = ofmem_arch_get_private(); if( !align ) { @@ -511,7 +511,7 @@ " align=" FMT_ucellx "\n", phys, size, align); - return ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); + return ofmem_claim_phys_( phys, size, align, 0, ofmem_arch_get_phys_top(), 0 ); } static ucell ofmem_claim_virt_( ucell virt, ucell size, ucell align, @@ -591,7 +591,7 @@ } else { if( align < 0x1000 ) align = 0x1000; - phys = ofmem_claim_phys_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ ); + 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 ) { OFMEM_TRACE("ofmem_claim failed\n");

1 0

[commit] r994 - trunk/openbios-devel/libopenbios
by repository service 30 Dec '10

30 Dec '10

Author: mcayland Date: Thu Dec 30 14:56:20 2010 New Revision: 994 URL: http://tracker.coreboot.org/trac/openbios/changeset/994 Log: Alter ofmem_posix_memalign() so that the resulting pointer is aligned for both physical and virtual addresses. Some uses of ofmem_posix_memalign() need to ensure that the alignment requirement is for physical as well as virtual addresses, e.g. for MMU page tables. 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 Thu Dec 30 14:56:17 2010 (r993) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Thu Dec 30 14:56:20 2010 (r994) @@ -33,9 +33,9 @@ return (x + a - 1) & ~(a - 1); } -static inline void * align_ptr(uintptr_t x, size_t a) +static inline phys_addr_t align_ptr(uintptr_t x, size_t a) { - return (void *)((x + a - 1) & ~(a - 1)); + return (x + a - 1) & ~(a - 1); } static ucell get_ram_size( void ) @@ -92,6 +92,7 @@ alloc_desc_t *d, **pp; void *ret; ucell top; + phys_addr_t pa; if( !size ) return ENOMEM; @@ -117,7 +118,11 @@ top = ofmem_arch_get_heap_top(); - ret = align_ptr((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t), alignment); + /* Alignment should be on physical not virtual address */ + pa = va2pa((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t)); + pa = align_ptr(pa, alignment); + ret = (void *)pa2va(pa); + if( pointer2cell(ret) + size > top ) { printk("out of malloc memory (%x)!\n", size ); return ENOMEM;

1 0

[commit] r993 - trunk/openbios-devel/arch/ppc/qemu
by repository service 30 Dec '10

30 Dec '10

Author: mcayland Date: Thu Dec 30 14:56:17 2010 New Revision: 993 URL: http://tracker.coreboot.org/trac/openbios/changeset/993 Log: Introduce va2pa() and pa2va() functions for PPC for subsequent use by OFMEM. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.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 Thu Dec 30 14:56:14 2010 (r992) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Thu Dec 30 14:56:17 2010 (r993) @@ -180,6 +180,27 @@ /* OF private allocations */ /************************************************************************/ +/* Private functions for mapping between physical/virtual addresses */ +phys_addr_t +va2pa(unsigned long va) +{ + if (va >= OF_CODE_START && va < OF_CODE_START + OF_CODE_SIZE) { + return (phys_addr_t)get_rom_base() - OF_CODE_START + va; + } else { + return (phys_addr_t)va; + } +} + +unsigned long +pa2va(phys_addr_t pa) +{ + if ((pa - get_rom_base() + OF_CODE_START >= OF_CODE_START) && + (pa - get_rom_base() + OF_CODE_START < OF_CODE_START + OF_CODE_SIZE)) + return (unsigned long)pa - get_rom_base() + OF_CODE_START; + else + return (unsigned long)pa; +} + void * malloc(int size) {

1 0

[commit] r992 - in trunk/openbios-devel: include/libopenbios libopenbios
by repository service 30 Dec '10

30 Dec '10

Author: mcayland Date: Thu Dec 30 14:56:14 2010 New Revision: 992 URL: http://tracker.coreboot.org/trac/openbios/changeset/992 Log: Introduce ofmem_posix_memalign() function for arbitrary alignment. Rework ofmem_malloc() so that it takes a parameter specifying the alignment for the allocation and then change the API to match that of posix_memalign(). Then create ofmem_malloc() as a simple wrapper function onto ofmem_posix_memalign() using a default alignment of CONFIG_OFMEM_MALLOC_ALIGN. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.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 Thu Dec 30 14:56:12 2010 (r991) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Thu Dec 30 14:56:14 2010 (r992) @@ -80,6 +80,7 @@ extern unsigned long pa2va(phys_addr_t pa); /* malloc interface */ +extern int ofmem_posix_memalign( void **memptr, size_t alignment, size_t size ); extern void* ofmem_malloc( size_t size ); extern void ofmem_free( void *ptr ); extern void* ofmem_realloc( void *ptr, size_t size ); Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Thu Dec 30 14:56:12 2010 (r991) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Thu Dec 30 14:56:14 2010 (r992) @@ -86,7 +86,7 @@ /* OF private allocations */ /************************************************************************/ -void* ofmem_malloc( size_t size ) +int ofmem_posix_memalign( void **memptr, size_t alignment, size_t size ) { ofmem_t *ofmem = ofmem_arch_get_private(); alloc_desc_t *d, **pp; @@ -94,12 +94,12 @@ ucell top; if( !size ) - return NULL; + return ENOMEM; if( !ofmem->next_malloc ) ofmem->next_malloc = (char*)ofmem_arch_get_malloc_base(); - size = align_size(size + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); + size = align_size(size + sizeof(alloc_desc_t), alignment); /* look in the freelist */ for( pp=&ofmem->mfree; *pp && (**pp).size < size; pp = &(**pp).next ) { @@ -110,15 +110,17 @@ ret = (void *)((uintptr_t)*pp + sizeof(alloc_desc_t)); memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); *pp = (**pp).next; - return ret; + + *memptr = ret; + return 0; } top = ofmem_arch_get_heap_top(); - ret = align_ptr((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); + ret = align_ptr((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t), alignment); if( pointer2cell(ret) + size > top ) { printk("out of malloc memory (%x)!\n", size ); - return NULL; + return ENOMEM; } d = (alloc_desc_t*)((uintptr_t)ret - sizeof(alloc_desc_t)); @@ -129,7 +131,23 @@ memset( ret, 0, size - sizeof(alloc_desc_t) ); - return ret; + *memptr = ret; + return 0; +} + +void* ofmem_malloc( size_t size ) +{ + void *memptr; + int res; + + res = ofmem_posix_memalign( &memptr, CONFIG_OFMEM_MALLOC_ALIGN, size ); + if (!res) { + /* Success */ + return memptr; + } else { + /* Failure */ + return NULL; + } } void ofmem_free( void *ptr )

1 0

[commit] r991 - trunk/openbios-devel/libopenbios
by repository service 30 Dec '10

30 Dec '10

Author: mcayland Date: Thu Dec 30 14:56:12 2010 New Revision: 991 URL: http://tracker.coreboot.org/trac/openbios/changeset/991 Log: Fix alignment of memory allocated by OFMEM's ofmem_malloc(). A casual glance at the source code suggests that pointers returned by ofmem_malloc() are aligned, but in fact they are not because sizeof(alloc_desc_t) is added to the final pointer return value. Create some additional padding after the previous value of ofmem->next_malloc so we can store the alloc_desc_t underneath the final return pointer in memory, thus ensuring that the final pointer is aligned correctly. 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 Thu Dec 30 14:28:36 2010 (r990) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Thu Dec 30 14:56:12 2010 (r991) @@ -28,9 +28,14 @@ //#define OFMEM_FILL_RANGE -static inline size_t ALIGN_SIZE(size_t x, size_t a) +static inline size_t align_size(size_t x, size_t a) { - return (x + a - 1) & ~(a-1); + return (x + a - 1) & ~(a - 1); +} + +static inline void * align_ptr(uintptr_t x, size_t a) +{ + return (void *)((x + a - 1) & ~(a - 1)); } static ucell get_ram_size( void ) @@ -85,7 +90,7 @@ { ofmem_t *ofmem = ofmem_arch_get_private(); alloc_desc_t *d, **pp; - char *ret; + void *ret; ucell top; if( !size ) @@ -94,7 +99,7 @@ if( !ofmem->next_malloc ) ofmem->next_malloc = (char*)ofmem_arch_get_malloc_base(); - size = ALIGN_SIZE(size + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); + size = align_size(size + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); /* look in the freelist */ for( pp=&ofmem->mfree; *pp && (**pp).size < size; pp = &(**pp).next ) { @@ -102,7 +107,7 @@ /* waste at most 4K by taking an entry from the freelist */ if( *pp && (**pp).size < size + 0x1000 ) { - ret = (char*)*pp + sizeof(alloc_desc_t); + ret = (void *)((uintptr_t)*pp + sizeof(alloc_desc_t)); memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); *pp = (**pp).next; return ret; @@ -110,18 +115,18 @@ top = ofmem_arch_get_heap_top(); - if( pointer2cell(ofmem->next_malloc) + size > top ) { + ret = align_ptr((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN); + if( pointer2cell(ret) + size > top ) { printk("out of malloc memory (%x)!\n", size ); return NULL; } - d = (alloc_desc_t*) ofmem->next_malloc; + d = (alloc_desc_t*)((uintptr_t)ret - sizeof(alloc_desc_t)); ofmem->next_malloc += size; d->next = NULL; d->size = size; - ret = (char*)d + sizeof(alloc_desc_t); memset( ret, 0, size - sizeof(alloc_desc_t) ); return ret;

1 0

[commit] r990 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 include/libopenbios
by repository service 30 Dec '10

30 Dec '10

Author: mcayland Date: Thu Dec 30 14:28:36 2010 New Revision: 990 URL: http://tracker.coreboot.org/trac/openbios/changeset/990 Log: Remove inline declaration from existing va2pa() and pa2va() functions as suggested by Blue. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/include/libopenbios/ofmem.h Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Tue Dec 28 22:41:11 2010 (r989) +++ trunk/openbios-devel/arch/sparc32/lib.c Thu Dec 30 14:28:36 2010 (r990) @@ -88,7 +88,7 @@ #define ALLOC_BLOCK (64 * 1024) /* Private functions for mapping between physical/virtual addresses */ -inline phys_addr_t +phys_addr_t va2pa(unsigned long va) { if ((va >= (unsigned long)&_start) && @@ -98,7 +98,7 @@ return va; } -inline unsigned long +unsigned long pa2va(phys_addr_t pa) { if ((pa + va_shift >= (unsigned long)&_start) && Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Tue Dec 28 22:41:11 2010 (r989) +++ trunk/openbios-devel/arch/sparc64/lib.c Thu Dec 30 14:28:36 2010 (r990) @@ -37,7 +37,7 @@ } /* Private functions for mapping between physical/virtual addresses */ -inline phys_addr_t +phys_addr_t va2pa(unsigned long va) { if ((va >= (unsigned long)&_start) && @@ -47,7 +47,7 @@ return va; } -inline unsigned long +unsigned long pa2va(phys_addr_t pa) { if ((pa + va_shift >= (unsigned long)&_start) && Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Tue Dec 28 22:41:11 2010 (r989) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Thu Dec 30 14:28:36 2010 (r990) @@ -76,8 +76,8 @@ ucell mode ); /* Private functions for mapping between physical/virtual addresses */ -extern inline phys_addr_t va2pa(unsigned long va); -extern inline unsigned long pa2va(phys_addr_t pa); +extern phys_addr_t va2pa(unsigned long va); +extern unsigned long pa2va(phys_addr_t pa); /* malloc interface */ extern void* ofmem_malloc( size_t size );

1 0