OpenBIOS December 2010

openbios@openbios.org

12 participants
64 discussions

Re: [OpenBIOS] [PATCH 2/6] Introduce ofmem_posix_memalign() function for arbitrary alignment.

by Blue Swirl

On Wed, Dec 29, 2010 at 11:07 AM, Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> wrote: > 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> > --- > openbios-devel/include/libopenbios/ofmem.h | 1 + > openbios-devel/libopenbios/ofmem_common.c | 32 +++++++++++++++++++++------ > 2 files changed, 26 insertions(+), 7 deletions(-) > > diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h > index 7b49e48..3d8ddbf 100644 > --- a/openbios-devel/include/libopenbios/ofmem.h > +++ b/openbios-devel/include/libopenbios/ofmem.h > @@ -80,6 +80,7 @@ extern inline phys_addr_t va2pa(unsigned long va); > extern inline unsigned long pa2va(phys_addr_t pa); > > /* malloc interface */ > +extern int ofmem_posix_memalign( void **memptr, int alignment, size_t size ); Actually the API for posix_memalign uses size_t for alignment.

9 years, 7 months

Re: [OpenBIOS] [PATCH 3/6] Introduce va2pa() and pa2va() functions for PPC for subsequent use by OFMEM.

by Blue Swirl

On Wed, Dec 29, 2010 at 11:07 AM, Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> wrote: > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> > --- > openbios-devel/arch/ppc/qemu/ofmem.c | 21 +++++++++++++++++++++ > 1 files changed, 21 insertions(+), 0 deletions(-) > > diff --git a/openbios-devel/arch/ppc/qemu/ofmem.c b/openbios-devel/arch/ppc/qemu/ofmem.c > index c21a112..44b5ef4 100644 > --- a/openbios-devel/arch/ppc/qemu/ofmem.c > +++ b/openbios-devel/arch/ppc/qemu/ofmem.c > @@ -180,6 +180,27 @@ void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) > /* OF private allocations */ > /************************************************************************/ > > +/* Private functions for mapping between physical/virtual addresses */ > +inline phys_addr_t I'd remove 'inline' from both. > +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; > + } > +} > + > +inline 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.7.2.3 > > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you >

9 years, 7 months

[commit] r989 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 include/arch/sparc32 include/arch/sparc64 include/libopenbios

by repository service

Author: mcayland Date: Tue Dec 28 22:41:11 2010 New Revision: 989 URL: http://tracker.coreboot.org/trac/openbios/changeset/989 Log: Move pa2va() and va2pa() inline functions from the io.h header files to lib.c for both SPARC32 and SPARC64. Also introduce the correct phys_addr_t type for physical addresses. 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/arch/sparc32/io.h trunk/openbios-devel/include/arch/sparc64/io.h trunk/openbios-devel/include/libopenbios/ofmem.h Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Fri Dec 24 23:36:33 2010 (r988) +++ trunk/openbios-devel/arch/sparc32/lib.c Tue Dec 28 22:41:11 2010 (r989) @@ -87,6 +87,27 @@ } ofmem; #define ALLOC_BLOCK (64 * 1024) +/* Private functions for mapping between physical/virtual addresses */ +inline phys_addr_t +va2pa(unsigned long va) +{ + if ((va >= (unsigned long)&_start) && + (va < (unsigned long)&_end)) + return va - va_shift; + else + return va; +} + +inline unsigned long +pa2va(phys_addr_t pa) +{ + if ((pa + va_shift >= (unsigned long)&_start) && + (pa + va_shift < (unsigned long)&_end)) + return pa + va_shift; + else + return pa; +} + // XXX should be posix_memalign static int posix_memalign2(void **memptr, size_t alignment, size_t size) Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Fri Dec 24 23:36:33 2010 (r988) +++ trunk/openbios-devel/arch/sparc64/lib.c Tue Dec 28 22:41:11 2010 (r989) @@ -36,6 +36,27 @@ return i; } +/* Private functions for mapping between physical/virtual addresses */ +inline phys_addr_t +va2pa(unsigned long va) +{ + if ((va >= (unsigned long)&_start) && + (va < (unsigned long)&_end)) + return va - va_shift; + else + return va; +} + +inline unsigned long +pa2va(phys_addr_t pa) +{ + if ((pa + va_shift >= (unsigned long)&_start) && + (pa + va_shift < (unsigned long)&_end)) + return pa + va_shift; + else + return pa; +} + void *malloc(int size) { return ofmem_malloc(size); Modified: trunk/openbios-devel/include/arch/sparc32/io.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/io.h Fri Dec 24 23:36:33 2010 (r988) +++ trunk/openbios-devel/include/arch/sparc32/io.h Tue Dec 28 22:41:11 2010 (r989) @@ -8,26 +8,6 @@ // Defined in ldscript extern char _start, _data, _stack, _estack, _end, _vmem, _evmem, _iomem; -static inline unsigned long -va2pa(unsigned long va) -{ - if ((va >= (unsigned long)&_start) && - (va < (unsigned long)&_end)) - return va - va_shift; - else - return va; -} - -static inline unsigned long -pa2va(unsigned long pa) -{ - if ((pa + va_shift >= (unsigned long)&_start) && - (pa + va_shift < (unsigned long)&_end)) - return pa + va_shift; - else - return pa; -} - // XXX check use and merge #define phys_to_virt(phys) ((void *) ((unsigned long) (phys))) #define virt_to_phys(virt) ((unsigned long) (virt)) Modified: trunk/openbios-devel/include/arch/sparc64/io.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/io.h Fri Dec 24 23:36:33 2010 (r988) +++ trunk/openbios-devel/include/arch/sparc64/io.h Tue Dec 28 22:41:11 2010 (r989) @@ -11,26 +11,6 @@ // Defined in ldscript extern char _start, _data, _stack, _estack, _end, _vmem, _evmem, _iomem; -static inline unsigned long -va2pa(unsigned long va) -{ - if ((va >= (unsigned long)&_data) && - (va < (unsigned long)&_end)) - return va - va_shift; - else - return va; -} - -static inline unsigned long -pa2va(unsigned long pa) -{ - if ((pa + va_shift >= (unsigned long)&_data) && - (pa + va_shift< (unsigned long)&_end)) - return pa + va_shift; - else - return pa; -} - // XXX check use and merge #define phys_to_virt(phys) ((void *) ((unsigned long) (phys))) #define virt_to_phys(virt) ((unsigned long) (virt)) Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Fri Dec 24 23:36:33 2010 (r988) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Tue Dec 28 22:41:11 2010 (r989) @@ -75,6 +75,10 @@ extern int ofmem_map_page_range( phys_addr_t phys, ucell virt, ucell size, 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); + /* malloc interface */ extern void* ofmem_malloc( size_t size ); extern void ofmem_free( void *ptr );

9 years, 7 months

[PATCH 6/6] Change OFMEM to allocate memory from the top of RAM downwards.

by Mark Cave-Ayland

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> --- openbios-devel/libopenbios/ofmem_common.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index a7a0edf..63a0783 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -511,7 +511,7 @@ phys_addr_t ofmem_claim_phys( phys_addr_t phys, ucell size, ucell align ) " 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 @@ ucell ofmem_claim_virt( ucell virt, ucell size, ucell align ) /* 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.7.2.3

9 years, 7 months

[PATCH 5/6] Introduce ofmem_arch_get_phys_top() for specifying the top of physical memory in OFMEM.

by Mark Cave-Ayland

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> --- openbios-devel/arch/ppc/qemu/ofmem.c | 7 +++++++ openbios-devel/arch/sparc64/ofmem_sparc64.c | 7 +++++++ openbios-devel/include/libopenbios/ofmem.h | 1 + openbios-devel/libopenbios/ofmem_common.c | 8 ++++---- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/openbios-devel/arch/ppc/qemu/ofmem.c b/openbios-devel/arch/ppc/qemu/ofmem.c index 44b5ef4..8f52bdf 100644 --- a/openbios-devel/arch/ppc/qemu/ofmem.c +++ b/openbios-devel/arch/ppc/qemu/ofmem.c @@ -115,6 +115,13 @@ ucell ofmem_arch_get_virt_top(void) 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 */ diff --git a/openbios-devel/arch/sparc64/ofmem_sparc64.c b/openbios-devel/arch/sparc64/ofmem_sparc64.c index 4d13038..0ec8632 100644 --- a/openbios-devel/arch/sparc64/ofmem_sparc64.c +++ b/openbios-devel/arch/sparc64/ofmem_sparc64.c @@ -63,6 +63,13 @@ ucell ofmem_arch_get_virt_top(void) 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 */ diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h index 3d8ddbf..1e44d36 100644 --- a/openbios-devel/include/libopenbios/ofmem.h +++ b/openbios-devel/include/libopenbios/ofmem.h @@ -62,6 +62,7 @@ extern ofmem_t* ofmem_arch_get_private(void); 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); diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index 638ca30..a7a0edf 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -354,7 +354,7 @@ static void ofmem_update_translations( void ) 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 ucell find_area( ucell align, ucell size, range_t *r, } 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 @@ phys_addr_t ofmem_claim_phys( phys_addr_t phys, ucell size, ucell align ) " 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 @@ ucell ofmem_claim( ucell addr, ucell size, ucell align ) } 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.7.2.3

9 years, 7 months

[PATCH 4/6] Alter ofmem_posix_memalign() so that the resulting pointer is aligned for both physical and virtual addresses.

by Mark Cave-Ayland

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> --- openbios-devel/libopenbios/ofmem_common.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index 8fb9e5b..638ca30 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -33,9 +33,9 @@ static inline size_t align_size(size_t x, size_t a) 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 @@ int ofmem_posix_memalign( void **memptr, int alignment, size_t size ) alloc_desc_t *d, **pp; void *ret; ucell top; + phys_addr_t pa; if( !size ) return ENOMEM; @@ -117,7 +118,11 @@ int ofmem_posix_memalign( void **memptr, int alignment, size_t size ) 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.7.2.3

9 years, 7 months

[PATCH 3/6] Introduce va2pa() and pa2va() functions for PPC for subsequent use by OFMEM.

by Mark Cave-Ayland

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/ppc/qemu/ofmem.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/openbios-devel/arch/ppc/qemu/ofmem.c b/openbios-devel/arch/ppc/qemu/ofmem.c index c21a112..44b5ef4 100644 --- a/openbios-devel/arch/ppc/qemu/ofmem.c +++ b/openbios-devel/arch/ppc/qemu/ofmem.c @@ -180,6 +180,27 @@ void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) /* OF private allocations */ /************************************************************************/ +/* Private functions for mapping between physical/virtual addresses */ +inline 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; + } +} + +inline 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.7.2.3

9 years, 7 months

[PATCH 2/6] Introduce ofmem_posix_memalign() function for arbitrary alignment.

by Mark Cave-Ayland

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> --- openbios-devel/include/libopenbios/ofmem.h | 1 + openbios-devel/libopenbios/ofmem_common.c | 32 +++++++++++++++++++++------ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h index 7b49e48..3d8ddbf 100644 --- a/openbios-devel/include/libopenbios/ofmem.h +++ b/openbios-devel/include/libopenbios/ofmem.h @@ -80,6 +80,7 @@ extern inline phys_addr_t va2pa(unsigned long va); extern inline unsigned long pa2va(phys_addr_t pa); /* malloc interface */ +extern int ofmem_posix_memalign( void **memptr, int 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 ); diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index bd0833f..8fb9e5b 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -86,7 +86,7 @@ print_trans( void ) /* OF private allocations */ /************************************************************************/ -void* ofmem_malloc( size_t size ) +int ofmem_posix_memalign( void **memptr, int alignment, size_t size ) { ofmem_t *ofmem = ofmem_arch_get_private(); alloc_desc_t *d, **pp; @@ -94,12 +94,12 @@ void* ofmem_malloc( size_t size ) 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 @@ void* ofmem_malloc( size_t size ) 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 @@ void* ofmem_malloc( size_t size ) 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.7.2.3

9 years, 7 months

[PATCH 1/6] Fix alignment of memory allocated by OFMEM's ofmem_malloc().

by Mark Cave-Ayland

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> --- openbios-devel/libopenbios/ofmem_common.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index 20a4cba..bd0833f 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -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 @@ void* ofmem_malloc( size_t size ) { ofmem_t *ofmem = ofmem_arch_get_private(); alloc_desc_t *d, **pp; - char *ret; + void *ret; ucell top; if( !size ) @@ -94,7 +99,7 @@ void* ofmem_malloc( size_t size ) 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 @@ void* ofmem_malloc( size_t size ) /* 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 @@ void* ofmem_malloc( size_t size ) 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.7.2.3

9 years, 7 months

[PATCH 0/6] Revised OFMEM patches in preparation for SPARC32 OFMEM patches v3

by Mark Cave-Ayland

Here are the OFMEM changes required in order to migrate SPARC32 over to OFMEM. v3: Rename ofmem_malloc_align() to ofmem_posix_memalign() and match with posix_memalign() API. v2: Revised based upon mailing list comments. v1: Initial implementation. Mark Cave-Ayland (6): Fix alignment of memory allocated by OFMEM's ofmem_malloc(). Introduce ofmem_posix_memalign() function for arbitrary alignment. Introduce va2pa() and pa2va() functions for PPC for subsequent use by OFMEM. Alter ofmem_posix_memalign() so that the resulting pointer is aligned for both physical and virtual addresses. Introduce ofmem_arch_get_phys_top() for specifying the top of physical memory in OFMEM. Change OFMEM to allocate memory from the top of RAM downwards. openbios-devel/arch/ppc/qemu/ofmem.c | 28 ++++++++++++ openbios-devel/arch/sparc64/ofmem_sparc64.c | 7 +++ openbios-devel/include/libopenbios/ofmem.h | 2 + openbios-devel/libopenbios/ofmem_common.c | 64 +++++++++++++++++++-------- 4 files changed, 83 insertions(+), 18 deletions(-) -- 1.7.2.3

9 years, 7 months