OpenBIOS December 2010

openbios@openbios.org

12 participants
64 discussions

[PATCH] RFC: Change ofmem_common.c to set memory translation properties by reference
by Mark Cave-Ayland 04 May '11

04 May '11

Hi folks, The attached patch changes OFMEM so that instead of allocating new space within the Forth dictionary every time the /memory and /virtual-memory available/translations nodes are updated, we simply change the property to point directly to a static buffer. This has the effect of saving substantial amounts of memory during OpenSolaris 10 boot (in fact the final dictionary size after boot is now < 256K once again). Blue/Andreas: please could you take a look at this patch and make … [View More]

4 14

Re: [OpenBIOS] [PATCH 3/6] Introduce va2pa() and pa2va() functions for PPC for subsequent use by OFMEM.
by Andreas Färber 01 Jan '11

01 Jan '11

Mark, Am 29.12.2010 um 12:07 schrieb Mark Cave-Ayland: > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> This does not really address my comments... > --- > 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/… [View More]

2 7

[PATCH 13/13] Fix the FMT_cell and FMT_ucell definitions for SPARC32.
by Mark Cave-Ayland 30 Dec '10

30 Dec '10

This is required to enable a build with CONFIG_DEBUG_OFMEM set to true to complete successfully. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/include/arch/sparc32/types.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/openbios-devel/include/arch/sparc32/types.h b/openbios-devel/include/arch/sparc32/types.h index 444d648..b7c5fec 100644 --- a/openbios-devel/include/arch/sparc32/types.h +++ b/openbios-devel/include/… [View More]

1 0

[PATCH 12/13] Switch remaining SPARC32 code over to OFMEM.
by Mark Cave-Ayland 30 Dec '10

30 Dec '10

This patch removes the SPARC32-specific map_pages() function from the IOMMU driver, plus switches obp_dumb_memalloc() over to use OFMEM. OFMEM property generation is enabled for the /memory and /virtual-memory nodes, and any remaining traces of the old memory variables are removed. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/lib.c | 65 +++++++++------------------- openbios-devel/drivers/iommu.c | 2 +- … [View More]openbios-devel/include/libopenbios/ofmem.h | 1 - 3 files changed, 21 insertions(+), 47 deletions(-) diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index 1de8868..72d3a87 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -53,8 +53,6 @@ struct mem { char *curp; }; -static struct mem cmem; /* Current memory, virtual */ -static struct mem cio; /* Current I/O space */ struct mem cdvmem; /* Current device virtual memory space */ unsigned int va_shift; @@ -190,7 +188,7 @@ find_pte(unsigned long va, int alloc) return pa2va(pa); } -void +static void map_pages(phys_addr_t phys, unsigned long virt, unsigned long size, unsigned long mode) { @@ -353,29 +351,19 @@ void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell char *obp_dumb_memalloc(char *va, unsigned int size) { - size = (size + 7) & ~7; - // XXX should use normal memory alloc - totavail[0].num_bytes -= size; - DPRINTF("obp_dumb_memalloc va 0x%p size %x at 0x%x\n", va, size, - totavail[0].num_bytes); - - // If va is null, the allocator is supposed to pick a "suitable" address. - // (See OpenSolaric prom_alloc.c) There's not any real guidance as - // to what might be "suitable". So we mimic the behavior of a Sun boot - // ROM. - - if (va == NULL) { - va = (char *)(totmap[0].start_adr - size); - totmap[0].start_adr -= size; - totmap[0].num_bytes += size; - DPRINTF("obp_dumb_memalloc req null -> 0x%p\n", va); - } + phys_addr_t phys; + ucell virt; - map_pages(totavail[0].num_bytes, (unsigned long)va, size, ofmem_arch_default_translation_mode(totavail[0].num_bytes)); + /* Claim physical memory */ + phys = ofmem_claim_phys(-1, size, CONFIG_OFMEM_MALLOC_ALIGN); - update_memory_properties(); + /* Claim virtual memory */ + virt = ofmem_claim_virt(pointer2cell(va), size, 0); - return va; + /* Map the memory */ + ofmem_map(phys, virt, size, ofmem_arch_default_translation_mode(phys)); + + return cell2pointer(virt); } void obp_dumb_memfree(__attribute__((unused))char *va, @@ -387,6 +375,8 @@ void obp_dumb_memfree(__attribute__((unused))char *va, void ob_init_mmu(void) { + ucell *reg; + init_romvec_mem(); /* Find the phandles for the /memory and /virtual-memory nodes */ @@ -400,30 +390,18 @@ ob_init_mmu(void) POP(); s_phandle_mmu = POP(); - /* Setup /memory:reg (totphys) property */ - push_str("/memory"); - fword("find-device"); - PUSH(pointer2cell(mem_reg)); - PUSH(3 * sizeof(ucell)); - push_str("reg"); - PUSH_ph(s_phandle_memory); - fword("encode-property"); + ofmem_register(s_phandle_memory, s_phandle_mmu); - /* Setup /virtual-memory:avail (totmap) property */ - push_str("/virtual-memory"); - fword("find-device"); - PUSH(pointer2cell(virt_avail)); - PUSH(3 * sizeof(ucell)); - push_str("available"); - PUSH_ph(s_phandle_mmu); - fword("encode-property"); + /* Setup /memory:reg (totphys) property */ + reg = malloc(3 * sizeof(ucell)); + ofmem_arch_encode_physaddr(reg, 0); /* physical base */ + reg[2] = (ucell)ofmem_arch_get_phys_top(); /* size */ - /* Setup /memory:avail (totavail) property */ push_str("/memory"); fword("find-device"); - PUSH(pointer2cell(mem_avail)); + PUSH(pointer2cell(reg)); PUSH(3 * sizeof(ucell)); - push_str("available"); + push_str("reg"); PUSH_ph(s_phandle_memory); fword("encode-property"); @@ -444,9 +422,6 @@ init_mmu_swift(void) unsigned long pa, va; int size; - mem_init(&cmem, (char *) &_vmem, (char *)&_evmem); - mem_init(&cio, (char *)&_end, (char *)&_iomem); - ofmem_posix_memalign((void *)&context_table, NCTX_SWIFT * sizeof(int), NCTX_SWIFT * sizeof(int)); ofmem_posix_memalign((void *)&l1, 256 * sizeof(int), 256 * sizeof(int)); diff --git a/openbios-devel/drivers/iommu.c b/openbios-devel/drivers/iommu.c index 7d34f81..28f3b57 100644 --- a/openbios-devel/drivers/iommu.c +++ b/openbios-devel/drivers/iommu.c @@ -68,7 +68,7 @@ dvma_alloc(int size, unsigned int *pphys) */ mva = (unsigned int) va; mpa = (unsigned int) pa; - map_pages(mpa, mva, npages * PAGE_SIZE, ofmem_arch_io_translation_mode(mpa)); + ofmem_arch_early_map_pages(mpa, mva, npages * PAGE_SIZE, ofmem_arch_io_translation_mode(mpa)); /* * Map into IOMMU page table. diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h index 1ba6c83..2269fd7 100644 --- a/openbios-devel/include/libopenbios/ofmem.h +++ b/openbios-devel/include/libopenbios/ofmem.h @@ -135,7 +135,6 @@ extern struct mem cdvmem; void mem_init(struct mem *t, char *begin, char *limit); void *mem_alloc(struct mem *t, int size, int align); -void map_pages(phys_addr_t phys, unsigned long virt, unsigned long size, unsigned long mode); #endif #ifdef PAGE_SHIFT -- 1.7.2.3 [View Less]

1 0

[PATCH 11/13] Switch all SPARC32 devices over from the private map_io() function over to OFMEM's ofmem_map_io() function.
by Mark Cave-Ayland 30 Dec '10

30 Dec '10

The old map_io() function can now be removed. Also fill in ofmem_arch_early_map_pages() on SPARC32 which is required for ofmem_map_io() to work correctly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/console.c | 4 ++-- openbios-devel/arch/sparc32/lib.c | 25 +------------------------ openbios-devel/drivers/escc.c | 4 ++-- openbios-devel/drivers/esp.c | 4 ++-- openbios-devel/… [View More]drivers/fw_cfg.c | 2 +- openbios-devel/drivers/iommu.c | 2 +- openbios-devel/drivers/obio.c | 10 +++++----- openbios-devel/drivers/sbus.c | 2 +- openbios-devel/include/libopenbios/ofmem.h | 1 - 9 files changed, 15 insertions(+), 39 deletions(-) diff --git a/openbios-devel/arch/sparc32/console.c b/openbios-devel/arch/sparc32/console.c index 52e4827..2bcdf02 100644 --- a/openbios-devel/arch/sparc32/console.c +++ b/openbios-devel/arch/sparc32/console.c @@ -46,8 +46,8 @@ static void video_cls(void) void tcx_init(uint64_t base) { - vmem = map_io(base + VMEM_BASE, VMEM_SIZE); - dac = map_io(base + DAC_BASE, DAC_SIZE); + vmem = (unsigned char *)ofmem_map_io(base + VMEM_BASE, VMEM_SIZE); + dac = (uint32_t *)ofmem_map_io(base + DAC_BASE, DAC_SIZE); console_init(); } diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index 12c69d9..1de8868 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -218,29 +218,6 @@ map_pages(phys_addr_t phys, unsigned long virt, } /* - * Create an I/O mapping to pa[size]. - * Returns va of the mapping or 0 if unsuccessful. - */ -void * -map_io(uint64_t pa, int size) -{ - unsigned long va; - unsigned int npages; - unsigned int off; - - off = pa & (PAGE_SIZE - 1); - npages = (off + size - 1) / PAGE_SIZE + 1; - pa &= ~(PAGE_SIZE - 1); - - va = (unsigned long)mem_alloc(&cio, npages * PAGE_SIZE, PAGE_SIZE); - if (va == 0) - return NULL; - - map_pages(pa, va, npages * PAGE_SIZE, ofmem_arch_io_translation_mode(pa)); - return (void *)(va + off); -} - -/* * D5.3 pgmap@ ( va -- pte ) */ static void @@ -371,7 +348,7 @@ void ofmem_arch_unmap_pages(ucell virt, ucell size) void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell mode) { - /* Currently do nothing */ + map_pages(phys, virt, size, mode); } char *obp_dumb_memalloc(char *va, unsigned int size) diff --git a/openbios-devel/drivers/escc.c b/openbios-devel/drivers/escc.c index e22d245..ef431b2 100644 --- a/openbios-devel/drivers/escc.c +++ b/openbios-devel/drivers/escc.c @@ -105,7 +105,7 @@ static void uart_init_line(volatile unsigned char *port, unsigned long baud) int uart_init(phys_addr_t port, unsigned long speed) { #ifdef CONFIG_DRIVER_ESCC_SUN - serial_dev = map_io(port & ~7ULL, ZS_REGS); + serial_dev = (unsigned char *)ofmem_map_io(port & ~7ULL, ZS_REGS); serial_dev += port & 7ULL; #else serial_dev = (unsigned char *)(uintptr_t)port; @@ -213,7 +213,7 @@ static volatile unsigned char *kbd_dev; void kbd_init(phys_addr_t base) { - kbd_dev = map_io(base, 2 * 4); + kbd_dev = (unsigned char *)ofmem_map_io(base, 2 * 4); kbd_dev += 4; } diff --git a/openbios-devel/drivers/esp.c b/openbios-devel/drivers/esp.c index 869421d..f268b6a 100644 --- a/openbios-devel/drivers/esp.c +++ b/openbios-devel/drivers/esp.c @@ -311,7 +311,7 @@ static int espdma_init(unsigned int slot, uint64_t base, unsigned long offset, struct esp_dma *espdma) { - espdma->regs = (void *)map_io(base + (uint64_t)offset, 0x10); + espdma->regs = (void *)ofmem_map_io(base + (uint64_t)offset, 0x10); if (espdma->regs == NULL) { DPRINTF("espdma_init: cannot map registers\n"); @@ -445,7 +445,7 @@ ob_esp_init(unsigned int slot, uint64_t base, unsigned long espoffset, return -1; } /* Get the IO region */ - esp->ll = (void *)map_io(base + (uint64_t)espoffset, + esp->ll = (void *)ofmem_map_io(base + (uint64_t)espoffset, sizeof(struct esp_regs)); if (esp->ll == NULL) { DPRINTF("Can't map ESP registers\n"); diff --git a/openbios-devel/drivers/fw_cfg.c b/openbios-devel/drivers/fw_cfg.c index 0da2e72..4027570 100644 --- a/openbios-devel/drivers/fw_cfg.c +++ b/openbios-devel/drivers/fw_cfg.c @@ -65,7 +65,7 @@ void fw_cfg_init(void) { #if defined(CONFIG_SPARC32) - fw_cfg_cmd = (void *)map_io(CONFIG_FW_CFG_ADDR, 2); + fw_cfg_cmd = (void *)ofmem_map_io(CONFIG_FW_CFG_ADDR, 2); fw_cfg_data = (uint8_t *)fw_cfg_cmd + 2; #elif defined(CONFIG_SPARC64) // Nothing for the port version diff --git a/openbios-devel/drivers/iommu.c b/openbios-devel/drivers/iommu.c index 6af5b33..7d34f81 100644 --- a/openbios-devel/drivers/iommu.c +++ b/openbios-devel/drivers/iommu.c @@ -103,7 +103,7 @@ iommu_init(struct iommu *t, uint64_t base) int ret; unsigned long vasize; - regs = map_io(base, IOMMU_REGS); + regs = (struct iommu_regs *)ofmem_map_io(base, IOMMU_REGS); if (regs == NULL) { DPRINTF("Cannot map IOMMU\n"); for (;;) { } diff --git a/openbios-devel/drivers/obio.c b/openbios-devel/drivers/obio.c index 38c5f8d..359c6c2 100644 --- a/openbios-devel/drivers/obio.c +++ b/openbios-devel/drivers/obio.c @@ -71,7 +71,7 @@ map_reg(uint64_t base, uint64_t offset, unsigned long size, int map, if (map) { unsigned long addr; - addr = (unsigned long)map_io(base + offset, size); + addr = (unsigned long)ofmem_map_io(base + offset, size); PUSH(addr); fword("encode-int"); @@ -251,7 +251,7 @@ ob_aux2_reset_init(uint64_t base, uint64_t offset, int intr) power_reg = (void *)ob_reg(base, offset, AUXIO2_REGS, 1); // Not in device tree - reset_reg = map_io(base + (uint64_t)SLAVIO_RESET, RESET_REGS); + reset_reg = (unsigned int *)ofmem_map_io(base + (uint64_t)SLAVIO_RESET, RESET_REGS); bind_func("sparc32-reset-all", sparc32_reset_all); push_str("' sparc32-reset-all to reset-all"); @@ -297,7 +297,7 @@ ob_counter_init(uint64_t base, unsigned long offset) fword("property"); - counter_regs = map_io(base + (uint64_t)offset, sizeof(*counter_regs)); + counter_regs = (struct sun4m_timer_regs *)ofmem_map_io(base + (uint64_t)offset, sizeof(*counter_regs)); counter_regs->cfg = 0xffffffff; counter_regs->l10_timer_limit = (((1000000/100) + 1) << 10); counter_regs->cpu_timers[0].l14_timer_limit = 0; @@ -352,7 +352,7 @@ ob_interrupt_init(uint64_t base, unsigned long offset) push_str("reg"); fword("property"); - intregs = map_io(base | (uint64_t)offset, sizeof(*intregs)); + intregs = (struct sun4m_intregs *)ofmem_map_io(base | (uint64_t)offset, sizeof(*intregs)); intregs->clear = ~SUN4M_INT_MASKALL; intregs->cpu_intregs[0].clear = ~0x17fff; @@ -403,7 +403,7 @@ static void ob_smp_init(unsigned long mem_size) { // See arch/sparc32/entry.S for memory layout - smp_header = (struct smp_cfg *)map_io((uint64_t)(mem_size - 0x100), + smp_header = (struct smp_cfg *)ofmem_map_io((uint64_t)(mem_size - 0x100), sizeof(struct smp_cfg)); } diff --git a/openbios-devel/drivers/sbus.c b/openbios-devel/drivers/sbus.c index cba1050..f4a6d66 100644 --- a/openbios-devel/drivers/sbus.c +++ b/openbios-devel/drivers/sbus.c @@ -49,7 +49,7 @@ ob_sbus_node_init(uint64_t base) push_str("reg"); fword("property"); - regs = map_io(base, SBUS_REGS); + regs = (void *)ofmem_map_io(base, SBUS_REGS); PUSH((unsigned long)regs); fword("encode-int"); push_str("address"); diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h index 940f5cc..1ba6c83 100644 --- a/openbios-devel/include/libopenbios/ofmem.h +++ b/openbios-devel/include/libopenbios/ofmem.h @@ -136,7 +136,6 @@ extern struct mem cdvmem; void mem_init(struct mem *t, char *begin, char *limit); void *mem_alloc(struct mem *t, int size, int align); void map_pages(phys_addr_t phys, unsigned long virt, unsigned long size, unsigned long mode); -void *map_io(uint64_t pa, int size); #endif #ifdef PAGE_SHIFT -- 1.7.2.3 [View Less]

1 0

[PATCH 10/13] Implement ofmem_map_io() within OFMEM as a function to map I/O memory (similar to SPARC32's private map_io() function).
by Mark Cave-Ayland 30 Dec '10

30 Dec '10

As a consequence we need to maintain a separate I/O range within OFMEM, and add management functions similar to those that exist for the virtual and physical ranges. At the same time, we introduce a couple of new OFMEM arch functions called ofmem_arch_get_iomem_base() and ofmem_arch_get_iomem_top() to control the range of allocatable I/O memory which is again similar to the existing method used for the virtual and physical ranges. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.… [View More]co.uk> --- openbios-devel/arch/ppc/qemu/ofmem.c | 12 ++++++ openbios-devel/arch/sparc32/ofmem_sparc32.c | 10 +++++ openbios-devel/arch/sparc64/ofmem_sparc64.c | 12 ++++++ openbios-devel/include/libopenbios/ofmem.h | 9 ++++- openbios-devel/libopenbios/ofmem_common.c | 52 +++++++++++++++++++++++++++ 5 files changed, 93 insertions(+), 2 deletions(-) diff --git a/openbios-devel/arch/ppc/qemu/ofmem.c b/openbios-devel/arch/ppc/qemu/ofmem.c index 80fad75..4c6825e 100644 --- a/openbios-devel/arch/ppc/qemu/ofmem.c +++ b/openbios-devel/arch/ppc/qemu/ofmem.c @@ -132,6 +132,18 @@ void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell /* none yet */ } +ucell ofmem_arch_get_iomem_base(void) +{ + /* Currently unused */ + return 0; +} + +ucell ofmem_arch_get_iomem_top(void) +{ + /* Currently unused */ + return 0; +} + retain_t *ofmem_arch_get_retained(void) { /* not implemented */ diff --git a/openbios-devel/arch/sparc32/ofmem_sparc32.c b/openbios-devel/arch/sparc32/ofmem_sparc32.c index 77112ec..6815349 100644 --- a/openbios-devel/arch/sparc32/ofmem_sparc32.c +++ b/openbios-devel/arch/sparc32/ofmem_sparc32.c @@ -71,6 +71,16 @@ phys_addr_t ofmem_arch_get_phys_top(void) return (uintptr_t)ofmem->ramsize - 0x1000000; } +ucell ofmem_arch_get_iomem_base(void) +{ + return pointer2cell(&_end); +} + +ucell ofmem_arch_get_iomem_top(void) +{ + return pointer2cell(&_iomem); +} + retain_t *ofmem_arch_get_retained(void) { /* Not used */ diff --git a/openbios-devel/arch/sparc64/ofmem_sparc64.c b/openbios-devel/arch/sparc64/ofmem_sparc64.c index 6a4fb5e..1655978 100644 --- a/openbios-devel/arch/sparc64/ofmem_sparc64.c +++ b/openbios-devel/arch/sparc64/ofmem_sparc64.c @@ -70,6 +70,18 @@ phys_addr_t ofmem_arch_get_phys_top(void) return ofmem->ramsize; } +ucell ofmem_arch_get_iomem_base(void) +{ + /* Currently unused */ + return 0; +} + +ucell ofmem_arch_get_iomem_top(void) +{ + /* Currently unused */ + return 0; +} + 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 e350dec..940f5cc 100644 --- a/openbios-devel/include/libopenbios/ofmem.h +++ b/openbios-devel/include/libopenbios/ofmem.h @@ -46,6 +46,7 @@ typedef struct { range_t *phys_range; range_t *virt_range; + range_t *io_range; translation_t *trans; /* this is really a translation_t */ } ofmem_t; @@ -63,6 +64,8 @@ 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 ucell ofmem_arch_get_iomem_base(void); +extern ucell ofmem_arch_get_iomem_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); @@ -104,25 +107,27 @@ extern void ofmem_register( phandle_t ph_memory, phandle_t ph_mmu ); extern ucell ofmem_claim( ucell addr, ucell size, ucell align ); extern phys_addr_t ofmem_claim_phys( phys_addr_t mphys, ucell size, ucell align ); extern ucell ofmem_claim_virt( ucell mvirt, ucell size, ucell align ); +extern ucell ofmem_claim_io( ucell virt, ucell size, ucell align ); extern phys_addr_t ofmem_retain( phys_addr_t phys, ucell size, ucell align ); extern int ofmem_map( phys_addr_t phys, ucell virt, ucell size, ucell mode ); extern int ofmem_unmap( ucell virt, ucell size ); +extern ucell ofmem_map_io( phys_addr_t phys, ucell size ); extern void ofmem_release( ucell virt, ucell size ); extern void ofmem_release_phys( phys_addr_t phys, ucell size ); extern void ofmem_release_virt( ucell virt, ucell size ); extern phys_addr_t ofmem_translate( ucell virt, ucell *ret_mode ); -#ifdef CONFIG_PPC +/* Currently the same for all architectures */ #define PAGE_SHIFT 12 +#ifdef CONFIG_PPC unsigned long get_ram_top( void ); unsigned long get_ram_bottom( void ); #elif defined(CONFIG_SPARC32) -#define PAGE_SHIFT 12 /* arch/sparc32/lib.c */ struct mem; diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c index e1accb2..7f6223b 100644 --- a/openbios-devel/libopenbios/ofmem_common.c +++ b/openbios-devel/libopenbios/ofmem_common.c @@ -551,6 +551,35 @@ ucell ofmem_claim_virt( ucell virt, ucell size, ucell align ) get_ram_size(), ofmem_arch_get_virt_top(), 1 ); } +static ucell ofmem_claim_io_( ucell virt, ucell size, ucell align, + ucell min, ucell max, int reverse ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + if( !align ) { + if( !is_free( virt, size, ofmem->io_range ) ) { + OFMEM_TRACE("Non-free I/O memory claimed!\n"); + return -1; + } + add_entry( virt, size, &ofmem->io_range ); + return virt; + } + + virt = find_area( align, size, ofmem->io_range, min, max, reverse ); + if( virt == -1 ) { + printk("ofmem_claim_io - out of space (failed request for " FMT_ucellx " bytes)\n", size); + return -1; + } + add_entry( virt, size, &ofmem->io_range ); + return virt; +} + +ucell ofmem_claim_io( ucell virt, ucell size, ucell align ) +{ + /* Claim a section of memory from the I/O range */ + return ofmem_claim_io_( virt, size, align, + ofmem_arch_get_iomem_base(), ofmem_arch_get_iomem_top(), 0 ); +} + /* if align != 0, phys is ignored. Returns -1 on error */ phys_addr_t ofmem_retain( phys_addr_t phys, ucell size, ucell align ) { @@ -797,6 +826,29 @@ int ofmem_unmap( ucell virt, ucell size ) return 0; } +ucell ofmem_map_io( phys_addr_t phys, ucell size ) +{ + /* Claim virtual memory from the I/O range and map the page-aligned + physical address phys to it, returning the newly allocated + virtual address */ + ucell virt, mode; + phys_addr_t off; + int npages; + + off = phys & (PAGE_SIZE - 1); + npages = (off + size - 1) / PAGE_SIZE + 1; + phys &= ~(PAGE_SIZE - 1); + + virt = ofmem_claim_io(-1, npages * PAGE_SIZE, PAGE_SIZE); + + mode = ofmem_arch_io_translation_mode(off); + + ofmem_map_page_range(phys, virt, npages * PAGE_SIZE, mode); + ofmem_arch_early_map_pages(phys, virt, npages * PAGE_SIZE, mode); + + return (virt + off); +} + /* virtual -> physical. */ phys_addr_t ofmem_translate( ucell virt, ucell *mode ) { -- 1.7.2.3 [View Less]

1 0

[PATCH 09/13] Introduce ofmem_arch_io_translation_mode() to allow an OFMEM arch to specify different MMU modes for I/O memory mapped regions.
by Mark Cave-Ayland 30 Dec '10

30 Dec '10

Once this is in place, we can switch SPARC32's map_pages() over to use the MMU mode directly to bring it in line with the existing OFMEM API. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/ppc/qemu/ofmem.c | 4 ++++ openbios-devel/arch/sparc32/lib.c | 22 +++++++--------------- openbios-devel/arch/sparc32/ofmem_sparc32.c | 5 +++++ openbios-devel/arch/sparc64/ofmem_sparc64.c | 7 +++++-- openbios-devel/drivers/… [View More]iommu.c | 2 +- openbios-devel/include/libopenbios/ofmem.h | 1 + 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/openbios-devel/arch/ppc/qemu/ofmem.c b/openbios-devel/arch/ppc/qemu/ofmem.c index c0143a4..80fad75 100644 --- a/openbios-devel/arch/ppc/qemu/ofmem.c +++ b/openbios-devel/arch/ppc/qemu/ofmem.c @@ -239,6 +239,10 @@ ucell ofmem_arch_default_translation_mode(phys_addr_t phys) return 0x6a; /* WIm GxPp, I/O */ } +ucell ofmem_arch_io_translation_mode(phys_addr_t phys) +{ + return 0x6a; /* WIm GxPp, I/O */ +} /************************************************************************/ /* page fault handler */ diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index b9f33a9..12c69d9 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -208,15 +208,7 @@ map_pages(phys_addr_t phys, unsigned long virt, pa = find_pte(virt, 1); pte = SRMMU_ET_PTE | ((phys & PAGE_MASK) >> 4); - - if (mode) { /* I/O */ - pte |= SRMMU_REF; - /* SRMMU cannot make Supervisor-only, but not exectutable */ - pte |= SRMMU_PRIV; - } else { /* memory */ - pte |= SRMMU_REF | SRMMU_CACHE; - pte |= SRMMU_PRIV; /* Supervisor only access */ - } + pte |= mode; *(uint32_t *)pa = pte; @@ -244,7 +236,7 @@ map_io(uint64_t pa, int size) if (va == 0) return NULL; - map_pages(pa, va, npages * PAGE_SIZE, 1); + map_pages(pa, va, npages * PAGE_SIZE, ofmem_arch_io_translation_mode(pa)); return (void *)(va + off); } @@ -304,7 +296,7 @@ ob_map_pages(void) pa <<= 32; pa |= POP() & 0xffffffff; - map_pages(pa, va, size, 0); + map_pages(pa, va, size, ofmem_arch_default_translation_mode(pa)); DPRINTF("map-page: va 0x%lx pa 0x%llx size 0x%x\n", va, pa, size); } @@ -362,7 +354,7 @@ char *obp_dumb_mmap(char *va, int which_io, unsigned int pa, { uint64_t mpa = ((uint64_t)which_io << 32) | (uint64_t)pa; - map_pages(mpa, (unsigned long)va, size, 0); + map_pages(mpa, (unsigned long)va, size, ofmem_arch_default_translation_mode(mpa)); return va; } @@ -402,7 +394,7 @@ char *obp_dumb_memalloc(char *va, unsigned int size) DPRINTF("obp_dumb_memalloc req null -> 0x%p\n", va); } - map_pages(totavail[0].num_bytes, (unsigned long)va, size, 0); + map_pages(totavail[0].num_bytes, (unsigned long)va, size, ofmem_arch_default_translation_mode(totavail[0].num_bytes)); update_memory_properties(); @@ -496,10 +488,10 @@ init_mmu_swift(void) va = (unsigned long)&_start; size = (unsigned long)&_end - (unsigned long)&_start; pa = va2pa(va); - map_pages(pa, va, size, 0); + map_pages(pa, va, size, ofmem_arch_default_translation_mode(pa)); // 1:1 mapping for RAM - map_pages(0, 0, LOWMEMSZ, 0); + map_pages(0, 0, LOWMEMSZ, ofmem_arch_default_translation_mode(0)); /* * Flush cache diff --git a/openbios-devel/arch/sparc32/ofmem_sparc32.c b/openbios-devel/arch/sparc32/ofmem_sparc32.c index 74975e1..77112ec 100644 --- a/openbios-devel/arch/sparc32/ofmem_sparc32.c +++ b/openbios-devel/arch/sparc32/ofmem_sparc32.c @@ -123,6 +123,11 @@ ucell ofmem_arch_default_translation_mode( phys_addr_t phys ) return SRMMU_REF | SRMMU_CACHE | SRMMU_PRIV; } +ucell ofmem_arch_io_translation_mode( phys_addr_t phys ) +{ + return SRMMU_REF | SRMMU_PRIV; +} + /************************************************************************/ /* init / cleanup */ /************************************************************************/ diff --git a/openbios-devel/arch/sparc64/ofmem_sparc64.c b/openbios-devel/arch/sparc64/ofmem_sparc64.c index 0ec8632..6a4fb5e 100644 --- a/openbios-devel/arch/sparc64/ofmem_sparc64.c +++ b/openbios-devel/arch/sparc64/ofmem_sparc64.c @@ -120,8 +120,11 @@ ucell ofmem_arch_default_translation_mode( phys_addr_t phys ) return SPITFIRE_TTE_CP | SPITFIRE_TTE_CV | SPITFIRE_TTE_WRITABLE; } - - +ucell ofmem_arch_io_translation_mode( phys_addr_t phys ) +{ + /* Writable, not privileged and not locked */ + return SPITFIRE_TTE_CV | SPITFIRE_TTE_WRITABLE; +} /************************************************************************/ /* init / cleanup */ diff --git a/openbios-devel/drivers/iommu.c b/openbios-devel/drivers/iommu.c index bf3c887..6af5b33 100644 --- a/openbios-devel/drivers/iommu.c +++ b/openbios-devel/drivers/iommu.c @@ -68,7 +68,7 @@ dvma_alloc(int size, unsigned int *pphys) */ mva = (unsigned int) va; mpa = (unsigned int) pa; - map_pages(mpa, mva, npages * PAGE_SIZE, 1); + map_pages(mpa, mva, npages * PAGE_SIZE, ofmem_arch_io_translation_mode(mpa)); /* * Map into IOMMU page table. diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h index 2766a95..e350dec 100644 --- a/openbios-devel/include/libopenbios/ofmem.h +++ b/openbios-devel/include/libopenbios/ofmem.h @@ -69,6 +69,7 @@ extern int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value); 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( phys_addr_t phys ); +extern ucell ofmem_arch_io_translation_mode( phys_addr_t phys ); extern void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell mode); extern void ofmem_arch_unmap_pages(ucell virt, ucell size); -- 1.7.2.3 [View Less]

1 0

[PATCH 08/13] Remove the existing map_page() function and instead install a transitional API using map_pages() which is almost identical to the OFMEM API.
by Mark Cave-Ayland 30 Dec '10

30 Dec '10

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/lib.c | 75 ++++++++++++---------------- openbios-devel/drivers/iommu.c | 6 +-- openbios-devel/include/libopenbios/ofmem.h | 2 +- 3 files changed, 34 insertions(+), 49 deletions(-) diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index df9c0c1..b9f33a9 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/… [View More]sparc32/lib.c @@ -190,49 +190,41 @@ find_pte(unsigned long va, int alloc) return pa2va(pa); } -/* - * Create a memory mapping from va to epa. - */ -int -map_page(unsigned long va, uint64_t epa, int type) +void +map_pages(phys_addr_t phys, unsigned long virt, + unsigned long size, unsigned long mode) { + unsigned long npages, off; uint32_t pte; unsigned long pa; - pa = find_pte(va, 1); + DPRINTF("map_pages: va 0x%lx, pa 0x%llx, size 0x%lx\n", virt, phys, size); - pte = SRMMU_ET_PTE | ((epa & PAGE_MASK) >> 4); - if (type) { /* I/O */ - pte |= SRMMU_REF; - /* SRMMU cannot make Supervisor-only, but not exectutable */ - pte |= SRMMU_PRIV; - } else { /* memory */ - pte |= SRMMU_REF | SRMMU_CACHE; - pte |= SRMMU_PRIV; /* Supervisor only access */ - } - *(uint32_t *)pa = pte; - DPRINTF("map_page: va 0x%lx pa 0x%llx pte 0x%x\n", va, epa, pte); + off = phys & (PAGE_SIZE - 1); + npages = (off + (size - 1) + (PAGE_SIZE - 1)) / PAGE_SIZE; + phys &= ~(uint64_t)(PAGE_SIZE - 1); - return 0; -} + while (npages-- != 0) { + pa = find_pte(virt, 1); -static void map_pages(unsigned long va, uint64_t pa, int type, - unsigned long size) -{ - unsigned long npages, off; + pte = SRMMU_ET_PTE | ((phys & PAGE_MASK) >> 4); - DPRINTF("map_pages: va 0x%lx, pa 0x%llx, size 0x%lx\n", va, pa, size); + if (mode) { /* I/O */ + pte |= SRMMU_REF; + /* SRMMU cannot make Supervisor-only, but not exectutable */ + pte |= SRMMU_PRIV; + } else { /* memory */ + pte |= SRMMU_REF | SRMMU_CACHE; + pte |= SRMMU_PRIV; /* Supervisor only access */ + } - off = pa & (PAGE_SIZE - 1); - npages = (off + (size - 1) + (PAGE_SIZE - 1)) / PAGE_SIZE; - pa &= ~(uint64_t)(PAGE_SIZE - 1); + *(uint32_t *)pa = pte; - while (npages-- != 0) { - map_page(va, pa, type); - va += PAGE_SIZE; - pa += PAGE_SIZE; + virt += PAGE_SIZE; + phys += PAGE_SIZE; } } + /* * Create an I/O mapping to pa[size]. * Returns va of the mapping or 0 if unsuccessful. @@ -252,7 +244,7 @@ map_io(uint64_t pa, int size) if (va == 0) return NULL; - map_pages(va, pa, 1, npages * PAGE_SIZE); + map_pages(pa, va, npages * PAGE_SIZE, 1); return (void *)(va + off); } @@ -312,7 +304,7 @@ ob_map_pages(void) pa <<= 32; pa |= POP() & 0xffffffff; - map_pages(va, pa, 0, size); + map_pages(pa, va, size, 0); DPRINTF("map-page: va 0x%lx pa 0x%llx size 0x%x\n", va, pa, size); } @@ -370,7 +362,7 @@ char *obp_dumb_mmap(char *va, int which_io, unsigned int pa, { uint64_t mpa = ((uint64_t)which_io << 32) | (uint64_t)pa; - map_pages((unsigned long)va, mpa, 0, size); + map_pages(mpa, (unsigned long)va, size, 0); return va; } @@ -410,7 +402,7 @@ char *obp_dumb_memalloc(char *va, unsigned int size) DPRINTF("obp_dumb_memalloc req null -> 0x%p\n", va); } - map_pages((unsigned long)va, totavail[0].num_bytes, 0, size); + map_pages(totavail[0].num_bytes, (unsigned long)va, size, 0); update_memory_properties(); @@ -481,6 +473,7 @@ init_mmu_swift(void) { unsigned int addr, i; unsigned long pa, va; + int size; mem_init(&cmem, (char *) &_vmem, (char *)&_evmem); mem_init(&cio, (char *)&_end, (char *)&_iomem); @@ -501,16 +494,12 @@ init_mmu_swift(void) // text, rodata, data, and bss mapped to end of RAM va = (unsigned long)&_start; - for (; va < (unsigned long)&_end; va += PAGE_SIZE) { - pa = va2pa(va); - map_page(va, pa, 0); - } + size = (unsigned long)&_end - (unsigned long)&_start; + pa = va2pa(va); + map_pages(pa, va, size, 0); // 1:1 mapping for RAM - pa = va = 0; - for (; va < LOWMEMSZ; va += PAGE_SIZE, pa += PAGE_SIZE) { - map_page(va, pa, 0); - } + map_pages(0, 0, LOWMEMSZ, 0); /* * Flush cache diff --git a/openbios-devel/drivers/iommu.c b/openbios-devel/drivers/iommu.c index 716d01e..bf3c887 100644 --- a/openbios-devel/drivers/iommu.c +++ b/openbios-devel/drivers/iommu.c @@ -68,11 +68,7 @@ dvma_alloc(int size, unsigned int *pphys) */ mva = (unsigned int) va; mpa = (unsigned int) pa; - for (i = 0; i < npages; i++) { - map_page(mva, mpa, 1); - mva += PAGE_SIZE; - mpa += PAGE_SIZE; - } + map_pages(mpa, mva, npages * PAGE_SIZE, 1); /* * Map into IOMMU page table. diff --git a/openbios-devel/include/libopenbios/ofmem.h b/openbios-devel/include/libopenbios/ofmem.h index 54868e2..2766a95 100644 --- a/openbios-devel/include/libopenbios/ofmem.h +++ b/openbios-devel/include/libopenbios/ofmem.h @@ -129,7 +129,7 @@ extern struct mem cdvmem; void mem_init(struct mem *t, char *begin, char *limit); void *mem_alloc(struct mem *t, int size, int align); -int map_page(unsigned long va, uint64_t epa, int type); +void map_pages(phys_addr_t phys, unsigned long virt, unsigned long size, unsigned long mode); void *map_io(uint64_t pa, int size); #endif -- 1.7.2.3 [View Less]

1 0

[PATCH 07/13] Switch SPARC32 over to use OFMEM's malloc()/free() internally rather than using it's own implementation.
by Mark Cave-Ayland 30 Dec '10

30 Dec '10

Also juggle the memory to take into account that the allocations are coming from OFMEM, and remove posix_memalign2() since it is no longer required. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/ldscript | 3 +- openbios-devel/arch/sparc32/lib.c | 120 ++------------------------- openbios-devel/arch/sparc32/ofmem_sparc32.c | 2 +- 3 files changed, 11 insertions(+), 114 deletions(-) diff --git a/openbios-devel/… [View More]arch/sparc32/ldscript b/openbios-devel/arch/sparc32/ldscript index da94a56..32c9445 100644 --- a/openbios-devel/arch/sparc32/ldscript +++ b/openbios-devel/arch/sparc32/ldscript @@ -12,8 +12,7 @@ BASE_ADDR = 0xffd00000; /* 16KB stack */ STACK_SIZE = 16384; -/* 256k general alloc + 256k Forth dictionary + 16k Forth memory */ -VMEM_SIZE = (256 + 256 + 16) * 1024; +VMEM_SIZE = 128 * 1024; IOMEM_SIZE = 256 * 1024 + 768 * 1024; SECTIONS diff --git a/openbios-devel/arch/sparc32/lib.c b/openbios-devel/arch/sparc32/lib.c index a5ad8ca..df9c0c1 100644 --- a/openbios-devel/arch/sparc32/lib.c +++ b/openbios-devel/arch/sparc32/lib.c @@ -75,18 +75,6 @@ struct linux_mlist_v0 *ptphys; struct linux_mlist_v0 *ptmap; struct linux_mlist_v0 *ptavail; -static struct { - char *next_malloc; - int left; - 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; -#define ALLOC_BLOCK (64 * 1024) - /* Private functions for mapping between physical/virtual addresses */ phys_addr_t va2pa(unsigned long va) @@ -108,112 +96,22 @@ pa2va(phys_addr_t pa) return pa; } -// XXX should be posix_memalign -static int -posix_memalign2(void **memptr, size_t alignment, size_t size) -{ - alloc_desc_t *d, **pp; - char *ret; - - if( !size ) - return -1; - - size = (size + (alignment - 1)) & ~(alignment - 1); - size += sizeof(alloc_desc_t); - - /* 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; - *memptr = ret; - return 0; - } - - if( !ofmem.next_malloc || ofmem.left < size) { - unsigned long alloc_size = ALLOC_BLOCK; - if (size > ALLOC_BLOCK) - alloc_size = size; - // Recover possible leftover - if ((size_t)ofmem.left > sizeof(alloc_desc_t) + 4) { - alloc_desc_t *d_leftover; - - d_leftover = (alloc_desc_t*)ofmem.next_malloc; - d_leftover->size = ofmem.left - sizeof(alloc_desc_t); - free((void *)((unsigned long)d_leftover + - sizeof(alloc_desc_t))); - } - - ofmem.next_malloc = mem_alloc(&cmem, alloc_size, 8); - ofmem.left = alloc_size; - } - - if( ofmem.left < size) { - printk("out of malloc memory (%x)!\n", size ); - return -1; - } - d = (alloc_desc_t*) ofmem.next_malloc; - ofmem.next_malloc += size; - ofmem.left -= size; - - d->next = NULL; - d->size = size; - - ret = (char*)d + sizeof(alloc_desc_t); - memset( ret, 0, size - sizeof(alloc_desc_t) ); - *memptr = ret; - return 0; -} - -void *malloc(int size) +void * +malloc(int size) { - int ret; - void *mem; - - ret = posix_memalign2(&mem, 8, size); - if (ret != 0) - return NULL; - return mem; + return ofmem_malloc(size); } -void free(void *ptr) +void * +realloc( void *ptr, size_t size ) { - alloc_desc_t **pp, *d; - - /* it is legal to free NULL pointers (size zero allocations) */ - if( !ptr ) - return; - - d = (alloc_desc_t*)((unsigned long)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 ofmem_realloc(ptr, size); } -void * -realloc( void *ptr, size_t size ) +void +free(void *ptr) { - alloc_desc_t *d = (alloc_desc_t*)((unsigned long)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; + ofmem_free(ptr); } /* diff --git a/openbios-devel/arch/sparc32/ofmem_sparc32.c b/openbios-devel/arch/sparc32/ofmem_sparc32.c index e45af2e..74975e1 100644 --- a/openbios-devel/arch/sparc32/ofmem_sparc32.c +++ b/openbios-devel/arch/sparc32/ofmem_sparc32.c @@ -21,7 +21,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE (256 * 1024) +#define MEMSIZE (512 * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem; -- 1.7.2.3 [View Less]

1 0

[PATCH 06/13] 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.
by Mark Cave-Ayland 30 Dec '10

30 Dec '10

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> --- openbios-devel/arch/sparc32/openbios.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/openbios-devel/arch/sparc32/openbios.c b/openbios-devel/arch/sparc32/openbios.c index 1419468..c940a5f 100644 --- a/openbios-devel/arch/sparc32/openbios.c +++ b/openbios-devel/arch/sparc32/openbios.c @@ -25,6 +25,7 @@ #include "packages/video.h" #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" +#… [View More]

1 0