[OpenBIOS] r528 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 config/examples

svn at openbios.org svn at openbios.org
Sun Aug 2 13:08:01 CEST 2009


Author: blueswirl
Date: 2009-08-02 13:08:01 +0200 (Sun, 02 Aug 2009)
New Revision: 528

Modified:
   trunk/openbios-devel/arch/sparc32/lib.c
   trunk/openbios-devel/arch/sparc64/lib.c
   trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c
   trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h
   trunk/openbios-devel/config/examples/cross-sparc64_config.xml
Log:
switch sparc64 to ofmem module implementation (Igor Kovalenko)


Modified: trunk/openbios-devel/arch/sparc32/lib.c
===================================================================
--- trunk/openbios-devel/arch/sparc32/lib.c	2009-08-02 11:07:13 UTC (rev 527)
+++ trunk/openbios-devel/arch/sparc32/lib.c	2009-08-02 11:08:01 UTC (rev 528)
@@ -68,25 +68,6 @@
 struct linux_mlist_v0 *ptmap;
 struct linux_mlist_v0 *ptavail;
 
-typedef struct alloc_desc {
-	struct alloc_desc 	*next;
-	int			size;			/* size (including) this struct */
-} alloc_desc_t;
-
-typedef struct mem_range {
-	struct mem_range	*next;
-	ulong			start;
-	ulong			size;
-} range_t;
-
-typedef struct trans {
-	struct trans		*next;
-	ulong			virt;			/* chain is sorted by virt */
-	ulong			size;
-	ulong			phys;
-	int			mode;
-} translation_t;
-
 static struct {
 	char 			*next_malloc;
         int                     left;

Modified: trunk/openbios-devel/arch/sparc64/lib.c
===================================================================
--- trunk/openbios-devel/arch/sparc64/lib.c	2009-08-02 11:07:13 UTC (rev 527)
+++ trunk/openbios-devel/arch/sparc64/lib.c	2009-08-02 11:08:01 UTC (rev 528)
@@ -298,11 +298,19 @@
     }
 }
 
-void ofmem_unmap_pages(ucell virt, ucell size)
+void ofmem_arch_unmap_pages(ucell virt, ucell size)
 {
 	unmap_pages(virt, size);
 }
 
+void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, ucell mode)
+{
+	if (mode & SPITFIRE_TTE_LOCKED) {
+		// install locked tlb entries now
+		ofmem_map_pages(phys, virt, size, mode);
+	}
+}
+
 /*
   3.6.5 unmap
   ( virt size -- )
@@ -332,14 +340,8 @@
     	virt = POP();
     }
 
-    printk("claim virt=" FMT_ucellx " size=" FMT_ucellx " align=" FMT_ucellx
-    		"\n",
-    		virt, size, align);
-
     virt = ofmem_claim_virt(virt, size, align);
 
-    printk("claimed virt=" FMT_ucellx "\n", virt);
-
     PUSH(virt);
 }
 
@@ -354,9 +356,8 @@
 
     size = POP();
     virt = POP();
-    printk("release virt=" FMT_ucellx " size=" FMT_ucellx "\n", virt, size);
 
-    ofmem_release(virt, size);
+    ofmem_release_virt(virt, size);
 }
 
 /* ( phys size align --- base ) */
@@ -373,14 +374,8 @@
         phys |= POP();
     }
 
-    printk("mem_claim phys=" FMT_ucellx " size=" FMT_ucellx
-    		" align=" FMT_ucellx "\n",
-    		phys, size, align);
-
     phys = ofmem_claim_phys(phys, size, align);
 
-    printk("ofmem_claim_phys result phys=" FMT_ucellx "\n", phys);
-
     ofmem_map(phys, phys, size, -1);
 
     PUSH(phys >> 32);
@@ -395,9 +390,8 @@
 
     size = POP();
     phys = POP();
-    printk("release virt=" FMT_ucellx " size=" FMT_ucellx "\n", phys, size);
 
-    ofmem_release(phys, size);
+    ofmem_release_phys(phys, size);
 }
 
 DECLARE_NODE(memory, INSTALL_OPEN, 0, "/memory");

Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c
===================================================================
--- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c	2009-08-02 11:07:13 UTC (rev 527)
+++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c	2009-08-02 11:08:01 UTC (rev 528)
@@ -18,11 +18,6 @@
 #include "ofmem_sparc64.h"
 #include "spitfire.h"
 
-static inline uint64_t ALIGN_SIZE(uint64_t x, uint64_t a)
-{
-    return (x + a - 1) & ~(a-1);
-}
-
 #define OF_MALLOC_BASE		((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8))
 
 #define MEMSIZE ((128 + 256 + 512) * 1024)
@@ -36,199 +31,41 @@
 
 translation_t **g_ofmem_translations = &s_ofmem_data.ofmem.trans;
 
-ulong get_ram_size( void )
+static ucell get_heap_top( void )
 {
-	ofmem_t *ofmem = OFMEM;
-	return ofmem->ramsize;
+	return (ucell)TOP_OF_RAM;
 }
 
-static phandle_t s_phandle_memory = 0;
-static phandle_t s_phandle_mmu = 0;
-
-static void ofmem_update_mmu_translations( void )
+static inline size_t ALIGN_SIZE(size_t x, size_t a)
 {
-	ofmem_t *ofmem = OFMEM;
-	translation_t *t;
-	int ncells;
-	ucell *props;
-
-	if (s_phandle_mmu == 0)
-		return;
-
-	for( t = ofmem->trans, ncells = 0; t ; t=t->next, ncells++ ) {
-	}
-
-	props = malloc(ncells * sizeof(ucell) * 3);
-
-	if (props == NULL)
-		return;
-
-	for( t = ofmem->trans, ncells = 0 ; t ; t=t->next ) {
-		props[ncells++] = t->virt;
-		props[ncells++] = t->size;
-		props[ncells++] = t->mode;
-	}
-
-	set_property(s_phandle_mmu, "translations",
-			(char*)props, ncells * sizeof(props[0]));
-
-	free(props);
+    return (x + a - 1) & ~(a-1);
 }
 
-static void ofmem_update_memory_available( phandle_t ph, range_t *range,
-		u64 top_address )
+ofmem_t* ofmem_arch_get_private(void)
 {
-	range_t *r;
-	int ncells;
-	ucell *props;
-
-	ucell start, size;
-
-	if (s_phandle_memory == 0)
-		return;
-
-	/* count phys_range list entries */
-	for( r = range, ncells = 0; r ; r=r->next, ncells++ ) {
-	}
-
-	/* inverse of phys_range list could take 2 more cells for the tail */
-	props = malloc((ncells+1) * sizeof(ucell) * 2);
-
-	if (props == NULL) {
-		/* out of memory! */
-		return;
-	}
-
-	start = 0;
-	ncells = 0;
-
-	for (r = range; r; r=r->next) {
-		if (r->start >= top_address) {
-			break;
-		}
-
-		size = r->start - start;
-		if (size) {
-			props[ncells++] = start;
-			props[ncells++] = size;
-		}
-		start = r->start + r->size;
-	}
-
-	/* tail */
-	if (start < top_address) {
-		props[ncells++] = start;
-		props[ncells++] = top_address - start;
-	}
-
-	set_property(ph, "available",
-			(char*)props, ncells * sizeof(props[0]));
-
-	free(props);
+	return OFMEM;
 }
 
-static void ofmem_update_translations( void )
+void* ofmem_arch_get_malloc_base(void)
 {
-	ofmem_t *ofmem = OFMEM;
-
-	ofmem_update_memory_available(s_phandle_memory,
-			ofmem->phys_range, ofmem->ramsize);
-	ofmem_update_memory_available(s_phandle_mmu,
-			ofmem->virt_range, -1ULL);
-	ofmem_update_mmu_translations();
+	return OF_MALLOC_BASE;
 }
 
-/************************************************************************/
-/* OF private allocations                                               */
-/************************************************************************/
-
-void* ofmem_malloc( size_t size )
+ucell ofmem_arch_get_heap_top(void)
 {
-	ofmem_t *ofmem = OFMEM;
-	alloc_desc_t *d, **pp;
-	char *ret;
-
-	if( !size )
-		return NULL;
-
-	if( !ofmem->next_malloc )
-		ofmem->next_malloc = (char*)OF_MALLOC_BASE;
-
-	/* assuming sizeof(alloc_desc_t) is multiple of 8 */
-	size = ALIGN_SIZE(size + sizeof(alloc_desc_t), 8);
-
-	/* look in the freelist */
-	for( pp=&ofmem->mfree; *pp && (**pp).size < size; pp = &(**pp).next ) {
-	}
-
-	/* waste at most 4K by taking an entry from the freelist */
-	if( *pp && (**pp).size < size + 0x1000 ) {
-		ret = (char*)*pp + sizeof(alloc_desc_t);
-		memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) );
-		*pp = (**pp).next;
-		return ret;
-	}
-
-	if( ofmem->next_malloc + size >= TOP_OF_RAM ) {
-		printk("out of malloc memory (%x)!\n", size );
-		return NULL;
-	}
-
-	d = (alloc_desc_t*) ofmem->next_malloc;
-	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;
+	return get_heap_top();
 }
 
-void ofmem_free( void *ptr )
+ucell ofmem_arch_get_virt_top(void)
 {
-	ofmem_t *ofmem = OFMEM;
-	alloc_desc_t **pp, *d;
-
-	/* it is legal to free NULL pointers (size zero allocations) */
-	if( !ptr )
-		return;
-
-	d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t));
-	d->next = ofmem->mfree;
-
-	/* insert in the (sorted) freelist */
-	for( pp=&ofmem->mfree; *pp && (**pp).size < d->size ; pp = &(**pp).next ) {
-	}
-
-	d->next = *pp;
-	*pp = d;
+	return (ucell)TOP_OF_RAM;
 }
 
-void* ofmem_realloc( void *ptr, size_t size )
-{
-	alloc_desc_t *d = (alloc_desc_t*)((char *)ptr - sizeof(alloc_desc_t));
-	char *p;
-
-	if( !ptr )
-		return malloc( size );
-	if( !size ) {
-		free( ptr );
-		return NULL;
-	}
-	p = malloc( size );
-	memcpy( p, ptr, MIN(d->size - sizeof(alloc_desc_t),size) );
-	free( ptr );
-	return p;
-}
-
-
 /************************************************************************/
 /* misc                                                                 */
 /************************************************************************/
 
-static inline ucell def_memmode( ucell phys )
+ucell ofmem_arch_default_translation_mode( ucell phys )
 {
 	/* Writable, cacheable */
 	/* not privileged and not locked */
@@ -236,399 +73,9 @@
 }
 
 
-/************************************************************************/
-/* client interface                                                     */
-/************************************************************************/
 
-static int is_free( ucell ea, ucell size, range_t *r )
-{
-	if( size == 0 )
-		return 1;
-	for( ; r ; r=r->next ) {
-		if( r->start + r->size - 1 >= ea && r->start <= ea )
-			return 0;
-		if( r->start >= ea && r->start <= ea + size - 1 )
-			return 0;
-	}
-	return 1;
-}
 
-static void add_entry_( ucell ea, ucell size, range_t **r )
-{
-	range_t *nr;
-
-	for( ; *r && (**r).start < ea; r=&(**r).next ) {
-	}
-
-	nr = (range_t*)malloc( sizeof(range_t) );
-	nr->next = *r;
-	nr->start = ea;
-	nr->size = size;
-	*r = nr;
-}
-
-static int add_entry( ucell ea, ucell size, range_t **r )
-{
-	if( !is_free( ea, size, *r ) ) {
-		printk("add_entry: range not free!\n");
-		return -1;
-	}
-	add_entry_( ea, size, r );
-	return 0;
-}
-
-static ucell find_area( ucell align, ucell size, range_t *r,
-		ucell min, ucell max, int reverse )
-{
-	ucell base = min;
-	range_t *r2;
-
-	if( (align & (align-1)) ) {
-		printk("bad alignment " FMT_ucell "\n", align);
-		align = 0x1000;
-	}
-	if( !align )
-		align = 0x1000;
-
-	base = reverse ? max - size : min;
-	r2 = reverse ? NULL : r;
-
-	for( ;; ) {
-		if( !reverse ) {
-			base = (base + align - 1) & ~(align-1);
-			if( base < min )
-				base = min;
-			if( base + size - 1 >= max -1 )
-				break;
-		} else {
-			if( base > max - size )
-				base = max - size;
-			base -= base & (align-1);
-		}
-		if( is_free( base, size, r ) )
-			return base;
-
-		if( !reverse ) {
-			if( !r2 )
-				break;
-			base = r2->start + r2->size;
-			r2 = r2->next;
-		} else {
-			range_t *rp;
-
-			for( rp=r; rp && rp->next != r2 ; rp=rp->next ) {
-			}
-
-			r2 = rp;
-			if( !r2 )
-				break;
-			base = r2->start - size;
-		}
-	}
-	return (ucell)-1;
-}
-
-static ucell ofmem_claim_phys_( ucell phys, ucell size, ucell align,
-		ucell min, ucell max, int reverse )
-{
-	ofmem_t *ofmem = OFMEM;
-	if( !align ) {
-		if( !is_free( phys, size, ofmem->phys_range ) ) {
-			printk("Non-free physical memory claimed!\n");
-			return -1;
-		}
-		add_entry( phys, size, &ofmem->phys_range );
-		return phys;
-	}
-	phys = find_area( align, size, ofmem->phys_range, min, max, reverse );
-	if( phys == (ucell)-1 ) {
-		printk("ofmem->claim_phys - out of space\n");
-		return -1;
-	}
-	add_entry( phys, size, &ofmem->phys_range );
-
-	ofmem_update_translations();
-
-	return phys;
-}
-
-/* if align != 0, phys is ignored. Returns -1 on error */
-ucell ofmem_claim_phys( ucell phys, ucell size, ucell align )
-{
-	/* printk("+ ofmem_claim phys %08lx %lx %ld\n", phys, size, align ); */
-	return ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 );
-}
-
-static ucell ofmem_claim_virt_( ucell virt, ucell size, ucell align,
-		ucell min, ucell max, int reverse )
-{
-	ofmem_t *ofmem = OFMEM;
-	if( !align ) {
-		if( !is_free( virt, size, ofmem->virt_range ) ) {
-			printk("Non-free physical memory claimed!\n");
-			return -1;
-		}
-		add_entry( virt, size, &ofmem->virt_range );
-		return virt;
-	}
-
-	virt = find_area( align, size, ofmem->virt_range, min, max, reverse );
-	if( virt == -1UL ) {
-		printk("ofmem_claim_virt - out of space\n");
-		return -1UL;
-	}
-	add_entry( virt, size, &ofmem->virt_range );
-	return virt;
-}
-
-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(), (ucell)TOP_OF_RAM, 0 );
-}
-
-
-/* allocate both physical and virtual space and add a translation */
-ucell ofmem_claim( ucell addr, ucell size, ucell align )
-{
-	ofmem_t *ofmem = OFMEM;
-	ucell virt, phys;
-	ucell offs = addr & 0xfff;
-
-	/* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */
-	virt = phys = 0;
-	if( !align ) {
-		if( is_free(addr, size, ofmem->virt_range) &&
-		    is_free(addr, size, ofmem->phys_range) ) {
-			ofmem_claim_phys_( addr, size, 0, 0, 0, 0 );
-			ofmem_claim_virt_( addr, size, 0, 0, 0, 0 );
-			virt = phys = addr;
-		} else {
-			/* printk("**** ofmem_claim failure ***!\n"); */
-			return -1;
-		}
-	} else {
-		if( align < 0x1000 )
-			align = 0x1000;
-		phys = ofmem_claim_phys_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ );
-		virt = ofmem_claim_virt_( addr, size, align, 0, get_ram_size(), 1 /* reverse */ );
-		if( phys == (ucell)-1 || virt == (ucell)-1 ) {
-			printk("ofmem_claim failed\n");
-			return -1;
-		}
-		/* printk("...phys = %08lX, virt = %08lX, size = %08lX\n", phys, virt, size ); */
-	}
-
-	/* align */
-	if( phys & 0xfff ) {
-		size += (phys & 0xfff);
-		virt -= (phys & 0xfff);
-		phys &= ~0xfff;
-	}
-	if( size & 0xfff )
-		size = (size + 0xfff) & ~0xfff;
-
-	/* printk("...free memory found... phys: %08lX, virt: %08lX, size %lX\n", phys, virt, size ); */
-	ofmem_map( phys, virt, size, -1 );
-	return virt + offs;
-}
-
-
 /************************************************************************/
-/*	keep track of ea -> phys translations				*/
-/************************************************************************/
-
-static void split_trans( ucell virt )
-{
-	ofmem_t *ofmem = OFMEM;
-	translation_t *t, *t2;
-
-	for( t=ofmem->trans; t; t=t->next ) {
-		if( virt > t->virt && virt < t->virt + t->size-1 ) {
-			t2 = (translation_t*)malloc( sizeof(translation_t) );
-			t2->virt = virt;
-			t2->size = t->size - (virt - t->virt);
-			t->size = virt - t->virt;
-			t2->phys = t->phys + t->size;
-			t2->mode = t->mode;
-			t2->next = t->next;
-			t->next = t2;
-		}
-	}
-}
-
-static int map_page_range( ucell phys, ucell virt, ucell size, ucell mode )
-{
-	ofmem_t *ofmem = OFMEM;
-	translation_t *t, **tt;
-
-	OFMEM_TRACE("map_page_range " FMT_ucellx
-			" -> " FMT_ucellx " " FMT_ucellx " mode " FMT_ucellx "\n",
-			virt, phys, size, mode );
-
-	split_trans( virt );
-	split_trans( virt + size );
-
-	/* detect remappings */
-	for( t=ofmem->trans; t; ) {
-		if( virt == t->virt || (virt < t->virt && virt + size > t->virt )) {
-			if( t->phys + virt - t->virt != phys ) {
-				OFMEM_TRACE("mapping altered virt=" FMT_ucellx ")\n", t->virt );
-			} else if( t->mode != mode ){
-				OFMEM_TRACE("mapping mode altered virt=" FMT_ucellx
-						" old mode=" FMT_ucellx " new mode=" FMT_ucellx "\n",
-						t->virt, t->mode, mode);
-			}
-
-			for( tt=&ofmem->trans; *tt != t ; tt=&(**tt).next ) {
-			}
-
-			*tt = t->next;
-
-			/* really unmap these pages */
-			ofmem_unmap_pages(t->virt, t->size);
-
-			free((char*)t);
-
-			t=ofmem->trans;
-			continue;
-		}
-		t=t->next;
-	}
-
-	/* add mapping */
-	for( tt=&ofmem->trans; *tt && (**tt).virt < virt ; tt=&(**tt).next ) {
-	}
-
-	t = (translation_t*)malloc( sizeof(translation_t) );
-	t->virt = virt;
-	t->phys = phys;
-	t->size = size;
-	t->mode = mode;
-	t->next = *tt;
-	*tt = t;
-
-	ofmem_update_translations();
-
-	return 0;
-}
-
-static int unmap_page_range( ucell virt, ucell size )
-{
-	ofmem_t *ofmem = OFMEM;
-	translation_t **plink;
-
-	/* make sure there is exactly one matching translation entry */
-
-	split_trans( virt );
-	split_trans( virt + size );
-
-	/* find and unlink entries in range */
-	plink = &ofmem->trans;
-
-	while (*plink && (*plink)->virt < virt+size) {
-		translation_t **plinkentry = plink;
-		translation_t *t = *plink;
-
-		/* move ahead */
-		plink = &t->next;
-
-		if (t->virt >= virt && t->virt + t->size <= virt+size) {
-
-			/* unlink entry */
-			*plinkentry = t->next;
-
-			printk("unmap_page_range found " FMT_ucellx
-					" -> " FMT_ucellx " " FMT_ucellx " mode " FMT_ucellx "\n",
-					t->virt, t->phys, t->size, t->mode );
-
-			// really map these pages
-			ofmem_unmap_pages(t->virt, t->size);
-
-			free((char*)t);
-		}
-	}
-
-	ofmem_update_translations();
-
-	return 0;
-}
-
-int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode )
-{
-	/* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n",
-	   virt, phys, size, mode ); */
-
-	if( (phys & 0xfff) || (virt & 0xfff) || (size & 0xfff) ) {
-		/* printk("ofmem_map: Bad parameters (%08lX %08lX %08lX)\n",
-		       phys, virt, size ); */
-		phys &= ~0xfff;
-		virt &= ~0xfff;
-		size = (size + 0xfff) & ~0xfff;
-	}
-
-	if (mode==-1) {
-		mode = def_memmode(phys);
-	}
-
-	// install translations
-	map_page_range(phys, virt, size, mode);
-
-	if (mode & SPITFIRE_TTE_LOCKED) {
-		// install locked tlb entries now
-		ofmem_map_pages(phys, virt, size, mode);
-	}
-
-	return 0;
-}
-
-int ofmem_unmap( ucell virt, ucell size )
-{
-	OFMEM_TRACE("ofmem_unmap " FMT_ucellx " " FMT_ucellx "\n",
-			virt, size );
-
-	if( (virt & 0xfff) || (size & 0xfff) ) {
-		/* printk("ofmem_unmap: Bad parameters (%08lX %08lX)\n",
-				virt, size ); */
-		virt &= ~0xfff;
-		size = (size + 0xfff) & ~0xfff;
-	}
-
-	/* remove translations and unmap pages */
-	unmap_page_range(virt, size);
-
-	return 0;
-}
-
-/* virtual -> physical. */
-ucell ofmem_translate( ucell virt, ucell *mode )
-{
-	ofmem_t *ofmem = OFMEM;
-	translation_t *t;
-
-	for( t=ofmem->trans; t && t->virt <= virt ; t=t->next ) {
-		ucell offs;
-		if( t->virt + t->size - 1 < virt )
-			continue;
-		offs = virt - t->virt;
-		*mode = t->mode;
-		return t->phys + offs;
-	}
-
-	/*printk("ofmem_translate: no translation defined (%08lx)\n", virt);*/
-	/*print_trans();*/
-	return -1UL;
-}
-
-/* release memory allocated by ofmem_claim */
-void ofmem_release( ucell virt, ucell size )
-{
-	printk("ofmem_release unimplemented (" FMT_ucellx ", " FMT_ucellx ")\n",
-			virt, size );
-}
-
-
-/************************************************************************/
 /* init / cleanup                                                       */
 /************************************************************************/
 
@@ -636,12 +83,12 @@
 
 static int remap_page_range( ucell phys, ucell virt, ucell size, ucell mode )
 {
-	map_page_range(phys, virt, size, mode);
+	ofmem_map_page_range(phys, virt, size, mode);
 	if (!(mode & SPITFIRE_TTE_LOCKED)) {
 		OFMEM_TRACE("remap_page_range clearing translation " FMT_ucellx
 				" -> " FMT_ucellx " " FMT_ucellx " mode " FMT_ucellx "\n",
 				virt, phys, size, mode );
-		ofmem_unmap_pages(virt, size);
+		ofmem_arch_unmap_pages(virt, size);
 	}
 	return 0;
 }
@@ -655,10 +102,3 @@
 	ofmem_walk_boot_map(remap_page_range);
 }
 
-void ofmem_register( phandle_t ph_memory, phandle_t ph_mmu )
-{
-	s_phandle_memory = ph_memory;
-	s_phandle_mmu = ph_mmu;
-
-	ofmem_update_translations();
-}

Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h
===================================================================
--- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h	2009-08-02 11:07:13 UTC (rev 527)
+++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h	2009-08-02 11:08:01 UTC (rev 528)
@@ -16,54 +16,13 @@
 
 #include "ofmem.h"
 
-extern void* ofmem_malloc( size_t size );
-extern void  ofmem_free( void *ptr );
-extern void* ofmem_realloc( void *ptr, size_t size );
-
-extern int ofmem_unmap(ucell virt, ucell size);
-
-ulong get_ram_size( void );
-ulong get_ram_top( void );
-ulong get_ram_bottom( void );
-extern void ofmem_register( phandle_t ph_memory, phandle_t ph_mmu );
 extern void ofmem_map_pages(ucell phys, ucell virt, ucell size, ucell mode);
-extern void ofmem_unmap_pages(ucell virt, ucell size);
 
 typedef int (*translation_entry_cb)(ucell phys,	ucell virt,
 									ucell size, ucell mode);
 
 extern void ofmem_walk_boot_map(translation_entry_cb cb);
 
-typedef struct alloc_desc {
-	struct alloc_desc	*next;
-	ucell				size;			/* size (including) this struct */
-} alloc_desc_t;
-
-typedef struct mem_range {
-	struct mem_range	*next;
-	ucell				start;
-	ucell				size;
-} range_t;
-
-typedef struct trans {
-	struct trans	*next;
-	ucell			virt;		/* chain is sorted by virt */
-	ucell			size;
-	ucell			phys;
-	ucell			mode;
-} translation_t;
-
-typedef struct {
-	uint64_t		ramsize;
-	char 			*next_malloc;
-	alloc_desc_t	*mfree;		/* list of free malloc blocks */
-
-	range_t			*phys_range;
-	range_t			*virt_range;
-
-	translation_t	*trans;		/* this is really a translation_t */
-} ofmem_t;
-
 extern translation_t **g_ofmem_translations;
 
 #endif   /* _H_OFMEM_SPARC64 */

Modified: trunk/openbios-devel/config/examples/cross-sparc64_config.xml
===================================================================
--- trunk/openbios-devel/config/examples/cross-sparc64_config.xml	2009-08-02 11:07:13 UTC (rev 527)
+++ trunk/openbios-devel/config/examples/cross-sparc64_config.xml	2009-08-02 11:08:01 UTC (rev 528)
@@ -38,6 +38,8 @@
   <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/>
   <option name="CONFIG_FONT_8X8" type="boolean" value="true"/>
   <option name="CONFIG_FONT_8X16" type="boolean" value="false"/>
+  <option name="CONFIG_OFMEM" type="boolean" value="true"/>
+  <option name="CONFIG_OFMEM_MALLOC_ALIGN" type="integer" value="8"/>
 
   <!-- Filesystem Configuration -->
   <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/>




More information about the OpenBIOS mailing list