OpenBIOS December 2010

openbios@openbios.org

12 participants
64 discussions

[PATCH 05/13] Switch IOMMU posix_memalign() calls over to ofmem_posix_memalign(), and then remove the private SPARC32 posix_memalign() implementation since it is no longer required.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/lib.c | 15 --------------- openbios-devel/drivers/iommu.c | 4 ++-- openbios-devel/include/libc/stdlib.h | 1 - 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index 788d6f5..a5ad8ca 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -216,21 +216,6 @@ realloc( void *ptr, size_t size ) return p; } -// XXX should be removed -int -posix_memalign(void **memptr, size_t alignment, size_t size) -{ - void *block; - - block = mem_alloc(&cmem, size, alignment); - - if (!block) - return -1; - - *memptr = block; - return 0; -} - /* * Allocate memory. This is reusable. */ diff --git a/openbios-devel/drivers/iommu.c b/openbios-devel/drivers/iommu.c index 019f8b7..716d01e 100644 --- a/openbios-devel/drivers/iommu.c +++ b/openbios-devel/drivers/iommu.c @@ -53,7 +53,7 @@ dvma_alloc(int size, unsigned int *pphys) int ret; npages = (size + (PAGE_SIZE-1)) / PAGE_SIZE; - ret = posix_memalign(&va, npages * PAGE_SIZE, PAGE_SIZE); + ret = ofmem_posix_memalign(&va, npages * PAGE_SIZE, PAGE_SIZE); if (ret != 0) return NULL; @@ -132,7 +132,7 @@ iommu_init(struct iommu *t, uint64_t base) /* Allocate IOMMU page table */ /* Tremendous alignment causes great waste... */ ptsize = (vasize / PAGE_SIZE) * sizeof(int); - ret = posix_memalign((void *)&ptab, ptsize, ptsize); + ret = ofmem_posix_memalign((void *)&ptab, ptsize, ptsize); if (ret != 0) { DPRINTF("Cannot allocate IOMMU table [0x%x]\n", ptsize); for (;;) { } diff --git a/openbios-devel/include/libc/stdlib.h b/openbios-devel/include/libc/stdlib.h index 4059db2..ef08838 100644 --- a/openbios-devel/include/libc/stdlib.h +++ b/openbios-devel/include/libc/stdlib.h @@ -19,7 +19,6 @@ extern void *malloc( int size ); extern void free( void *ptr ); extern void *realloc( void *ptr, size_t size ); -extern int posix_memalign(void **memptr, size_t alignment, size_t size); /* should perhaps go somewhere else... */ extern void qsort( void *base, size_t nmemb, size_t size, int (*compar)(const void*, const void*)); -- 1.7.2.3

1 0

[PATCH 04/13] Switch SPARC32 page tables over to use OFMEM's ofmem_posix_memalign() rather than its internal posix_memalign() function.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

This requires a corresponding increase in the memory allocated to OFMEM in order to store the page tables. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/lib.c | 8 ++++---- openbios-devel/arch/sparc32/ofmem_sparc32.c | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index 10599ce..788d6f5 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -273,7 +273,7 @@ find_pte(unsigned long va, int alloc) pte = l1[(va >> SRMMU_PGDIR_SHIFT) & (SRMMU_PTRS_PER_PGD - 1)]; if ((pte & SRMMU_ET_MASK) == SRMMU_ET_INVALID) { if (alloc) { - ret = posix_memalign(&p, SRMMU_PTRS_PER_PMD * sizeof(int), + ret = ofmem_posix_memalign(&p, SRMMU_PTRS_PER_PMD * sizeof(int), SRMMU_PTRS_PER_PMD * sizeof(int)); if (ret != 0) return ret; @@ -290,7 +290,7 @@ find_pte(unsigned long va, int alloc) pte = *(uint32_t *)pa2va(pa); if ((pte & SRMMU_ET_MASK) == SRMMU_ET_INVALID) { if (alloc) { - ret = posix_memalign(&p, SRMMU_PTRS_PER_PTE * sizeof(void *), + ret = ofmem_posix_memalign(&p, SRMMU_PTRS_PER_PTE * sizeof(void *), SRMMU_PTRS_PER_PTE * sizeof(void *)); if (ret != 0) return ret; @@ -602,9 +602,9 @@ init_mmu_swift(void) mem_init(&cmem, (char *) &_vmem, (char *)&_evmem); mem_init(&cio, (char *)&_end, (char *)&_iomem); - posix_memalign((void *)&context_table, NCTX_SWIFT * sizeof(int), + ofmem_posix_memalign((void *)&context_table, NCTX_SWIFT * sizeof(int), NCTX_SWIFT * sizeof(int)); - posix_memalign((void *)&l1, 256 * sizeof(int), 256 * sizeof(int)); + ofmem_posix_memalign((void *)&l1, 256 * sizeof(int), 256 * sizeof(int)); context_table[0] = (((unsigned long)va2pa((unsigned long)l1)) >> 4) | SRMMU_ET_PTD; diff --git a/openbios-devel/arch/sparc32/ofmem_sparc32.c b/openbios-devel/arch/sparc32/ofmem_sparc32.c index fffd32a..e45af2e 100644 --- a/openbios-devel/arch/sparc32/ofmem_sparc32.c +++ b/openbios-devel/arch/sparc32/ofmem_sparc32.c @@ -21,8 +21,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -/* Temporarily very small */ -#define MEMSIZE (1 * 1024) +#define MEMSIZE (256 * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; -- 1.7.2.3

1 0

[PATCH 03/13] Alter the SPARC32 entry.S file to allow extra space for the page tables to handle OpenBIOS images up to 2MB.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

Currently the page tables only allow enough space for a 1.5MB image; however during testing/development it was useful to temporarily allow larger images for debugging. Note that if larger ROM sizes are required for testing, it is necessary to patch qemu to raise the hardcoded limit there too. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/entry.S | 52 ++++++++++++++++++++++++----------- 1 files changed, 36 insertions(+), 16 deletions(-) diff --git a/openbios-devel/arch/sparc32/entry.S b/openbios-devel/arch/sparc32/entry.S index 3a4ce4e..9f5356c 100644 --- a/openbios-devel/arch/sparc32/entry.S +++ b/openbios-devel/arch/sparc32/entry.S @@ -38,15 +38,15 @@ * * Top +-------------------------+ * | SMP CPU table | - * | s + 0xf00 ... 0xf0f | - * | s + 0xf0c valid | - * | s + 0xf08 entry | - * | s + 0xf04 ctxtbl | - * | s + 0xf00 ctx | + * | s + 0x1f00 ... 0x1f0f | + * | s + 0x1f0c valid | + * | s + 0x1f08 entry | + * | s + 0x1f04 ctxtbl | + * | s + 0x1f00 ctx | * +-------------------------+ * | Bootstrap | - * | MMU L3 tables 5 * 0x100 | - * | s + 0xa00 ... 0xeff | + * | MMU L3 tables 8 * 0x100 | + * | s + 0xa00 ... 0x11ff | * +-------------------------+ * | Bootstrap | * | MMU L2 tables 2 * 0x100 | @@ -123,11 +123,12 @@ entry: ! Start of private memory in %g6 - set 0x1000, %g3 + set 0x2000, %g3 sub %g1, %g3, %g6 ! Calculate SMP table location - add %g6, 0xf0c, %g2 ! valid? + set 0x1f0c, %g2 + add %g6, %g2, %g2 ! valid? lda [%g2] ASI_M_BYPASS, %g7 sta %g0, [%g2] ASI_M_BYPASS @@ -168,17 +169,20 @@ entry: load_ctx: ! SMP init, jump to user specified address - add %g6, 0xf04, %g5 ! ctxtbl + set 0x1f04, %g5 + add %g6, %g5, %g5 ! ctxtbl lda [%g5] ASI_M_BYPASS, %g2 sta %g0, [%g5] ASI_M_BYPASS set AC_M_CTPR, %g1 sta %g2, [%g1] ASI_M_MMUREGS ! set ctx table ptr - add %g6, 0xf00, %g5 ! ctx + set 0x1f00, %g5 + add %g6, %g5, %g5 ! ctx lda [%g5] ASI_M_BYPASS, %g2 sta %g0, [%g5] ASI_M_BYPASS set AC_M_CXR, %g1 sta %g2, [%g1] ASI_M_MMUREGS ! set context - add %g6, 0xf08, %g5 ! entry + set 0x1f08, %g5 + add %g6, %g5, %g5 ! entry lda [%g5] ASI_M_BYPASS, %g2 sta %g0, [%g5] ASI_M_BYPASS set 1, %g1 @@ -217,7 +221,7 @@ first_cpu: /* Create temporary page tables and map the ROM area to end of RAM. This will be done properly in iommu.c later. */ ! Calculate start of page tables etc. to %g6 - set 0x1000, %g4 + set 0x2000, %g4 sub %g1, %g4, %g6 ! start of private memory mov %g6, %g2 ! ctx table at s+0x0 @@ -273,7 +277,22 @@ first_cpu: srl %g3, 0x4, %g3 or %g3, 0x1, %g3 sta %g3, [%g2] ASI_M_BYPASS - add %g2, 0xa00-0x9e0, %g2 ! s+0xa00 + add %g2, 4, %g2 ! s+0x9e4 + add %g2, 0xf00 - 0x9e4, %g3 ! 6th l3 table for rom at s+0xf00 + srl %g3, 0x4, %g3 + or %g3, 0x1, %g3 + sta %g3, [%g2] ASI_M_BYPASS + add %g2, 4, %g2 ! s+0x9e8 + add %g2, 0x1000 - 0x9e8, %g3 ! 7th l3 table for rom at s+0x1000 + srl %g3, 0x4, %g3 + or %g3, 0x1, %g3 + sta %g3, [%g2] ASI_M_BYPASS + add %g2, 4, %g2 ! s+0x9ec + add %g2, 0x1100 - 0x9ec, %g3 ! 8th l3 table for rom at s+0x1100 + srl %g3, 0x4, %g3 + or %g3, 0x1, %g3 + sta %g3, [%g2] ASI_M_BYPASS + add %g2, 0xa00-0x9ec, %g2 ! s+0xa00 /* Use end of ram for code, rodata, data, and bss sections. SunOS wants to write to trap table... */ @@ -282,6 +301,7 @@ first_cpu: sub %g6, %g4, %g6 sub %g1, %g6, %g3 set 0x1000, %g5 + sub %g3, %g5, %g3 sub %g3, %g5, %g3 ! start of ROM copy mov %g3, %g7 ! save in %g7 srl %g6, 12, %g6 ! # of all pages @@ -311,7 +331,7 @@ first_cpu: bl 1b add %g4, 0x4, %g4 - set 0x1000, %g3 + set 0x2000, %g3 sub %g6, %g3, %g7 ! ctx table at s+0x0 set AC_M_CTPR, %g2 srl %g7, 4, %g7 @@ -360,7 +380,7 @@ highmem: set _start, %o2 sub %o0, %o2, %o0 sub %g6, %o0, %o0 - set 0x1000, %o1 + set 0x2000, %o1 sub %o0, %o1, %o0 ! start of ROM copy sub %o2, %o0, %o0 ! start of ROM copy set va_shift, %g1 -- 1.7.2.3

1 0

[PATCH 02/13] Reduce memory of the Forth machine to 16k.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

Since this memory is only being used by alloc-mem and free-mem then the majority of memory allocations will not actually be taken from this pool but from the C malloc()/free() implementations instead. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/ldscript | 4 ++-- openbios-devel/arch/sparc32/openbios.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openbios-devel/arch/sparc32/ldscript b/openbios-devel/arch/sparc32/ldscript index a95ef68..da94a56 100644 --- a/openbios-devel/arch/sparc32/ldscript +++ b/openbios-devel/arch/sparc32/ldscript @@ -12,8 +12,8 @@ BASE_ADDR = 0xffd00000; /* 16KB stack */ STACK_SIZE = 16384; -/* 256k general alloc + 256k Forth dictionary + 128k Forth memory */ -VMEM_SIZE = (256 + 256 + 128) * 1024; +/* 256k general alloc + 256k Forth dictionary + 16k Forth memory */ +VMEM_SIZE = (256 + 256 + 16) * 1024; IOMEM_SIZE = 256 * 1024 + 768 * 1024; SECTIONS diff --git a/openbios-devel/arch/sparc32/openbios.c b/openbios-devel/arch/sparc32/openbios.c index 1c86752..1419468 100644 --- a/openbios-devel/arch/sparc32/openbios.c +++ b/openbios-devel/arch/sparc32/openbios.c @@ -26,7 +26,7 @@ #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" -#define MEMORY_SIZE (128*1024) /* 16K ram for hosted system */ +#define MEMORY_SIZE (16*1024) /* 16K ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" #define FW_CFG_SUN4M_DEPTH (FW_CFG_ARCH_LOCAL + 0x00) -- 1.7.2.3

1 0

[PATCH 01/13] Change the SPARC32 build system so that OFMEM is now included within SPARC32 builds.
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/build.xml | 1 + openbios-devel/arch/sparc32/lib.c | 10 ++ openbios-devel/arch/sparc32/ofmem_sparc32.c | 135 +++++++++++++++++++++ openbios-devel/config/examples/sparc32_config.xml | 2 + 4 files changed, 148 insertions(+), 0 deletions(-) create mode 100644 openbios-devel/arch/sparc32/ofmem_sparc32.c diff --git a/openbios-devel/arch/sparc32/build.xml b/openbios-devel/arch/sparc32/build.xml index 222dfb7..3d2f71d 100644 --- a/openbios-devel/arch/sparc32/build.xml +++ b/openbios-devel/arch/sparc32/build.xml @@ -15,6 +15,7 @@ <object source="udiv.S"/> <object source="linux_load.c"/> <object source="sys_info.c"/> + <object source="ofmem_sparc32.c"/> <object source="romvec.c"/> <object source="call-romvec.S"/> <object source="entry.S"/> diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index a30729f..10599ce 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -497,6 +497,16 @@ void obp_dumb_munmap(__attribute__((unused)) char *va, DPRINTF("obp_dumb_munmap: virta 0x%x, sz %d\n", (unsigned int)va, size); } +void ofmem_arch_unmap_pages(ucell virt, ucell size) +{ + /* Currently do nothing */ +} + +void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell mode) +{ + /* Currently do nothing */ +} + char *obp_dumb_memalloc(char *va, unsigned int size) { size = (size + 7) & ~7; diff --git a/openbios-devel/arch/sparc32/ofmem_sparc32.c b/openbios-devel/arch/sparc32/ofmem_sparc32.c new file mode 100644 index 0000000..fffd32a --- /dev/null +++ b/openbios-devel/arch/sparc32/ofmem_sparc32.c @@ -0,0 +1,135 @@ +/* + * <ofmem_sparc32.c> + * + * OF Memory manager + * + * Copyright (C) 1999-2004 Samuel Rydh (samuel(a)ibrium.se) + * Copyright (C) 2004 Stefan Reinauer + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation + * + */ + +#include "config.h" +#include "libopenbios/bindings.h" +#include "libc/string.h" +#include "libopenbios/ofmem.h" +#include "asm/asi.h" +#include "pgtsrmmu.h" + +#define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) + +/* Temporarily very small */ +#define MEMSIZE (1 * 1024) +static union { + char memory[MEMSIZE]; + ofmem_t ofmem; +} s_ofmem_data; + +#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; + +extern uint32_t qemu_mem_size; + +static inline size_t ALIGN_SIZE(size_t x, size_t a) +{ + return (x + a - 1) & ~(a-1); +} + +static ucell get_heap_top( void ) +{ + return (ucell)TOP_OF_RAM; +} + +ofmem_t* ofmem_arch_get_private(void) +{ + return OFMEM; +} + +void* ofmem_arch_get_malloc_base(void) +{ + return OF_MALLOC_BASE; +} + +ucell ofmem_arch_get_heap_top(void) +{ + return get_heap_top(); +} + +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 (uintptr_t)ofmem->ramsize - 0x1000000; +} + +retain_t *ofmem_arch_get_retained(void) +{ + /* Not used */ + return 0; +} + +int ofmem_arch_get_physaddr_cellsize(void) +{ + return 2; +} + +int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value) +{ + int n = 0; + + p[n++] = value >> 32; + p[n++] = value; + + return n; +} + +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 */ +/************************************************************************/ + +ucell ofmem_arch_default_translation_mode( phys_addr_t phys ) +{ + return SRMMU_REF | SRMMU_CACHE | SRMMU_PRIV; +} + +/************************************************************************/ +/* init / cleanup */ +/************************************************************************/ + +void ofmem_init( void ) +{ + memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); + s_ofmem_data.ofmem.ramsize = qemu_mem_size; +} diff --git a/openbios-devel/config/examples/sparc32_config.xml b/openbios-devel/config/examples/sparc32_config.xml index 233bacb..ba4b7d7 100644 --- a/openbios-devel/config/examples/sparc32_config.xml +++ b/openbios-devel/config/examples/sparc32_config.xml @@ -26,6 +26,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"/> <option name="CONFIG_LOADER_AOUT" type="boolean" value="true"/> <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="false"/> <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> -- 1.7.2.3

1 0

[PATCH 00/13] Convert SPARC32 to OFMEM v2
by Mark Cave-Ayland 31 Dec '10

31 Dec '10

This patchset converts SPARC32 and its associated devices over from its own private memory routines over to using the OFMEM API as used by PPC and SPARC64. v2: Fix whitespace issues. Fix unused variable causing GCC 4.6.0 to fail. Use PRI* macros for FMT_cell and FMT_ucell changes. v1: Initial patchset. Mark Cave-Ayland (13): Change the SPARC32 build system so that OFMEM is now included within SPARC32 builds. Reduce memory of the Forth machine to 16k. Alter the SPARC32 entry.S file to allow extra space for the page tables to handle OpenBIOS images up to 2MB. Switch SPARC32 page tables over to use OFMEM's ofmem_posix_memalign() rather than its internal posix_memalign() function. Switch IOMMU posix_memalign() calls over to ofmem_posix_memalign(), and then remove the private SPARC32 posix_memalign() implementation since it is no longer required. Add ofmem_init() function to openbios.c taking into account that unlike SPARC64, OFMEM needs to be setup *before* the MMU so that the page table allocation routines can use it. Switch SPARC32 over to use OFMEM's malloc()/free() internally rather than using it's own implementation. Remove the existing map_page() function and instead install a transitional API using map_pages() which is almost identical to the OFMEM API. Introduce ofmem_arch_io_translation_mode() to allow an OFMEM arch to specify different MMU modes for I/O memory mapped regions. Implement ofmem_map_io() within OFMEM as a function to map I/O memory (similar to SPARC32's private map_io() function). Switch all SPARC32 devices over from the private map_io() function over to OFMEM's ofmem_map_io() function. Switch remaining SPARC32 code over to OFMEM. Fix the FMT_cell and FMT_ucell definitions for SPARC32. openbios-devel/arch/ppc/qemu/ofmem.c | 16 ++ openbios-devel/arch/sparc32/build.xml | 1 + openbios-devel/arch/sparc32/console.c | 4 +- openbios-devel/arch/sparc32/entry.S | 52 +++-- openbios-devel/arch/sparc32/ldscript | 3 +- openbios-devel/arch/sparc32/lib.c | 296 +++++---------------- openbios-devel/arch/sparc32/ofmem_sparc32.c | 149 +++++++++++ openbios-devel/arch/sparc32/openbios.c | 6 +- openbios-devel/arch/sparc64/ofmem_sparc64.c | 19 ++- openbios-devel/config/examples/sparc32_config.xml | 2 + openbios-devel/drivers/escc.c | 4 +- openbios-devel/drivers/esp.c | 4 +- openbios-devel/drivers/fw_cfg.c | 2 +- openbios-devel/drivers/iommu.c | 12 +- openbios-devel/drivers/obio.c | 10 +- openbios-devel/drivers/sbus.c | 2 +- openbios-devel/include/arch/sparc32/types.h | 6 +- openbios-devel/include/libc/stdlib.h | 1 - openbios-devel/include/libopenbios/ofmem.h | 12 +- openbios-devel/libopenbios/ofmem_common.c | 52 ++++ 20 files changed, 369 insertions(+), 284 deletions(-) create mode 100644 openbios-devel/arch/sparc32/ofmem_sparc32.c -- 1.7.2.3

1 0

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

30 Dec '10

Author: mcayland Date: Thu Dec 30 23:02:09 2010 New Revision: 997 URL: http://tracker.coreboot.org/trac/openbios/changeset/997 Log: Fix ofmem_posix_memalign() so that it also enforces physical alignment when re-allocating memory from the freelist. 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:28 2010 (r996) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Thu Dec 30 23:02:09 2010 (r997) @@ -108,7 +108,11 @@ /* waste at most 4K by taking an entry from the freelist */ if( *pp && (**pp).size < size + 0x1000 ) { - ret = (void *)((uintptr_t)*pp + sizeof(alloc_desc_t)); + /* Alignment should be on physical not virtual address */ + pa = va2pa((uintptr_t)*pp + sizeof(alloc_desc_t)); + pa = align_ptr(pa, alignment); + ret = (void *)pa2va(pa); + memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) ); *pp = (**pp).next;

1 0

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

30 Dec '10

This patchset converts SPARC32 and its associated devices over from its own private memory routines over to using the OFMEM API as used by PPC and SPARC64. v1: Initial patchset. Mark Cave-Ayland (13): Change the SPARC32 build system so that OFMEM is now included within SPARC32 builds. Reduce memory of the Forth machine to 16k. Alter the SPARC32 entry.S file to allow extra space for the page tables to handle OpenBIOS images up to 2MB. Switch SPARC32 page tables over to use OFMEM's ofmem_posix_memalign() rather than its internal posix_memalign() function. Switch IOMMU posix_memalign() calls over to ofmem_posix_memalign(), and then remove the private SPARC32 posix_memalign() implementation since it is no longer required. Add ofmem_init() function to openbios.c taking into account that unlike SPARC64, OFMEM needs to be setup *before* the MMU so that the page table allocation routines can use it. Switch SPARC32 over to use OFMEM's malloc()/free() internally rather than using it's own implementation. Remove the existing map_page() function and instead install a transitional API using map_pages() which is almost identical to the OFMEM API. Introduce ofmem_arch_io_translation_mode() to allow an OFMEM arch to specify different MMU modes for I/O memory mapped regions. Implement ofmem_map_io() within OFMEM as a function to map I/O memory (similar to SPARC32's private map_io() function). Switch all SPARC32 devices over from the private map_io() function over to OFMEM's ofmem_map_io() function. Switch remaining SPARC32 code over to OFMEM. Fix the FMT_cell and FMT_ucell definitions for SPARC32. mcayland (3): 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 | 23 ++ openbios-devel/arch/sparc32/build.xml | 1 + openbios-devel/arch/sparc32/console.c | 4 +- openbios-devel/arch/sparc32/entry.S | 52 +++- openbios-devel/arch/sparc32/ldscript | 3 +- openbios-devel/arch/sparc32/lib.c | 306 +++++---------------- openbios-devel/arch/sparc32/ofmem_sparc32.c | 149 ++++++++++ openbios-devel/arch/sparc32/openbios.c | 6 +- openbios-devel/arch/sparc64/ofmem_sparc64.c | 26 ++- openbios-devel/config/examples/sparc32_config.xml | 2 + openbios-devel/drivers/escc.c | 4 +- openbios-devel/drivers/esp.c | 4 +- openbios-devel/drivers/fw_cfg.c | 2 +- openbios-devel/drivers/iommu.c | 12 +- openbios-devel/drivers/obio.c | 10 +- openbios-devel/drivers/sbus.c | 2 +- openbios-devel/include/arch/sparc32/types.h | 4 +- openbios-devel/include/libc/stdlib.h | 1 - openbios-devel/include/libopenbios/ofmem.h | 15 +- openbios-devel/libopenbios/ofmem_common.c | 73 +++++- 20 files changed, 402 insertions(+), 297 deletions(-) create mode 100644 openbios-devel/arch/sparc32/ofmem_sparc32.c -- 1.7.2.3

2 20

Hello. I'm on the driver floppy.c
by Анатолий Литвяков 30 Dec '10

30 Dec '10

sorry for my english, I'm from Russia. I think that you have, and Linux. there is a bug in the team drive_specific_command (0x8e). you pass the first parameter as (FD_Drive & 3). but you have to (( FD_Drive & 3) <5). if I'm wrong then please explain how this team. please reply to this message. thanks in advance.

3 3

[PATCH] Generate Makefile dependencies also from Forth files
by Blue Swirl 30 Dec '10

30 Dec '10

Dependencies between Forth files were not detected, so dictionaries were not regenerated automatically in some cases. Introduce '-M' flag to forthstrap to dump dependency information in Makefile compatible format, based on the Forth 'include' directives. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> --- Makefile.target | 2 +- config/xml/dictionary.xsl | 1 + kernel/bootstrap.c | 30 +++++++++++++++++++++++++++--- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/Makefile.target b/Makefile.target index 9ae8120..934b95a 100644 --- a/Makefile.target +++ b/Makefile.target @@ -77,4 +77,4 @@ build: all include rules.mak # Include automatically generated dependency files --include $(wildcard $(ODIR)/host/kernel/*.d $(ODIR)/target/*/*.d $(ODIR)/target/*/*/*.d $(ODIR)/target/*/*/*/*.d) +-include $(wildcard $(ODIR)/*.d $(ODIR)/host/kernel/*.d $(ODIR)/target/*/*.d $(ODIR)/target/*/*/*.d $(ODIR)/target/*/*/*/*.d) diff --git a/config/xml/dictionary.xsl b/config/xml/dictionary.xsl index fc61359..52d836a 100644 --- a/config/xml/dictionary.xsl +++ b/config/xml/dictionary.xsl @@ -126,6 +126,7 @@ <xsl:text> -I$(ODIR)/forth</xsl:text> <xsl:text> -D $@</xsl:text> + <xsl:text> -M $@.d</xsl:text> <xsl:if test="$init!=''"> <xsl:text> -d $(ODIR)/</xsl:text><xsl:value-of select="$init"/><xsl:text>.dict</xsl:text> </xsl:if> diff --git a/kernel/bootstrap.c b/kernel/bootstrap.c index 3c3356e..8a45fb7 100644 --- a/kernel/bootstrap.c +++ b/kernel/bootstrap.c @@ -69,6 +69,7 @@ struct include_path { }; static include includes = { ".", NULL }; +static FILE *depfile; static ucell * relocation_address=NULL; static int relocation_length=0; @@ -465,6 +466,10 @@ static FILE *fopen_include(const char *fil) srclines [ cursrc ] = 1; srcfiles [ cursrc++ ] = ret; + if (depfile) { + fprintf(depfile, " %s", fullpath); + } + return ret; } @@ -1025,7 +1030,9 @@ static void new_dictionary(const char *source) " write to output.dict\n" \ " -c|--console output.log\n" \ " write kernel console output to log file\n" \ - " -s|--segfault install segfault handler\n\n" + " -s|--segfault install segfault handler\n" \ + " -M|--dependency-dump file\n" \ + " dump dependencies in Makefile format\n\n" #else #define USAGE "Usage: %s [options] [dictionary file|source file]\n\n" \ " -h show this help\n" \ @@ -1039,7 +1046,7 @@ static void new_dictionary(const char *source) " -c output.log\n" \ " write kernel console output to log file\n" \ " -s install segfault handler\n\n" - + " -M file dump dependencies in Makefile format\n\n" #endif int main(int argc, char *argv[]) @@ -1050,11 +1057,12 @@ int main(int argc, char *argv[]) char *dictname = NULL; char *basedict = NULL; char *consolefile = NULL; + char *depfilename = NULL; unsigned char *bootstrapdict[2]; int c, cnt; - const char *optstring = "VvhsI:d:D:c:?"; + const char *optstring = "VvhsI:d:D:c:M:?"; while (1) { #ifdef __GLIBC__ @@ -1068,6 +1076,7 @@ int main(int argc, char *argv[]) {"source-dictionary", 1, NULL, 'd'}, {"target-dictionary", 1, NULL, 'D'}, {"console", 1, NULL, 'c'}, + {"dependency-dump", 1, NULL, 'M'}, }; /* @@ -1118,6 +1127,11 @@ int main(int argc, char *argv[]) consolefile = optarg; } break; + case 'M': + if (!depfilename) { + depfilename = optarg; + } + break; default: return 1; } @@ -1127,6 +1141,7 @@ int main(int argc, char *argv[]) printk(BANNER); printk("Using source dictionary '%s'\n", basedict); printk("Dumping final dictionary to '%s'\n", dictname); + printk("Dumping dependencies to '%s'\n", depfilename); } if (argc < optind + 1) { @@ -1134,6 +1149,10 @@ int main(int argc, char *argv[]) return 1; } + if (depfilename) { + depfile = fopen(depfilename, "w"); + fprintf(depfile, "%s: ", dictname); + } /* * Get all required resources @@ -1203,6 +1222,11 @@ int main(int argc, char *argv[]) run_dictionary(basedict, consolefile); } + if (depfile) { + fprintf(depfile, "\n"); + fclose(depfile); + depfile = NULL; + } if(errors) break; } -- 1.6.2.4

2 4