Virtualization/openbios
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/openbios.git synced 2024-02-13 08:34:06 +08:00
Code Issues Projects Releases Wiki Activity

Use ucell type to pass ofmem arguments (Igor Kovalenko)

Browse Source 
git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@513 f158a5a8-5612-0410-a976-696ce0be7e32
This commit is contained in:
Blue Swirl
2009-07-31 11:10:38 +00:00
parent 12fda803f3
commit 6b052af925
3 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/ppc/qemu/methods.c
View File

@@ -241,9 +241,9 @@ mmu_unmap( void )
static void static void
mmu_translate( void ) mmu_translate( void )
{ {
int mode; ucell mode;
int virt = POP(); ucell virt = POP();
int phys = ofmem_translate( virt, &mode ); ucell phys = ofmem_translate( virt, &mode );
if( phys == -1 ) { if( phys == -1 ) {
PUSH( 0 ); PUSH( 0 );

94
arch/ppc/qemu/ofmem.c
View File

@@ -37,21 +37,21 @@
typedef struct alloc_desc { typedef struct alloc_desc {
struct alloc_desc *next; struct alloc_desc *next;
int size; /* size (including) this struct */ ucell size; /* size (including) this struct */
} alloc_desc_t; } alloc_desc_t;
typedef struct mem_range { typedef struct mem_range {
struct mem_range *next; struct mem_range *next;
ulong start; ucell start;
ulong size; ucell size;
} range_t; } range_t;
typedef struct trans { typedef struct trans {
struct trans *next; struct trans *next;
ulong virt; /* chain is sorted by virt */ ucell virt; /* chain is sorted by virt */
ulong size; ucell size;
ulong phys; ucell phys;
int mode; ucell mode;
} translation_t; } translation_t;
typedef struct { typedef struct {
@@ -236,8 +236,8 @@ realloc( void *ptr, size_t size )
/************************************************************************/ /************************************************************************/
extern char _start[], _end[]; extern char _start[], _end[];
static inline int static inline ucell
def_memmode( ulong phys ) def_memmode( ucell phys )
{ {
/* XXX: Guard bit not set as it should! */ /* XXX: Guard bit not set as it should! */
if( phys < IO_BASE ) if( phys < IO_BASE )
@@ -251,7 +251,7 @@ def_memmode( ulong phys )
/************************************************************************/ /************************************************************************/
static int static int
is_free( ulong ea, ulong size, range_t *r ) is_free( ucell ea, ucell size, range_t *r )
{ {
if( size == 0 ) if( size == 0 )
return 1; return 1;
@@ -265,7 +265,7 @@ is_free( ulong ea, ulong size, range_t *r )
} }
static void static void
add_entry_( ulong ea, ulong size, range_t **r ) add_entry_( ucell ea, ucell size, range_t **r )
{ {
range_t *nr; range_t *nr;
@@ -279,7 +279,7 @@ add_entry_( ulong ea, ulong size, range_t **r )
} }
static int static int
add_entry( ulong ea, ulong size, range_t **r ) add_entry( ucell ea, ucell size, range_t **r )
{ {
if( !is_free( ea, size, *r ) ) { if( !is_free( ea, size, *r ) ) {
printk("add_entry: range not free!\n"); printk("add_entry: range not free!\n");
@@ -310,20 +310,20 @@ join_ranges( range_t **rr )
} }
static void static void
fill_range( ulong ea, int size, range_t **rr ) fill_range( ulong ea, ucell size, range_t **rr )
{ {
add_entry_( ea, size, rr ); add_entry_( ea, size, rr );
join_ranges( rr ); join_ranges( rr );
} }
static ulong static ucell
find_area( ulong align, ulong size, range_t *r, ulong min, ulong max, int reverse ) find_area( ucell align, ucell size, range_t *r, ucell min, ucell max, int reverse )
{ {
ulong base = min; ucell base = min;
range_t *r2; range_t *r2;
if( (align & (align-1)) ) { if( (align & (align-1)) ) {
printk("bad alignment %ld\n", align); printk("bad alignment %d\n", align);
align = 0x1000; align = 0x1000;
} }
if( !align ) if( !align )
@@ -362,11 +362,11 @@ find_area( ulong align, ulong size, range_t *r, ulong min, ulong max, int revers
base = r2->start - size; base = r2->start - size;
} }
} }
return (ulong)-1; return (ucell)-1;
} }
static ulong static ucell
ofmem_claim_phys_( ulong phys, ulong size, ulong align, int min, int max, int reverse ) ofmem_claim_phys_( ucell phys, ucell size, ucell align, ucell min, ucell max, int reverse )
{ {
ofmem_t *ofmem = OFMEM; ofmem_t *ofmem = OFMEM;
if( !align ) { if( !align ) {
@@ -387,15 +387,15 @@ ofmem_claim_phys_( ulong phys, ulong size, ulong align, int min, int max, int re
} }
/* if align != 0, phys is ignored. Returns -1 on error */ /* if align != 0, phys is ignored. Returns -1 on error */
ulong ucell
ofmem_claim_phys( ulong phys, ulong size, ulong align ) ofmem_claim_phys( ucell phys, ucell size, ucell align )
{ {
/* printk("+ ofmem_claim phys %08lx %lx %ld\n", phys, size, align ); */ /* printk("+ ofmem_claim phys %08lx %lx %ld\n", phys, size, align ); */
return ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); return ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 );
} }
static ulong static ucell
ofmem_claim_virt_( ulong virt, ulong size, ulong align, int min, int max, int reverse ) ofmem_claim_virt_( ucell virt, ucell size, ucell align, ucell min, ucell max, int reverse )
{ {
ofmem_t *ofmem = OFMEM; ofmem_t *ofmem = OFMEM;
if( !align ) { if( !align ) {
@@ -416,8 +416,8 @@ ofmem_claim_virt_( ulong virt, ulong size, ulong align, int min, int max, int re
return virt; return virt;
} }
ulong ucell
ofmem_claim_virt( ulong virt, ulong size, ulong align ) ofmem_claim_virt( ucell virt, ucell size, ucell align )
{ {
/* printk("+ ofmem_claim virt %08lx %lx %ld\n", virt, size, align ); */ /* printk("+ ofmem_claim virt %08lx %lx %ld\n", virt, size, align ); */
return ofmem_claim_virt_( virt, size, align, get_ram_size() , IO_BASE, 0 ); return ofmem_claim_virt_( virt, size, align, get_ram_size() , IO_BASE, 0 );
@@ -425,12 +425,12 @@ ofmem_claim_virt( ulong virt, ulong size, ulong align )
/* allocate both physical and virtual space and add a translation */ /* allocate both physical and virtual space and add a translation */
ulong ucell
ofmem_claim( ulong addr, ulong size, ulong align ) ofmem_claim( ucell addr, ucell size, ucell align )
{ {
ofmem_t *ofmem = OFMEM; ofmem_t *ofmem = OFMEM;
ulong virt, phys; ucell virt, phys;
ulong offs = addr & 0xfff; ucell offs = addr & 0xfff;
/* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */ /* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */
virt = phys = 0; virt = phys = 0;
@@ -496,7 +496,7 @@ split_trans( ulong virt )
} }
static int static int
map_page_range( ulong virt, ulong phys, ulong size, int mode ) map_page_range( ucell virt, ucell phys, ucell size, ucell mode )
{ {
ofmem_t *ofmem = OFMEM; ofmem_t *ofmem = OFMEM;
translation_t *t, **tt; translation_t *t, **tt;
@@ -508,7 +508,7 @@ map_page_range( ulong virt, ulong phys, ulong size, int mode )
for( t=ofmem->trans; t; ) { for( t=ofmem->trans; t; ) {
if( virt == t->virt || (virt < t->virt && virt + size > t->virt )) { if( virt == t->virt || (virt < t->virt && virt + size > t->virt )) {
if( t->phys + virt - t->virt != phys ) { if( t->phys + virt - t->virt != phys ) {
printk("mapping altered (ea %08lx)\n", t->virt ); printk("mapping altered (ea %08x)\n", t->virt );
} else if( t->mode != mode ){ } else if( t->mode != mode ){
printk("mapping mode altered\n"); printk("mapping mode altered\n");
} }
@@ -538,7 +538,7 @@ map_page_range( ulong virt, ulong phys, ulong size, int mode )
} }
int int
ofmem_map( ulong phys, ulong virt, ulong size, int mode ) ofmem_map( ucell phys, ucell virt, ucell size, ucell mode )
{ {
ofmem_t *ofmem = OFMEM; ofmem_t *ofmem = OFMEM;
/* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n", /* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n",
@@ -563,14 +563,14 @@ ofmem_map( ulong phys, ulong virt, ulong size, int mode )
} }
/* virtual -> physical. */ /* virtual -> physical. */
ulong ucell
ofmem_translate( ulong virt, int *mode ) ofmem_translate( ucell virt, ucell *mode )
{ {
ofmem_t *ofmem = OFMEM; ofmem_t *ofmem = OFMEM;
translation_t *t; translation_t *t;
for( t=ofmem->trans; t && t->virt <= virt ; t=t->next ) { for( t=ofmem->trans; t && t->virt <= virt ; t=t->next ) {
ulong offs; ucell offs;
if( t->virt + t->size - 1 < virt ) if( t->virt + t->size - 1 < virt )
continue; continue;
offs = virt - t->virt; offs = virt - t->virt;
@@ -585,7 +585,7 @@ ofmem_translate( ulong virt, int *mode )
/* release memory allocated by ofmem_claim */ /* release memory allocated by ofmem_claim */
void void
ofmem_release( ulong virt, ulong size ) ofmem_release( ucell virt, ucell size )
{ {
/* printk("ofmem_release unimplemented (%08lx, %08lx)\n", virt, size ); */ /* printk("ofmem_release unimplemented (%08lx, %08lx)\n", virt, size ); */
} }
@@ -595,10 +595,10 @@ ofmem_release( ulong virt, ulong size )
/* page fault handler */ /* page fault handler */
/************************************************************************/ /************************************************************************/
static ulong static ucell
ea_to_phys( ulong ea, int *mode ) ea_to_phys( ucell ea, ucell *mode )
{ {
ulong phys; ucell phys;
if (ea >= 0xfff00000UL) { if (ea >= 0xfff00000UL) {
/* ROM into RAM */ /* ROM into RAM */
@@ -621,7 +621,7 @@ ea_to_phys( ulong ea, int *mode )
} }
static void static void
hash_page_64( ulong ea, ulong phys, int mode ) hash_page_64( ucell ea, ucell phys, ucell mode )
{ {
static int next_grab_slot=0; static int next_grab_slot=0;
uint64_t vsid_mask, page_mask, pgidx, hash; uint64_t vsid_mask, page_mask, pgidx, hash;
@@ -687,7 +687,7 @@ hash_page_64( ulong ea, ulong phys, int mode )
} }
static void static void
hash_page_32( ulong ea, ulong phys, int mode ) hash_page_32( ucell ea, ucell phys, ucell mode )
{ {
static int next_grab_slot=0; static int next_grab_slot=0;
ulong *upte, cmp, hash1; ulong *upte, cmp, hash1;
@@ -734,7 +734,7 @@ static int is_ppc64(void)
return ((pvr >= 0x330000) && (pvr < 0x70330000)); return ((pvr >= 0x330000) && (pvr < 0x70330000));
} }
static void hash_page( ulong ea, ulong phys, int mode ) static void hash_page( ulong ea, ulong phys, ucell mode )
{ {
if ( is_ppc64() ) if ( is_ppc64() )
hash_page_64(ea, phys, mode); hash_page_64(ea, phys, mode);
@@ -746,8 +746,8 @@ void
dsi_exception( void ) dsi_exception( void )
{ {
ulong dar, dsisr; ulong dar, dsisr;
int mode; ucell mode;
ulong phys; ucell phys;
asm volatile("mfdar %0" : "=r" (dar) : ); asm volatile("mfdar %0" : "=r" (dar) : );
asm volatile("mfdsisr %0" : "=r" (dsisr) : ); asm volatile("mfdsisr %0" : "=r" (dsisr) : );
@@ -760,8 +760,8 @@ void
isi_exception( void ) isi_exception( void )
{ {
ulong nip, srr1; ulong nip, srr1;
int mode; ucell mode;
ulong phys; ucell phys;
asm volatile("mfsrr0 %0" : "=r" (nip) : ); asm volatile("mfsrr0 %0" : "=r" (nip) : );
asm volatile("mfsrr1 %0" : "=r" (srr1) : ); asm volatile("mfsrr1 %0" : "=r" (srr1) : );

12
include/ofmem.h
View File

@@ -20,14 +20,14 @@
extern void ofmem_cleanup( void ); extern void ofmem_cleanup( void );
extern void ofmem_init( void ); extern void ofmem_init( void );
extern ulong ofmem_claim( ulong addr, ulong size, ulong align ); extern ucell ofmem_claim( ucell addr, ucell size, ucell align );
extern ulong ofmem_claim_phys( ulong mphys, ulong size, ulong align ); extern ucell ofmem_claim_phys( ucell mphys, ucell size, ucell align );
extern ulong ofmem_claim_virt( ulong mvirt, ulong size, ulong align ); extern ucell ofmem_claim_virt( ucell mvirt, ucell size, ucell align );
extern int ofmem_map( ulong phys, ulong virt, ulong size, int mode ); extern int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode );
extern void ofmem_release( ulong virt, ulong size ); extern void ofmem_release( ucell virt, ucell size );
extern ulong ofmem_translate( ulong virt, int *ret_mode ); extern ucell ofmem_translate( ucell virt, ucell *ret_mode );
#ifdef CONFIG_PPC #ifdef CONFIG_PPC
#define PAGE_SHIFT 12 #define PAGE_SHIFT 12