OpenBIOS May 2010

openbios@openbios.org

15 participants
48 discussions

[PATCH] Fixes for Makefile clean target
by Andreas Färber 22 May '10

22 May '10

Hello, Here are two fixes for Makefile.target: 1) Lots of .o files stay around after a `make clean`, on Mac OS X host. diff --git a/Makefile.target b/Makefile.target index aa45120..8a706b2 100644 --- a/Makefile.target +++ b/Makefile.target @@ -62,7 +62,7 @@ info: clean: @printf "Cleaning up for $(ARCH)..." @rm -rf forth.dict.core forthstrap *.dict openbios-* - @find . -type f -name "*~" -o -name '*.o' -o -name '*.a' -exec rm \ {\} \; + @find . -type f $ -name "*~" -o -name '*.o' -o -name '*.a' $ -exec rm \{\} \; @echo " ok" Without this grouping, `find` fails to exec anything. 2) Even with the `find` expression fixed, the two generated files with the date are not removed, so take care of that manually: diff --git a/Makefile.target b/Makefile.target index 8a706b2..bab5998 100644 --- a/Makefile.target +++ b/Makefile.target @@ -62,6 +62,7 @@ info: clean: @printf "Cleaning up for $(ARCH)..." @rm -rf forth.dict.core forthstrap *.dict openbios-* + @rm -f $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/ version.fs @find . -type f $ -name "*~" -o -name '*.o' -o -name '*.a' $ - exec rm \{\} \; @echo " ok" Signed-off-by: Andreas Faerber <andreas.faerber(a)web.de> Regards, Andreas

2 1

[commit] r774 - trunk/openbios-devel
by repository service 22 May '10

22 May '10

Author: blueswirl Date: Sat May 22 15:34:10 2010 New Revision: 774 URL: http://tracker.coreboot.org/trac/openbios/changeset/774 Log: Clean generated version files Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/Makefile.target Modified: trunk/openbios-devel/Makefile.target ============================================================================== --- trunk/openbios-devel/Makefile.target Sat May 22 15:34:08 2010 (r773) +++ trunk/openbios-devel/Makefile.target Sat May 22 15:34:10 2010 (r774) @@ -62,6 +62,7 @@ clean: @printf "Cleaning up for $(ARCH)..." @rm -rf forth.dict.core forthstrap *.dict openbios-* + @rm -f $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs @find . -type f $ -name "*~" -o -name '*.o' -o -name '*.a' $ -exec rm \{\} \; @echo " ok"

1 0

[commit] r773 - trunk/openbios-devel
by repository service 22 May '10

22 May '10

Author: blueswirl Date: Sat May 22 15:34:08 2010 New Revision: 773 URL: http://tracker.coreboot.org/trac/openbios/changeset/773 Log: Fix find expression in clean target Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/Makefile.target Modified: trunk/openbios-devel/Makefile.target ============================================================================== --- trunk/openbios-devel/Makefile.target Fri May 21 13:07:53 2010 (r772) +++ trunk/openbios-devel/Makefile.target Sat May 22 15:34:08 2010 (r773) @@ -62,7 +62,7 @@ clean: @printf "Cleaning up for $(ARCH)..." @rm -rf forth.dict.core forthstrap *.dict openbios-* - @find . -type f -name "*~" -o -name '*.o' -o -name '*.a' -exec rm \{\} \; + @find . -type f $ -name "*~" -o -name '*.o' -o -name '*.a' $ -exec rm \{\} \; @echo " ok" build-verbose: info build

1 0

Concatenating strings
by Programmingkid 21 May '10

21 May '10

Is there a way to concatenate strings in OpenBIOS using forth?

2 2

[commit] r772 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc64 include/libopenbios libopenbios
by repository service 21 May '10

21 May '10

Author: mcayland Date: Fri May 21 13:07:53 2010 New Revision: 772 URL: http://tracker.coreboot.org/trac/openbios/changeset/772 Log: Move creation of MMU translation property entries into architecture-specific files, rather than in ofmem_common.c. This is because different architectures have different translation entries described within the OF platform bindings. With thanks to Andreas Färber and Igor Kovalenko. 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 Mon May 3 13:29:38 2010 (r771) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Fri May 21 13:07:53 2010 (r772) @@ -141,6 +141,30 @@ return NULL; } +int ofmem_arch_get_translation_entry_size(void) +{ + /* Return size of a single MMU package translation property entry in cells */ + return 4; +} + +void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) +{ + /* Generate translation property entry for PPC. According to the + platform bindings for PPC (http://playground.sun.com/1275/bindings/ppc/release/ppc-2_1.html#REF34579) + a translation property entry has the following layout: + + virtual address + length + physical address + mode + */ + + transentry[0] = t->virt; + transentry[1] = t->size; + transentry[2] = t->phys; + transentry[3] = t->mode; +} + /************************************************************************/ /* OF private allocations */ /************************************************************************/ Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon May 3 13:29:38 2010 (r771) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Fri May 21 13:07:53 2010 (r772) @@ -69,6 +69,28 @@ return (retain_t *)(qemu_mem_size - sizeof(retain_t)); } +int ofmem_arch_get_translation_entry_size(void) +{ + /* Return size of a single MMU package translation property entry in cells */ + return 3; +} + +void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) +{ + /* Generate translation property entry for SPARC. While there is no + formal documentation for this, both Linux kernel and OpenSolaris sources + expect a translation property entry to have the following layout: + + virtual address + length + mode + */ + + transentry[0] = t->virt; + transentry[1] = t->size; + transentry[2] = t->mode; +} + /************************************************************************/ /* misc */ /************************************************************************/ Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Mon May 3 13:29:38 2010 (r771) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Fri May 21 13:07:53 2010 (r772) @@ -63,6 +63,8 @@ extern ucell ofmem_arch_get_heap_top(void); extern ucell ofmem_arch_get_virt_top(void); extern retain_t* ofmem_arch_get_retained(void); +extern int ofmem_arch_get_translation_entry_size(void); +extern void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t); extern ucell ofmem_arch_default_translation_mode( ucell phys ); extern void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, ucell mode); Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Mon May 3 13:29:38 2010 (r771) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Fri May 21 13:07:53 2010 (r772) @@ -182,15 +182,15 @@ for( t = ofmem->trans, ncells = 0; t ; t=t->next, ncells++ ) { } - props = malloc(ncells * sizeof(ucell) * 3); + props = malloc(ncells * sizeof(ucell) * ofmem_arch_get_translation_entry_size()); if (props == NULL) return; + /* Call architecture-specific routines to generate translation entries */ for( t = ofmem->trans, ncells = 0 ; t ; t=t->next ) { - props[ncells++] = t->virt; - props[ncells++] = t->size; - props[ncells++] = t->mode; + ofmem_arch_create_translation_entry(&props[ncells], t); + ncells += ofmem_arch_get_translation_entry_size(); } set_property(s_phandle_mmu, "translations",

1 0

Missing portid properties
by Mark Cave-Ayland 15 May '10

15 May '10

Hi everyone, I've just committed a partial implementation of the SUNW,retain word and so have moved further into booting OpenSolaris. Currently it's only a partial implementation because I can't get Qemu to perform a warm restart without crashing the guest, so I may need to revisit this later. Fortunately, the SUNW,retain word itself is there which now enables the OpenSolaris kernel to get further during boot: 0 > go Jumping to entry point 00000000010071d8 for type 0000000000000001... switching to new context: entry point 0x10071d8 stack 0x00000000ffe02a91 / panic[cpu0]/thread=180e000: portid not found 000000000180b750 unix:fill_cpu+418 (ffffffffffe2fbd8, 10b81b0, 10b83d0, 0, 10bac00, ffffffffffffffff) %l0-3: 00000000018127c0 00000000010b81b8 00000000010b8000 ffffffffffffffff %l4-7: 0000000000000000 0000000000000004 00000000ffe2fbd8 0000000000000004 000000000180b870 unix:map_wellknown+124 (ffffffffffe2fbd8, 0, 0, 180b940, 0, 10b8188) %l0-3: 0000000000000001 0000000000000000 0000000000000000 ffffffffffffffff %l4-7: 0000000000000000 00000000010b8000 0000000000000000 000000000180b92c 000000000180b960 unix:map_wellknown_devices+80 (0, f7, 0, 10bb000, 10bb000, 10b8000) %l0-3: 0000000001812c00 0000000000002000 00000000010b8000 0000000000000000 %l4-7: 000000000183ac00 0000000001812400 0000000000000010 0000000000000000 000000000180ba20 unix:mlsetup+308 (180c000, 180bec0, 10b6548, 180c000, 2000, 180e000) %l0-3: 000000000180e000 0000000070002000 0000000000000000 000000000183ac00 %l4-7: 0000000000000000 000000000180c000 0000000070002000 0000000000000000 Looking through the OpenSolaris source code[1], it appears that fill_cpu() is expecting a portid property on the CPU nodes. Also searching further within the same file, it seems have_pci() is expecting a portid property on the PCI bus node too. Does anyone with experience with real Sun kit know what the portid property for both the CPU and PCI device should be set to? It's fairly obvious that it's an integer, but I'm not sure how it should reflect the virtual hardware. ATB, Mark. [1] http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/uts/sun4u/os/… -- 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

3 13

Re: [OpenBIOS] making switch-arch executable
by Programmingkid 07 May '10

07 May '10

On May 7, 2010, at 6:00 AM, openbios-request(a)openbios.org wrote: > On 5/6/10, Programmingkid <programmingkidx(a)gmail.com> wrote: >> I made a change to the documentation on the page http://www.openfirmware.info/OpenBIOS. I added a step in the Building OpenBIOS section to make the switch-arch script executable. I was wondering if it is possible to download OpenBIOS with the script being executable without the user having to change it permissions. This would save some time and frustration. > > The permissions are already set up correctly: > $ svn proplist config/scripts/switch-arch > Properties on 'config/scripts/switch-arch': > svn:executable > > So the problem is actually with the program creating the zip, or maybe > the zip format itself misses any executability bits. I am betting it is with the program creating the zip. I did a little test on my computer to see if I could preserve the permissions of a file inside a zip file. The test was a success. The improvement with the documentation should compensate for the program's issues.

1 0

making switch-arch executable
by Programmingkid 06 May '10

06 May '10

I made a change to the documentation on the page http://www.openfirmware.info/OpenBIOS. I added a step in the Building OpenBIOS section to make the switch-arch script executable. I was wondering if it is possible to download OpenBIOS with the script being executable without the user having to change it permissions. This would save some time and frustration.

2 1

[commit] r771 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc64 include/libopenbios libopenbios
by repository service 03 May '10

03 May '10

Author: mcayland Date: Mon May 3 13:29:38 2010 New Revision: 771 URL: http://tracker.coreboot.org/trac/openbios/changeset/771 Log: Move the retained magic block to the top of physical RAM and implement code that should do the right thing. Probably needs more testing though. 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 Mon May 3 08:56:57 2010 (r770) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Mon May 3 13:29:38 2010 (r771) @@ -135,6 +135,12 @@ /* none yet */ } +retain_t *ofmem_arch_get_retained(void) +{ + /* not implemented */ + return NULL; +} + /************************************************************************/ /* OF private allocations */ /************************************************************************/ Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon May 3 08:56:57 2010 (r770) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon May 3 13:29:38 2010 (r771) @@ -31,6 +31,8 @@ translation_t **g_ofmem_translations = &s_ofmem_data.ofmem.trans; +extern uint64_t qemu_mem_size; + static inline size_t ALIGN_SIZE(size_t x, size_t a) { return (x + a - 1) & ~(a-1); @@ -61,6 +63,12 @@ return (ucell)TOP_OF_RAM; } +retain_t *ofmem_arch_get_retained(void) +{ + /* Retained area is at the top of physical RAM */ + return (retain_t *)(qemu_mem_size - sizeof(retain_t)); +} + /************************************************************************/ /* misc */ /************************************************************************/ @@ -79,8 +87,6 @@ /* init / cleanup */ /************************************************************************/ -extern uint64_t qemu_mem_size; - static int remap_page_range( ucell phys, ucell virt, ucell size, ucell mode ) { ofmem_claim_phys(phys, size, 0); @@ -95,32 +101,37 @@ return 0; } -#define RETAIN_OFMEM (TOP_OF_RAM - ALIGN_SIZE(sizeof(retain_t), 8)) #define RETAIN_MAGIC 0x1100220033004400 void ofmem_init( void ) { - retain_t *retained = (retain_t *)RETAIN_OFMEM; - - /* Clear all memory except any retained areas */ - if (!(retained->magic == RETAIN_MAGIC)) { - memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); - s_ofmem_data.ofmem.ramsize = qemu_mem_size; - - retained->magic = RETAIN_MAGIC; - } else { - /* TODO: walk retain_phys_range and add entries to phys_range to prevent - them being reused */ - OFMEM_TRACE("ofmem_init has detected retained magic but currently not implemented"); + retain_t *retained = ofmem_arch_get_retained(); + int i; - memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); - s_ofmem_data.ofmem.ramsize = qemu_mem_size; - } + memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); + s_ofmem_data.ofmem.ramsize = qemu_mem_size; /* inherit translations set up by entry.S */ ofmem_walk_boot_map(remap_page_range); /* Map the memory */ ofmem_map_page_range(0, 0, qemu_mem_size, 0x36); -} + if (!(retained->magic == RETAIN_MAGIC)) { + OFMEM_TRACE("ofmem_init: no retained magic found, creating\n"); + retained->magic = RETAIN_MAGIC; + retained->numentries = 0; + } else { + OFMEM_TRACE("ofmem_init: retained magic found, total %lld mappings\n", retained->numentries); + + /* Mark physical addresses as used so they are not reallocated */ + for (i = 0; i < retained->numentries; i++) { + ofmem_claim_phys(retained->retain_phys_range[i].start, + retained->retain_phys_range[i].size, 0); + } + + /* Reset retained area for next reset */ + retained->magic = RETAIN_MAGIC; + retained->numentries = 0; + } +} Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Mon May 3 08:56:57 2010 (r770) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Mon May 3 13:29:38 2010 (r771) @@ -46,28 +46,29 @@ range_t *phys_range; range_t *virt_range; - range_t *retain_phys_range; /* physical memory that should survive a warm reset */ translation_t *trans; /* this is really a translation_t */ } ofmem_t; -/* structure for retained data at the top of the heap */ +/* structure for retained data */ typedef struct { ucell magic; - range_t *retain_phys_range; + ucell numentries; + range_t retain_phys_range[8]; /* physical memory that should survive a warm reset */ } retain_t; /* TODO: temporary migration interface */ -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 ucell ofmem_arch_default_translation_mode( ucell phys ); -extern void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, +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 retain_t* ofmem_arch_get_retained(void); +extern ucell ofmem_arch_default_translation_mode( ucell phys ); +extern void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, ucell mode); -extern void ofmem_arch_unmap_pages(ucell virt, ucell size); +extern void ofmem_arch_unmap_pages(ucell virt, ucell size); /* sparc64 uses this method */ -extern int ofmem_map_page_range( ucell phys, ucell virt, ucell size, +extern int ofmem_map_page_range( ucell phys, ucell virt, ucell size, ucell mode ); /* malloc interface */ Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Mon May 3 08:56:57 2010 (r770) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Mon May 3 13:29:38 2010 (r771) @@ -452,7 +452,7 @@ /* if align != 0, phys is ignored. Returns -1 on error */ ucell ofmem_retain( ucell phys, ucell size, ucell align ) { - ofmem_t *ofmem = ofmem_arch_get_private(); + retain_t *retained = ofmem_arch_get_retained(); ucell retain_phys; OFMEM_TRACE("ofmem_retain phys=" FMT_ucellx " size=" FMT_ucellx @@ -461,8 +461,11 @@ retain_phys = ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); - /* Also add to the retain_phys_range list */ - add_entry( phys, size, &ofmem->retain_phys_range ); + /* Add to the retain_phys_range list */ + retained->retain_phys_range[retained->numentries].next = NULL; + retained->retain_phys_range[retained->numentries].start = retain_phys; + retained->retain_phys_range[retained->numentries].size = size; + retained->numentries++; return retain_phys; }

1 0

Re: [OpenBIOS] [commit] r766 - in trunk/openbios-devel: arch/sparc64 include/libopenbios libopenbios
by Nick Couchman 03 May '10

03 May '10

After the changes in this rev, I get the following trying to compile: nick@nick0:/home/nick/Temp/openbios-devel> ./config/scripts/switch-arch cross-sparc64 Configuring OpenBIOS on amd64 for cross-sparc64 Initializing build tree obj-sparc64...ok. Creating target Makefile...ok. Creating config files...ok. nick@nick0:/home/nick/Temp/openbios-devel> make Building OpenBIOS for sparc32 sparc64 Building...ok. error: GEN target/include/static-dict.h CC target/arch/sparc64/builtin.o CC target/arch/sparc64/openbios.o CC target/arch/sparc64/console.o CC target/arch/sparc64/lib.o CC target/arch/sparc64/boot.o CC target/arch/sparc64/context.o CC target/arch/sparc64/switch.o CC target/arch/sparc64/linux_load.o CC target/arch/sparc64/sys_info.o CC target/arch/sparc64/ofmem_sparc64.o ../arch/sparc64/ofmem_sparc64.c: In function `ofmem_init': ../arch/sparc64/ofmem_sparc64.c:106: warning: comparison is always false due to limited range of data type make[1]: *** [target/arch/sparc64/ofmem_sparc64.o] Error 1 make[1]: Leaving directory `/home/nick/Temp/openbios-devel/obj-sparc64' make: *** [build] Error 1 I'm using gcc 3.4.5 cross-compilers with glibc 2.3.6. -Nick >>> repository service 05/02/10 1:27 PM >>> Author: mcayland Date: Sun May 2 21:26:29 2010 New Revision: 766 URL: http://tracker.coreboot.org/trac/openbios/changeset/766 Log: Commit partial implementation of SUNW,retain for SPARC64 based upon the existing physical allocation routines. I've been unable to finish the code and test retention after a restart since the OpenBIOS words reset and reset-all don't seem to work at the moment. However, it enables OpenSolaris boot to get further in the meantime. Signed-off-by: Mark Cave-Ayland Modified: trunk/openbios-devel/arch/sparc64/lib.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/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sat May 1 14:13:16 2010 (r765) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun May 2 21:26:29 2010 (r766) @@ -394,11 +394,35 @@ ofmem_release_phys(phys, size); } +/* ( name-cstr phys size align --- phys ) */ +static void +mem_retain ( void ) +{ + ucell phys=-1UL, size, align; + + align = POP(); + size = POP(); + if (!align) { + phys = POP(); + phys <<= 32; + phys |= POP(); + } + + /* Currently do nothing with the name */ + POP(); + + phys = ofmem_retain(phys, size, align); + + PUSH(phys & 0xffffffffUL); + PUSH(phys >> 32); +} + DECLARE_NODE(memory, INSTALL_OPEN, 0, "/memory"); NODE_METHODS( memory ) = { { "claim", mem_claim }, { "release", mem_release }, + { "SUNW,retain", mem_retain }, }; DECLARE_UNNAMED_NODE(mmu, INSTALL_OPEN, 0); Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sat May 1 14:13:16 2010 (r765) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun May 2 21:26:29 2010 (r766) @@ -26,19 +26,19 @@ ofmem_t ofmem; } s_ofmem_data; -#define OFMEM (&s_ofmem_data.ofmem) -#define TOP_OF_RAM (s_ofmem_data.memory + MEMSIZE) +#define OFMEM (&s_ofmem_data.ofmem) +#define TOP_OF_RAM (s_ofmem_data.memory + MEMSIZE) translation_t **g_ofmem_translations = &s_ofmem_data.ofmem.trans; -static ucell get_heap_top( void ) +static inline size_t ALIGN_SIZE(size_t x, size_t a) { - return (ucell)TOP_OF_RAM; + return (x + a - 1) & ~(a-1); } -static inline size_t ALIGN_SIZE(size_t x, size_t a) +static ucell get_heap_top( void ) { - return (x + a - 1) & ~(a-1); + return (ucell)(TOP_OF_RAM - ALIGN_SIZE(sizeof(retain_t), 8)); } ofmem_t* ofmem_arch_get_private(void) @@ -95,10 +95,27 @@ return 0; } +#define RETAIN_OFMEM (TOP_OF_RAM - ALIGN_SIZE(sizeof(retain_t), 8)) +#define RETAIN_MAGIC 0x1100220033004400 + void ofmem_init( void ) { - memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); - s_ofmem_data.ofmem.ramsize = qemu_mem_size; + retain_t *retained = (retain_t *)RETAIN_OFMEM; + + /* Clear all memory except any retained areas */ + if (!retained->magic == RETAIN_MAGIC) { + memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); + s_ofmem_data.ofmem.ramsize = qemu_mem_size; + + retained->magic = RETAIN_MAGIC; + } else { + /* TODO: walk retain_phys_range and add entries to phys_range to prevent + them being reused */ + OFMEM_TRACE("ofmem_init has detected retained magic but currently not implemented"); + + memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); + s_ofmem_data.ofmem.ramsize = qemu_mem_size; + } /* inherit translations set up by entry.S */ ofmem_walk_boot_map(remap_page_range); Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sat May 1 14:13:16 2010 (r765) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun May 2 21:26:29 2010 (r766) @@ -46,10 +46,17 @@ range_t *phys_range; range_t *virt_range; + range_t *retain_phys_range; /* physical memory that should survive a warm reset */ translation_t *trans; /* this is really a translation_t */ } ofmem_t; +/* structure for retained data at the top of the heap */ +typedef struct { + ucell magic; + range_t *retain_phys_range; +} retain_t; + /* TODO: temporary migration interface */ extern ofmem_t* ofmem_arch_get_private(void); extern void* ofmem_arch_get_malloc_base(void); @@ -86,6 +93,8 @@ extern ucell ofmem_claim_phys( ucell mphys, ucell size, ucell align ); extern ucell ofmem_claim_virt( ucell mvirt, ucell size, ucell align ); +extern ucell ofmem_retain( ucell phys, ucell size, ucell align ); + extern int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ); extern int ofmem_unmap( ucell virt, ucell size ); Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sat May 1 14:13:16 2010 (r765) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun May 2 21:26:29 2010 (r766) @@ -449,6 +449,23 @@ get_ram_size(), ofmem_arch_get_virt_top(), 0 ); } +/* if align != 0, phys is ignored. Returns -1 on error */ +ucell ofmem_retain( ucell phys, ucell size, ucell align ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + ucell retain_phys; + + OFMEM_TRACE("ofmem_retain phys=" FMT_ucellx " size=" FMT_ucellx + " align=" FMT_ucellx "\n", + phys, size, align); + + retain_phys = ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); + + /* Also add to the retain_phys_range list */ + add_entry( phys, size, &ofmem->retain_phys_range ); + + return retain_phys; +} /* allocate both physical and virtual space and add a translation */ ucell ofmem_claim( ucell addr, ucell size, ucell align ) -- OpenBIOS http://openbios.org/ Mailinglist: http://lists.openbios.org/mailman/listinfo Free your System - May the Forth be with you -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

3 2